Update declaration of memory safe assembly blocks (#5172)

scripts/generate/templates/Arrays.js

@@ -86,8 +86,7 @@ function _quickSort(uint256 begin, uint256 end, function(uint256, uint256) pure
  * @dev Pointer to the memory location of the first element of \`array\`.
  */
 function _begin(uint256[] memory array) private pure returns (uint256 ptr) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         ptr := add(array, 0x20)
     }
 }
@@ -323,8 +322,7 @@ function unsafeAccess(${type}[] storage arr, uint256 pos) internal pure returns
   type,
 )}Slot storage) {
     bytes32 slot;
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         slot := arr.slot
     }
     return slot.deriveArray().offset(pos).get${capitalize(type)}Slot();
@@ -351,8 +349,7 @@ const unsafeSetLength = type => `\
  * WARNING: this does not clear elements if length is reduced, of initialize elements if length is increased.
  */
 function unsafeSetLength(${type}[] storage array, uint256 len) internal {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         sstore(array.slot, len)
     }
 }

scripts/generate/templates/EnumerableMap.js

@@ -250,8 +250,7 @@ function keys(${name} storage map) internal view returns (${keyType}[] memory) {
     bytes32[] memory store = keys(map._inner);
     ${keyType}[] memory result;
 
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         result := store
     }
 

scripts/generate/templates/EnumerableSet.js

@@ -227,8 +227,7 @@ function values(${name} storage set) internal view returns (${type}[] memory) {
     bytes32[] memory store = _values(set._inner);
     ${type}[] memory result;
 
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         result := store
     }
 

scripts/generate/templates/Heap.js

@@ -214,8 +214,7 @@ function length(${struct} storage self) internal view returns (${indexType}) {
  */
 function clear(${struct} storage self) internal {
     ${struct}Node[] storage data = self.data;
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         sstore(data.slot, 0)
     }
 }

scripts/generate/templates/SafeCast.js

@@ -121,8 +121,7 @@ const boolToUint = `\
  * @dev Cast a boolean (false or true) to a uint256 (0 or 1) with no jump.
  */
 function toUint(bool b) internal pure returns (uint256 u) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         u := iszero(iszero(b))
     }
 }

scripts/generate/templates/SlotDerivation.js

@@ -43,8 +43,7 @@ const namespace = `\
  * @dev Derive an ERC-7201 slot from a string (namespace).
  */
 function erc7201Slot(string memory namespace) internal pure returns (bytes32 slot) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         mstore(0x00, sub(keccak256(add(namespace, 0x20), mload(namespace)), 1))
         slot := and(keccak256(0x00, 0x20), not(0xff))
     }
@@ -65,8 +64,7 @@ function offset(bytes32 slot, uint256 pos) internal pure returns (bytes32 result
  * @dev Derive the location of the first element in an array from the slot where the length is stored.
  */
 function deriveArray(bytes32 slot) internal pure returns (bytes32 result) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         mstore(0x00, slot)
         result := keccak256(0x00, 0x20)
     }
@@ -78,8 +76,7 @@ const mapping = ({ type }) => `\
  * @dev Derive the location of a mapping element from the key.
  */
 function deriveMapping(bytes32 slot, ${type} key) internal pure returns (bytes32 result) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         mstore(0x00, key)
         mstore(0x20, slot)
         result := keccak256(0x00, 0x40)
@@ -92,8 +89,7 @@ const mapping2 = ({ type }) => `\
  * @dev Derive the location of a mapping element from the key.
  */
 function deriveMapping(bytes32 slot, ${type} memory key) internal pure returns (bytes32 result) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         let length := mload(key)
         let begin := add(key, 0x20)
         let end := add(begin, length)

scripts/generate/templates/StorageSlot.js

@@ -64,8 +64,7 @@ const get = ({ name }) => `\
  } \`${name}Slot\` with member \`value\` located at \`slot\`.
  */
 function get${name}Slot(bytes32 slot) internal pure returns (${name}Slot storage r) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         r.slot := slot
     }
 }
@@ -76,8 +75,7 @@ const getStorage = ({ type, name }) => `\
  * @dev Returns an \`${name}Slot\` representation of the ${type} storage pointer \`store\`.
  */
 function get${name}Slot(${type} storage store) internal pure returns (${name}Slot storage r) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         r.slot := store.slot
     }
 }
@@ -102,8 +100,7 @@ const transient = ({ type, name }) => `\
  * @dev Load the value held at location \`slot\` in transient storage.
  */
 function tload(${name}SlotType slot) internal view returns (${type} value) {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         value := tload(slot)
     }
 }
@@ -112,8 +109,7 @@ function tload(${name}SlotType slot) internal view returns (${type} value) {
  * @dev Store \`value\` at location \`slot\` in transient storage.
  */
 function tstore(${name}SlotType slot, ${type} value) internal {
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         tstore(slot, value)
     }
 }