chore: aggregate PRs

This PR aggregates changes from the following PRs:

- Closes #11957 by @\MozirDmitriy
- Closes #11954 by @\anim001k
- Closes #11953 by @\strmfos
- Closes #11939 by @\silvekkk

Author: DaniPopes

a.ll

@@ -0,0 +1,21 @@
+define noundef i64 @give_asm(ptr noalias noundef nonnull readonly align 1 captures(none) %slice.0, i64 noundef %slice.1) unnamed_addr #39 {
+start:
+  %_26.not = icmp eq i64 %slice.1, 0
+  br i1 %_26.not, label %bb7, label %bb3
+
+bb7:                                              ; preds = %bb3, %start
+  %pc.sroa.0.0.lcssa = phi i64 [ 0, %start ], [ %3, %bb3 ]
+  ret i64 %pc.sroa.0.0.lcssa
+
+bb3:                                              ; preds = %start, %bb3
+  %pc.sroa.0.07 = phi i64 [ %3, %bb3 ], [ 0, %start ]
+  %0 = getelementptr inbounds nuw i8, ptr %slice.0, i64 %pc.sroa.0.07
+  %opcode = load i8, ptr %0, align 1, !noundef !22
+  %1 = tail call i8 @llvm.smax.i8(i8 %opcode, i8 95)
+  %imm.sroa.0.0 = add nsw i8 %1, -95
+  %_11 = zext nneg i8 %imm.sroa.0.0 to i64
+  %2 = add nuw i64 %pc.sroa.0.07, 1
+  %3 = add i64 %2, %_11
+  %_2 = icmp ult i64 %3, %slice.1
+  br i1 %_2, label %bb3, label %bb7
+}

b.ll

@@ -0,0 +1,34 @@
+define noundef i64 @give_asm(ptr noalias noundef nonnull readonly align 1 captures(address, read_provenance) %slice.0, i64 noundef %slice.1) unnamed_addr #39 personality ptr @rust_eh_personality {
+start:
+  %_8.i16.i = icmp samesign eq i64 %slice.1, 0
+  br i1 %_8.i16.i, label %bb5, label %bb2.i.i.preheader
+
+bb2.i.i.preheader:                                ; preds = %start
+  %_10 = getelementptr inbounds nuw i8, ptr %slice.0, i64 %slice.1
+  %0 = ptrtoint ptr %_10 to i64
+  br label %bb2.i.i
+
+bb2.i.i:                                          ; preds = %bb2.i.i.preheader, %bb3.i
+  %1 = phi i64 [ %6, %bb3.i ], [ 0, %bb2.i.i.preheader ]
+  %_8.sroa.7.0.i.i1418.i = phi ptr [ %5, %bb3.i ], [ %slice.0, %bb2.i.i.preheader ]
+  %_14.i.i = getelementptr inbounds nuw i8, ptr %_8.sroa.7.0.i.i1418.i, i64 1
+  %_6.val.i.i = load i8, ptr %_8.sroa.7.0.i.i1418.i, align 1, !noalias !62783, !noundef !22
+  %2 = tail call i8 @llvm.smax.i8(i8 %_6.val.i.i, i8 95)
+  %narrow.i.i.i = add nsw i8 %2, -95
+  %_5.sroa.0.0.i.i.i = zext nneg i8 %narrow.i.i.i to i64
+  %3 = ptrtoint ptr %_14.i.i to i64
+  %4 = sub nuw i64 %0, %3
+  %_22.not.i.i.i = icmp ult i64 %4, %_5.sroa.0.0.i.i.i
+  br i1 %_22.not.i.i.i, label %bb5, label %bb3.i
+
+bb3.i:                                            ; preds = %bb2.i.i
+  %5 = getelementptr inbounds nuw i8, ptr %_14.i.i, i64 %_5.sroa.0.0.i.i.i
+  %_21.i.i = add i64 %1, 1
+  %6 = add i64 %_21.i.i, %_5.sroa.0.0.i.i.i
+  %_8.i.i = icmp eq i64 %4, %_5.sroa.0.0.i.i.i
+  br i1 %_8.i.i, label %bb5, label %bb2.i.i
+
+bb5:                                              ; preds = %bb3.i, %bb2.i.i, %start
+  %_0.sroa.0.0 = phi i64 [ 0, %start ], [ %1, %bb2.i.i ], [ %1, %bb3.i ]
+  ret i64 %_0.sroa.0.0
+}

