Bless tests.

2025-11-10 15:11:17 +01:00 · 2025-11-10 15:11:17 +01:00 · 7b42543f81
commit 7b42543f81
parent d66d15be2b
41 changed files with 322 additions and 447 deletions
--- a/tests/codegen-units/item-collection/opaque-return-impls.rs
+++ b/tests/codegen-units/item-collection/opaque-return-impls.rs
@ -86,4 +86,4 @@ pub fn foo3() -> Box<dyn Iterator<Item = usize>> {
 //~ MONO_ITEM fn foo3
 //~ MONO_ITEM fn std::boxed::Box::<Counter>::new
 //~ MONO_ITEM fn Counter::new
-//~ MONO_ITEM fn core::fmt::rt::<impl std::fmt::Arguments<'_>>::new_const::<1>
+//~ MONO_ITEM fn core::fmt::rt::<impl std::fmt::Arguments<'_>>::from_str
--- a/tests/coverage/abort.cov-map
+++ b/tests/coverage/abort.cov-map
@ -37,16 +37,15 @@ Number of file 0 mappings: 16
 Highest counter ID seen: c4

 Function name: abort::might_abort
-Raw bytes (41): 0x[01, 01, 01, 01, 05, 07, 01, 03, 01, 00, 2e, 01, 01, 08, 00, 14, 05, 01, 09, 00, 11, 05, 00, 12, 00, 1f, 05, 01, 09, 00, 0f, 02, 01, 0c, 02, 06, 02, 03, 01, 00, 02]
+Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 03, 01, 00, 2e, 01, 01, 08, 00, 14, 05, 01, 09, 00, 11, 05, 01, 09, 00, 0f, 02, 01, 0c, 02, 06, 02, 03, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/abort.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 3, 1) to (start + 0, 46)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 20)
 - Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(1)) at (prev + 0, 18) to (start + 0, 31)
 - Code(Counter(1)) at (prev + 1, 9) to (start + 0, 15)
 - Code(Expression(0, Sub)) at (prev + 1, 12) to (start + 2, 6)
    = (c0 - c1)
--- a/tests/coverage/assert.cov-map
+++ b/tests/coverage/assert.cov-map
@ -29,18 +29,14 @@ Number of file 0 mappings: 12
 Highest counter ID seen: c3

 Function name: assert::might_fail_assert
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 04, 01, 00, 28, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 20, 01, 01, 05, 00, 0f, 02, 00, 25, 00, 3d, 05, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 04, 01, 00, 28, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 05, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/assert.rs
-Number of expressions: 1
- expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of expressions: 0
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 4, 1) to (start + 0, 40)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 32)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Expression(0, Sub)) at (prev + 0, 37) to (start + 0, 61)
-    = (c0 - c1)
 - Code(Counter(1)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1

--- a/tests/coverage/async2.cov-map
+++ b/tests/coverage/async2.cov-map
@ -8,14 +8,13 @@ Number of file 0 mappings: 1
 Highest counter ID seen: c0

 Function name: async2::async_func::{closure#0}
-Raw bytes (49): 0x[01, 01, 00, 09, 01, 0f, 17, 00, 18, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 26, 01, 01, 09, 00, 0a, 01, 00, 0d, 00, 11, 01, 01, 08, 00, 09, 01, 00, 0a, 02, 06, 00, 02, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (44): 0x[01, 01, 00, 08, 01, 0f, 17, 00, 18, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 0a, 01, 00, 0d, 00, 11, 01, 01, 08, 00, 09, 01, 00, 0a, 02, 06, 00, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/async2.rs
 Number of expressions: 0
-Number of file 0 mappings: 9
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 15, 23) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 9)
@ -34,26 +33,24 @@ Number of file 0 mappings: 1
 Highest counter ID seen: c0

 Function name: async2::async_func_just_println::{closure#0}
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 17, 24, 00, 25, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 33, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 17, 24, 00, 25, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/async2.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 23, 36) to (start + 0, 37)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 51)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: async2::main
-Raw bytes (49): 0x[01, 01, 00, 09, 01, 1b, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 23, 01, 02, 05, 00, 13, 01, 02, 05, 00, 17, 01, 00, 18, 00, 22, 01, 01, 05, 00, 17, 01, 00, 18, 00, 2f, 01, 01, 01, 00, 02]
+Raw bytes (44): 0x[01, 01, 00, 08, 01, 1b, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 02, 05, 00, 13, 01, 02, 05, 00, 17, 01, 00, 18, 00, 22, 01, 01, 05, 00, 17, 01, 00, 18, 00, 2f, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/async2.rs
 Number of expressions: 0
-Number of file 0 mappings: 9
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 27, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 35)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 19)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 0, 24) to (start + 0, 34)
@ -63,14 +60,13 @@ Number of file 0 mappings: 9
 Highest counter ID seen: c0

 Function name: async2::non_async_func
-Raw bytes (49): 0x[01, 01, 00, 09, 01, 07, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 2a, 01, 01, 09, 00, 0a, 01, 00, 0d, 00, 11, 01, 01, 08, 00, 09, 01, 00, 0a, 02, 06, 00, 02, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (44): 0x[01, 01, 00, 08, 01, 07, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 0a, 01, 00, 0d, 00, 11, 01, 01, 08, 00, 09, 01, 00, 0a, 02, 06, 00, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/async2.rs
 Number of expressions: 0
-Number of file 0 mappings: 9
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 7, 1) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 42)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 0, 13) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 9)
--- a/tests/coverage/attr/trait-impl-inherit.cov-map
+++ b/tests/coverage/attr/trait-impl-inherit.cov-map
@ -1,12 +1,11 @@
 Function name: <trait_impl_inherit::S as trait_impl_inherit::T>::f
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 11, 05, 00, 10, 01, 01, 09, 00, 11, 01, 00, 12, 00, 1a, 01, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 11, 05, 00, 10, 01, 01, 09, 00, 11, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/trait-impl-inherit.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 17, 5) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 26)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c0

--- a/tests/coverage/bad_counter_ids.cov-map
+++ b/tests/coverage/bad_counter_ids.cov-map
@ -1,108 +1,96 @@
 Function name: bad_counter_ids::eq_bad
-Raw bytes (29): 0x[01, 01, 00, 05, 01, 24, 01, 00, 0c, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 24, 01, 00, 0c, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 5
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 36, 1) to (start + 0, 12)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::eq_bad_message
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 29, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 01, 00, 20, 00, 2b, 00, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 29, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 41, 1) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Counter(0)) at (prev + 0, 32) to (start + 0, 43)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::eq_good
-Raw bytes (29): 0x[01, 01, 00, 05, 01, 10, 01, 00, 0d, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 10, 01, 00, 0d, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 5
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 16, 1) to (start + 0, 13)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::eq_good_message
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 15, 01, 00, 15, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 00, 00, 20, 00, 2b, 01, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 15, 01, 00, 15, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 21, 1) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Zero) at (prev + 0, 32) to (start + 0, 43)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::ne_bad
-Raw bytes (29): 0x[01, 01, 00, 05, 01, 2e, 01, 00, 0c, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 2e, 01, 00, 0c, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 5
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 46, 1) to (start + 0, 12)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::ne_bad_message
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 33, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 01, 00, 20, 00, 2b, 00, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 33, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 51, 1) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Counter(0)) at (prev + 0, 32) to (start + 0, 43)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::ne_good
-Raw bytes (29): 0x[01, 01, 00, 05, 01, 1a, 01, 00, 0d, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 1a, 01, 00, 0d, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 5
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 26, 1) to (start + 0, 13)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: bad_counter_ids::ne_good_message
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 1f, 01, 00, 15, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 11, 01, 01, 05, 00, 0f, 00, 00, 20, 00, 2b, 01, 01, 01, 00, 02]
+Raw bytes (24): 0x[01, 01, 00, 04, 01, 1f, 01, 00, 15, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0f, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/bad_counter_ids.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 4
 - Code(Counter(0)) at (prev + 31, 1) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Zero) at (prev + 0, 32) to (start + 0, 43)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/closure.cov-map
+++ b/tests/coverage/closure.cov-map
@ -1,10 +1,10 @@
 Function name: closure::main
-Raw bytes (336): 0x[01, 01, 01, 01, 05, 42, 01, 09, 01, 00, 0a, 01, 04, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 01, 09, 00, 11, 01, 00, 14, 00, 1c, 01, 02, 09, 00, 18, 01, 00, 1b, 00, 43, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 20, 01, 02, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 0d, 05, 00, 10, 01, 00, 13, 00, 3b, 01, 02, 09, 00, 0a, 01, 0a, 05, 00, 0d, 01, 01, 09, 00, 20, 01, 02, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 02, 0d, 00, 0e, 01, 04, 05, 00, 10, 01, 00, 13, 00, 17, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 20, 01, 02, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 0d, 05, 00, 10, 01, 00, 13, 00, 17, 01, 02, 09, 00, 0a, 01, 0a, 05, 00, 0d, 01, 01, 09, 00, 20, 01, 02, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 02, 0d, 00, 0e, 01, 05, 09, 00, 16, 01, 0a, 05, 00, 0d, 01, 01, 09, 00, 28, 01, 02, 09, 00, 1a, 01, 01, 0e, 00, 12, 01, 01, 0e, 00, 11, 01, 02, 0d, 00, 1a, 01, 02, 0e, 00, 15, 01, 04, 09, 00, 18, 01, 0c, 09, 00, 16, 01, 00, 19, 00, 1b, 01, 01, 09, 00, 1e, 01, 03, 09, 00, 29, 01, 01, 09, 00, 2d, 01, 01, 09, 00, 24, 01, 05, 09, 00, 24, 01, 02, 09, 00, 21, 01, 04, 09, 00, 21, 01, 04, 09, 00, 28, 01, 09, 09, 00, 32, 01, 04, 09, 00, 33, 01, 07, 09, 00, 4b, 01, 08, 09, 00, 48, 01, 0a, 09, 00, 47, 01, 08, 09, 00, 44, 01, 0a, 08, 00, 10, 05, 00, 11, 04, 06, 05, 01, 09, 00, 30, 02, 03, 05, 00, 06, 01, 01, 05, 00, 28, 01, 01, 05, 00, 46, 01, 01, 05, 00, 43, 01, 01, 01, 00, 02]
+Raw bytes (311): 0x[01, 01, 01, 01, 05, 3d, 01, 09, 01, 00, 0a, 01, 04, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 01, 09, 00, 11, 01, 00, 14, 00, 1c, 01, 02, 09, 00, 18, 01, 00, 1b, 00, 43, 01, 01, 05, 00, 0d, 01, 03, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 0d, 05, 00, 10, 01, 00, 13, 00, 3b, 01, 02, 09, 00, 0a, 01, 0a, 05, 00, 0d, 01, 03, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 02, 0d, 00, 0e, 01, 04, 05, 00, 10, 01, 00, 13, 00, 17, 01, 01, 05, 00, 0d, 01, 03, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 0d, 05, 00, 10, 01, 00, 13, 00, 17, 01, 02, 09, 00, 0a, 01, 0a, 05, 00, 0d, 01, 03, 09, 00, 14, 01, 02, 0d, 00, 1b, 01, 02, 0d, 00, 0e, 01, 05, 09, 00, 16, 01, 0a, 05, 00, 0d, 01, 03, 09, 00, 1a, 01, 01, 0e, 00, 12, 01, 01, 0e, 00, 11, 01, 02, 0d, 00, 1a, 01, 02, 0e, 00, 15, 01, 04, 09, 00, 18, 01, 0c, 09, 00, 16, 01, 00, 19, 00, 1b, 01, 01, 09, 00, 1e, 01, 03, 09, 00, 29, 01, 01, 09, 00, 2d, 01, 01, 09, 00, 24, 01, 05, 09, 00, 24, 01, 02, 09, 00, 21, 01, 04, 09, 00, 21, 01, 04, 09, 00, 28, 01, 09, 09, 00, 32, 01, 04, 09, 00, 33, 01, 07, 09, 00, 4b, 01, 08, 09, 00, 48, 01, 0a, 09, 00, 47, 01, 08, 09, 00, 44, 01, 0a, 08, 00, 10, 05, 00, 11, 04, 06, 05, 01, 09, 00, 30, 02, 03, 05, 00, 06, 01, 01, 05, 00, 28, 01, 01, 05, 00, 46, 01, 01, 05, 00, 43, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 66
+Number of file 0 mappings: 61
 - Code(Counter(0)) at (prev + 9, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 4, 9) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 0, 19) to (start + 0, 46)
@ -13,35 +13,30 @@ Number of file 0 mappings: 66
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 0, 27) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 32)
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 20)
+- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 27)
 - Code(Counter(0)) at (prev + 13, 5) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 0, 19) to (start + 0, 59)
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 10, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 32)
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 20)
+- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 27)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 4, 5) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 0, 19) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 32)
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 20)
+- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 27)
 - Code(Counter(0)) at (prev + 13, 5) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 0, 19) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 10, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 32)
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 20)
+- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 27)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 5, 9) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 10, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 40)
- Code(Counter(0)) at (prev + 2, 9) to (start + 0, 26)
+- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 26)
 - Code(Counter(0)) at (prev + 1, 14) to (start + 0, 18)
 - Code(Counter(0)) at (prev + 1, 14) to (start + 0, 17)
 - Code(Counter(0)) at (prev + 2, 13) to (start + 0, 26)
@ -94,74 +89,68 @@ Number of file 0 mappings: 9
 Highest counter ID seen: c1

 Function name: closure::main::{closure#10} (unused)
-Raw bytes (25): 0x[01, 01, 00, 04, 00, 9b, 01, 07, 00, 08, 00, 00, 09, 00, 11, 00, 00, 12, 00, 1e, 00, 00, 20, 00, 21]
+Raw bytes (20): 0x[01, 01, 00, 03, 00, 9b, 01, 07, 00, 08, 00, 00, 09, 00, 11, 00, 00, 20, 00, 21]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 155, 7) to (start + 0, 8)
 - Code(Zero) at (prev + 0, 9) to (start + 0, 17)
- Code(Zero) at (prev + 0, 18) to (start + 0, 30)
 - Code(Zero) at (prev + 0, 32) to (start + 0, 33)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#11} (unused)
-Raw bytes (25): 0x[01, 01, 00, 04, 00, 9f, 01, 07, 00, 08, 00, 00, 09, 00, 11, 00, 00, 12, 00, 1e, 00, 00, 20, 00, 21]
+Raw bytes (20): 0x[01, 01, 00, 03, 00, 9f, 01, 07, 00, 08, 00, 00, 09, 00, 11, 00, 00, 20, 00, 21]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 159, 7) to (start + 0, 8)
 - Code(Zero) at (prev + 0, 9) to (start + 0, 17)
- Code(Zero) at (prev + 0, 18) to (start + 0, 30)
 - Code(Zero) at (prev + 0, 32) to (start + 0, 33)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#12} (unused)
