Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions crates/integration/contracts/UnreachableStoreAfterBreak.sol
Original file line number Diff line number Diff line change
@@ -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);
}
}
10 changes: 10 additions & 0 deletions crates/integration/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
19 changes: 10 additions & 9 deletions crates/newyork/src/mem_opt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}
}
Expand Down
Loading