c.ll

@@ -0,0 +1,36 @@
+define noundef i64 @give_asm(ptr noalias noundef nonnull readonly align 1 captures(address, read_provenance) %slice.0, i64 noundef %slice.1) unnamed_addr #39 personality ptr @rust_eh_personality {
+start:
+  %_8.i7 = icmp samesign eq i64 %slice.1, 0
+  br i1 %_8.i7, label %bb5, label %bb2.i.preheader
+
+bb2.i.preheader:                                  ; preds = %start
+  %_12 = getelementptr inbounds nuw i8, ptr %slice.0, i64 %slice.1
+  br label %bb2.i
+
+bb2.i:                                            ; preds = %bb2.i.preheader, %bb2.i
+  %iter.sroa.0.010 = phi ptr [ %_8.sroa.7.0.i.i, %bb2.i ], [ %slice.0, %bb2.i.preheader ]
+  %iter.sroa.5.09 = phi ptr [ %_28.i.i, %bb2.i ], [ %_12, %bb2.i.preheader ]
+  %iter.sroa.8.08 = phi i64 [ %6, %bb2.i ], [ 0, %bb2.i.preheader ]
+  %_14.i = getelementptr inbounds nuw i8, ptr %iter.sroa.0.010, i64 1
+  %_6.val.i = load i8, ptr %iter.sroa.0.010, align 1, !noalias !62783, !noundef !22
+  %0 = tail call i8 @llvm.smax.i8(i8 %_6.val.i, i8 95)
+  %narrow.i.i = add nsw i8 %0, -95
+  %_5.sroa.0.0.i.i = zext nneg i8 %narrow.i.i to i64
+  %1 = ptrtoint ptr %iter.sroa.5.09 to i64
+  %2 = ptrtoint ptr %_14.i to i64
+  %3 = sub nuw i64 %1, %2
+  %_22.not.i.i = icmp ult i64 %3, %_5.sroa.0.0.i.i
+  %4 = getelementptr inbounds nuw i8, ptr %_14.i, i64 %_5.sroa.0.0.i.i
+  %5 = add nuw nsw i64 %_5.sroa.0.0.i.i, 1
+  %_8.sroa.9.0.i.i = call i64 @llvm.usub.sat.i64(i64 %3, i64 %_5.sroa.0.0.i.i)
+  %_8.sroa.7.0.i.i = select i1 %_22.not.i.i, ptr inttoptr (i64 1 to ptr), ptr %4
+  %_8.sroa.5.0.i.i = select i1 %_22.not.i.i, i64 1, i64 %5
+  %_28.i.i = getelementptr inbounds nuw i8, ptr %_8.sroa.7.0.i.i, i64 %_8.sroa.9.0.i.i
+  %6 = add i64 %_8.sroa.5.0.i.i, %iter.sroa.8.08
+  %_8.i.not = icmp ugt i64 %3, %_5.sroa.0.0.i.i
+  br i1 %_8.i.not, label %bb2.i, label %bb5
+
+bb5:                                              ; preds = %bb2.i, %start
+  %pc.sroa.0.0.lcssa = phi i64 [ 0, %start ], [ %iter.sroa.8.08, %bb2.i ]
+  ret i64 %pc.sroa.0.0.lcssa
+}

crates/anvil/src/eth/backend/db.rs

