Skip to content

fix: sanitize settings.optimizer.details.inliner #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 18, 2024
Merged

fix: sanitize settings.optimizer.details.inliner #216

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a5720d
fix: set inliner to None in with_via_ir_minimum_optimization
grandizzy Nov 18, 2024
04bdba6
Merge branch 'main' into inliner-optimizer
DaniPopes Nov 18, 2024
db74ff4
Sanitize inliner solc setting
grandizzy Nov 18, 2024
59dc023
Sanitized inliner
grandizzy Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions crates/artifacts/solc/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,14 @@ impl Settings {
self.via_ir = None;
}

const V0_8_5: Version = Version::new(0, 8, 5);
if *version < V0_8_5 {
// introduced in 0.8.5 <https://github.com/ethereum/solidity/releases/tag/v0.8.5>
if let Some(optimizer_details) = &mut self.optimizer.details {
optimizer_details.inliner = None;
}
}

const V0_8_7: Version = Version::new(0, 8, 7);
if *version < V0_8_7 {
// lower the disable version from 0.8.10 to 0.8.7, due to `divModNoSlacks`,
Expand Down Expand Up @@ -2221,4 +2229,20 @@ mod tests {
let content = fs::read_to_string(path).unwrap();
let _output: CompilerOutput = serde_json::from_str(&content).unwrap();
}

// <https://github.com/foundry-rs/foundry/issues/9322>
#[test]
fn can_sanitize_optimizer_inliner() {
let version: Version = "0.8.4".parse().unwrap();
let settings = Settings::default().with_via_ir_minimum_optimization();

let input =
SolcInput { language: SolcLanguage::Solidity, sources: Default::default(), settings };

let i = input.clone().sanitized(&version);
assert!(i.settings.optimizer.details.unwrap().inliner.is_none());

let i = input.sanitized(&Version::new(0, 8, 5));
assert_eq!(i.settings.optimizer.details.unwrap().inliner, Some(false));
}
}