Merge pull request #3785 from onflow/bastian/sync-compiler-2

Sync compiler feature branch

.github/workflows/compatibility-check-template.yml

@@ -102,7 +102,7 @@ jobs:
       # Upload checking results for later use
 
       - name: Archive checking results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.chain }}-checking-results
           path: |

.github/workflows/get-contracts.yml

@@ -45,7 +45,7 @@ jobs:
       # Upload
 
       - name: Upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ inputs.chain }}-contracts
           path: |

README.md

@@ -45,3 +45,5 @@ If you would like to contribute to Cadence, have a look at the [contributing gui
 
 Development documentation can be found in the [`/docs` directory](https://github.com/onflow/cadence/tree/master/docs).
 For example, it contains the source for the language reference.
+
+You can also look out for the next [Cadence Working Group](https://github.com/onflow/Flow-Working-Groups/tree/main/cadence_language_and_execution_working_group) meeting and join our discussions!

activations/activations.go

@@ -107,6 +107,19 @@ func (a *Activation[T]) Set(name string, value T) {
 	a.entries[name] = value
 }
 
+func (a *Activation[T]) Clone() *Activation[T] {
+	clone := NewActivation[T](a.MemoryGauge, a.Parent)
+
+	if a.entries != nil {
+		clone.entries = make(map[string]T, len(a.entries))
+		for name, value := range a.entries { //nolint:maprange
+			clone.entries[name] = value
+		}
+	}
+
+	return clone
+}
+
 // Activations is a stack of activation records.
 // Each entry represents a new activation record.
 //

ast/visitor.go

@@ -30,7 +30,7 @@ type Element interface {
 
 type StatementDeclarationVisitor[T any] interface {
 	VisitVariableDeclaration(*VariableDeclaration) T
-	VisitFunctionDeclaration(*FunctionDeclaration) T
+	VisitFunctionDeclaration(declaration *FunctionDeclaration, isStatement bool) T
 	VisitSpecialFunctionDeclaration(*SpecialFunctionDeclaration) T
 	VisitCompositeDeclaration(*CompositeDeclaration) T
 	VisitAttachmentDeclaration(*AttachmentDeclaration) T
@@ -68,7 +68,7 @@ func AcceptDeclaration[T any](declaration Declaration, visitor DeclarationVisito
 		return visitor.VisitVariableDeclaration(declaration.(*VariableDeclaration))
 
 	case ElementTypeFunctionDeclaration:
-		return visitor.VisitFunctionDeclaration(declaration.(*FunctionDeclaration))
+		return visitor.VisitFunctionDeclaration(declaration.(*FunctionDeclaration), false)
 
 	case ElementTypeSpecialFunctionDeclaration:
 		return visitor.VisitSpecialFunctionDeclaration(declaration.(*SpecialFunctionDeclaration))
@@ -151,7 +151,7 @@ func AcceptStatement[T any](statement Statement, visitor StatementVisitor[T]) (_
 		return visitor.VisitVariableDeclaration(statement.(*VariableDeclaration))
 
 	case ElementTypeFunctionDeclaration:
-		return visitor.VisitFunctionDeclaration(statement.(*FunctionDeclaration))
+		return visitor.VisitFunctionDeclaration(statement.(*FunctionDeclaration), true)
 
 	case ElementTypeSpecialFunctionDeclaration:
 		return visitor.VisitSpecialFunctionDeclaration(statement.(*SpecialFunctionDeclaration))

bbq/compiler/compiler.go

@@ -1302,7 +1302,7 @@ func (c *Compiler[_]) compileInitializer(declaration *ast.SpecialFunctionDeclara
 	c.codeGen.Emit(opcode.InstructionReturnValue{})
 }
 
-func (c *Compiler[_]) VisitFunctionDeclaration(declaration *ast.FunctionDeclaration) (_ struct{}) {
+func (c *Compiler[_]) VisitFunctionDeclaration(declaration *ast.FunctionDeclaration, _ bool) (_ struct{}) {
 	declareReceiver := !c.compositeTypeStack.isEmpty()
 	function := c.declareFunction(declaration, declareReceiver)
 

bbq/compiler/desugar.go

@@ -100,7 +100,7 @@ func (d *Desugar) VisitVariableDeclaration(declaration *ast.VariableDeclaration)
 	return declaration
 }
 
-func (d *Desugar) VisitFunctionDeclaration(declaration *ast.FunctionDeclaration) ast.Declaration {
+func (d *Desugar) VisitFunctionDeclaration(declaration *ast.FunctionDeclaration, _ bool) ast.Declaration {
 	funcBlock := declaration.FunctionBlock
 	funcName := declaration.Identifier.Identifier
 

cmd/decode-state-values/main.go

@@ -400,7 +400,7 @@ func loadStorageKey(
 
 					if composite, ok := v.(*interpreter.CompositeValue); ok &&
 						composite.Kind == common.CompositeKindResource &&
-						composite.ResourceUUID(inter, interpreter.EmptyLocationRange) == nil {
+						composite.ResourceUUID(inter) == nil {
 
 						log.Printf(
 							"Failed to get UUID for resource @ 0x%x %s",

compat/README.md

@@ -14,8 +14,8 @@ In the future we can integrate this as part of CI, maybe as a periodic job.
   pip3 install -r requirements.txt
   ```
 
-- Run the suite. For example, to clone the repositories, benchmark, and compare to branch `master`:
+- Run the suite:
 
   ```sh
-  python3 main.py --format=pretty --bench --compare-ref master
+  python3 main.py
   ```

compat/main.py

@@ -32,7 +32,7 @@ def cadence_replacement(cadence_version: Optional[str]) -> str:
     if cadence_version:
         return f'github.com/onflow/cadence@{cadence_version}'
     # default: point to local cadence repo
-    return shlex.quote(Path.cwd().parent.absolute().resolve().as_posix())
+    return shlex.quote(Path(__file__).parent.parent.absolute().resolve().as_posix())
 
 def flowgo_replacement(flowgo_version: Optional[str]) -> str:
     if flowgo_version:
@@ -102,11 +102,6 @@ def run(
             result = subprocess.run(self.command, shell=True, env=env)
             return result.returncode == 0
 
-def load_index(path: Path) -> List[str]:
-    logger.info(f"Loading suite index from {path} ...")
-    with path.open(mode="r") as f:
-        return yaml.safe_load(f)
-
 @dataclass
 class Description:
     description: str
@@ -308,7 +303,7 @@ def run(
     all_succeeded = True
 
     if not names:
-        names = load_index(SUITE_PATH / "index.yaml")
+        names = [f.stem for f in SUITE_PATH.glob("*.yaml")]
 
     for name in names:
 

compat/suite/nba-smart-contracts.yaml → compat/suite/dapper-labs-nba-smart-contracts.yaml

@@ -1,7 +1,5 @@
-description: NBA Top Shot
+description: Dapper Labs NBA Top Shot
 maintainers:
-  - [email protected]
-  - [email protected]
 url: https://github.com/dapperlabs/nba-smart-contracts.git
 branch: master
 go_tests:

compat/suite/dapper-labs-nfl-smart-contracts.yaml

@@ -0,0 +1,7 @@
+description: Dapper Labs NFL Smart Contracts
+maintainers:
+url: https://github.com/dapperlabs/nfl-smart-contracts.git
+branch: main
+go_tests:
+- path: lib/go/test
+  command: make test

compat/suite/flow-core-contracts.yaml

@@ -1,7 +1,5 @@
 description: Flow Core Contracts
 maintainers:
-  - [email protected]
-  - [email protected]
 url: https://github.com/onflow/flow-core-contracts.git
 branch: master
 go_tests:

compat/suite/flow-ft.yaml

@@ -1,7 +1,5 @@
 description: Flow Fungible Token
 maintainers:
-  - [email protected]
-  - [email protected]
 url: https://github.com/onflow/flow-ft.git
 branch: master
 go_tests:

compat/suite/flow-nft.yaml

@@ -1,7 +1,5 @@
 description: Flow Non-Fungible Token
 maintainers:
-  - [email protected]
-  - [email protected]
 url: https://github.com/onflow/flow-nft.git
 branch: master
 go_tests:

compat/suite/green-goo-dao-flow-utils.yaml

@@ -1,6 +1,5 @@
 description: Green Goo Dao flow-utils
 maintainers:
-  - [email protected]
 url: https://github.com/green-goo-dao/flow-utils.git
 branch: main
 cadence_tests: