Merge remote-tracking branch 'upstream/main' into remove-ranking

.github/workflows/sanctuary.yml

@@ -41,6 +41,22 @@ jobs:
       __SLANG_SANCTUARY_SHARD_RESULTS__13: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__13 }}"
       __SLANG_SANCTUARY_SHARD_RESULTS__14: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__14 }}"
       __SLANG_SANCTUARY_SHARD_RESULTS__15: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__15 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__16: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__16 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__17: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__17 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__18: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__18 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__19: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__19 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__20: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__20 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__21: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__21 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__22: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__22 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__23: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__23 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__24: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__24 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__25: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__25 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__26: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__26 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__27: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__27 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__28: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__28 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__29: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__29 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__30: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__30 }}"
+      __SLANG_SANCTUARY_SHARD_RESULTS__31: "${{ steps.output-shard-results.outputs.__SLANG_SANCTUARY_SHARD_RESULTS__31 }}"
 
     strategy:
       fail-fast: false # Continue running all shards even if some fail.
@@ -62,9 +78,25 @@ jobs:
           - 13
           - 14
           - 15
+          - 16
+          - 17
+          - 18
+          - 19
+          - 20
+          - 21
+          - 22
+          - 23
+          - 24
+          - 25
+          - 26
+          - 27
+          - 28
+          - 29
+          - 30
+          - 31
 
     env:
-      SHARDS_COUNT: 16 # Length of the 'shard_index' array above.
+      SHARDS_COUNT: 32 # Length of the 'shard_index' array above.
 
     steps:
       - name: "Checkout Repository"

crates/solidity/inputs/language/bindings/rules.msgb

@@ -1579,11 +1579,14 @@ inherit .star_extension
 
 @modifier [ModifierDefinition
     @name name: [Identifier]
-    body: [FunctionBody @body [Block]]
 ] {
   attr (@modifier.def) node_definition = @name
   attr (@modifier.def) definiens_node = @modifier
+}
 
+@modifier [ModifierDefinition
+    body: [FunctionBody @body [Block]]
+] {
   edge @body.lexical_scope -> @modifier.lexical_scope
 
   ; Special case: bind the place holder statement `_` to the built-in
@@ -1912,6 +1915,15 @@ inherit .star_extension
   attr (@body.lexical_scope -> @catch_params.defs) precedence = 1
 }
 
+@stmt [Statement [TryStatement [CatchClauses [CatchClause
+    [CatchClauseError @name [Identifier]]
+]]]] {
+  node ref
+  attr (ref) node_reference = @name
+
+  edge ref -> @stmt.lexical_scope
+}
+
 
 ;;; Revert statements
 

crates/solidity/inputs/language/src/definition.rs

@@ -6920,6 +6920,12 @@ codegen_language_macros::compile!(Language(
             functions = [],
             enabled = From("0.6.2")
         ),
+        BuiltInType(
+            name = "Error",
+            fields = [BuiltInField(definition = "string reason")],
+            functions = [],
+            enabled = From("0.6.0")
+        ),
         BuiltInType(
             name = "$ErrorType",
             fields = [BuiltInField(definition = "bytes4 selector")],
@@ -6980,6 +6986,12 @@ codegen_language_macros::compile!(Language(
             ],
             functions = []
         ),
+        BuiltInType(
+            name = "Panic",
+            fields = [BuiltInField(definition = "uint errorCode")],
+            functions = [],
+            enabled = From("0.6.0")
+        ),
         BuiltInType(
             name = "$StringType",
             fields = [],