[Compiler] Sync with master

[turbolent]

Work towards #3742

Description

Merge master into the feature branch.

Conflict resolution:

commit 359ce2ab0abbcf73763dd0ec1edcdf3e4dea66df
Merge: 4703a34a2 68a046054
Author: Bastian Müller <[email protected]>
Date:   Wed Jan 29 10:54:04 2025 -0800

    Merge branch 'master' into bastian/sync-compiler

diff --git a/interpreter/encode.go b/interpreter/encode.go
remerge CONFLICT (content): Merge conflict in interpreter/encode.go
index 101a0d46d..aad1bfa82 100644
--- a/interpreter/encode.go
+++ b/interpreter/encode.go
@@ -1684,15 +1684,7 @@ func (c CompositeTypeInfo) IsComposite() bool {
 	return true
 }
 
-<<<<<<< 4703a34a2 (Merge pull request #3735 from onflow/supun/compiler-lint)
-func (c CompositeTypeInfo) Identifier() string {
-	return string(c.Location.TypeID(nil, c.QualifiedIdentifier))
-}
-
 func (c CompositeTypeInfo) Copy() atree.TypeInfo {
-=======
-func (c compositeTypeInfo) Copy() atree.TypeInfo {
->>>>>>> 68a046054 (Merge pull request #3743 from onflow/release/v1.3.1)
 	// Return c as is because c is a value type.
 	return c
 }
diff --git a/interpreter/value_composite.go b/interpreter/value_composite.go
remerge CONFLICT (content): Merge conflict in interpreter/value_composite.go
index caf1c3052..db1ce4c49 100644
--- a/interpreter/value_composite.go
+++ b/interpreter/value_composite.go
@@ -1953,11 +1953,10 @@ func (v *CompositeValue) ForEach(
 	}
 }
 
-<<<<<<< 4703a34a2 (Merge pull request #3735 from onflow/supun/compiler-lint)
 func (v *CompositeValue) AtreeMap() *atree.OrderedMap {
 	return v.dictionary
-=======
+}
+
 func (v *CompositeValue) Inlined() bool {
 	return v.dictionary.Inlined()
->>>>>>> 68a046054 (Merge pull request #3743 from onflow/release/v1.3.1)
 }
diff --git a/interpreter/value_dictionary.go b/interpreter/value_dictionary.go
remerge CONFLICT (content): Merge conflict in interpreter/value_dictionary.go
index 3946fdc80..8ee1be485 100644
--- a/interpreter/value_dictionary.go
+++ b/interpreter/value_dictionary.go
@@ -1599,15 +1599,14 @@ func (v *DictionaryValue) SetType(staticType *DictionaryStaticType) {
 	}
 }
 
-<<<<<<< 4703a34a2 (Merge pull request #3735 from onflow/supun/compiler-lint)
 func (v *DictionaryValue) AtreeMap() *atree.OrderedMap {
 	return v.dictionary
 }
 
 func (v *DictionaryValue) ElementSize() uint {
 	return v.elementSize
-=======
+}
+
 func (v *DictionaryValue) Inlined() bool {
 	return v.dictionary.Inlined()
->>>>>>> 68a046054 (Merge pull request #3743 from onflow/release/v1.3.1)
 }
diff --git a/runtime/runtime_test.go b/runtime/runtime_test.go
remerge CONFLICT (content): Merge conflict in runtime/runtime_test.go
index ee3d7cb77..4394b73e9 100644
--- a/runtime/runtime_test.go
+++ b/runtime/runtime_test.go
@@ -11912,7 +11912,6 @@ func TestRuntimeBuiltInFunctionConfusion(t *testing.T) {
 	require.ErrorAs(t, err, &redeclarationError)
 }
 
-<<<<<<< 4703a34a2 (Merge pull request #3735 from onflow/supun/compiler-lint)
 func BenchmarkContractFunctionInvocation(b *testing.B) {
 
 	runtime := NewTestInterpreterRuntime()
@@ -11938,37 +11937,10 @@ func BenchmarkContractFunctionInvocation(b *testing.B) {
                   // return self.id
                   return Test.helloText()
               }
-=======
-func TestRuntimeInvocationReturnTypeInferenceFailure(t *testing.T) {
-
-	t.Parallel()
-
-	address := common.MustBytesToAddress([]byte{0x1})
-
-	newRuntimeInterface := func() Interface {
-
-		return &TestRuntimeInterface{
-			Storage: NewTestLedger(nil, nil),
-			OnGetSigningAccounts: func() ([]common.Address, error) {
-				return []common.Address{address}, nil
-			},
-		}
-	}
-
-	runtime := NewTestInterpreterRuntime()
-
-	nextTransactionLocation := NewTransactionLocationGenerator()
-
-	tx := []byte(`
-      transaction{
-          prepare(signer: auth(Storage) &Account){
-              let functions = [signer.storage.save].reverse()
->>>>>>> 68a046054 (Merge pull request #3743 from onflow/release/v1.3.1)
           }
       }
     `)
 
-<<<<<<< 4703a34a2 (Merge pull request #3735 from onflow/supun/compiler-lint)
 	deploy := DeploymentTransaction("Test", contract)
 
 	var accountCode []byte
@@ -12045,7 +12017,36 @@ func TestRuntimeInvocationReturnTypeInferenceFailure(t *testing.T) {
 		)
 		require.NoError(b, err)
 	}
-=======
+}
+
+func TestRuntimeInvocationReturnTypeInferenceFailure(t *testing.T) {
+
+	t.Parallel()
+
+	address := common.MustBytesToAddress([]byte{0x1})
+
+	newRuntimeInterface := func() Interface {
+
+		return &TestRuntimeInterface{
+			Storage: NewTestLedger(nil, nil),
+			OnGetSigningAccounts: func() ([]common.Address, error) {
+				return []common.Address{address}, nil
+			},
+		}
+	}
+
+	runtime := NewTestInterpreterRuntime()
+
+	nextTransactionLocation := NewTransactionLocationGenerator()
+
+	tx := []byte(`
+      transaction{
+          prepare(signer: auth(Storage) &Account){
+              let functions = [signer.storage.save].reverse()
+          }
+      }
+    `)
+
 	err := runtime.ExecuteTransaction(
 		Script{
 			Source: tx,
@@ -12383,5 +12384,4 @@ func TestRuntimeSomeValueChildContainerMutation(t *testing.T) {
 		logs = runTransaction(buyTicketTx)
 		assert.Equal(t, []string{"5.00000000", "10.00000000"}, logs)
 	})
->>>>>>> 68a046054 (Merge pull request #3743 from onflow/release/v1.3.1)
 }

---

• Targeted PR against master branch
• Linked to Github issue with discussion and accepted design OR link to spec that describes this work
• Code follows the standards mentioned here
• Updated relevant documentation
• Re-reviewed Files changed in the Github PR explorer
• Added appropriate labels

[github-actions]

Cadence Benchstat comparison

This branch with compared with the base branch onflow:feature/compiler commit 4703a34
The command for i in {1..N}; do go test ./... -run=XXX -bench=. -benchmem -shuffle=on; done was used.
Bench tests were run a total of 7 times on each branch.

Collapsed results for better readability

[SupunS]

Thank you for updating!