fix: missing --via-ir flag in combined json request to solc

Author: hedgar2017

CHANGELOG.md

@@ -10,6 +10,10 @@
 
 - The warning about the default codegen is made more verbose and informative
 
+### Fixed
+
+- Missing `--via-ir` flag in the combined JSON request to `solc`
+
 ## [1.5.11] - 2025-01-27
 
 ### Fixed

era-compiler-solidity/src/lib.rs

@@ -844,7 +844,7 @@ pub fn combined_json_eravm(
     }
     let output_assembly = selectors.contains(&era_solc::CombinedJsonSelector::Assembly);
 
-    let mut combined_json = solc_compiler.combined_json(paths, selectors)?;
+    let mut combined_json = solc_compiler.combined_json(paths, selectors, codegen)?;
 
     let build = standard_output_eravm(
         paths,
@@ -937,7 +937,7 @@ pub fn combined_json_evm(
         ));
     }
 
-    let mut combined_json = solc_compiler.combined_json(paths, selectors)?;
+    let mut combined_json = solc_compiler.combined_json(paths, selectors, codegen)?;
 
     let build = standard_output_evm(
         paths,

era-compiler-solidity/tests/common/mod.rs

@@ -221,8 +221,11 @@ pub fn build_solidity_combined_json(
     )?;
     build.check_errors()?;
 
-    let mut combined_json =
-        solc_compiler.combined_json(paths.as_slice(), selectors.into_iter().collect())?;
+    let mut combined_json = solc_compiler.combined_json(
+        paths.as_slice(),
+        selectors.into_iter().collect(),
+        Some(solc_codegen),
+    )?;
     build.write_to_combined_json(&mut combined_json)?;
     Ok(combined_json)
 }

era-solc/src/combined_json/selector.rs

@@ -64,7 +64,10 @@ impl Selector {
     /// Whether the selector is available in `solc`.
     ///
     pub fn is_source_solc(&self) -> bool {
-        !matches!(self, Self::Assembly)
+        !matches!(
+            self,
+            Self::Assembly | Self::Bytecode | Self::BytecodeRuntime
+        )
     }
 }
 
@@ -82,6 +85,7 @@ impl FromStr for Selector {
             "transient-storage-layout" => Ok(Self::TransientStorageLayout),
             "ast" => Ok(Self::AST),
             "asm" => Ok(Self::ASM),
+
             "bin" => Ok(Self::Bytecode),
             "bin-runtime" => Ok(Self::BytecodeRuntime),
 
@@ -104,6 +108,7 @@ impl std::fmt::Display for Selector {
             Self::TransientStorageLayout => write!(f, "transient-storage-layout"),
             Self::AST => write!(f, "ast"),
             Self::ASM => write!(f, "asm"),
+
             Self::Bytecode => write!(f, "bin"),
             Self::BytecodeRuntime => write!(f, "bin-runtime"),
 

era-solc/src/solc.rs

@@ -11,6 +11,7 @@ use std::sync::RwLock;
 
 use crate::combined_json::selector::Selector as CombinedJsonSelector;
 use crate::combined_json::CombinedJson;
+use crate::standard_json::input::settings::codegen::Codegen as StandardJsonInputSettingsCodegen;
 use crate::standard_json::input::settings::libraries::Libraries as StandardJsonInputSettingsLibraries;
 use crate::standard_json::input::settings::optimizer::Optimizer as StandardJsonInputSettingsOptimizer;
 use crate::standard_json::input::settings::selection::Selection as StandardJsonInputSettingsSelection;
@@ -243,6 +244,7 @@ For reference, see the following links:
         &self,
         paths: &[PathBuf],
         mut selectors: HashSet<CombinedJsonSelector>,
+        codegen: Option<StandardJsonInputSettingsCodegen>,
     ) -> anyhow::Result<CombinedJson> {
         selectors.retain(|selector| selector.is_source_solc());
         if selectors.is_empty() {
@@ -263,10 +265,17 @@ For reference, see the following links:
                 .collect::<Vec<String>>()
                 .join(","),
         );
+        if let Some(StandardJsonInputSettingsCodegen::Yul) = codegen {
+            if self.version.default >= Self::FIRST_VIA_IR_VERSION {
+                command.arg("--via-ir");
+            } else if self.version.default >= Self::FIRST_YUL_VERSION {
+                command.arg("--experimental-via-ir");
+            }
+        }
 
         let process = command
             .spawn()
-            .map_err(|error| anyhow::anyhow!("{} subprocess spawning: {:?}", executable, error))?;
+            .map_err(|error| anyhow::anyhow!("{executable} subprocess spawning: {error:?}"))?;
 
         let result = process.wait_with_output().map_err(|error| {
             anyhow::anyhow!("{} subprocess output reading: {error:?}", self.executable)

era-solc/src/standard_json/output/error/mapped_location.rs

@@ -97,7 +97,7 @@ impl<'a> MappedLocation<'a> {
     }
 }
 
-impl<'a> std::fmt::Display for MappedLocation<'a> {
+impl std::fmt::Display for MappedLocation<'_> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         let mut path = self.path.clone();
         if let Some(line) = self.line {