-Raw bytes (15): 0x[01, 01, 00, 02, 00, a7, 01, 01, 00, 09, 00, 00, 0a, 00, 16]
+Raw bytes (10): 0x[01, 01, 00, 01, 00, a7, 01, 01, 00, 09]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Zero) at (prev + 167, 1) to (start + 0, 9)
- Code(Zero) at (prev + 0, 10) to (start + 0, 22)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#13} (unused)
-Raw bytes (15): 0x[01, 01, 00, 02, 00, ac, 01, 0d, 00, 15, 00, 01, 11, 00, 1d]
+Raw bytes (10): 0x[01, 01, 00, 01, 00, ac, 01, 0d, 00, 15]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Zero) at (prev + 172, 13) to (start + 0, 21)
- Code(Zero) at (prev + 1, 17) to (start + 0, 29)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#14}
-Raw bytes (27): 0x[01, 01, 01, 01, 05, 04, 01, b4, 01, 11, 00, 21, 01, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33]
+Raw bytes (22): 0x[01, 01, 01, 01, 05, 03, 01, b5, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 4
- Code(Counter(0)) at (prev + 180, 17) to (start + 0, 33)
- Code(Counter(0)) at (prev + 1, 20) to (start + 0, 27)
+Number of file 0 mappings: 3
+- Code(Counter(0)) at (prev + 181, 20) to (start + 0, 27)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 37)
 - Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
    = (c0 - c1)
 Highest counter ID seen: c1

 Function name: closure::main::{closure#15}
-Raw bytes (42): 0x[01, 01, 01, 01, 05, 07, 01, bb, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 01, 11, 00, 21, 01, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
+Raw bytes (37): 0x[01, 01, 01, 01, 05, 06, 01, bb, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 02, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 187, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 21)
- Code(Counter(0)) at (prev + 1, 17) to (start + 0, 33)
- Code(Counter(0)) at (prev + 1, 20) to (start + 0, 27)
+- Code(Counter(0)) at (prev + 2, 20) to (start + 0, 27)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 37)
 - Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
    = (c0 - c1)
@ -169,30 +158,28 @@ Number of file 0 mappings: 7
 Highest counter ID seen: c1

 Function name: closure::main::{closure#16}
-Raw bytes (27): 0x[01, 01, 01, 01, 05, 04, 01, c6, 01, 11, 00, 21, 01, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33]
+Raw bytes (22): 0x[01, 01, 01, 01, 05, 03, 01, c7, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 4
- Code(Counter(0)) at (prev + 198, 17) to (start + 0, 33)
- Code(Counter(0)) at (prev + 1, 20) to (start + 0, 27)
+Number of file 0 mappings: 3
+- Code(Counter(0)) at (prev + 199, 20) to (start + 0, 27)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 37)
 - Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
    = (c0 - c1)
 Highest counter ID seen: c1

 Function name: closure::main::{closure#17}
-Raw bytes (42): 0x[01, 01, 01, 01, 05, 07, 01, cd, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 01, 11, 00, 21, 01, 01, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
+Raw bytes (37): 0x[01, 01, 01, 01, 05, 06, 01, cd, 01, 09, 00, 0a, 01, 01, 0d, 00, 15, 01, 02, 14, 00, 1b, 05, 00, 1e, 00, 25, 02, 00, 2f, 00, 33, 01, 02, 09, 00, 0a]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 205, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 21)
- Code(Counter(0)) at (prev + 1, 17) to (start + 0, 33)
- Code(Counter(0)) at (prev + 1, 20) to (start + 0, 27)
+- Code(Counter(0)) at (prev + 2, 20) to (start + 0, 27)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 37)
 - Code(Expression(0, Sub)) at (prev + 0, 47) to (start + 0, 51)
    = (c0 - c1)
@ -257,12 +244,12 @@ Number of file 0 mappings: 9
 Highest counter ID seen: c1

 Function name: closure::main::{closure#2}
-Raw bytes (51): 0x[01, 01, 01, 01, 05, 09, 01, 68, 05, 00, 06, 01, 01, 0d, 00, 1a, 01, 00, 1d, 00, 1e, 01, 01, 0c, 00, 14, 05, 00, 15, 02, 0a, 02, 02, 09, 00, 0a, 01, 01, 09, 00, 10, 01, 00, 11, 00, 17, 01, 01, 05, 00, 06]
+Raw bytes (46): 0x[01, 01, 01, 01, 05, 08, 01, 68, 05, 00, 06, 01, 01, 0d, 00, 1a, 01, 00, 1d, 00, 1e, 01, 01, 0c, 00, 14, 05, 00, 15, 02, 0a, 02, 02, 09, 00, 0a, 01, 01, 09, 00, 10, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 9
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 104, 5) to (start + 0, 6)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 26)
 - Code(Counter(0)) at (prev + 0, 29) to (start + 0, 30)
@ -271,7 +258,6 @@ Number of file 0 mappings: 9
 - Code(Expression(0, Sub)) at (prev + 2, 9) to (start + 0, 10)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 16)
- Code(Counter(0)) at (prev + 0, 17) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c1

@ -291,56 +277,51 @@ Number of file 0 mappings: 7
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#5}
-Raw bytes (15): 0x[01, 01, 00, 02, 01, 8c, 01, 3d, 00, 45, 01, 00, 46, 00, 4e]
+Raw bytes (10): 0x[01, 01, 00, 01, 01, 8c, 01, 3d, 00, 45]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Counter(0)) at (prev + 140, 61) to (start + 0, 69)
- Code(Counter(0)) at (prev + 0, 70) to (start + 0, 78)
 Highest counter ID seen: c0

 Function name: closure::main::{closure#6}
-Raw bytes (15): 0x[01, 01, 00, 02, 01, 8d, 01, 41, 00, 49, 01, 00, 4a, 00, 56]
+Raw bytes (10): 0x[01, 01, 00, 01, 01, 8d, 01, 41, 00, 49]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Counter(0)) at (prev + 141, 65) to (start + 0, 73)
- Code(Counter(0)) at (prev + 0, 74) to (start + 0, 86)
 Highest counter ID seen: c0

 Function name: closure::main::{closure#7} (unused)
-Raw bytes (15): 0x[01, 01, 00, 02, 00, 8e, 01, 3b, 00, 43, 00, 00, 44, 00, 50]
+Raw bytes (10): 0x[01, 01, 00, 01, 00, 8e, 01, 3b, 00, 43]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Zero) at (prev + 142, 59) to (start + 0, 67)
- Code(Zero) at (prev + 0, 68) to (start + 0, 80)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#8} (unused)
-Raw bytes (25): 0x[01, 01, 00, 04, 00, 93, 01, 3b, 00, 3c, 00, 00, 3d, 00, 45, 00, 00, 46, 00, 52, 00, 00, 54, 00, 55]
+Raw bytes (20): 0x[01, 01, 00, 03, 00, 93, 01, 3b, 00, 3c, 00, 00, 3d, 00, 45, 00, 00, 54, 00, 55]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 147, 59) to (start + 0, 60)
 - Code(Zero) at (prev + 0, 61) to (start + 0, 69)
- Code(Zero) at (prev + 0, 70) to (start + 0, 82)
 - Code(Zero) at (prev + 0, 84) to (start + 0, 85)
 Highest counter ID seen: (none)

 Function name: closure::main::{closure#9} (unused)
-Raw bytes (25): 0x[01, 01, 00, 04, 00, 95, 01, 38, 00, 39, 00, 01, 09, 00, 11, 00, 00, 12, 00, 1e, 00, 01, 05, 00, 06]
+Raw bytes (20): 0x[01, 01, 00, 03, 00, 95, 01, 38, 00, 39, 00, 01, 09, 00, 11, 00, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 149, 56) to (start + 0, 57)
 - Code(Zero) at (prev + 1, 9) to (start + 0, 17)
- Code(Zero) at (prev + 0, 18) to (start + 0, 30)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: (none)

--- a/tests/coverage/closure_macro.cov-map
+++ b/tests/coverage/closure_macro.cov-map
@ -10,15 +10,14 @@ Number of file 0 mappings: 3
 Highest counter ID seen: c0

 Function name: closure_macro::main
-Raw bytes (66): 0x[01, 01, 01, 01, 05, 0c, 01, 21, 01, 00, 24, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 20, 02, 01, 09, 00, 0f, 01, 00, 12, 00, 1b, 01, 00, 1c, 00, 34, 05, 00, 54, 00, 55, 02, 02, 09, 00, 1f, 02, 00, 22, 00, 2e, 02, 01, 0d, 00, 2d, 02, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (61): 0x[01, 01, 01, 01, 05, 0b, 01, 21, 01, 00, 24, 01, 01, 05, 00, 0d, 02, 01, 09, 00, 0f, 01, 00, 12, 00, 1b, 01, 00, 1c, 00, 34, 05, 00, 54, 00, 55, 02, 02, 09, 00, 1f, 02, 00, 22, 00, 2e, 02, 01, 0d, 00, 2d, 02, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/closure_macro.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 12
+Number of file 0 mappings: 11
 - Code(Counter(0)) at (prev + 33, 1) to (start + 0, 36)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 32)
 - Code(Expression(0, Sub)) at (prev + 1, 9) to (start + 0, 15)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 0, 18) to (start + 0, 27)
@ -36,25 +35,22 @@ Number of file 0 mappings: 12
 Highest counter ID seen: c1

 Function name: closure_macro::main::{closure#0}
-Raw bytes (60): 0x[01, 01, 03, 01, 05, 01, 0b, 05, 09, 0a, 01, 10, 1c, 00, 1d, 01, 02, 11, 00, 18, 01, 00, 1b, 00, 22, 01, 01, 10, 00, 21, 05, 01, 11, 00, 19, 05, 00, 1a, 00, 1e, 05, 01, 11, 00, 27, 02, 02, 11, 00, 16, 06, 00, 17, 00, 1e, 01, 02, 09, 00, 0a]
+Raw bytes (51): 0x[01, 01, 01, 01, 05, 09, 01, 10, 1c, 00, 1d, 01, 02, 11, 00, 18, 01, 00, 1b, 00, 22, 01, 01, 10, 00, 21, 05, 01, 11, 00, 19, 05, 01, 11, 00, 27, 02, 02, 11, 00, 16, 02, 00, 17, 00, 1e, 01, 02, 09, 00, 0a]
 Number of files: 1
 - file 0 => $DIR/closure_macro.rs
-Number of expressions: 3
+Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
- expression 1 operands: lhs = Counter(0), rhs = Expression(2, Add)
- expression 2 operands: lhs = Counter(1), rhs = Counter(2)
-Number of file 0 mappings: 10
+Number of file 0 mappings: 9
 - Code(Counter(0)) at (prev + 16, 28) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 2, 17) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 0, 27) to (start + 0, 34)
 - Code(Counter(0)) at (prev + 1, 16) to (start + 0, 33)
 - Code(Counter(1)) at (prev + 1, 17) to (start + 0, 25)
- Code(Counter(1)) at (prev + 0, 26) to (start + 0, 30)
 - Code(Counter(1)) at (prev + 1, 17) to (start + 0, 39)
 - Code(Expression(0, Sub)) at (prev + 2, 17) to (start + 0, 22)
    = (c0 - c1)
- Code(Expression(1, Sub)) at (prev + 0, 23) to (start + 0, 30)
-    = (c0 - (c1 + c2))
+- Code(Expression(0, Sub)) at (prev + 0, 23) to (start + 0, 30)
+    = (c0 - c1)
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
 Highest counter ID seen: c1

--- a/tests/coverage/closure_macro_async.cov-map
+++ b/tests/coverage/closure_macro_async.cov-map
@ -19,15 +19,14 @@ Number of file 0 mappings: 1
 Highest counter ID seen: c0

 Function name: closure_macro_async::test::{closure#0}
-Raw bytes (66): 0x[01, 01, 01, 01, 05, 0c, 01, 25, 2b, 00, 2c, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 20, 02, 01, 09, 00, 0f, 01, 00, 12, 00, 1b, 01, 00, 1c, 00, 34, 05, 00, 54, 00, 55, 02, 02, 09, 00, 1f, 02, 00, 22, 00, 2e, 02, 01, 0d, 00, 2d, 02, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (61): 0x[01, 01, 01, 01, 05, 0b, 01, 25, 2b, 00, 2c, 01, 01, 05, 00, 0d, 02, 01, 09, 00, 0f, 01, 00, 12, 00, 1b, 01, 00, 1c, 00, 34, 05, 00, 54, 00, 55, 02, 02, 09, 00, 1f, 02, 00, 22, 00, 2e, 02, 01, 0d, 00, 2d, 02, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/closure_macro_async.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 12
+Number of file 0 mappings: 11
 - Code(Counter(0)) at (prev + 37, 43) to (start + 0, 44)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 32)
 - Code(Expression(0, Sub)) at (prev + 1, 9) to (start + 0, 15)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 0, 18) to (start + 0, 27)
@ -45,25 +44,22 @@ Number of file 0 mappings: 12
 Highest counter ID seen: c1

 Function name: closure_macro_async::test::{closure#0}::{closure#0}
-Raw bytes (60): 0x[01, 01, 03, 01, 05, 01, 0b, 05, 09, 0a, 01, 14, 1c, 00, 1d, 01, 02, 11, 00, 18, 01, 00, 1b, 00, 22, 01, 01, 10, 00, 21, 05, 01, 11, 00, 19, 05, 00, 1a, 00, 1e, 05, 01, 11, 00, 27, 02, 02, 11, 00, 16, 06, 00, 17, 00, 1e, 01, 02, 09, 00, 0a]
+Raw bytes (51): 0x[01, 01, 01, 01, 05, 09, 01, 14, 1c, 00, 1d, 01, 02, 11, 00, 18, 01, 00, 1b, 00, 22, 01, 01, 10, 00, 21, 05, 01, 11, 00, 19, 05, 01, 11, 00, 27, 02, 02, 11, 00, 16, 02, 00, 17, 00, 1e, 01, 02, 09, 00, 0a]
 Number of files: 1
 - file 0 => $DIR/closure_macro_async.rs
-Number of expressions: 3
+Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
- expression 1 operands: lhs = Counter(0), rhs = Expression(2, Add)
- expression 2 operands: lhs = Counter(1), rhs = Counter(2)
-Number of file 0 mappings: 10
+Number of file 0 mappings: 9
 - Code(Counter(0)) at (prev + 20, 28) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 2, 17) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 0, 27) to (start + 0, 34)
 - Code(Counter(0)) at (prev + 1, 16) to (start + 0, 33)
 - Code(Counter(1)) at (prev + 1, 17) to (start + 0, 25)
- Code(Counter(1)) at (prev + 0, 26) to (start + 0, 30)
 - Code(Counter(1)) at (prev + 1, 17) to (start + 0, 39)
 - Code(Expression(0, Sub)) at (prev + 2, 17) to (start + 0, 22)
    = (c0 - c1)
