Merge with main

.github/workflows/main.yml

@@ -447,7 +447,7 @@ jobs:
     - uses: ./.github/actions/install-rust
 
     - run: rustup component add clippy
-    - run: cargo clippy --workspace --all-targets
+    - run: cargo clippy --workspace --all-targets --features p3,component-model-async
 
   # Similar to `micro_checks` but where we need to install some more state
   # (e.g. Android NDK) and we haven't factored support for those things out into

.gitignore

@@ -26,9 +26,7 @@ examples/.cache
 *.smt2
 cranelift/isle/veri/veri_engine/test_output
 crates/explorer/node_modules
-tests/all/pulley_provenance_test.cwasm
-tests/all/pulley_provenance_test_component.cwasm
-tests/all/pulley_provenance_test_async_component.cwasm
+*.cwasm
 /artifacts
 testcase*.wat
 testcase*.wasm

cranelift/codegen/src/inline.rs

@@ -445,7 +445,7 @@ fn inline_one(
     // terminator, so do a quick pass over the inlined blocks and remove any
     // empty blocks from the caller's layout.
     for block in entity_map.iter_inlined_blocks(func) {
-        if func.layout.first_inst(block).is_none() {
+        if func.layout.is_block_inserted(block) && func.layout.first_inst(block).is_none() {
             func.layout.remove_block(block);
         }
     }