Skip to content
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

Add memory safe assembly annotations #3384

Merged
merged 13 commits into from
May 23, 2022
Merged

Add memory safe assembly annotations #3384

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ceb26e7
chore: adds memory-safe annotations for assembly in SafeMathMock.sol
Apr 23, 2022
04144fb
Merge branch 'OpenZeppelin:master' into chore/memory-safe-assembly-an…
nathan-lapinski Apr 30, 2022
993a17e
fix: use comment instead of dialect string for now
Apr 30, 2022
b2cd1a5
chore: adds memory-safe-assembly MinimalForwarder
May 3, 2022
b5ff227
Merge branch 'OpenZeppelin:master' into chore/memory-safe-assembly-an…
nathan-lapinski May 7, 2022
8761fb2
chore: removes annotations from mock file
May 7, 2022
0f2a8bb
chore: adds mem safe annotation
May 9, 2022
7acabd5
chore: add mem annotation to address.sol
May 10, 2022
e92db64
chore: adds mem annotation to ERC721.sol
May 10, 2022
a53f962
Merge branch 'OpenZeppelin:master' into chore/memory-safe-assembly-an…
nathan-lapinski May 14, 2022
2ad0b08
chore: adds more files
May 18, 2022
43e86e7
chore: adds annotation to remaining files
May 19, 2022
9720855
Merge branch 'OpenZeppelin:master' into chore/memory-safe-assembly-an…
nathan-lapinski May 19, 2022
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
1 change: 1 addition & 0 deletions contracts/metatx/MinimalForwarder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ contract MinimalForwarder is EIP712 {
// We explicitly trigger invalid opcode to consume all gas and bubble-up the effects, since
// neither revert or assert consume all gas since Solidity 0.8.0
// https://docs.soliditylang.org/en/v0.8.0/control-structures.html#panic-via-assert-and-error-via-require
/// @solidity memory-safe-assembly
assembly {
invalid()
}
Expand Down
1 change: 1 addition & 0 deletions contracts/token/ERC721/ERC721.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ contract ERC721 is Context, ERC165, IERC721, IERC721Metadata {
if (reason.length == 0) {
revert("ERC721: transfer to non ERC721Receiver implementer");
} else {
/// @solidity memory-safe-assembly
assembly {
revert(add(32, reason), mload(reason))
}
Expand Down
2 changes: 1 addition & 1 deletion contracts/utils/Address.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ library Address {
// Look for revert reason and bubble it up if present
if (returndata.length > 0) {
// The easiest way to bubble the revert reason is using memory via assembly

/// @solidity memory-safe-assembly
assembly {
let returndata_size := mload(returndata)
revert(add(32, returndata), returndata_size)
Expand Down
4 changes: 4 additions & 0 deletions contracts/utils/StorageSlot.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ library StorageSlot {
* @dev Returns an `AddressSlot` with member `value` located at `slot`.
*/
function getAddressSlot(bytes32 slot) internal pure returns (AddressSlot storage r) {
/// @solidity memory-safe-assembly
assembly {
r.slot := slot
}
Expand All @@ -59,6 +60,7 @@ library StorageSlot {
* @dev Returns an `BooleanSlot` with member `value` located at `slot`.
*/
function getBooleanSlot(bytes32 slot) internal pure returns (BooleanSlot storage r) {
/// @solidity memory-safe-assembly
assembly {
r.slot := slot
}
Expand All @@ -68,6 +70,7 @@ library StorageSlot {
* @dev Returns an `Bytes32Slot` with member `value` located at `slot`.
*/
function getBytes32Slot(bytes32 slot) internal pure returns (Bytes32Slot storage r) {
/// @solidity memory-safe-assembly
assembly {
r.slot := slot
}
Expand All @@ -77,6 +80,7 @@ library StorageSlot {
* @dev Returns an `Uint256Slot` with member `value` located at `slot`.
*/
function getUint256Slot(bytes32 slot) internal pure returns (Uint256Slot storage r) {
/// @solidity memory-safe-assembly
assembly {
r.slot := slot
}
Expand Down