diff --git a/crates/integration/contracts/UnreachableStoreAfterBreak.sol b/crates/integration/contracts/UnreachableStoreAfterBreak.sol new file mode 100644 index 00000000..afd28e53 --- /dev/null +++ b/crates/integration/contracts/UnreachableStoreAfterBreak.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.0; +contract UnreachableStoreAfterBreak { + fallback(bytes calldata) external returns (bytes memory) { + while (true) { + assembly { mstore(0, 7) } + break; + assembly { mstore(0, 9) } + } + uint256 r; + assembly { r := mload(0) } + return abi.encode(r); + } +} diff --git a/crates/integration/src/tests.rs b/crates/integration/src/tests.rs index 0e5a5c39..88622a91 100644 --- a/crates/integration/src/tests.rs +++ b/crates/integration/src/tests.rs @@ -6208,3 +6208,13 @@ fn hex_string_separator() { push_call(&mut actions, TestAddress::Instantiated(0), vec![0; 32]); run_differential(actions); } + +#[test] +fn store_before_break_with_unreachable_store() { + let mut actions = instantiate_solc_unoptimized( + "contracts/UnreachableStoreAfterBreak.sol", + "UnreachableStoreAfterBreak", + ); + push_call(&mut actions, TestAddress::Instantiated(0), vec![0; 32]); + run_differential(actions); +} diff --git a/crates/newyork/src/mem_opt.rs b/crates/newyork/src/mem_opt.rs index e2f7396b..2b8960b0 100644 --- a/crates/newyork/src/mem_opt.rs +++ b/crates/newyork/src/mem_opt.rs @@ -457,15 +457,8 @@ impl MemoryOptimizer { }); } - Statement::Return { .. } | Statement::Revert { .. } => { - self.pending_stores.clear(); - processed.push(statement); - } - - Statement::SStore { .. } - | Statement::TStore { .. } - | Statement::MappingSStore { .. } - | Statement::SetImmutable { .. } + Statement::Return { .. } + | Statement::Revert { .. } | Statement::SelfDestruct { .. } | Statement::Stop | Statement::Invalid @@ -475,6 +468,14 @@ impl MemoryOptimizer { | Statement::Break { .. } | Statement::Continue { .. } | Statement::Leave { .. } => { + self.pending_stores.clear(); + processed.push(statement); + } + + Statement::SStore { .. } + | Statement::TStore { .. } + | Statement::MappingSStore { .. } + | Statement::SetImmutable { .. } => { processed.push(statement); } }