Handle vars without name in ctor

Author: grandizzy

crates/compilers/src/preprocessor/data.rs

@@ -1,6 +1,5 @@
 use crate::preprocessor::SourceMapLocation;
 use foundry_compilers_artifacts::{Source, Sources};
-use itertools::Itertools;
 use solar_parse::interface::{Session, SourceMap};
 use solar_sema::{
     hir::{Contract, ContractId, Hir},
@@ -92,22 +91,30 @@ impl ContractData {
             .map(|ctor_id| hir.function(ctor_id))
             .filter(|ctor| !ctor.parameters.is_empty())
             .map(|ctor| {
-                let abi_encode_args = ctor
-                    .parameters
-                    .iter()
-                    .map(|param_id| format!("args.{}", hir.variable(*param_id).name.unwrap().name))
-                    .join(", ");
-                let struct_fields = ctor
-                    .parameters
-                    .iter()
-                    .map(|param_id| {
-                        let src = source.file.src.as_str();
-                        let loc =
-                            SourceMapLocation::from_span(source_map, hir.variable(*param_id).span);
-                        src[loc.start..loc.end].replace(" memory ", " ").replace(" calldata ", " ")
-                    })
-                    .join("; ");
-                ContractConstructorData { abi_encode_args, struct_fields }
+                let mut abi_encode_args = vec![];
+                let mut struct_fields = vec![];
+                let mut arg_index = 0;
+                for param_id in ctor.parameters {
+                    let src = source.file.src.as_str();
+                    let loc =
+                        SourceMapLocation::from_span(source_map, hir.variable(*param_id).span);
+                    let mut new_src =
+                        src[loc.start..loc.end].replace(" memory ", " ").replace(" calldata ", " ");
+                    if let Some(ident) = hir.variable(*param_id).name {
+                        abi_encode_args.push(format!("args.{}", ident.name));
+                    } else {
+                        // Generate an unique name if constructor arg doesn't have one.
+                        arg_index += 1;
+                        abi_encode_args.push(format!("args.foundry_pp_ctor_arg{arg_index}"));
+                        new_src.push_str(&format!(" foundry_pp_ctor_arg{arg_index}"));
+                    }
+                    struct_fields.push(new_src);
+                }
+
+                ContractConstructorData {
+                    abi_encode_args: abi_encode_args.join(", "),
+                    struct_fields: struct_fields.join("; "),
+                }
             });
 
         Self {

crates/compilers/src/preprocessor/deps.rs

@@ -8,7 +8,6 @@ use crate::{
 use itertools::Itertools;
 use solar_parse::interface::Session;
 use solar_sema::{
-    ast::Span,
     hir::{ContractId, Expr, ExprKind, Hir, TypeKind, Visit},
     interface::{data_structures::Never, source_map::FileName, SourceMap},
 };
@@ -184,10 +183,7 @@ impl<'hir> Visit<'hir> for BytecodeDependencyCollector<'hir> {
                         let args_len = self.src[name_loc.end..].split_once(';').unwrap().0.len();
                         self.collect_dependency(BytecodeDependency {
                             kind: BytecodeDependencyKind::New(name.to_string(), args_len),
-                            loc: SourceMapLocation::from_span(
-                                self.source_map,
-                                expr.span,
-                            ),
+                            loc: SourceMapLocation::from_span(self.source_map, expr.span),
                             referenced_contract: contract_id,
                         });
                     }

test-data/preprocessor/src/CounterD.sol

@@ -0,0 +1,4 @@
+// Contract with constructor args without name
+contract CounterD {
+    constructor(address, uint256 x, uint256) {}
+}

test-data/preprocessor/test/CounterTest.sol

@@ -2,6 +2,7 @@ import {Counter} from "src/Counter.sol";
 import {Counter as CounterV1} from "src/v1/Counter.sol";
 import "src/CounterB.sol";
 import "src/CounterC.sol";
+import "src/CounterD.sol";
 
 contract CounterTest {
     Counter public counter;
@@ -19,5 +20,6 @@ contract CounterTest {
             35,
             address(this)
         );
+        CounterD counterD = new CounterD(address(this), 15, 15);
     }
 }