- Code(Expression(1, Sub)) at (prev + 0, 23) to (start + 0, 30)
-    = (c0 - (c1 + c2))
+- Code(Expression(0, Sub)) at (prev + 0, 23) to (start + 0, 30)
+    = (c0 - c1)
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
 Highest counter ID seen: c1

--- a/tests/coverage/conditions.cov-map
+++ b/tests/coverage/conditions.cov-map
@ -1,8 +1,8 @@
 Function name: conditions::main
-Raw bytes (656): 0x[01, 01, 57, 05, 09, 01, 05, 09, 5d, 09, 27, 5d, 61, 27, 65, 5d, 61, 09, 23, 27, 65, 5d, 61, 01, 03, 03, 0d, 11, 51, 11, 4f, 51, 55, 4f, 59, 51, 55, 11, 4b, 4f, 59, 51, 55, 03, 9f, 01, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 9f, 01, 15, 0d, 11, 19, 45, 19, 97, 01, 45, 49, 97, 01, 4d, 45, 49, 19, 93, 01, 97, 01, 4d, 45, 49, 9f, 01, 9b, 02, 0d, 11, 15, 19, 15, 19, 15, 19, 15, 19, 15, 19, 1d, 21, 15, 19, 9b, 02, 1d, 15, 19, 21, 39, 21, e3, 01, 39, 3d, e3, 01, 41, 39, 3d, 21, df, 01, e3, 01, 41, 39, 3d, 9b, 02, d7, 02, 15, 19, 1d, 21, 9b, 02, d7, 02, 15, 19, 1d, 21, 9b, 02, d7, 02, 15, 19, 1d, 21, 9b, 02, d7, 02, 15, 19, 1d, 21, 9b, 02, d7, 02, 15, 19, 1d, 21, 25, 29, 1d, 21, d7, 02, 25, 1d, 21, 29, 2d, 29, cf, 02, 2d, 31, cf, 02, 35, 2d, 31, 29, cb, 02, cf, 02, 35, 2d, 31, d7, 02, db, 02, 1d, 21, 25, 29, 53, 01, 03, 01, 00, 0a, 01, 01, 09, 00, 16, 01, 00, 19, 00, 1a, 01, 01, 08, 00, 0c, 01, 00, 0d, 02, 06, 00, 02, 05, 00, 06, 03, 03, 09, 00, 0a, 01, 00, 10, 00, 1d, 05, 01, 09, 00, 17, 05, 01, 09, 00, 0a, 06, 01, 0f, 00, 1c, 09, 01, 0c, 00, 19, 0a, 00, 1d, 00, 2a, 0e, 00, 2e, 00, 3c, 23, 00, 3d, 02, 0a, 1e, 02, 09, 00, 0a, 09, 01, 09, 00, 17, 09, 01, 09, 00, 12, 2a, 02, 09, 00, 0f, 03, 03, 09, 00, 16, 03, 00, 19, 00, 1a, 03, 01, 08, 00, 0c, 03, 00, 0d, 02, 06, 00, 02, 05, 00, 06, 03, 02, 08, 00, 15, 0d, 00, 16, 02, 06, 2e, 02, 0f, 00, 1c, 11, 01, 0c, 00, 19, 32, 00, 1d, 00, 2a, 36, 00, 2e, 00, 3c, 4b, 00, 3d, 02, 0a, 46, 02, 09, 00, 0a, 11, 01, 09, 00, 17, 52, 02, 09, 00, 0f, 9f, 01, 03, 08, 00, 0c, 9f, 01, 01, 0d, 00, 1a, 9f, 01, 00, 1d, 00, 1e, 9f, 01, 01, 0c, 00, 10, 9f, 01, 00, 11, 02, 0a, 00, 02, 09, 00, 0a, 9f, 01, 02, 0c, 00, 19, 15, 00, 1a, 02, 0a, 72, 04, 11, 00, 1e, 19, 01, 10, 00, 1d, 7a, 00, 21, 00, 2e, 7e, 00, 32, 00, 40, 93, 01, 00, 41, 02, 0e, 8e, 01, 02, 0d, 00, 0e, 19, 01, 0d, 00, 1b, 9a, 01, 02, 0d, 00, 13, 00, 02, 05, 00, 06, 9b, 02, 02, 09, 00, 16, 9b, 02, 00, 19, 00, 1a, 9b, 02, 01, 08, 00, 0c, 9b, 02, 00, 0d, 02, 06, 00, 02, 05, 00, 06, d7, 02, 02, 09, 00, 0a, 9b, 02, 00, 10, 00, 1d, 1d, 00, 1e, 02, 06, be, 01, 02, 0f, 00, 1c, 21, 01, 0c, 00, 19, c6, 01, 00, 1d, 00, 2a, ca, 01, 00, 2e, 00, 3c, df, 01, 00, 3d, 02, 0a, da, 01, 02, 09, 00, 0a, 21, 01, 09, 00, 17, 96, 02, 02, 0d, 00, 20, 96, 02, 00, 23, 00, 2c, 96, 02, 01, 09, 00, 11, 96, 02, 00, 12, 00, 1b, 96, 02, 01, 09, 00, 0f, db, 02, 03, 09, 00, 0a, d7, 02, 00, 10, 00, 1d, 25, 00, 1e, 02, 06, aa, 02, 02, 0f, 00, 1c, 29, 01, 0c, 00, 19, b2, 02, 00, 1d, 00, 2a, b6, 02, 00, 2e, 00, 3c, cb, 02, 00, 3d, 02, 0a, c6, 02, 02, 09, 00, 0a, 29, 01, 09, 00, 17, d2, 02, 02, 09, 00, 0f, 01, 02, 01, 00, 02]
+Raw bytes (642): 0x[01, 01, 54, 05, 09, 01, 05, 09, 5d, 09, 27, 5d, 61, 27, 65, 5d, 61, 09, 23, 27, 65, 5d, 61, 01, 03, 03, 0d, 11, 51, 11, 4f, 51, 55, 4f, 59, 51, 55, 11, 4b, 4f, 59, 51, 55, 03, 9f, 01, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 0d, 11, 9f, 01, 15, 0d, 11, 19, 45, 19, 97, 01, 45, 49, 97, 01, 4d, 45, 49, 19, 93, 01, 97, 01, 4d, 45, 49, 9f, 01, 8f, 02, 0d, 11, 15, 19, 15, 19, 15, 19, 15, 19, 15, 19, 1d, 21, 15, 19, 8f, 02, 1d, 15, 19, 21, 39, 21, e3, 01, 39, 3d, e3, 01, 41, 39, 3d, 21, df, 01, e3, 01, 41, 39, 3d, 8f, 02, cb, 02, 15, 19, 1d, 21, 8f, 02, cb, 02, 15, 19, 1d, 21, 8f, 02, cb, 02, 15, 19, 1d, 21, 8f, 02, cb, 02, 15, 19, 1d, 21, 25, 29, 1d, 21, cb, 02, 25, 1d, 21, 29, 2d, 29, c3, 02, 2d, 31, c3, 02, 35, 2d, 31, 29, bf, 02, c3, 02, 35, 2d, 31, cb, 02, cf, 02, 1d, 21, 25, 29, 52, 01, 03, 01, 00, 0a, 01, 01, 09, 00, 16, 01, 00, 19, 00, 1a, 01, 01, 08, 00, 0c, 01, 00, 0d, 02, 06, 00, 02, 05, 00, 06, 03, 03, 09, 00, 0a, 01, 00, 10, 00, 1d, 05, 01, 09, 00, 17, 05, 01, 09, 00, 0a, 06, 01, 0f, 00, 1c, 09, 01, 0c, 00, 19, 0a, 00, 1d, 00, 2a, 0e, 00, 2e, 00, 3c, 23, 00, 3d, 02, 0a, 1e, 02, 09, 00, 0a, 09, 01, 09, 00, 17, 09, 01, 09, 00, 12, 2a, 02, 09, 00, 0f, 03, 03, 09, 00, 16, 03, 00, 19, 00, 1a, 03, 01, 08, 00, 0c, 03, 00, 0d, 02, 06, 00, 02, 05, 00, 06, 03, 02, 08, 00, 15, 0d, 00, 16, 02, 06, 2e, 02, 0f, 00, 1c, 11, 01, 0c, 00, 19, 32, 00, 1d, 00, 2a, 36, 00, 2e, 00, 3c, 4b, 00, 3d, 02, 0a, 46, 02, 09, 00, 0a, 11, 01, 09, 00, 17, 52, 02, 09, 00, 0f, 9f, 01, 03, 08, 00, 0c, 9f, 01, 01, 0d, 00, 1a, 9f, 01, 00, 1d, 00, 1e, 9f, 01, 01, 0c, 00, 10, 9f, 01, 00, 11, 02, 0a, 00, 02, 09, 00, 0a, 9f, 01, 02, 0c, 00, 19, 15, 00, 1a, 02, 0a, 72, 04, 11, 00, 1e, 19, 01, 10, 00, 1d, 7a, 00, 21, 00, 2e, 7e, 00, 32, 00, 40, 93, 01, 00, 41, 02, 0e, 8e, 01, 02, 0d, 00, 0e, 19, 01, 0d, 00, 1b, 9a, 01, 02, 0d, 00, 13, 00, 02, 05, 00, 06, 8f, 02, 02, 09, 00, 16, 8f, 02, 00, 19, 00, 1a, 8f, 02, 01, 08, 00, 0c, 8f, 02, 00, 0d, 02, 06, 00, 02, 05, 00, 06, cb, 02, 02, 09, 00, 0a, 8f, 02, 00, 10, 00, 1d, 1d, 00, 1e, 02, 06, be, 01, 02, 0f, 00, 1c, 21, 01, 0c, 00, 19, c6, 01, 00, 1d, 00, 2a, ca, 01, 00, 2e, 00, 3c, df, 01, 00, 3d, 02, 0a, da, 01, 02, 09, 00, 0a, 21, 01, 09, 00, 17, 8a, 02, 02, 0d, 00, 20, 8a, 02, 00, 23, 00, 2c, 8a, 02, 01, 09, 00, 11, 8a, 02, 01, 09, 00, 0f, cf, 02, 03, 09, 00, 0a, cb, 02, 00, 10, 00, 1d, 25, 00, 1e, 02, 06, 9e, 02, 02, 0f, 00, 1c, 29, 01, 0c, 00, 19, a6, 02, 00, 1d, 00, 2a, aa, 02, 00, 2e, 00, 3c, bf, 02, 00, 3d, 02, 0a, ba, 02, 02, 09, 00, 0a, 29, 01, 09, 00, 17, c6, 02, 02, 09, 00, 0f, 01, 02, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/conditions.rs
-Number of expressions: 87
+Number of expressions: 84
 - expression 0 operands: lhs = Counter(1), rhs = Counter(2)
 - expression 1 operands: lhs = Counter(0), rhs = Counter(1)
 - expression 2 operands: lhs = Counter(2), rhs = Counter(23)
@ -41,7 +41,7 @@ Number of expressions: 87
 - expression 35 operands: lhs = Counter(6), rhs = Expression(36, Add)
 - expression 36 operands: lhs = Expression(37, Add), rhs = Counter(19)
 - expression 37 operands: lhs = Counter(17), rhs = Counter(18)
- expression 38 operands: lhs = Expression(39, Add), rhs = Expression(70, Add)
+- expression 38 operands: lhs = Expression(39, Add), rhs = Expression(67, Add)
 - expression 39 operands: lhs = Counter(3), rhs = Counter(4)
 - expression 40 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 41 operands: lhs = Counter(5), rhs = Counter(6)
@ -50,7 +50,7 @@ Number of expressions: 87
 - expression 44 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 45 operands: lhs = Counter(7), rhs = Counter(8)
 - expression 46 operands: lhs = Counter(5), rhs = Counter(6)
- expression 47 operands: lhs = Expression(70, Add), rhs = Counter(7)
+- expression 47 operands: lhs = Expression(67, Add), rhs = Counter(7)
 - expression 48 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 49 operands: lhs = Counter(8), rhs = Counter(14)
 - expression 50 operands: lhs = Counter(8), rhs = Expression(56, Add)
@ -60,37 +60,34 @@ Number of expressions: 87
 - expression 54 operands: lhs = Counter(8), rhs = Expression(55, Add)
 - expression 55 operands: lhs = Expression(56, Add), rhs = Counter(16)
 - expression 56 operands: lhs = Counter(14), rhs = Counter(15)
- expression 57 operands: lhs = Expression(70, Add), rhs = Expression(85, Add)
+- expression 57 operands: lhs = Expression(67, Add), rhs = Expression(82, Add)
 - expression 58 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 59 operands: lhs = Counter(7), rhs = Counter(8)
- expression 60 operands: lhs = Expression(70, Add), rhs = Expression(85, Add)
+- expression 60 operands: lhs = Expression(67, Add), rhs = Expression(82, Add)
 - expression 61 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 62 operands: lhs = Counter(7), rhs = Counter(8)
- expression 63 operands: lhs = Expression(70, Add), rhs = Expression(85, Add)
+- expression 63 operands: lhs = Expression(67, Add), rhs = Expression(82, Add)
 - expression 64 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 65 operands: lhs = Counter(7), rhs = Counter(8)
- expression 66 operands: lhs = Expression(70, Add), rhs = Expression(85, Add)
+- expression 66 operands: lhs = Expression(67, Add), rhs = Expression(82, Add)
 - expression 67 operands: lhs = Counter(5), rhs = Counter(6)
 - expression 68 operands: lhs = Counter(7), rhs = Counter(8)
- expression 69 operands: lhs = Expression(70, Add), rhs = Expression(85, Add)
- expression 70 operands: lhs = Counter(5), rhs = Counter(6)
- expression 71 operands: lhs = Counter(7), rhs = Counter(8)
- expression 72 operands: lhs = Counter(9), rhs = Counter(10)
- expression 73 operands: lhs = Counter(7), rhs = Counter(8)
- expression 74 operands: lhs = Expression(85, Add), rhs = Counter(9)
- expression 75 operands: lhs = Counter(7), rhs = Counter(8)
- expression 76 operands: lhs = Counter(10), rhs = Counter(11)
- expression 77 operands: lhs = Counter(10), rhs = Expression(83, Add)
- expression 78 operands: lhs = Counter(11), rhs = Counter(12)
- expression 79 operands: lhs = Expression(83, Add), rhs = Counter(13)
+- expression 69 operands: lhs = Counter(9), rhs = Counter(10)
+- expression 70 operands: lhs = Counter(7), rhs = Counter(8)
+- expression 71 operands: lhs = Expression(82, Add), rhs = Counter(9)
+- expression 72 operands: lhs = Counter(7), rhs = Counter(8)
+- expression 73 operands: lhs = Counter(10), rhs = Counter(11)
+- expression 74 operands: lhs = Counter(10), rhs = Expression(80, Add)
+- expression 75 operands: lhs = Counter(11), rhs = Counter(12)
+- expression 76 operands: lhs = Expression(80, Add), rhs = Counter(13)
+- expression 77 operands: lhs = Counter(11), rhs = Counter(12)
+- expression 78 operands: lhs = Counter(10), rhs = Expression(79, Add)
+- expression 79 operands: lhs = Expression(80, Add), rhs = Counter(13)
 - expression 80 operands: lhs = Counter(11), rhs = Counter(12)
- expression 81 operands: lhs = Counter(10), rhs = Expression(82, Add)
- expression 82 operands: lhs = Expression(83, Add), rhs = Counter(13)
- expression 83 operands: lhs = Counter(11), rhs = Counter(12)
- expression 84 operands: lhs = Expression(85, Add), rhs = Expression(86, Add)
- expression 85 operands: lhs = Counter(7), rhs = Counter(8)
- expression 86 operands: lhs = Counter(9), rhs = Counter(10)
-Number of file 0 mappings: 83
+- expression 81 operands: lhs = Expression(82, Add), rhs = Expression(83, Add)
+- expression 82 operands: lhs = Counter(7), rhs = Counter(8)
+- expression 83 operands: lhs = Counter(9), rhs = Counter(10)
+Number of file 0 mappings: 82
 - Code(Counter(0)) at (prev + 3, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 0, 25) to (start + 0, 26)
@ -172,18 +169,18 @@ Number of file 0 mappings: 83
 - Code(Expression(38, Sub)) at (prev + 2, 13) to (start + 0, 19)
    = ((c3 + c4) - (c5 + c6))
 - Code(Zero) at (prev + 2, 5) to (start + 0, 6)
- Code(Expression(70, Add)) at (prev + 2, 9) to (start + 0, 22)
+- Code(Expression(67, Add)) at (prev + 2, 9) to (start + 0, 22)
    = (c5 + c6)
- Code(Expression(70, Add)) at (prev + 0, 25) to (start + 0, 26)
+- Code(Expression(67, Add)) at (prev + 0, 25) to (start + 0, 26)
    = (c5 + c6)
- Code(Expression(70, Add)) at (prev + 1, 8) to (start + 0, 12)
+- Code(Expression(67, Add)) at (prev + 1, 8) to (start + 0, 12)
    = (c5 + c6)
- Code(Expression(70, Add)) at (prev + 0, 13) to (start + 2, 6)
+- Code(Expression(67, Add)) at (prev + 0, 13) to (start + 2, 6)
    = (c5 + c6)
 - Code(Zero) at (prev + 2, 5) to (start + 0, 6)
- Code(Expression(85, Add)) at (prev + 2, 9) to (start + 0, 10)
+- Code(Expression(82, Add)) at (prev + 2, 9) to (start + 0, 10)
    = (c7 + c8)
- Code(Expression(70, Add)) at (prev + 0, 16) to (start + 0, 29)
+- Code(Expression(67, Add)) at (prev + 0, 16) to (start + 0, 29)
    = (c5 + c6)
 - Code(Counter(7)) at (prev + 0, 30) to (start + 2, 6)
 - Code(Expression(47, Sub)) at (prev + 2, 15) to (start + 0, 28)
@ -198,34 +195,32 @@ Number of file 0 mappings: 83
 - Code(Expression(54, Sub)) at (prev + 2, 9) to (start + 0, 10)
    = (c8 - ((c14 + c15) + c16))
 - Code(Counter(8)) at (prev + 1, 9) to (start + 0, 23)
- Code(Expression(69, Sub)) at (prev + 2, 13) to (start + 0, 32)
+- Code(Expression(66, Sub)) at (prev + 2, 13) to (start + 0, 32)
    = ((c5 + c6) - (c7 + c8))
- Code(Expression(69, Sub)) at (prev + 0, 35) to (start + 0, 44)
+- Code(Expression(66, Sub)) at (prev + 0, 35) to (start + 0, 44)
    = ((c5 + c6) - (c7 + c8))
- Code(Expression(69, Sub)) at (prev + 1, 9) to (start + 0, 17)
+- Code(Expression(66, Sub)) at (prev + 1, 9) to (start + 0, 17)
    = ((c5 + c6) - (c7 + c8))
- Code(Expression(69, Sub)) at (prev + 0, 18) to (start + 0, 27)
+- Code(Expression(66, Sub)) at (prev + 1, 9) to (start + 0, 15)
    = ((c5 + c6) - (c7 + c8))
- Code(Expression(69, Sub)) at (prev + 1, 9) to (start + 0, 15)
-    = ((c5 + c6) - (c7 + c8))
- Code(Expression(86, Add)) at (prev + 3, 9) to (start + 0, 10)
+- Code(Expression(83, Add)) at (prev + 3, 9) to (start + 0, 10)
    = (c9 + c10)
- Code(Expression(85, Add)) at (prev + 0, 16) to (start + 0, 29)
+- Code(Expression(82, Add)) at (prev + 0, 16) to (start + 0, 29)
    = (c7 + c8)
 - Code(Counter(9)) at (prev + 0, 30) to (start + 2, 6)
- Code(Expression(74, Sub)) at (prev + 2, 15) to (start + 0, 28)
+- Code(Expression(71, Sub)) at (prev + 2, 15) to (start + 0, 28)
    = ((c7 + c8) - c9)
 - Code(Counter(10)) at (prev + 1, 12) to (start + 0, 25)
- Code(Expression(76, Sub)) at (prev + 0, 29) to (start + 0, 42)
+- Code(Expression(73, Sub)) at (prev + 0, 29) to (start + 0, 42)
    = (c10 - c11)
- Code(Expression(77, Sub)) at (prev + 0, 46) to (start + 0, 60)
+- Code(Expression(74, Sub)) at (prev + 0, 46) to (start + 0, 60)
    = (c10 - (c11 + c12))
- Code(Expression(82, Add)) at (prev + 0, 61) to (start + 2, 10)
+- Code(Expression(79, Add)) at (prev + 0, 61) to (start + 2, 10)
    = ((c11 + c12) + c13)
- Code(Expression(81, Sub)) at (prev + 2, 9) to (start + 0, 10)
+- Code(Expression(78, Sub)) at (prev + 2, 9) to (start + 0, 10)
    = (c10 - ((c11 + c12) + c13))
 - Code(Counter(10)) at (prev + 1, 9) to (start + 0, 23)
- Code(Expression(84, Sub)) at (prev + 2, 9) to (start + 0, 15)
+- Code(Expression(81, Sub)) at (prev + 2, 9) to (start + 0, 15)
    = ((c7 + c8) - (c9 + c10))
 - Code(Counter(0)) at (prev + 2, 1) to (start + 0, 2)
 Highest counter ID seen: c10
--- a/tests/coverage/coverage_attr_closure.cov-map
+++ b/tests/coverage/coverage_attr_closure.cov-map
@ -1,24 +1,22 @@
 Function name: coverage_attr_closure::GLOBAL_CLOSURE_ON::{closure#0}
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 06, 0f, 00, 10, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 17, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 06, 0f, 00, 10, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/coverage_attr_closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 6, 15) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: coverage_attr_closure::contains_closures_off::{closure#0} (unused)
-Raw bytes (24): 0x[01, 01, 00, 04, 00, 1d, 13, 00, 14, 00, 01, 09, 00, 11, 00, 00, 12, 00, 1b, 00, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 00, 1d, 13, 00, 14, 00, 01, 09, 00, 11, 00, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/coverage_attr_closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 29, 19) to (start + 0, 20)
 - Code(Zero) at (prev + 1, 9) to (start + 0, 17)
- Code(Zero) at (prev + 0, 18) to (start + 0, 27)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: (none)

@ -35,14 +33,13 @@ Number of file 0 mappings: 4
 Highest counter ID seen: c0

 Function name: coverage_attr_closure::contains_closures_on::{closure#0} (unused)
-Raw bytes (24): 0x[01, 01, 00, 04, 00, 11, 13, 00, 14, 00, 01, 09, 00, 11, 00, 00, 12, 00, 1b, 00, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 00, 11, 13, 00, 14, 00, 01, 09, 00, 11, 00, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/coverage_attr_closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 17, 19) to (start + 0, 20)
 - Code(Zero) at (prev + 1, 9) to (start + 0, 17)
- Code(Zero) at (prev + 0, 18) to (start + 0, 27)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: (none)

--- a/tests/coverage/drop_trait.cov-map
+++ b/tests/coverage/drop_trait.cov-map
@ -1,21 +1,20 @@
 Function name: <drop_trait::Firework as core::ops::drop::Drop>::drop
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 09, 05, 00, 17, 01, 01, 09, 00, 11, 01, 00, 12, 00, 24, 01, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 09, 05, 00, 17, 01, 01, 09, 00, 11, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/drop_trait.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 9, 5) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 36)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c0

 Function name: drop_trait::main
-Raw bytes (69): 0x[01, 01, 00, 0d, 01, 0e, 01, 00, 1c, 01, 01, 09, 00, 15, 01, 00, 18, 00, 30, 01, 02, 09, 00, 0d, 01, 00, 10, 00, 2a, 01, 02, 08, 00, 0c, 01, 01, 09, 00, 11, 01, 00, 12, 00, 29, 01, 01, 10, 00, 16, 00, 01, 05, 00, 06, 00, 02, 0d, 00, 28, 00, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (64): 0x[01, 01, 00, 0c, 01, 0e, 01, 00, 1c, 01, 01, 09, 00, 15, 01, 00, 18, 00, 30, 01, 02, 09, 00, 0d, 01, 00, 10, 00, 2a, 01, 02, 08, 00, 0c, 01, 01, 09, 00, 11, 01, 01, 10, 00, 16, 00, 01, 05, 00, 06, 00, 02, 0d, 00, 28, 00, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/drop_trait.rs
 Number of expressions: 0
-Number of file 0 mappings: 13
+Number of file 0 mappings: 12
 - Code(Counter(0)) at (prev + 14, 1) to (start + 0, 28)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 0, 24) to (start + 0, 48)
@ -23,7 +22,6 @@ Number of file 0 mappings: 13
 - Code(Counter(0)) at (prev + 0, 16) to (start + 0, 42)
 - Code(Counter(0)) at (prev + 2, 8) to (start + 0, 12)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 41)
 - Code(Counter(0)) at (prev + 1, 16) to (start + 0, 22)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 6)
 - Code(Zero) at (prev + 2, 13) to (start + 0, 40)
