Improve allocations in checker

runtime/interpreter/function_test.go

@@ -44,7 +44,6 @@ func TestFunctionStaticType(t *testing.T) {
 		}
 
 		hostFunctionType := &sema.FunctionType{
-			Parameters:           []*sema.Parameter{},
 			ReturnTypeAnnotation: sema.NewTypeAnnotation(sema.BoolType),
 		}
 
@@ -69,7 +68,6 @@ func TestFunctionStaticType(t *testing.T) {
 		}
 
 		hostFunctionType := &sema.FunctionType{
-			Parameters:           []*sema.Parameter{},
 			ReturnTypeAnnotation: sema.NewTypeAnnotation(sema.BoolType),
 		}
 

runtime/interpreter/interpreter.go

@@ -42,7 +42,7 @@ import (
 //
 
 var emptyFunctionType = &sema.FunctionType{
-	ReturnTypeAnnotation: &sema.TypeAnnotation{
+	ReturnTypeAnnotation: sema.TypeAnnotation{
 		Type: sema.VoidType,
 	},
 }
@@ -942,7 +942,7 @@ func (interpreter *Interpreter) declareNonEnumCompositeValue(
 	constructorType := &sema.FunctionType{
 		IsConstructor: true,
 		Parameters:    compositeType.ConstructorParameters,
-		ReturnTypeAnnotation: &sema.TypeAnnotation{
+		ReturnTypeAnnotation: sema.TypeAnnotation{
 			Type: compositeType,
 		},
 		RequiredArgumentCount: nil,
@@ -2725,24 +2725,29 @@ func init() {
 				}
 
 				returnType := invocation.Interpreter.MustConvertStaticToSemaType(typeValue.Type)
-				parameterTypes := make([]*sema.Parameter, 0, parameters.Count())
-				parameters.Iterate(invocation.Interpreter, func(param Value) bool {
-					semaType := invocation.Interpreter.MustConvertStaticToSemaType(param.(TypeValue).Type)
-					parameterTypes = append(
-						parameterTypes,
-						&sema.Parameter{
-							TypeAnnotation: sema.NewTypeAnnotation(semaType),
-						},
-					)
 
-					// Continue iteration
-					return true
-				})
+				var resultParameters []sema.Parameter
+				parameterCount := parameters.Count()
+				if parameterCount > 0 {
+					resultParameters = make([]sema.Parameter, 0, parameterCount)
+					parameters.Iterate(invocation.Interpreter, func(param Value) bool {
+						semaType := invocation.Interpreter.MustConvertStaticToSemaType(param.(TypeValue).Type)
+						resultParameters = append(
+							resultParameters,
+							sema.Parameter{
+								TypeAnnotation: sema.NewTypeAnnotation(semaType),
+							},
+						)
+
+						// Continue iteration
+						return true
+					})
+				}
 				functionStaticType := NewFunctionStaticType(
 					invocation.Interpreter,
 					&sema.FunctionType{
 						ReturnTypeAnnotation: sema.NewTypeAnnotation(returnType),
-						Parameters:           parameterTypes,
+						Parameters:           resultParameters,
 					},
 				)
 				return NewUnmeteredTypeValue(functionStaticType)

runtime/interpreter/statictype.go

@@ -832,7 +832,7 @@ func (t FunctionStaticType) ParameterTypes(interpreter *Interpreter) []StaticTyp
 
 func (t FunctionStaticType) ReturnType(interpreter *Interpreter) StaticType {
 	var returnType StaticType
-	if t.Type.ReturnTypeAnnotation != nil {
+	if t.Type.ReturnTypeAnnotation.Type != nil {
 		returnType = ConvertSemaToStaticType(interpreter, t.Type.ReturnTypeAnnotation.Type)
 	}
 

runtime/interpreter/value_test.go

@@ -3709,7 +3709,7 @@ func TestValue_ConformsToStaticType(t *testing.T) {
 		t.Parallel()
 
 		functionType := &sema.FunctionType{
-			Parameters: []*sema.Parameter{
+			Parameters: []sema.Parameter{
 				{
 					TypeAnnotation: sema.NewTypeAnnotation(sema.IntType),
 				},

runtime/runtime.go

@@ -364,7 +364,7 @@ func validateArgumentParams(
 	decoder ArgumentDecoder,
 	locationRange interpreter.LocationRange,
 	arguments [][]byte,
-	parameters []*sema.Parameter,
+	parameters []sema.Parameter,
 ) (
 	[]interpreter.Value,
 	error,

runtime/sema/account_contracts.go

@@ -29,7 +29,7 @@ Returns nil if no contract/contract interface with the given name exists in the
 `
 
 var AccountContractsTypeGetFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier: "name",
 			TypeAnnotation: NewTypeAnnotation(
@@ -63,7 +63,7 @@ var AccountContractsTypeBorrowFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Identifier:     "name",
 				TypeAnnotation: NewTypeAnnotation(StringType),

runtime/sema/authaccount_contracts.go

@@ -103,7 +103,7 @@ Returns the deployed contract.
 `
 
 var AuthAccountContractsTypeAddFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier: "name",
 			TypeAnnotation: NewTypeAnnotation(
@@ -144,7 +144,7 @@ Returns the deployed contract for the updated contract.
 `
 
 var AuthAccountContractsTypeUpdateExperimentalFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier: "name",
 			TypeAnnotation: NewTypeAnnotation(
@@ -172,7 +172,7 @@ Returns nil if no contract/contract interface with the given name exists in the
 `
 
 var AuthAccountContractsTypeRemoveFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier:     "name",
 			TypeAnnotation: NewTypeAnnotation(StringType),

runtime/sema/authaccount_type.go

@@ -293,7 +293,7 @@ var AuthAccountForEachPrivateFunctionType = AccountForEachFunctionType(PrivatePa
 var AuthAccountForEachStoredFunctionType = AccountForEachFunctionType(StoragePathType)
 
 var AuthAccountTypeAddPublicKeyFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:      ArgumentLabelNotRequired,
 			Identifier: "key",
@@ -312,7 +312,7 @@ Adds the given byte representation of a public key to the account's keys
 `
 
 var AuthAccountTypeRemovePublicKeyFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:      ArgumentLabelNotRequired,
 			Identifier: "index",
@@ -341,7 +341,7 @@ var AuthAccountTypeSaveFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:      ArgumentLabelNotRequired,
 				Identifier: "value",
@@ -381,7 +381,7 @@ var AuthAccountTypeLoadFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          "from",
 				Identifier:     "path",
@@ -407,7 +407,7 @@ The path must be a storage path, i.e., only the domain ` + "`storage`" + ` is al
 `
 
 var AuthAccountTypeTypeFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:          "at",
 			Identifier:     "path",
@@ -446,7 +446,7 @@ var AuthAccountTypeCopyFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          "from",
 				Identifier:     "path",
@@ -489,7 +489,7 @@ var AuthAccountTypeBorrowFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          "from",
 				Identifier:     "path",
@@ -534,7 +534,7 @@ var AuthAccountTypeLinkFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          ArgumentLabelNotRequired,
 				Identifier:     "newCapabilityPath",
@@ -571,7 +571,7 @@ The link is latent. The target value might be stored after the link is created,
 `
 
 var AuthAccountTypeUnlinkFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:          ArgumentLabelNotRequired,
 			Identifier:     "capabilityPath",
@@ -599,7 +599,7 @@ var AuthAccountTypeGetCapabilityFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          ArgumentLabelNotRequired,
 				Identifier:     "capabilityPath",
@@ -621,7 +621,7 @@ Returns the capability at the given private or public path, or nil if it does no
 `
 
 var AccountTypeGetLinkTargetFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:          ArgumentLabelNotRequired,
 			Identifier:     "capabilityPath",
@@ -683,7 +683,7 @@ var AuthAccountKeysType = func() *CompositeType {
 }()
 
 var AuthAccountKeysTypeAddFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier:     AccountKeyPublicKeyField,
 			TypeAnnotation: NewTypeAnnotation(PublicKeyType),
@@ -702,7 +702,7 @@ var AuthAccountKeysTypeAddFunctionType = &FunctionType{
 }
 
 var AccountKeysTypeGetFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier:     AccountKeyKeyIndexField,
 			TypeAnnotation: NewTypeAnnotation(IntType),
@@ -716,7 +716,7 @@ var AccountKeysTypeGetFunctionType = &FunctionType{
 var AccountKeysTypeForEachFunctionType = func() *FunctionType {
 	// ((AccountKey): Bool)
 	iterFunctionType := &FunctionType{
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				TypeAnnotation: NewTypeAnnotation(AccountKeyType),
 			},
@@ -725,7 +725,7 @@ var AccountKeysTypeForEachFunctionType = func() *FunctionType {
 	}
 
 	return &FunctionType{
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          ArgumentLabelNotRequired,
 				Identifier:     "function",
@@ -739,7 +739,7 @@ var AccountKeysTypeForEachFunctionType = func() *FunctionType {
 var AccountKeysTypeCountFieldType = UInt64Type
 
 var AuthAccountKeysTypeRevokeFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Identifier:     AccountKeyKeyIndexField,
 			TypeAnnotation: NewTypeAnnotation(IntType),
@@ -819,7 +819,7 @@ Publishes the argument value under the given name, to be later claimed by the sp
 `
 
 var AuthAccountTypeInboxPublishFunctionType = &FunctionType{
-	Parameters: []*Parameter{
+	Parameters: []Parameter{
 		{
 			Label:          ArgumentLabelNotRequired,
 			Identifier:     "value",
@@ -854,7 +854,7 @@ var AuthAccountTypeInboxUnpublishFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          ArgumentLabelNotRequired,
 				Identifier:     "name",
@@ -888,7 +888,7 @@ var AuthAccountTypeInboxClaimFunctionType = func() *FunctionType {
 		TypeParameters: []*TypeParameter{
 			typeParameter,
 		},
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Label:          ArgumentLabelNotRequired,
 				Identifier:     "name",

runtime/sema/check_composite_declaration.go

@@ -866,7 +866,7 @@ func (checker *Checker) declareEnumConstructor(
 func EnumConstructorType(compositeType *CompositeType) *FunctionType {
 	return &FunctionType{
 		IsConstructor: true,
-		Parameters: []*Parameter{
+		Parameters: []Parameter{
 			{
 				Identifier:     EnumRawValueFieldName,
 				TypeAnnotation: NewTypeAnnotation(compositeType.EnumRawType),
@@ -902,9 +902,9 @@ func (checker *Checker) checkMemberStorability(members *StringMemberOrderedMap)
 	})
 }
 
-func (checker *Checker) initializerParameters(initializers []*ast.SpecialFunctionDeclaration) []*Parameter {
+func (checker *Checker) initializerParameters(initializers []*ast.SpecialFunctionDeclaration) []Parameter {
 	// TODO: support multiple overloaded initializers
-	var parameters []*Parameter
+	var parameters []Parameter
 
 	initializerCount := len(initializers)
 	if initializerCount > 0 {
@@ -1260,8 +1260,8 @@ func (checker *Checker) memberSatisfied(compositeMember, interfaceMember *Member
 
 			// Functions are covariant in their return type
 
-			if compositeMemberFunctionType.ReturnTypeAnnotation != nil &&
-				interfaceMemberFunctionType.ReturnTypeAnnotation != nil {
+			if compositeMemberFunctionType.ReturnTypeAnnotation.Type != nil &&
+				interfaceMemberFunctionType.ReturnTypeAnnotation.Type != nil {
 
 				if !IsSubType(
 					compositeMemberFunctionType.ReturnTypeAnnotation.Type,
@@ -1271,10 +1271,10 @@ func (checker *Checker) memberSatisfied(compositeMember, interfaceMember *Member
 				}
 			}
 
-			if (compositeMemberFunctionType.ReturnTypeAnnotation != nil &&
-				interfaceMemberFunctionType.ReturnTypeAnnotation == nil) ||
-				(compositeMemberFunctionType.ReturnTypeAnnotation == nil &&
-					interfaceMemberFunctionType.ReturnTypeAnnotation != nil) {
+			if (compositeMemberFunctionType.ReturnTypeAnnotation.Type != nil &&
+				interfaceMemberFunctionType.ReturnTypeAnnotation.Type == nil) ||
+				(compositeMemberFunctionType.ReturnTypeAnnotation.Type == nil &&
+					interfaceMemberFunctionType.ReturnTypeAnnotation.Type != nil) {
 
 				return false
 			}
@@ -1781,7 +1781,7 @@ func (checker *Checker) checkInitializers(
 	fields []*ast.FieldDeclaration,
 	containerType Type,
 	containerDocString string,
-	initializerParameters []*Parameter,
+	initializerParameters []Parameter,
 	containerKind ContainerKind,
 	initializationInfo *InitializationInfo,
 ) {
@@ -1852,7 +1852,7 @@ func (checker *Checker) checkSpecialFunction(
 	specialFunction *ast.SpecialFunctionDeclaration,
 	containerType Type,
 	containerDocString string,
-	parameters []*Parameter,
+	parameters []Parameter,
 	containerKind ContainerKind,
 	initializationInfo *InitializationInfo,
 ) {

runtime/sema/check_event_declaration.go

@@ -27,7 +27,7 @@ import (
 // as determined by `isValidEventParameterType`.
 func (checker *Checker) checkEventParameters(
 	parameterList *ast.ParameterList,
-	parameters []*Parameter,
+	parameters []Parameter,
 ) {
 
 	parameterTypeValidationResults := map[*Member]bool{}