@@ -256,15 +256,14 @@ impl<T: DatabaseRef<Error = DatabaseError> + Debug> MaybeFullDatabase for CacheD
     }
 
     fn read_as_state_snapshot(&self) -> StateSnapshot {
-        let db_accounts = self.cache.accounts.clone();
         let mut accounts = HashMap::default();
         let mut account_storage = HashMap::default();
 
-        for (addr, acc) in db_accounts {
-            account_storage.insert(addr, acc.storage.clone());
-            let mut info = acc.info;
+        for (addr, acc) in &self.cache.accounts {
+            account_storage.insert(*addr, acc.storage.clone());
+            let mut info = acc.info.clone();
             info.code = self.cache.contracts.get(&info.code_hash).cloned();
-            accounts.insert(addr, info);
+            accounts.insert(*addr, info);
         }
 
         let block_hashes = self.cache.block_hashes.clone();

crates/anvil/src/eth/backend/mem/mod.rs

@@ -2229,7 +2229,7 @@ impl Backend {
 
     fn mined_block_by_hash(&self, hash: B256) -> Option<AnyRpcBlock> {
         let block = self.blockchain.get_block_by_hash(&hash)?;
-        Some(self.convert_block(block))
+        Some(self.convert_block_with_hash(block, Some(hash)))
     }
 
     pub(crate) async fn mined_transactions_by_block_number(
@@ -2298,7 +2298,8 @@ impl Backend {
         Ok(None)
     }
 
-    pub fn get_block(&self, id: impl Into<BlockId>) -> Option<Block> {
+    /// Returns the block and its hash for the given id
+    fn get_block_with_hash(&self, id: impl Into<BlockId>) -> Option<(Block, B256)> {
         let hash = match id.into() {
             BlockId::Hash(hash) => hash.block_hash,
             BlockId::Number(number) => {
@@ -2326,36 +2327,46 @@ impl Backend {
                 }
             }
         };
-        self.get_block_by_hash(hash)
+        let block = self.get_block_by_hash(hash)?;
+        Some((block, hash))
+    }
+
+    pub fn get_block(&self, id: impl Into<BlockId>) -> Option<Block> {
+        self.get_block_with_hash(id).map(|(block, _)| block)
     }
 
     pub fn get_block_by_hash(&self, hash: B256) -> Option<Block> {
         self.blockchain.get_block_by_hash(&hash)
     }
 
     pub fn mined_block_by_number(&self, number: BlockNumber) -> Option<AnyRpcBlock> {
-        let block = self.get_block(number)?;
-        let mut block = self.convert_block(block);
+        let (block, hash) = self.get_block_with_hash(number)?;
+        let mut block = self.convert_block_with_hash(block, Some(hash));
         block.transactions.convert_to_hashes();
         Some(block)
     }
 
     pub fn get_full_block(&self, id: impl Into<BlockId>) -> Option<AnyRpcBlock> {
-        let block = self.get_block(id)?;
+        let (block, hash) = self.get_block_with_hash(id)?;
         let transactions = self.mined_transactions_in_block(&block)?;
-        let mut block = self.convert_block(block);
+        let mut block = self.convert_block_with_hash(block, Some(hash));
         block.inner.transactions = BlockTransactions::Full(transactions);
-
         Some(block)
     }
 
     /// Takes a block as it's stored internally and returns the eth api conform block format.
     pub fn convert_block(&self, block: Block) -> AnyRpcBlock {
+        self.convert_block_with_hash(block, None)
+    }
+
+    /// Takes a block as it's stored internally and returns the eth api conform block format.
+    /// If `known_hash` is provided, it will be used instead of computing `hash_slow()`.
+    pub fn convert_block_with_hash(&self, block: Block, known_hash: Option<B256>) -> AnyRpcBlock {
         let size = U256::from(alloy_rlp::encode(&block).len() as u32);
 
         let Block { header, transactions, .. } = block;
 
-        let hash = header.hash_slow();
+        let hash = known_hash.unwrap_or_else(|| header.hash_slow());
         let Header { number, withdrawals_root, .. } = header;
 
         let block = AlloyBlock {

crates/chisel/src/solidity_helper.rs

@@ -51,7 +51,7 @@ impl Default for SolidityHelper {
 
 impl fmt::Debug for SolidityHelper {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let this = self.inner.borrow_mut();
+        let this = self.inner.borrow();
         f.debug_struct("SolidityHelper")
             .field("errored", &this.errored)
             .field("do_paint", &this.do_paint)

npm/src/const.ts

@@ -16,13 +16,8 @@ export type Platform = Extract<
   'darwin' | 'linux' | 'win32'
 >
 
-/**
- * foundry doesn't ship arm64 binaries for windows
- */
-export type ArchitecturePlatform = Exclude<
-  `${Platform}-${Architecture}`,
-  'win32-arm64'
->
+// Note: we intentionally don't export a combined `Platform-Architecture` alias here,
+// since only specific pairs are supported (see `BINARY_DISTRIBUTION_PACKAGES`).
 
 export const BINARY_DISTRIBUTION_PACKAGES = {
   darwin: {

npm/src/install.ts

@@ -105,7 +105,7 @@ function extractFileFromTarball(
     if (fileName === filepath)
       return tarballBuffer.subarray(offset, offset + fileSize)
 
-    // Clamp offset to the uppoer multiple of 512
+    // Clamp offset to the upper multiple of 512
     offset = (offset + fileSize + 511) & ~511
   }
   throw new Error(`File ${filepath} not found in tarball`)