--- a/tests/coverage/generics.cov-map
+++ b/tests/coverage/generics.cov-map
@ -1,12 +1,11 @@
 Function name: <generics::Firework<f64> as core::ops::drop::Drop>::drop
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 11, 05, 00, 17, 01, 01, 09, 00, 11, 01, 00, 12, 00, 24, 01, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 11, 05, 00, 17, 01, 01, 09, 00, 11, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/generics.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 17, 5) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 36)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c0

@ -22,14 +21,13 @@ Number of file 0 mappings: 3
 Highest counter ID seen: c0

 Function name: <generics::Firework<i32> as core::ops::drop::Drop>::drop
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 11, 05, 00, 17, 01, 01, 09, 00, 11, 01, 00, 12, 00, 24, 01, 01, 05, 00, 06]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 11, 05, 00, 17, 01, 01, 09, 00, 11, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/generics.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 17, 5) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 36)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c0

@ -45,11 +43,11 @@ Number of file 0 mappings: 3
 Highest counter ID seen: c0

 Function name: generics::main
-Raw bytes (99): 0x[01, 01, 00, 13, 01, 16, 01, 00, 1c, 01, 01, 09, 00, 18, 01, 00, 1b, 00, 33, 01, 01, 05, 00, 10, 01, 00, 11, 00, 1d, 01, 02, 09, 00, 10, 01, 00, 13, 00, 2f, 01, 01, 05, 00, 08, 01, 00, 09, 00, 15, 01, 01, 05, 00, 08, 01, 00, 09, 00, 15, 01, 02, 08, 00, 0c, 01, 01, 09, 00, 11, 01, 00, 12, 00, 29, 01, 01, 10, 00, 16, 00, 01, 05, 00, 06, 00, 02, 0d, 00, 28, 00, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (94): 0x[01, 01, 00, 12, 01, 16, 01, 00, 1c, 01, 01, 09, 00, 18, 01, 00, 1b, 00, 33, 01, 01, 05, 00, 10, 01, 00, 11, 00, 1d, 01, 02, 09, 00, 10, 01, 00, 13, 00, 2f, 01, 01, 05, 00, 08, 01, 00, 09, 00, 15, 01, 01, 05, 00, 08, 01, 00, 09, 00, 15, 01, 02, 08, 00, 0c, 01, 01, 09, 00, 11, 01, 01, 10, 00, 16, 00, 01, 05, 00, 06, 00, 02, 0d, 00, 28, 00, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/generics.rs
 Number of expressions: 0
-Number of file 0 mappings: 19
+Number of file 0 mappings: 18
 - Code(Counter(0)) at (prev + 22, 1) to (start + 0, 28)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 0, 27) to (start + 0, 51)
@ -63,7 +61,6 @@ Number of file 0 mappings: 19
 - Code(Counter(0)) at (prev + 0, 9) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 2, 8) to (start + 0, 12)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 41)
 - Code(Counter(0)) at (prev + 1, 16) to (start + 0, 22)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 6)
 - Code(Zero) at (prev + 2, 13) to (start + 0, 40)
--- a/tests/coverage/inline-dead.cov-map
+++ b/tests/coverage/inline-dead.cov-map
@ -25,14 +25,13 @@ Number of file 0 mappings: 5
 Highest counter ID seen: c1

 Function name: inline_dead::main
-Raw bytes (39): 0x[01, 01, 00, 07, 01, 04, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 12, 01, 00, 14, 00, 21, 01, 02, 09, 00, 0a, 01, 03, 05, 00, 0d, 01, 01, 01, 00, 02]
+Raw bytes (34): 0x[01, 01, 00, 06, 01, 04, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 00, 14, 00, 21, 01, 02, 09, 00, 0a, 01, 03, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/inline-dead.rs
 Number of expressions: 0
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 4, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 18)
 - Code(Counter(0)) at (prev + 0, 20) to (start + 0, 33)
 - Code(Counter(0)) at (prev + 2, 9) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 3, 5) to (start + 0, 13)
--- a/tests/coverage/inner_items.cov-map
+++ b/tests/coverage/inner_items.cov-map
@ -53,18 +53,17 @@ Number of file 0 mappings: 16
 Highest counter ID seen: c2

 Function name: inner_items::main::in_func
