[Subtyping Generator] Test and improve generated runtime subtype check

Makefile

@@ -52,7 +52,7 @@ build-commands: ./cmd/parse/parse ./cmd/parse/parse.wasm ./cmd/check/check ./cmd
 build-tools: build-analysis build-get-contracts build-compatibility-check
 
 .PHONY: test-tools
-test-tools: test-analysis test-compatibility-check
+test-tools: test-analysis test-compatibility-check test-subtype-gen
 
 ## Analysis tool
 
@@ -80,6 +80,12 @@ build-compatibility-check:
 test-compatibility-check:
 	(cd ./tools/compatibility-check && go test .)
 
+## Subtyping generator tool
+
+.PHONY: test-subtype-gen
+test-subtype-gen:
+	(cd ./tools/subtype-gen && go test .)
+
 # Testing
 
 TEST_PKGS := $(shell go list ./... | grep -Ev '/cmd|/analysis|/tools')

encoding/ccf/ccf_test.go

@@ -8783,6 +8783,7 @@ func TestEncodeSimpleTypes(t *testing.T) {
 		ccf.SimpleTypeIssueAccountCapabilityController: cadence.IssueAccountCapabilityControllerType,
 		ccf.SimpleTypeCapabilitiesMapping:              cadence.CapabilitiesMappingType,
 		ccf.SimpleTypeAccountMapping:                   cadence.AccountMappingType,
+		ccf.SimpleTypeStorable:                         cadence.StorableType,
 	}
 
 	var missingTests []string

encoding/ccf/simpletype.go

@@ -150,6 +150,8 @@ const ( // Cadence simple type IDs
 	SimpleTypeUFix128
 	_
 
+	SimpleTypeStorable
+
 	// !!! *WARNING* !!!
 	// ADD NEW TYPES *BEFORE* THIS WARNING.
 	// DO *NOT* ADD NEW TYPES AFTER THIS LINE!
@@ -174,6 +176,7 @@ func initSimpleTypeIDBiMap() (m *bimap.BiMap[cadence.PrimitiveType, SimpleType])
 	m.Insert(cadence.StringType, SimpleTypeString)
 	m.Insert(cadence.CharacterType, SimpleTypeCharacter)
 	m.Insert(cadence.HashableStructType, SimpleTypeHashableStruct)
+	m.Insert(cadence.StorableType, SimpleTypeStorable)
 
 	m.Insert(cadence.NumberType, SimpleTypeNumber)
 	m.Insert(cadence.SignedNumberType, SimpleTypeSignedNumber)

interpreter/memory_metering_test.go

@@ -9730,6 +9730,7 @@ func TestInterpretStaticTypeStringConversion(t *testing.T) {
 
 			switch primitiveStaticType {
 			case interpreter.PrimitiveStaticTypeAny,
+				interpreter.PrimitiveStaticTypeStorable,
 				interpreter.PrimitiveStaticTypeUnknown,
 				interpreter.PrimitiveStaticType_Count:
 				continue

interpreter/primitivestatictype.go

@@ -86,7 +86,7 @@ const (
 	PrimitiveStaticTypeAnyResourceAttachment
 	PrimitiveStaticTypeAnyStructAttachment
 	PrimitiveStaticTypeHashableStruct
-	_
+	PrimitiveStaticTypeStorable
 	_
 	_
 
@@ -273,7 +273,8 @@ func (t PrimitiveStaticType) elementSize() uint {
 		PrimitiveStaticTypeAny,
 		PrimitiveStaticTypeAnyStructAttachment,
 		PrimitiveStaticTypeAnyResourceAttachment,
-		PrimitiveStaticTypeHashableStruct:
+		PrimitiveStaticTypeHashableStruct,
+		PrimitiveStaticTypeStorable:
 		return UnknownElementSize
 
 	case PrimitiveStaticTypeVoid:
@@ -511,6 +512,9 @@ func (t PrimitiveStaticType) SemaType() sema.Type {
 	case PrimitiveStaticTypeBlock:
 		return sema.BlockType
 
+	case PrimitiveStaticTypeStorable:
+		return sema.StorableType
+
 	// Number
 
 	case PrimitiveStaticTypeNumber:
@@ -881,6 +885,8 @@ func ConvertSemaToPrimitiveStaticType(
 		typ = PrimitiveStaticTypeStorageCapabilityController
 	case sema.AccountCapabilityControllerType:
 		typ = PrimitiveStaticTypeAccountCapabilityController
+	case sema.StorableType:
+		typ = PrimitiveStaticTypeStorable
 
 	case sema.AccountType:
 		typ = PrimitiveStaticTypeAccount

interpreter/statictype.go

@@ -357,7 +357,7 @@ func (t InclusiveRangeStaticType) BaseType() StaticType {
 	if t.ElementType == nil {
 		return nil
 	}
-	return &InclusiveRangeStaticType{}
+	return InclusiveRangeStaticType{}
 }
 
 func (t InclusiveRangeStaticType) TypeArguments() []StaticType {
@@ -1357,12 +1357,15 @@ func ConvertStaticToSemaType(
 		), nil
 
 	case InclusiveRangeStaticType:
-		elementType, err := ConvertStaticToSemaType(
-			context,
-			t.ElementType,
-		)
-		if err != nil {
-			return nil, err
+		var elementType sema.Type
+		if t.ElementType != nil {
+			elementType, err = ConvertStaticToSemaType(
+				context,
+				t.ElementType,
+			)
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		return sema.NewInclusiveRangeType(

interpreter/statictype_test.go

@@ -1621,6 +1621,11 @@ func TestStaticTypeConversion(t *testing.T) {
 				ElementType: PrimitiveStaticTypeInt,
 			},
 		},
+		{
+			name:       "Storable",
+			semaType:   sema.StorableType,
+			staticType: PrimitiveStaticTypeStorable,
+		},
 		// Deprecated primitive static types, only exist for migration purposes
 		{
 			name:           "AuthAccount",