From abdc4e1fd4e999bf90a9767b1f33fee8a87cd8a5 Mon Sep 17 00:00:00 2001
From: OmarTawfik <15987992+OmarTawfik@users.noreply.github.com>
Date: Tue, 10 Oct 2023 14:35:37 -0700
Subject: [PATCH] ---

---
 .../language/definition/src/compiler/analysis/mod.rs        | 6 +-----
 crates/solidity/inputs/language/src/definition.rs           | 4 ++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crates/codegen/language/definition/src/compiler/analysis/mod.rs b/crates/codegen/language/definition/src/compiler/analysis/mod.rs
index ef6a7bdb18..b07dd0b673 100644
--- a/crates/codegen/language/definition/src/compiler/analysis/mod.rs
+++ b/crates/codegen/language/definition/src/compiler/analysis/mod.rs
@@ -39,11 +39,7 @@ impl Analysis {
 
         analysis.analyze_definitions();
         analysis.analyze_references();
-
-        // TODO: re-enable this once grammar is complete:
-        if std::env::var("CODEGEN_REACHABILITY_ANALYSIS").is_ok() {
-            analysis.analyze_reachability();
-        }
+        analysis.analyze_reachability();
 
         return analysis;
     }
diff --git a/crates/solidity/inputs/language/src/definition.rs b/crates/solidity/inputs/language/src/definition.rs
index 81b1d23a01..708204c7d5 100644
--- a/crates/solidity/inputs/language/src/definition.rs
+++ b/crates/solidity/inputs/language/src/definition.rs
@@ -284,10 +284,12 @@ codegen_language_macros::compile!(
                             name = UsingDeconstructionFields,
                             separated = UsingDeconstructionField,
                             separator = Comma,
+                            enabled_in = "0.8.13",
                             allow_empty = true
                         ),
                         Struct(
                             name = UsingDeconstructionField,
+                            enabled_in = "0.8.13",
                             fields = (
                                 name = Single(Rule(IdentifierPath)),
                                 alias =
@@ -2389,6 +2391,8 @@ codegen_language_macros::compile!(
                         Repeated(
                             name = NamedArgumentsDeclarations,
                             repeated = NamedArgumentsDeclaration,
+                            enabled_in = "0.6.2",
+                            disabled_in = "0.8.0",
                             allow_empty = true
                         ),
                         Struct(