-Raw bytes (44): 0x[01, 01, 00, 08, 01, 12, 05, 00, 17, 01, 01, 0d, 00, 0e, 01, 00, 11, 00, 12, 01, 01, 0d, 00, 0e, 01, 00, 11, 00, 16, 01, 01, 09, 00, 11, 01, 00, 12, 00, 1a, 01, 01, 05, 00, 06]
+Raw bytes (39): 0x[01, 01, 00, 07, 01, 12, 05, 00, 17, 01, 01, 0d, 00, 0e, 01, 00, 11, 00, 12, 01, 01, 0d, 00, 0e, 01, 00, 11, 00, 16, 01, 01, 09, 00, 11, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/inner_items.rs
 Number of expressions: 0
-Number of file 0 mappings: 8
+Number of file 0 mappings: 7
 - Code(Counter(0)) at (prev + 18, 5) to (start + 0, 23)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 0, 17) to (start + 0, 18)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 0, 17) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 26)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 6)
 Highest counter ID seen: c0

--- a/tests/coverage/issue-83601.cov-map
+++ b/tests/coverage/issue-83601.cov-map
@ -1,9 +1,9 @@
 Function name: issue_83601::main
-Raw bytes (74): 0x[01, 01, 00, 0e, 01, 06, 01, 00, 0a, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 01, 00, 02]
+Raw bytes (59): 0x[01, 01, 00, 0b, 01, 06, 01, 00, 0a, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/issue-83601.rs
 Number of expressions: 0
-Number of file 0 mappings: 14
+Number of file 0 mappings: 11
 - Code(Counter(0)) at (prev + 6, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 12)
 - Code(Counter(0)) at (prev + 0, 15) to (start + 0, 21)
@ -12,11 +12,8 @@ Number of file 0 mappings: 14
 - Code(Counter(0)) at (prev + 0, 15) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/issue-84561.cov-map
+++ b/tests/coverage/issue-84561.cov-map
@ -1,14 +1,13 @@
 Function name: <issue_84561::Foo as core::fmt::Debug>::fmt
-Raw bytes (42): 0x[01, 01, 01, 01, 05, 07, 01, 8a, 01, 05, 00, 43, 01, 01, 09, 00, 0f, 01, 00, 10, 00, 11, 01, 00, 13, 00, 24, 05, 00, 25, 00, 26, 02, 01, 09, 00, 0f, 01, 01, 05, 00, 06]
+Raw bytes (37): 0x[01, 01, 01, 01, 05, 06, 01, 8a, 01, 05, 00, 43, 01, 01, 09, 00, 0f, 01, 00, 10, 00, 11, 05, 00, 25, 00, 26, 02, 01, 09, 00, 0f, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/issue-84561.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 138, 5) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 0, 16) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 19) to (start + 0, 36)
 - Code(Counter(1)) at (prev + 0, 37) to (start + 0, 38)
 - Code(Expression(0, Sub)) at (prev + 1, 9) to (start + 0, 15)
    = (c0 - c1)
@ -29,54 +28,48 @@ Number of file 0 mappings: 5
 Highest counter ID seen: c0

 Function name: issue_84561::test1
-Raw bytes (65): 0x[01, 01, 00, 0c, 01, 9a, 01, 01, 00, 0b, 01, 01, 05, 00, 0b, 05, 00, 0c, 00, 1e, 01, 01, 05, 00, 0b, 09, 00, 0c, 00, 1e, 01, 01, 0d, 00, 0e, 01, 01, 05, 00, 0b, 0d, 00, 0c, 00, 1e, 01, 01, 05, 02, 06, 01, 03, 05, 00, 0b, 11, 00, 0c, 00, 1e, 01, 01, 01, 00, 02]
+Raw bytes (45): 0x[01, 01, 00, 08, 01, 9a, 01, 01, 00, 0b, 01, 01, 05, 00, 0b, 01, 01, 05, 00, 0b, 01, 01, 0d, 00, 0e, 01, 01, 05, 00, 0b, 01, 01, 05, 02, 06, 01, 03, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/issue-84561.rs
 Number of expressions: 0
-Number of file 0 mappings: 12
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 154, 1) to (start + 0, 11)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 11)
- Code(Counter(1)) at (prev + 0, 12) to (start + 0, 30)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 11)
- Code(Counter(2)) at (prev + 0, 12) to (start + 0, 30)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 11)
- Code(Counter(3)) at (prev + 0, 12) to (start + 0, 30)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 2, 6)
 - Code(Counter(0)) at (prev + 3, 5) to (start + 0, 11)
- Code(Counter(4)) at (prev + 0, 12) to (start + 0, 30)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
-Highest counter ID seen: c4
+Highest counter ID seen: c0

 Function name: issue_84561::test2
-Raw bytes (25): 0x[01, 01, 00, 04, 01, b0, 01, 01, 00, 0b, 01, 01, 05, 00, 10, 05, 00, 11, 00, 23, 01, 01, 01, 00, 02]
+Raw bytes (20): 0x[01, 01, 00, 03, 01, b0, 01, 01, 00, 0b, 01, 01, 05, 00, 10, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/issue-84561.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 176, 1) to (start + 0, 11)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 16)
- Code(Counter(1)) at (prev + 0, 17) to (start + 0, 35)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
-Highest counter ID seen: c1
+Highest counter ID seen: c0

 Function name: issue_84561::test2::call_print
-Raw bytes (25): 0x[01, 01, 00, 04, 01, a7, 01, 09, 00, 1f, 01, 01, 0d, 00, 13, 01, 00, 14, 00, 18, 01, 01, 09, 00, 0a]
+Raw bytes (20): 0x[01, 01, 00, 03, 01, a7, 01, 09, 00, 1f, 01, 01, 0d, 00, 13, 01, 01, 09, 00, 0a]
 Number of files: 1
 - file 0 => $DIR/issue-84561.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 167, 9) to (start + 0, 31)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 19)
- Code(Counter(0)) at (prev + 0, 20) to (start + 0, 24)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 10)
 Highest counter ID seen: c0

 Function name: issue_84561::test3
-Raw bytes (409): 0x[01, 01, 0a, 01, 05, 01, 09, 01, 0d, 11, 15, 1d, 21, 19, 1d, 19, 1d, 19, 1d, 27, 25, 1d, 21, 4d, 01, 08, 01, 00, 0b, 01, 01, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 02, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 00, 00, 20, 00, 30, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 02, 05, 00, 0f, 00, 00, 20, 00, 24, 00, 00, 29, 00, 30, 00, 00, 33, 00, 41, 00, 00, 4b, 00, 5a, 01, 01, 05, 00, 0f, 00, 05, 09, 00, 0d, 00, 03, 09, 00, 10, 00, 02, 0d, 00, 1b, 00, 02, 0d, 00, 1c, 01, 04, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 02, 05, 00, 0f, 01, 04, 05, 00, 0f, 01, 04, 05, 00, 0f, 01, 04, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 04, 08, 00, 0f, 05, 01, 09, 00, 13, 02, 05, 09, 00, 13, 01, 05, 08, 00, 0f, 09, 01, 09, 00, 13, 00, 03, 0d, 00, 1d, 06, 03, 09, 00, 13, 00, 03, 0d, 00, 1d, 01, 03, 05, 00, 0f, 01, 01, 0c, 00, 13, 0d, 01, 0d, 00, 13, 0a, 02, 0d, 00, 13, 11, 04, 05, 00, 0f, 11, 02, 0c, 00, 13, 15, 01, 0d, 00, 13, 0e, 02, 0d, 00, 13, 27, 03, 05, 00, 0f, 19, 01, 0c, 00, 13, 1d, 01, 0d, 00, 17, 1d, 04, 0d, 00, 13, 1e, 02, 0d, 00, 17, 1e, 01, 14, 00, 1b, 00, 01, 15, 00, 1b, 1e, 02, 15, 00, 1b, 21, 04, 0d, 00, 13, 22, 03, 09, 00, 19, 25, 02, 05, 00, 0f, 25, 03, 09, 00, 22, 00, 02, 05, 00, 0f, 00, 03, 09, 00, 2c, 00, 02, 01, 00, 02]
+Raw bytes (340): 0x[01, 01, 08, 01, 05, 01, 09, 01, 0d, 11, 15, 1d, 21, 19, 1d, 19, 1d, 19, 1d, 40, 01, 08, 01, 00, 0b, 01, 01, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0d, 01, 02, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0f, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0d, 01, 02, 05, 00, 0f, 00, 00, 29, 00, 30, 00, 00, 33, 00, 41, 00, 00, 4b, 00, 5a, 01, 01, 05, 00, 0f, 00, 08, 09, 00, 10, 00, 02, 0d, 00, 1b, 00, 02, 0d, 00, 1c, 01, 04, 09, 00, 10, 01, 00, 13, 00, 2e, 01, 02, 05, 00, 0f, 01, 04, 05, 00, 0f, 01, 04, 05, 00, 0f, 01, 04, 09, 00, 0c, 01, 00, 0f, 00, 15, 01, 01, 05, 00, 0f, 01, 04, 08, 00, 0f, 05, 01, 09, 00, 13, 02, 05, 09, 00, 13, 01, 05, 08, 00, 0f, 09, 01, 09, 00, 13, 06, 06, 09, 00, 13, 01, 06, 05, 00, 0f, 01, 01, 0c, 00, 13, 0d, 01, 0d, 00, 13, 0a, 02, 0d, 00, 13, 11, 04, 05, 00, 0f, 11, 02, 0c, 00, 13, 15, 01, 0d, 00, 13, 0e, 02, 0d, 00, 13, 13, 03, 05, 00, 0f, 19, 01, 0c, 00, 13, 1d, 01, 0d, 00, 17, 1d, 04, 0d, 00, 13, 1e, 02, 0d, 00, 17, 1e, 01, 14, 00, 1b, 00, 01, 15, 00, 1b, 1e, 02, 15, 00, 1b, 21, 04, 0d, 00, 13, 25, 05, 05, 00, 0f, 00, 05, 05, 00, 0f, 00, 05, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/issue-84561.rs
-Number of expressions: 10
+Number of expressions: 8
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
 - expression 1 operands: lhs = Counter(0), rhs = Counter(2)
 - expression 2 operands: lhs = Counter(0), rhs = Counter(3)
@ -85,9 +78,7 @@ Number of expressions: 10
 - expression 5 operands: lhs = Counter(6), rhs = Counter(7)
 - expression 6 operands: lhs = Counter(6), rhs = Counter(7)
 - expression 7 operands: lhs = Counter(6), rhs = Counter(7)
- expression 8 operands: lhs = Expression(9, Add), rhs = Counter(9)
- expression 9 operands: lhs = Counter(7), rhs = Counter(8)
-Number of file 0 mappings: 77
+Number of file 0 mappings: 64
 - Code(Counter(0)) at (prev + 8, 1) to (start + 0, 11)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 0, 19) to (start + 0, 46)
@ -98,11 +89,8 @@ Number of file 0 mappings: 77
 - Code(Counter(0)) at (prev + 0, 15) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
@ -111,19 +99,14 @@ Number of file 0 mappings: 77
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Zero) at (prev + 0, 32) to (start + 0, 48)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 15)
- Code(Zero) at (prev + 0, 32) to (start + 0, 36)
 - Code(Zero) at (prev + 0, 41) to (start + 0, 48)
 - Code(Zero) at (prev + 0, 51) to (start + 0, 65)
 - Code(Zero) at (prev + 0, 75) to (start + 0, 90)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 15)
- Code(Zero) at (prev + 5, 9) to (start + 0, 13)
- Code(Zero) at (prev + 3, 9) to (start + 0, 16)
+- Code(Zero) at (prev + 8, 9) to (start + 0, 16)
 - Code(Zero) at (prev + 2, 13) to (start + 0, 27)
 - Code(Zero) at (prev + 2, 13) to (start + 0, 28)
 - Code(Counter(0)) at (prev + 4, 9) to (start + 0, 16)
@ -140,11 +123,9 @@ Number of file 0 mappings: 77
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 5, 8) to (start + 0, 15)
 - Code(Counter(2)) at (prev + 1, 9) to (start + 0, 19)
- Code(Zero) at (prev + 3, 13) to (start + 0, 29)
- Code(Expression(1, Sub)) at (prev + 3, 9) to (start + 0, 19)
+- Code(Expression(1, Sub)) at (prev + 6, 9) to (start + 0, 19)
    = (c0 - c2)
- Code(Zero) at (prev + 3, 13) to (start + 0, 29)
- Code(Counter(0)) at (prev + 3, 5) to (start + 0, 15)
+- Code(Counter(0)) at (prev + 6, 5) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 1, 12) to (start + 0, 19)
 - Code(Counter(3)) at (prev + 1, 13) to (start + 0, 19)
 - Code(Expression(2, Sub)) at (prev + 2, 13) to (start + 0, 19)
@ -154,7 +135,7 @@ Number of file 0 mappings: 77
 - Code(Counter(5)) at (prev + 1, 13) to (start + 0, 19)
 - Code(Expression(3, Sub)) at (prev + 2, 13) to (start + 0, 19)
    = (c4 - c5)
- Code(Expression(9, Add)) at (prev + 3, 5) to (start + 0, 15)
+- Code(Expression(4, Add)) at (prev + 3, 5) to (start + 0, 15)
    = (c7 + c8)
 - Code(Counter(6)) at (prev + 1, 12) to (start + 0, 19)
 - Code(Counter(7)) at (prev + 1, 13) to (start + 0, 23)
@ -167,12 +148,8 @@ Number of file 0 mappings: 77
 - Code(Expression(7, Sub)) at (prev + 2, 21) to (start + 0, 27)
    = (c6 - c7)
 - Code(Counter(8)) at (prev + 4, 13) to (start + 0, 19)
- Code(Expression(8, Sub)) at (prev + 3, 9) to (start + 0, 25)
-    = ((c7 + c8) - c9)
- Code(Counter(9)) at (prev + 2, 5) to (start + 0, 15)
- Code(Counter(9)) at (prev + 3, 9) to (start + 0, 34)
- Code(Zero) at (prev + 2, 5) to (start + 0, 15)
- Code(Zero) at (prev + 3, 9) to (start + 0, 44)
- Code(Zero) at (prev + 2, 1) to (start + 0, 2)
+- Code(Counter(9)) at (prev + 5, 5) to (start + 0, 15)
+- Code(Zero) at (prev + 5, 5) to (start + 0, 15)
+- Code(Zero) at (prev + 5, 1) to (start + 0, 2)
 Highest counter ID seen: c9

--- a/tests/coverage/loops_branches.cov-map
+++ b/tests/coverage/loops_branches.cov-map
@ -1,5 +1,5 @@
 Function name: <loops_branches::DebugTest as core::fmt::Debug>::fmt
