feat: handle runtime code size errors separately

hedgar2017 · hedgar2017 · commit 411119833469 · 2025-03-24T20:06:01.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/solx-solc/Cargo.toml b/solx-solc/Cargo.toml
@@ -16,8 +16,9 @@ rayon = "=1.10.0"
 serde = { version = "=1.0.210", "features" = [ "derive" ] }
 serde_json = { version = "=1.0.128", features = [ "arbitrary_precision" ] }
 semver = { version = "=1.0.23", features = [ "serde" ] }
-libc = "0.2"
+libc = "=0.2.171"
 hex = "=0.4.3"
 num = "=0.4.3"
 
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "az-error-code-runtime-code-size" }
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
diff --git a/solx-solc/src/standard_json/output/error/mod.rs b/solx-solc/src/standard_json/output/error/mod.rs
@@ -46,6 +46,7 @@ impl Error {
     ///
     pub fn new<S>(
         r#type: &str,
+        error_code: Option<isize>,
         message: S,
         source_location: Option<SourceLocation>,
         sources: Option<&BTreeMap<String, StandardJsonInputSource>>,
@@ -76,7 +77,7 @@ impl Error {
 
         Self {
             component: "general".to_owned(),
-            error_code: None,
+            error_code: error_code.map(|code| code.to_string()),
             formatted_message,
             message,
             severity: r#type.to_lowercase(),
@@ -89,28 +90,36 @@ impl Error {
     /// A shortcut constructor.
     ///
     pub fn new_error<S>(
+        error_code: Option<isize>,
         message: S,
         source_location: Option<SourceLocation>,
         sources: Option<&BTreeMap<String, StandardJsonInputSource>>,
     ) -> Self
     where
         S: std::fmt::Display,
     {
-        Self::new("Error", message, source_location, sources)
+        Self::new("Error", error_code, message, source_location, sources)
     }
 
     ///
     /// A shortcut constructor.
     ///
     pub fn new_warning<S>(
+        error_code: Option<isize>,
         message: S,
         source_location: Option<SourceLocation>,
         sources: Option<&BTreeMap<String, StandardJsonInputSource>>,
     ) -> Self
     where
         S: std::fmt::Display,
     {
-        Self::new("Warning", message, source_location, sources)
+        Self::new("Warning", error_code, message, source_location, sources)
+    }
+}
+
+impl From<&era_compiler_llvm_context::EVMError> for Error {
+    fn from(error: &era_compiler_llvm_context::EVMError) -> Self {
+        Self::new_error(error.code(), error.to_string(), None, None)
     }
 }
 
diff --git a/solx-solc/src/standard_json/output/mod.rs b/solx-solc/src/standard_json/output/mod.rs
@@ -135,6 +135,7 @@ impl Output {
     ///
     pub fn push_error(&mut self, path: Option<String>, error: anyhow::Error) {
         self.errors.push(JsonOutputError::new_error(
+            None,
             error,
             path.map(JsonOutputErrorSourceLocation::new),
             None,
diff --git a/solx/Cargo.toml b/solx/Cargo.toml
@@ -29,8 +29,8 @@ num = "=0.4.3"
 
 zkevm_opcode_defs = "=0.150.6"
 
+era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "az-error-code-runtime-code-size" }
 era-compiler-common = { git = "https://github.com/matter-labs/era-compiler-common", branch = "main" }
-era-compiler-llvm-context = { git = "https://github.com/matter-labs/era-compiler-llvm-context", branch = "main" }
 solx-solc = { path = "../solx-solc" }
 solx-yul = { path = "../solx-yul" }
 
diff --git a/solx/src/build_evm/contract/object.rs b/solx/src/build_evm/contract/object.rs
@@ -29,6 +29,8 @@ pub struct Object {
     pub is_assembled: bool,
     /// Binary object format.
     pub format: era_compiler_common::ObjectFormat,
+    /// Compilation errors.
+    pub errors: Vec<era_compiler_llvm_context::EVMError>,
 }
 
 impl Object {
@@ -43,6 +45,7 @@ impl Object {
         code_segment: era_compiler_common::CodeSegment,
         dependencies: solx_yul::Dependencies,
         unlinked_libraries: BTreeSet<String>,
+        errors: Vec<era_compiler_llvm_context::EVMError>,
     ) -> Self {
         Self {
             identifier,
@@ -54,6 +57,7 @@ impl Object {
             unlinked_libraries,
             is_assembled: false,
             format: era_compiler_common::ObjectFormat::ELF,
+            errors,
         }
     }
 
diff --git a/solx/src/build_evm/mod.rs b/solx/src/build_evm/mod.rs
@@ -121,7 +121,7 @@ impl Build {
                         Err(error) => {
                             self.messages
                                 .push(solx_solc::StandardJsonOutputError::new_error(
-                                    error, None, None,
+                                    None, error, None, None,
                                 ));
                             continue;
                         }
@@ -161,7 +161,7 @@ impl Build {
                         Err(error) => {
                             self.messages
                                 .push(solx_solc::StandardJsonOutputError::new_error(
-                                    error, None, None,
+                                    None, error, None, None,
                                 ));
                             continue;
                         }
@@ -249,7 +249,11 @@ impl Build {
         let mut errors = Vec::with_capacity(self.results.len());
         for result in self.results.into_values() {
             let build = match result {
-                Ok(build) => build,
+                Ok(build) => {
+                    errors.extend(build.deploy_object.errors.iter().map(|error| error.into()));
+                    errors.extend(build.runtime_object.errors.iter().map(|error| error.into()));
+                    build
+                }
                 Err(error) => {
                     errors.push(error);
                     continue;
diff --git a/solx/src/process/mod.rs b/solx/src/process/mod.rs
@@ -39,7 +39,7 @@ pub fn run() -> anyhow::Result<()> {
         )
         .map(EVMOutput::new)
         .map_err(|error| {
-            solx_solc::StandardJsonOutputError::new_error(error, Some(source_location), None)
+            solx_solc::StandardJsonOutputError::new_error(None, error, Some(source_location), None)
         });
     serde_json::to_writer(std::io::stdout(), &result)
         .map_err(|error| anyhow::anyhow!("Stdout writing error: {error}"))?;
@@ -91,6 +91,7 @@ where
             String::from_utf8_lossy(result.stderr.as_slice()),
         );
         return Err(solx_solc::StandardJsonOutputError::new_error(
+            None,
             message,
             Some(solx_solc::StandardJsonOutputErrorSourceLocation::new(
                 path.to_owned(),
diff --git a/solx/src/project/contract/mod.rs b/solx/src/project/contract/mod.rs
@@ -132,15 +132,16 @@ impl Contract {
                     .map_err(|error| {
                         anyhow::anyhow!("{runtime_code_segment} code LLVM IR generator: {error}")
                     })?;
-                let runtime_buffer = runtime_context.build()?;
-                let runtime_build = EVMContractObject::new(
+                let (runtime_buffer, runtime_code_errors) = runtime_context.build()?;
+                let runtime_object = EVMContractObject::new(
                     runtime_code_identifier,
                     self.name.clone(),
                     runtime_buffer.as_slice().to_owned(),
                     true,
                     runtime_code_segment,
                     runtime_code_dependecies,
                     runtime_code_libraries,
+                    runtime_code_errors,
                 );
 
                 let immutables_map = runtime_buffer.get_immutables_evm();
@@ -170,21 +171,22 @@ impl Contract {
                     .map_err(|error| {
                         anyhow::anyhow!("{deploy_code_segment} code LLVM IR generator: {error}")
                     })?;
-                let deploy_buffer = deploy_context.build()?;
-                let deploy_build = EVMContractObject::new(
+                let (deploy_buffer, deploy_code_errors) = deploy_context.build()?;
+                let deploy_object = EVMContractObject::new(
                     deploy_code_identifier,
                     self.name.clone(),
                     deploy_buffer.as_slice().to_owned(),
                     true,
                     deploy_code_segment,
                     deploy_code_dependecies,
                     deploy_code_libraries,
+                    deploy_code_errors,
                 );
 
                 Ok(EVMContractBuild::new(
                     self.name,
-                    deploy_build,
-                    runtime_build,
+                    deploy_object,
+                    runtime_object,
                     metadata_hash,
                     metadata_string,
                 ))
@@ -232,15 +234,16 @@ impl Contract {
                     .map_err(|error| {
                         anyhow::anyhow!("{runtime_code_segment} code LLVM IR generator: {error}")
                     })?;
-                let runtime_buffer = runtime_context.build()?;
-                let runtime_build = EVMContractObject::new(
+                let (runtime_buffer, runtime_code_errors) = runtime_context.build()?;
+                let runtime_object = EVMContractObject::new(
                     runtime_code_identifier,
                     self.name.clone(),
                     runtime_buffer.as_slice().to_owned(),
                     false,
                     runtime_code_segment,
                     runtime_code_dependecies,
                     runtime_code_libraries,
+                    runtime_code_errors,
                 );
 
                 let immutables_map = runtime_buffer.get_immutables_evm();
@@ -265,21 +268,22 @@ impl Contract {
                     .map_err(|error| {
                         anyhow::anyhow!("{deploy_code_segment} code LLVM IR generator: {error}")
                     })?;
-                let deploy_buffer = deploy_context.build()?;
-                let deploy_build = EVMContractObject::new(
+                let (deploy_buffer, deploy_code_errors) = deploy_context.build()?;
+                let deploy_object = EVMContractObject::new(
                     deploy_code_identifier,
                     self.name.clone(),
                     deploy_buffer.as_slice().to_owned(),
                     false,
                     deploy_code_segment,
                     deploy_code_dependecies,
                     deploy_code_libraries,
+                    deploy_code_errors,
                 );
 
                 Ok(EVMContractBuild::new(
                     self.name,
-                    deploy_build,
-                    runtime_build,
+                    deploy_object,
+                    runtime_object,
                     metadata_hash,
                     metadata_string,
                 ))
diff --git a/solx/src/solx/arguments.rs b/solx/src/solx/arguments.rs
diff --git a/solx/src/solx/main.rs b/solx/src/solx/main.rs