-Raw bytes (139): 0x[01, 01, 05, 01, 05, 0b, 0f, 01, 09, 05, 0d, 0d, 09, 19, 01, 09, 05, 00, 43, 01, 01, 0c, 00, 10, 01, 01, 10, 00, 15, 00, 01, 17, 00, 1b, 00, 00, 1c, 00, 1e, 01, 01, 0d, 00, 0e, 01, 01, 0d, 00, 13, 01, 00, 14, 00, 15, 01, 00, 17, 00, 1d, 05, 00, 1e, 00, 1f, 00, 01, 10, 01, 0a, 09, 03, 0d, 00, 0e, 02, 00, 12, 00, 17, 09, 01, 10, 00, 14, 09, 01, 14, 00, 19, 00, 01, 1b, 00, 1f, 00, 00, 20, 00, 22, 09, 01, 11, 00, 12, 09, 01, 11, 00, 17, 09, 00, 18, 00, 19, 09, 00, 1b, 00, 21, 06, 00, 22, 00, 23, 00, 01, 14, 01, 0e, 12, 03, 09, 00, 0f, 01, 01, 05, 00, 06]
+Raw bytes (129): 0x[01, 01, 05, 01, 05, 0b, 0f, 01, 09, 05, 0d, 0d, 09, 17, 01, 09, 05, 00, 43, 01, 01, 0c, 00, 10, 01, 01, 10, 00, 15, 00, 01, 17, 00, 1b, 00, 00, 1c, 00, 1e, 01, 01, 0d, 00, 0e, 01, 01, 0d, 00, 13, 01, 00, 14, 00, 15, 05, 00, 1e, 00, 1f, 00, 01, 10, 01, 0a, 09, 03, 0d, 00, 0e, 02, 00, 12, 00, 17, 09, 01, 10, 00, 14, 09, 01, 14, 00, 19, 00, 01, 1b, 00, 1f, 00, 00, 20, 00, 22, 09, 01, 11, 00, 12, 09, 01, 11, 00, 17, 09, 00, 18, 00, 19, 06, 00, 22, 00, 23, 00, 01, 14, 01, 0e, 12, 03, 09, 00, 0f, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/loops_branches.rs
 Number of expressions: 5
@ -8,7 +8,7 @@ Number of expressions: 5
 - expression 2 operands: lhs = Counter(0), rhs = Counter(2)
 - expression 3 operands: lhs = Counter(1), rhs = Counter(3)
 - expression 4 operands: lhs = Counter(3), rhs = Counter(2)
-Number of file 0 mappings: 25
+Number of file 0 mappings: 23
 - Code(Counter(0)) at (prev + 9, 5) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 12) to (start + 0, 16)
 - Code(Counter(0)) at (prev + 1, 16) to (start + 0, 21)
@ -17,7 +17,6 @@ Number of file 0 mappings: 25
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 19)
 - Code(Counter(0)) at (prev + 0, 20) to (start + 0, 21)
- Code(Counter(0)) at (prev + 0, 23) to (start + 0, 29)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 31)
 - Code(Zero) at (prev + 1, 16) to (start + 1, 10)
 - Code(Counter(2)) at (prev + 3, 13) to (start + 0, 14)
@ -30,7 +29,6 @@ Number of file 0 mappings: 25
 - Code(Counter(2)) at (prev + 1, 17) to (start + 0, 18)
 - Code(Counter(2)) at (prev + 1, 17) to (start + 0, 23)
 - Code(Counter(2)) at (prev + 0, 24) to (start + 0, 25)
- Code(Counter(2)) at (prev + 0, 27) to (start + 0, 33)
 - Code(Expression(1, Sub)) at (prev + 0, 34) to (start + 0, 35)
    = ((c0 + c2) - (c1 + c3))
 - Code(Zero) at (prev + 1, 20) to (start + 1, 14)
@ -40,7 +38,7 @@ Number of file 0 mappings: 25
 Highest counter ID seen: c2

 Function name: <loops_branches::DisplayTest as core::fmt::Display>::fmt
-Raw bytes (139): 0x[01, 01, 05, 01, 05, 0b, 0f, 01, 09, 0d, 05, 0d, 09, 19, 01, 22, 05, 00, 43, 01, 01, 0c, 00, 11, 00, 00, 12, 01, 0a, 01, 02, 10, 00, 15, 00, 01, 17, 00, 1b, 00, 00, 1c, 00, 1e, 01, 01, 0d, 00, 0e, 01, 01, 0d, 00, 13, 01, 00, 14, 00, 15, 01, 00, 17, 00, 1d, 05, 00, 1e, 00, 1f, 09, 02, 0d, 00, 0e, 02, 00, 12, 00, 17, 09, 01, 10, 00, 15, 00, 00, 16, 01, 0e, 09, 02, 14, 00, 19, 00, 01, 1b, 00, 1f, 00, 00, 20, 00, 22, 09, 01, 11, 00, 12, 09, 01, 11, 00, 17, 09, 00, 18, 00, 19, 09, 00, 1b, 00, 21, 06, 00, 22, 00, 23, 12, 03, 09, 00, 0f, 01, 01, 05, 00, 06]
+Raw bytes (129): 0x[01, 01, 05, 01, 05, 0b, 0f, 01, 09, 0d, 05, 0d, 09, 17, 01, 22, 05, 00, 43, 01, 01, 0c, 00, 11, 00, 00, 12, 01, 0a, 01, 02, 10, 00, 15, 00, 01, 17, 00, 1b, 00, 00, 1c, 00, 1e, 01, 01, 0d, 00, 0e, 01, 01, 0d, 00, 13, 01, 00, 14, 00, 15, 05, 00, 1e, 00, 1f, 09, 02, 0d, 00, 0e, 02, 00, 12, 00, 17, 09, 01, 10, 00, 15, 00, 00, 16, 01, 0e, 09, 02, 14, 00, 19, 00, 01, 1b, 00, 1f, 00, 00, 20, 00, 22, 09, 01, 11, 00, 12, 09, 01, 11, 00, 17, 09, 00, 18, 00, 19, 06, 00, 22, 00, 23, 12, 03, 09, 00, 0f, 01, 01, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/loops_branches.rs
 Number of expressions: 5
@ -49,7 +47,7 @@ Number of expressions: 5
 - expression 2 operands: lhs = Counter(0), rhs = Counter(2)
 - expression 3 operands: lhs = Counter(3), rhs = Counter(1)
 - expression 4 operands: lhs = Counter(3), rhs = Counter(2)
-Number of file 0 mappings: 25
+Number of file 0 mappings: 23
 - Code(Counter(0)) at (prev + 34, 5) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 12) to (start + 0, 17)
 - Code(Zero) at (prev + 0, 18) to (start + 1, 10)
@ -59,7 +57,6 @@ Number of file 0 mappings: 25
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 1, 13) to (start + 0, 19)
 - Code(Counter(0)) at (prev + 0, 20) to (start + 0, 21)
- Code(Counter(0)) at (prev + 0, 23) to (start + 0, 29)
 - Code(Counter(1)) at (prev + 0, 30) to (start + 0, 31)
 - Code(Counter(2)) at (prev + 2, 13) to (start + 0, 14)
 - Code(Expression(0, Sub)) at (prev + 0, 18) to (start + 0, 23)
@ -72,7 +69,6 @@ Number of file 0 mappings: 25
 - Code(Counter(2)) at (prev + 1, 17) to (start + 0, 18)
 - Code(Counter(2)) at (prev + 1, 17) to (start + 0, 23)
 - Code(Counter(2)) at (prev + 0, 24) to (start + 0, 25)
- Code(Counter(2)) at (prev + 0, 27) to (start + 0, 33)
 - Code(Expression(1, Sub)) at (prev + 0, 34) to (start + 0, 35)
    = ((c0 + c2) - (c3 + c1))
 - Code(Expression(4, Sub)) at (prev + 3, 9) to (start + 0, 15)
@ -81,20 +77,18 @@ Number of file 0 mappings: 25
 Highest counter ID seen: c2

 Function name: loops_branches::main
-Raw bytes (54): 0x[01, 01, 00, 0a, 01, 37, 01, 00, 0a, 01, 01, 09, 00, 13, 01, 00, 16, 00, 1f, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 14, 01, 01, 09, 00, 15, 01, 00, 18, 00, 23, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 12, 01, 01, 01, 00, 02]
+Raw bytes (44): 0x[01, 01, 00, 08, 01, 37, 01, 00, 0a, 01, 01, 09, 00, 13, 01, 00, 16, 00, 1f, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 15, 01, 00, 18, 00, 23, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/loops_branches.rs
 Number of expressions: 0
-Number of file 0 mappings: 10
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 55, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 19)
 - Code(Counter(0)) at (prev + 0, 22) to (start + 0, 31)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 0, 24) to (start + 0, 35)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 18)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/macro_in_closure.cov-map
+++ b/tests/coverage/macro_in_closure.cov-map
@ -1,22 +1,20 @@
 Function name: macro_in_closure::NO_BLOCK::{closure#0}
-Raw bytes (14): 0x[01, 01, 00, 02, 01, 07, 1c, 00, 24, 01, 00, 25, 00, 2c]
+Raw bytes (9): 0x[01, 01, 00, 01, 01, 07, 1c, 00, 24]
 Number of files: 1
 - file 0 => $DIR/macro_in_closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 2
+Number of file 0 mappings: 1
 - Code(Counter(0)) at (prev + 7, 28) to (start + 0, 36)
- Code(Counter(0)) at (prev + 0, 37) to (start + 0, 44)
 Highest counter ID seen: c0

 Function name: macro_in_closure::WITH_BLOCK::{closure#0}
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 09, 1e, 00, 1f, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 15, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 09, 1e, 00, 1f, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/macro_in_closure.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 9, 30) to (start + 0, 31)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 21)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/no_cov_crate.cov-map
+++ b/tests/coverage/no_cov_crate.cov-map
@ -1,36 +1,33 @@
 Function name: no_cov_crate::add_coverage_1
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 16, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 22, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 16, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/no_cov_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 22, 1) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 34)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: no_cov_crate::add_coverage_2
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 1a, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 22, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 1a, 01, 00, 14, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/no_cov_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 26, 1) to (start + 0, 20)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 34)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: no_cov_crate::add_coverage_not_called (unused)
-Raw bytes (24): 0x[01, 01, 00, 04, 00, 1f, 01, 00, 1d, 00, 01, 05, 00, 0d, 00, 00, 0e, 00, 26, 00, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 00, 1f, 01, 00, 1d, 00, 01, 05, 00, 0d, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/no_cov_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 31, 1) to (start + 0, 29)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 13)
- Code(Zero) at (prev + 0, 14) to (start + 0, 38)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: (none)

@ -57,28 +54,26 @@ Number of file 0 mappings: 14
 Highest counter ID seen: c0

 Function name: no_cov_crate::nested_fns::outer
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 33, 05, 00, 20, 01, 01, 09, 00, 11, 01, 00, 12, 00, 26, 01, 01, 09, 00, 1a, 01, 00, 1b, 00, 22, 01, 0a, 05, 00, 06]
+Raw bytes (29): 0x[01, 01, 00, 05, 01, 33, 05, 00, 20, 01, 01, 09, 00, 11, 01, 01, 09, 00, 1a, 01, 00, 1b, 00, 22, 01, 0a, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/no_cov_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 51, 5) to (start + 0, 32)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 26)
 - Code(Counter(0)) at (prev + 0, 27) to (start + 0, 34)
 - Code(Counter(0)) at (prev + 10, 5) to (start + 0, 6)
 Highest counter ID seen: c0

 Function name: no_cov_crate::nested_fns::outer_both_covered
-Raw bytes (34): 0x[01, 01, 00, 06, 01, 41, 05, 00, 2d, 01, 01, 09, 00, 11, 01, 00, 12, 00, 26, 01, 01, 09, 00, 0e, 01, 00, 0f, 00, 16, 01, 09, 05, 00, 06]
+Raw bytes (29): 0x[01, 01, 00, 05, 01, 41, 05, 00, 2d, 01, 01, 09, 00, 11, 01, 01, 09, 00, 0e, 01, 00, 0f, 00, 16, 01, 09, 05, 00, 06]
 Number of files: 1
 - file 0 => $DIR/no_cov_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 65, 5) to (start + 0, 45)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(0)) at (prev + 0, 18) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 14)
 - Code(Counter(0)) at (prev + 0, 15) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 9, 5) to (start + 0, 6)
--- a/tests/coverage/overflow.cov-map
+++ b/tests/coverage/overflow.cov-map
@ -1,5 +1,5 @@
 Function name: overflow::main
-Raw bytes (96): 0x[01, 01, 06, 05, 01, 05, 17, 01, 09, 05, 13, 17, 0d, 01, 09, 10, 01, 10, 01, 00, 1c, 01, 01, 09, 00, 16, 01, 00, 19, 00, 1b, 05, 01, 0b, 00, 18, 02, 01, 0c, 00, 1a, 09, 00, 1b, 03, 0a, 09, 01, 11, 00, 17, 09, 00, 1a, 00, 28, 06, 02, 13, 00, 20, 0d, 00, 21, 03, 0a, 0d, 01, 11, 00, 17, 0d, 00, 1a, 00, 28, 0e, 02, 09, 00, 0a, 02, 01, 09, 00, 17, 01, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (86): 0x[01, 01, 06, 05, 01, 05, 17, 01, 09, 05, 13, 17, 0d, 01, 09, 0e, 01, 10, 01, 00, 1c, 01, 01, 09, 00, 16, 01, 00, 19, 00, 1b, 05, 01, 0b, 00, 18, 02, 01, 0c, 00, 1a, 09, 00, 1b, 03, 0a, 09, 01, 11, 00, 17, 06, 02, 13, 00, 20, 0d, 00, 21, 03, 0a, 0d, 01, 11, 00, 17, 0e, 02, 09, 00, 0a, 02, 01, 09, 00, 17, 01, 02, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/overflow.rs
 Number of expressions: 6
@ -9,7 +9,7 @@ Number of expressions: 6
 - expression 3 operands: lhs = Counter(1), rhs = Expression(4, Add)
 - expression 4 operands: lhs = Expression(5, Add), rhs = Counter(3)
 - expression 5 operands: lhs = Counter(0), rhs = Counter(2)
-Number of file 0 mappings: 16
+Number of file 0 mappings: 14
 - Code(Counter(0)) at (prev + 16, 1) to (start + 0, 28)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 0, 25) to (start + 0, 27)
@ -18,12 +18,10 @@ Number of file 0 mappings: 16
    = (c1 - c0)
 - Code(Counter(2)) at (prev + 0, 27) to (start + 3, 10)
 - Code(Counter(2)) at (prev + 1, 17) to (start + 0, 23)
- Code(Counter(2)) at (prev + 0, 26) to (start + 0, 40)
 - Code(Expression(1, Sub)) at (prev + 2, 19) to (start + 0, 32)
    = (c1 - (c0 + c2))
 - Code(Counter(3)) at (prev + 0, 33) to (start + 3, 10)
 - Code(Counter(3)) at (prev + 1, 17) to (start + 0, 23)
- Code(Counter(3)) at (prev + 0, 26) to (start + 0, 40)
 - Code(Expression(3, Sub)) at (prev + 2, 9) to (start + 0, 10)
    = (c1 - ((c0 + c2) + c3))
 - Code(Expression(0, Sub)) at (prev + 1, 9) to (start + 0, 23)
@ -33,12 +31,12 @@ Number of file 0 mappings: 16
 Highest counter ID seen: c3

 Function name: overflow::might_overflow
-Raw bytes (76): 0x[01, 01, 01, 01, 05, 0e, 01, 05, 01, 00, 26, 01, 01, 08, 00, 12, 05, 00, 13, 02, 06, 02, 02, 05, 00, 06, 01, 01, 09, 00, 0f, 01, 00, 12, 00, 1e, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 26, 01, 01, 09, 00, 0f, 01, 00, 12, 00, 21, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 2f, 01, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
+Raw bytes (66): 0x[01, 01, 01, 01, 05, 0c, 01, 05, 01, 00, 26, 01, 01, 08, 00, 12, 05, 00, 13, 02, 06, 02, 02, 05, 00, 06, 01, 01, 09, 00, 0f, 01, 00, 12, 00, 1e, 01, 01, 05, 00, 0d, 01, 01, 09, 00, 0f, 01, 00, 12, 00, 21, 01, 01, 05, 00, 0d, 01, 01, 05, 00, 0b, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/overflow.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 14
+Number of file 0 mappings: 12
 - Code(Counter(0)) at (prev + 5, 1) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 18)
 - Code(Counter(1)) at (prev + 0, 19) to (start + 2, 6)
@ -47,11 +45,9 @@ Number of file 0 mappings: 14
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 0, 18) to (start + 0, 30)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 15)
 - Code(Counter(0)) at (prev + 0, 18) to (start + 0, 33)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 47)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 11)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1
--- a/tests/coverage/panic_unwind.cov-map
+++ b/tests/coverage/panic_unwind.cov-map
@ -29,16 +29,15 @@ Number of file 0 mappings: 12
 Highest counter ID seen: c3

 Function name: panic_unwind::might_panic
-Raw bytes (41): 0x[01, 01, 01, 01, 05, 07, 01, 04, 01, 00, 23, 01, 01, 08, 00, 14, 05, 01, 09, 00, 11, 05, 00, 12, 00, 20, 05, 01, 09, 00, 0f, 02, 01, 0c, 02, 06, 02, 03, 01, 00, 02]
+Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 04, 01, 00, 23, 01, 01, 08, 00, 14, 05, 01, 09, 00, 11, 05, 01, 09, 00, 0f, 02, 01, 0c, 02, 06, 02, 03, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/panic_unwind.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 7
+Number of file 0 mappings: 6
 - Code(Counter(0)) at (prev + 4, 1) to (start + 0, 35)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 20)
 - Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Counter(1)) at (prev + 0, 18) to (start + 0, 32)
 - Code(Counter(1)) at (prev + 1, 9) to (start + 0, 15)
 - Code(Expression(0, Sub)) at (prev + 1, 12) to (start + 2, 6)
    = (c0 - c1)
--- a/tests/coverage/partial_eq.cov-map
+++ b/tests/coverage/partial_eq.cov-map
@ -11,19 +11,18 @@ Number of file 0 mappings: 4
 Highest counter ID seen: c0

 Function name: partial_eq::main
-Raw bytes (49): 0x[01, 01, 00, 09, 01, 11, 01, 00, 0a, 01, 01, 09, 00, 16, 01, 00, 19, 00, 25, 01, 01, 09, 00, 16, 01, 00, 19, 00, 25, 01, 02, 05, 00, 0d, 01, 01, 09, 00, 1b, 01, 03, 09, 00, 26, 01, 02, 01, 00, 02]
+Raw bytes (44): 0x[01, 01, 00, 08, 01, 11, 01, 00, 0a, 01, 01, 09, 00, 16, 01, 00, 19, 00, 25, 01, 01, 09, 00, 16, 01, 00, 19, 00, 25, 01, 02, 05, 00, 0d, 01, 04, 09, 00, 26, 01, 02, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/partial_eq.rs
 Number of expressions: 0
-Number of file 0 mappings: 9
+Number of file 0 mappings: 8
 - Code(Counter(0)) at (prev + 17, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 0, 25) to (start + 0, 37)
 - Code(Counter(0)) at (prev + 1, 9) to (start + 0, 22)
 - Code(Counter(0)) at (prev + 0, 25) to (start + 0, 37)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 1, 9) to (start + 0, 27)
- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 38)
+- Code(Counter(0)) at (prev + 4, 9) to (start + 0, 38)
 - Code(Counter(0)) at (prev + 2, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/rustfmt-skip.cov-map
+++ b/tests/coverage/rustfmt-skip.cov-map
@ -1,12 +1,11 @@
 Function name: rustfmt_skip::main
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 0a, 01, 00, 0a, 01, 02, 05, 00, 0d, 01, 03, 09, 00, 10, 01, 02, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 0a, 01, 00, 0a, 01, 02, 05, 00, 0d, 01, 05, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/rustfmt-skip.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 10, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 2, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 3, 9) to (start + 0, 16)
- Code(Counter(0)) at (prev + 2, 1) to (start + 0, 2)
+- Code(Counter(0)) at (prev + 5, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/sort_groups.cov-map
+++ b/tests/coverage/sort_groups.cov-map
@ -1,63 +1,59 @@
 Function name: sort_groups::generic_fn::<&str>
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 05, 01, 09, 00, 11, 02, 01, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 02, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/sort_groups.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 17, 1) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 12)
 - Code(Counter(1)) at (prev + 0, 13) to (start + 2, 6)
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Expression(0, Sub)) at (prev + 1, 5) to (start + 0, 6)
+- Code(Expression(0, Sub)) at (prev + 2, 5) to (start + 0, 6)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1

 Function name: sort_groups::generic_fn::<()>
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 05, 01, 09, 00, 11, 02, 01, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 02, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/sort_groups.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 17, 1) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 12)
 - Code(Counter(1)) at (prev + 0, 13) to (start + 2, 6)
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Expression(0, Sub)) at (prev + 1, 5) to (start + 0, 6)
+- Code(Expression(0, Sub)) at (prev + 2, 5) to (start + 0, 6)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1

 Function name: sort_groups::generic_fn::<char>
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 05, 01, 09, 00, 11, 02, 01, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 02, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/sort_groups.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 17, 1) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 12)
 - Code(Counter(1)) at (prev + 0, 13) to (start + 2, 6)
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Expression(0, Sub)) at (prev + 1, 5) to (start + 0, 6)
+- Code(Expression(0, Sub)) at (prev + 2, 5) to (start + 0, 6)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1

 Function name: sort_groups::generic_fn::<i32>
-Raw bytes (36): 0x[01, 01, 01, 01, 05, 06, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 05, 01, 09, 00, 11, 02, 01, 05, 00, 06, 01, 01, 01, 00, 02]
+Raw bytes (31): 0x[01, 01, 01, 01, 05, 05, 01, 11, 01, 00, 1d, 01, 01, 08, 00, 0c, 05, 00, 0d, 02, 06, 02, 02, 05, 00, 06, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/sort_groups.rs
 Number of expressions: 1
 - expression 0 operands: lhs = Counter(0), rhs = Counter(1)
-Number of file 0 mappings: 6
+Number of file 0 mappings: 5
 - Code(Counter(0)) at (prev + 17, 1) to (start + 0, 29)
 - Code(Counter(0)) at (prev + 1, 8) to (start + 0, 12)
 - Code(Counter(1)) at (prev + 0, 13) to (start + 2, 6)
- Code(Counter(1)) at (prev + 1, 9) to (start + 0, 17)
- Code(Expression(0, Sub)) at (prev + 1, 5) to (start + 0, 6)
+- Code(Expression(0, Sub)) at (prev + 2, 5) to (start + 0, 6)
    = (c0 - c1)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c1
--- a/tests/coverage/unused_mod.cov-map
+++ b/tests/coverage/unused_mod.cov-map
@ -1,24 +1,22 @@
 Function name: unused_mod::main
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 04, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 1c, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 04, 01, 00, 0a, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/unused_mod.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 4, 1) to (start + 0, 10)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 28)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: unused_mod::unused_module::never_called_function (unused)
-Raw bytes (24): 0x[01, 02, 00, 04, 00, 02, 01, 00, 1f, 00, 01, 05, 00, 0d, 00, 00, 0e, 00, 21, 00, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 02, 00, 03, 00, 02, 01, 00, 1f, 00, 01, 05, 00, 0d, 00, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/unused_mod_helper.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Zero) at (prev + 2, 1) to (start + 0, 31)
 - Code(Zero) at (prev + 1, 5) to (start + 0, 13)
- Code(Zero) at (prev + 0, 14) to (start + 0, 33)
 - Code(Zero) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: (none)

--- a/tests/coverage/uses_crate.cov-map
+++ b/tests/coverage/uses_crate.cov-map
@ -1,48 +1,44 @@
 Function name: used_crate::used_from_bin_crate_and_lib_crate_generic_function::<alloc::vec::Vec<i32>>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 1b, 01, 00, 4c, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 4f, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 1b, 01, 00, 4c, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 27, 1) to (start + 0, 76)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 79)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: used_crate::used_only_from_bin_crate_generic_function::<&alloc::vec::Vec<i32>>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 13, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 46, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 13, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 19, 1) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 70)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: used_crate::used_only_from_bin_crate_generic_function::<&str>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 13, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 46, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 13, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 19, 1) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 70)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: used_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function::<&str>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 1f, 01, 00, 5b, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 5e, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 1f, 01, 00, 5b, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 31, 1) to (start + 0, 91)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 94)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/coverage/uses_inline_crate.cov-map
+++ b/tests/coverage/uses_inline_crate.cov-map
@ -1,12 +1,11 @@
 Function name: used_inline_crate::used_from_bin_crate_and_lib_crate_generic_function::<alloc::vec::Vec<i32>>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 2c, 01, 00, 4c, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 4f, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 2c, 01, 00, 4c, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_inline_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 44, 1) to (start + 0, 76)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 79)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

@ -31,38 +30,35 @@ Number of file 0 mappings: 10
 Highest counter ID seen: c1

 Function name: used_inline_crate::used_only_from_bin_crate_generic_function::<&alloc::vec::Vec<i32>>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 21, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 46, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 21, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_inline_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 33, 1) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 70)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: used_inline_crate::used_only_from_bin_crate_generic_function::<&str>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 21, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 46, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 21, 01, 00, 43, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_inline_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 33, 1) to (start + 0, 67)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 70)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

 Function name: used_inline_crate::used_with_same_type_from_bin_crate_and_lib_crate_generic_function::<&str>
-Raw bytes (24): 0x[01, 01, 00, 04, 01, 31, 01, 00, 5b, 01, 01, 05, 00, 0d, 01, 00, 0e, 00, 5e, 01, 01, 01, 00, 02]
+Raw bytes (19): 0x[01, 01, 00, 03, 01, 31, 01, 00, 5b, 01, 01, 05, 00, 0d, 01, 01, 01, 00, 02]
 Number of files: 1
 - file 0 => $DIR/auxiliary/used_inline_crate.rs
 Number of expressions: 0
-Number of file 0 mappings: 4
+Number of file 0 mappings: 3
 - Code(Counter(0)) at (prev + 49, 1) to (start + 0, 91)
 - Code(Counter(0)) at (prev + 1, 5) to (start + 0, 13)
- Code(Counter(0)) at (prev + 0, 14) to (start + 0, 94)
 - Code(Counter(0)) at (prev + 1, 1) to (start + 0, 2)
 Highest counter ID seen: c0

--- a/tests/incremental/hashes/inherent_impls.rs
+++ b/tests/incremental/hashes/inherent_impls.rs
@ -72,15 +72,9 @@ impl Foo {
 // This should affect the method itself, but not the impl.
 #[cfg(any(cfail1,cfail4))]
 impl Foo {
-    //------------
-    //---------------
-    //----------------------------------------------------------------
-    //
+    //-----------------------------------------------------------------------------
    //--------------------------
-    //------------
-    //---------------
-    //----------------------------------------------------------------
-    //
+    //-----------------------------------------------------------------------------
    //--------------------------
    #[inline]
    pub fn method_body_inlined() {
@ -94,15 +88,9 @@ impl Foo {
 #[rustc_clean(cfg="cfail5")]
 #[rustc_clean(cfg="cfail6")]
 impl Foo {
-    #[rustc_clean(
-        cfg="cfail2",
-        except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck"
-    )]
+    #[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
    #[rustc_clean(cfg="cfail3")]
-    #[rustc_clean(
-        cfg="cfail5",
-        except="opt_hir_owner_nodes,optimized_mir,promoted_mir,typeck"
-    )]
+    #[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
    #[rustc_clean(cfg="cfail6")]
    #[inline]
    pub fn method_body_inlined() {
--- a/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
+++ b/tests/incremental/hygiene/auxiliary/cached_hygiene.rs
@ -13,7 +13,7 @@ macro_rules! first_macro {
    }
 }

-#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir,promoted_mir", cfg="rpass2")]
+#[rustc_clean(except="opt_hir_owner_nodes,typeck,optimized_mir", cfg="rpass2")]
 #[inline(always)]
 pub fn changed_fn() {
    // This will cause additional hygiene to be generate,
--- a/tests/incremental/string_constant.rs
+++ b/tests/incremental/string_constant.rs
@ -17,7 +17,7 @@ pub mod x {
    }

    #[cfg(cfail2)]
-    #[rustc_clean(except = "opt_hir_owner_nodes,promoted_mir", cfg = "cfail2")]
+    #[rustc_clean(except = "opt_hir_owner_nodes,optimized_mir", cfg = "cfail2")]
    pub fn x() {
        println!("{}", "2");
    }
--- a/tests/mir-opt/gvn.slices.GVN.panic-abort.diff
+++ b/tests/mir-opt/gvn.slices.GVN.panic-abort.diff
@ -209,9 +209,10 @@
 +         _27 = &(*_12);
          _26 = &(*_27);
          StorageLive(_28);
-          _28 = Option::<Arguments<'_>>::None;
+-         _28 = Option::<Arguments<'_>>::None;
 -         _22 = assert_failed::<*const u8, *const u8>(move _23, move _24, move _26, move _28) -> unwind unreachable;
-+         _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, move _28) -> unwind unreachable;
+         _28 = const Option::<Arguments<'_>>::None;
+         _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, const Option::<Arguments<'_>>::None) -> unwind unreachable;
      }
  
      bb7: {
@ -311,11 +312,15 @@
 +         _53 = &(*_38);
          _52 = &(*_53);
          StorageLive(_54);
-          _54 = Option::<Arguments<'_>>::None;
+-         _54 = Option::<Arguments<'_>>::None;
 -         _48 = assert_failed::<*const u8, *const u8>(move _49, move _50, move _52, move _54) -> unwind unreachable;
-+         _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, move _54) -> unwind unreachable;
+         _54 = const Option::<Arguments<'_>>::None;
+         _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, const Option::<Arguments<'_>>::None) -> unwind unreachable;
      }
  }
  
-  ALLOC0 (size: 18, align: 1) { .. }
+- ALLOC0 (size: 18, align: 1) { .. }
+ ALLOC0 (size: 16, align: 8) { .. }
+ 
+ ALLOC1 (size: 18, align: 1) { .. }
  
--- a/tests/mir-opt/gvn.slices.GVN.panic-unwind.diff
+++ b/tests/mir-opt/gvn.slices.GVN.panic-unwind.diff
@ -209,9 +209,10 @@
 +         _27 = &(*_12);
          _26 = &(*_27);
          StorageLive(_28);
-          _28 = Option::<Arguments<'_>>::None;
+-         _28 = Option::<Arguments<'_>>::None;
 -         _22 = assert_failed::<*const u8, *const u8>(move _23, move _24, move _26, move _28) -> unwind continue;
-+         _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, move _28) -> unwind continue;
+         _28 = const Option::<Arguments<'_>>::None;
+         _22 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _24, move _26, const Option::<Arguments<'_>>::None) -> unwind continue;
      }
  
      bb7: {
@ -311,11 +312,15 @@
 +         _53 = &(*_38);
          _52 = &(*_53);
          StorageLive(_54);
-          _54 = Option::<Arguments<'_>>::None;
+-         _54 = Option::<Arguments<'_>>::None;
 -         _48 = assert_failed::<*const u8, *const u8>(move _49, move _50, move _52, move _54) -> unwind continue;
-+         _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, move _54) -> unwind continue;
+         _54 = const Option::<Arguments<'_>>::None;
+         _48 = assert_failed::<*const u8, *const u8>(const core::panicking::AssertKind::Eq, move _50, move _52, const Option::<Arguments<'_>>::None) -> unwind continue;
      }
  }
  
-  ALLOC0 (size: 18, align: 1) { .. }
+- ALLOC0 (size: 18, align: 1) { .. }
+ ALLOC0 (size: 16, align: 8) { .. }
+ 
+ ALLOC1 (size: 18, align: 1) { .. }
  
--- a/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir
+++ b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-abort.mir
@ -164,7 +164,6 @@ fn array_casts() -> () {
        _31 = &(*_32);
        StorageLive(_33);
        _33 = Option::<Arguments<'_>>::None;
-        Retag(_33);
        _27 = core::panicking::assert_failed::<usize, usize>(move _28, move _29, move _31, move _33) -> unwind unreachable;
    }
 }
--- a/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir
+++ b/tests/mir-opt/retag.array_casts.SimplifyCfg-pre-optimizations.after.panic-unwind.mir
@ -164,7 +164,6 @@ fn array_casts() -> () {
        _31 = &(*_32);
        StorageLive(_33);
        _33 = Option::<Arguments<'_>>::None;
-        Retag(_33);
        _27 = core::panicking::assert_failed::<usize, usize>(move _28, move _29, move _31, move _33) -> unwind continue;
    }
 }
--- a/tests/mir-opt/sroa/lifetimes.foo.ScalarReplacementOfAggregates.diff
+++ b/tests/mir-opt/sroa/lifetimes.foo.ScalarReplacementOfAggregates.diff
@ -17,23 +17,22 @@
      let mut _17: &std::boxed::Box<dyn std::fmt::Display>;
      let mut _18: core::fmt::rt::Argument<'_>;
      let mut _19: &u32;
-      let mut _20: &[&str; 3];
-      let _21: &[&str; 3];
-      let _22: [&str; 3];
-      let mut _23: &[core::fmt::rt::Argument<'_>; 2];
-      let _24: &[core::fmt::rt::Argument<'_>; 2];
-      let mut _26: &std::boxed::Box<dyn std::fmt::Display>;
-      let mut _27: &u32;
-      let mut _28: bool;
+      let mut _20: &[u8; 7];
+      let _21: &[u8; 7];
+      let mut _22: &[core::fmt::rt::Argument<'_>; 2];
+      let _23: &[core::fmt::rt::Argument<'_>; 2];
+      let mut _24: &std::boxed::Box<dyn std::fmt::Display>;
+      let mut _25: &u32;
+      let mut _26: bool;
+      let mut _27: isize;
+      let mut _28: isize;
      let mut _29: isize;
-      let mut _30: isize;
-      let mut _31: isize;
-+     let _32: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
-+     let _33: u32;
+     let _30: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
+     let _31: u32;
      scope 1 {
 -         debug foo => _1;
-+         debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _32;
-+         debug ((foo: Foo<T>).1: u32) => _33;
+         debug ((foo: Foo<T>).0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>) => _30;
+         debug ((foo: Foo<T>).1: u32) => _31;
          let _5: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>;
          scope 2 {
              debug x => _5;
@ -44,16 +43,15 @@
                      debug x => _8;
                      let _8: std::boxed::Box<dyn std::fmt::Display>;
                      let _12: (&std::boxed::Box<dyn std::fmt::Display>, &u32);
-+                     let _34: &std::boxed::Box<dyn std::fmt::Display>;
-+                     let _35: &u32;
+                     let _32: &std::boxed::Box<dyn std::fmt::Display>;
+                     let _33: &u32;
                      scope 5 {
 -                         debug args => _12;
-+                         debug ((args: (&Box<dyn std::fmt::Display>, &u32)).0: &std::boxed::Box<dyn std::fmt::Display>) => _34;
-+                         debug ((args: (&Box<dyn std::fmt::Display>, &u32)).1: &u32) => _35;
+                         debug ((args: (&Box<dyn std::fmt::Display>, &u32)).0: &std::boxed::Box<dyn std::fmt::Display>) => _32;
+                         debug ((args: (&Box<dyn std::fmt::Display>, &u32)).1: &u32) => _33;
                          let _15: [core::fmt::rt::Argument<'_>; 2];
                          scope 6 {
                              debug args => _15;
-                              let mut _25: &[&str; 3];
                          }
                      }
                  }
@ -62,10 +60,10 @@
      }
  
      bb0: {
-          _28 = const false;
+          _26 = const false;
 -         StorageLive(_1);
-+         StorageLive(_32);
-+         StorageLive(_33);
+         StorageLive(_30);
+         StorageLive(_31);
 +         nop;
          StorageLive(_2);
          StorageLive(_3);
@ -79,17 +77,17 @@
          _2 = Result::<Box<dyn std::fmt::Display>, <T as Err>::Err>::Ok(move _3);
          StorageDead(_3);
 -         _1 = Foo::<T> { x: move _2, y: const 7_u32 };
-+         _32 = move _2;
-+         _33 = const 7_u32;
+         _30 = move _2;
+         _31 = const 7_u32;
 +         nop;
          StorageDead(_2);
          StorageLive(_5);
-          _28 = const true;
+          _26 = const true;
 -         _5 = move (_1.0: std::result::Result<std::boxed::Box<dyn std::fmt::Display>, <T as Err>::Err>);
-+         _5 = move _32;
+         _5 = move _30;
          StorageLive(_6);
 -         _6 = copy (_1.1: u32);
-+         _6 = copy _33;
+         _6 = copy _31;
          _7 = discriminant(_5);
          switchInt(move _7) -> [0: bb2, otherwise: bb7];
      }
@ -101,25 +99,25 @@
          StorageLive(_10);
          StorageLive(_11);
 -         StorageLive(_12);
-+         StorageLive(_34);
-+         StorageLive(_35);
+         StorageLive(_32);
+         StorageLive(_33);
 +         nop;
          StorageLive(_13);
          _13 = &_8;
          StorageLive(_14);
          _14 = &_6;
 -         _12 = (move _13, move _14);
-+         _34 = move _13;
-+         _35 = move _14;
+         _32 = move _13;
+         _33 = move _14;
 +         nop;
          StorageDead(_14);
          StorageDead(_13);
          StorageLive(_15);
          StorageLive(_16);
          StorageLive(_17);
-         _26 = copy (_12.0: &std::boxed::Box<dyn std::fmt::Display>);
-+         _26 = copy _34;
-          _17 = &(*_26);
+-         _24 = copy (_12.0: &std::boxed::Box<dyn std::fmt::Display>);
+         _24 = copy _32;
+          _17 = &(*_24);
          _16 = core::fmt::rt::Argument::<'_>::new_display::<Box<dyn std::fmt::Display>>(move _17) -> [return: bb3, unwind unreachable];
      }
  
@ -127,9 +125,9 @@
          StorageDead(_17);
          StorageLive(_18);
          StorageLive(_19);
-         _27 = copy (_12.1: &u32);
-+         _27 = copy _35;
-          _19 = &(*_27);
+-         _25 = copy (_12.1: &u32);
+         _25 = copy _33;
+          _19 = &(*_25);
          _18 = core::fmt::rt::Argument::<'_>::new_display::<u32>(move _19) -> [return: bb4, unwind unreachable];
      }
  
@ -140,19 +138,18 @@
          StorageDead(_16);
          StorageLive(_20);
          StorageLive(_21);
-          _25 = const foo::<T>::promoted[0];
-          _21 = &(*_25);
+          _21 = const b"\x80\x01 \x80\x01\n\x00";
          _20 = &(*_21);
+          StorageLive(_22);
          StorageLive(_23);
-          StorageLive(_24);
-          _24 = &_15;
-          _23 = &(*_24);
-          _11 = core::fmt::rt::<impl Arguments<'_>>::new_v1::<3, 2>(move _20, move _23) -> [return: bb5, unwind unreachable];
+          _23 = &_15;
+          _22 = &(*_23);
+          _11 = core::fmt::rt::<impl Arguments<'_>>::new::<7, 2>(move _20, move _22) -> [return: bb5, unwind unreachable];
      }
  
      bb5: {
-          StorageDead(_24);
          StorageDead(_23);
+          StorageDead(_22);
          StorageDead(_21);
          StorageDead(_20);
          _10 = _eprint(move _11) -> [return: bb6, unwind unreachable];
@ -162,8 +159,8 @@
          StorageDead(_11);
          StorageDead(_15);
 -         StorageDead(_12);
-+         StorageDead(_34);
-+         StorageDead(_35);
+         StorageDead(_32);
+         StorageDead(_33);
 +         nop;
          StorageDead(_10);
          _9 = const ();
@ -184,16 +181,16 @@
  
      bb9: {
          StorageDead(_6);
-          _29 = discriminant(_5);
-          switchInt(move _29) -> [0: bb10, otherwise: bb11];
+          _27 = discriminant(_5);
+          switchInt(move _27) -> [0: bb10, otherwise: bb11];
      }
  
      bb10: {
-          _28 = const false;
+          _26 = const false;
          StorageDead(_5);
 -         StorageDead(_1);
-+         StorageDead(_32);
-+         StorageDead(_33);
+         StorageDead(_30);
+         StorageDead(_31);
 +         nop;
          return;
      }
@ -203,3 +200,7 @@
      }
  }
  
+  ALLOC0 (size: 7, align: 1) {
+      80 01 20 80 01 0a 00                            │ .. ....
+  }
+  
--- a/tests/pretty/issue-4264.pp
+++ b/tests/pretty/issue-4264.pp
@ -32,11 +32,10 @@ fn bar() ({
    ((::alloc::__export::must_use as
            fn(String) -> String {must_use::<String>})(({
            ((::alloc::fmt::format as
-                    for<'a> fn(Arguments<'a>) -> String {format})(((format_arguments::new_const
+                    for<'a> fn(Arguments<'a>) -> String {format})(((format_arguments::from_str
                        as
-                        fn(&[&'static str; 1]) -> Arguments<'_> {core::fmt::rt::<impl Arguments<'_>>::new_const::<1>})((&([("test"
-                                    as &str)] as [&str; 1]) as &[&str; 1])) as Arguments<'_>))
-                as String)
+                        fn(&'static str) -> Arguments<'_> {core::fmt::rt::<impl Arguments<'_>>::from_str})(("test"
+                        as &str)) as Arguments<'_>)) as String)
        } as String)) as String);
 } as ())
 type Foo = [i32; (3 as usize)];
--- a/tests/run-make/symbol-mangling-hashed/rmake.rs
+++ b/tests/run-make/symbol-mangling-hashed/rmake.rs
@ -61,7 +61,7 @@ fn main() {
        }

        let expected_prefix = adjust_symbol_prefix!("_RNxC12hashed_dylib");
-        if dynamic_symbols.iter().filter(|sym| sym.starts_with(expected_prefix)).count() != 2 {
+        if dynamic_symbols.iter().filter(|sym| sym.starts_with(expected_prefix)).count() != 1 {
            eprintln!("exported dynamic symbols: {:#?}", dynamic_symbols);
            panic!("expected two dynamic symbols starting with `{expected_prefix}`");
        }
@ -88,7 +88,7 @@ fn main() {
        }

        let expected_rlib_prefix = adjust_symbol_prefix!("_RNxC11hashed_rlib");
-        if dynamic_symbols.iter().filter(|sym| sym.starts_with(expected_rlib_prefix)).count() != 2 {
+        if dynamic_symbols.iter().filter(|sym| sym.starts_with(expected_rlib_prefix)).count() != 1 {
            eprintln!("exported dynamic symbols: {:#?}", dynamic_symbols);
            panic!("expected two exported symbols starting with `{expected_rlib_prefix}`");
        }
--- a/tests/ui/consts/recursive-const-in-impl.stderr
+++ b/tests/ui/consts/recursive-const-in-impl.stderr
@ -5,7 +5,7 @@ LL |     println!("{}", Thing::<i32>::X);
   |                    ^^^^^^^^^^^^^^^
   |
   = help: consider increasing the recursion limit by adding a `#![recursion_limit = "14"]` attribute to your crate (`recursive_const_in_impl`)
-   = note: query depth increased by 9 when simplifying constant for the type system `main::promoted[1]`
+   = note: query depth increased by 9 when simplifying constant for the type system `main::promoted[0]`
   = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)

 error: aborting due to 1 previous error
--- a/tests/ui/unpretty/exhaustive.hir.stdout
+++ b/tests/ui/unpretty/exhaustive.hir.stdout
@ -390,11 +390,11 @@ mod expressions {
    /// ExprKind::FormatArgs
    fn expr_format_args() {
        let expr;
-        format_arguments::new_const(&[]);
+        format_arguments::from_str("");
        {
            super let args = (&expr,);
            super let args = [format_argument::new_display(args.0)];
-            format_arguments::new_v1(&[""], &args)
+            unsafe { format_arguments::new(b"\x80\x00", &args) }
        };
    }
 }
--- a/tests/ui/unpretty/flattened-format-args.stdout
+++ b/tests/ui/unpretty/flattened-format-args.stdout
@ -13,7 +13,10 @@ fn main() {
        ::std::io::_print({
                super let args = (&x,);
                super let args = [format_argument::new_display(args.0)];
-                format_arguments::new_v1(&["a 123 b ", " xyz\n"], &args)
+                unsafe {
+                    format_arguments::new(b"\x08a 123 b \x80\x05 xyz\n\x00",
+                        &args)
+                }
            });
    };
 }