ElaborateDrops.after.mir.diff

diff --git a/dump2/rustc.node41.002-004.ElaborateDrops.after.mir b/dump/rustc.node41.002-004.ElaborateDrops.after.mir
index 8085529..9a08f5f 100644
--- a/dump2/rustc.node41.002-004.ElaborateDrops.after.mir
+++ b/dump/rustc.node41.002-004.ElaborateDrops.after.mir
@@ -22,9 +22,9 @@ fn main() -> () {
         StorageLive(_4);                 // scope 0 at nodep.rs:16:47: 16:54
         _4 = &(main::STATIC: ());        // scope 0 at nodep.rs:16:47: 16:54
         _3 = &(*_4);                     // scope 0 at nodep.rs:16:47: 16:54
-        _2 = DropHasLifetime::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
+        _2 = DropHasLifetime<'_>::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
         StorageDead(_3);                 // scope 0 at nodep.rs:16:55: 16:55
-        _1 = Wrapper::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
+        _1 = Wrapper<'_>::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
         goto -> bb1;                     // scope 0 at nodep.rs:16:56: 16:56
     }
 
@@ -33,7 +33,7 @@ fn main() -> () {
         StorageDead(_4);                 // scope 0 at nodep.rs:16:57: 16:57
         StorageLive(_6);                 // scope 1 at nodep.rs:18:17: 18:43
         StorageLive(_7);                 // scope 1 at nodep.rs:18:33: 18:42
-        _7 = (_1.0: DropHasLifetime);    // scope 1 at nodep.rs:18:33: 18:42
+        _7 = (_1.0: DropHasLifetime<'_>); // scope 1 at nodep.rs:18:33: 18:42
         _6 = const move_and_return(_7) -> bb2; // scope 1 at nodep.rs:18:17: 18:43
     }
 
@@ -43,7 +43,7 @@ fn main() -> () {
 
     bb3: {
         StorageDead(_7);                 // scope 1 at nodep.rs:18:43: 18:43
-        goto -> bb9;                     // scope 1 at nodep.rs:18:5: 18:14
+        drop((_1.0: DropHasLifetime)) -> [return: bb9, unwind: bb8]; // scope 1 at nodep.rs:18:5: 18:14
     }
 
     bb4: {
@@ -52,8 +52,8 @@ fn main() -> () {
 
     bb5: {
         StorageDead(_6);                 // scope 1 at nodep.rs:18:43: 18:43
-        _0 = ();                         // scope 1 at nodep.rs:13:11: 19:2
-        drop(_1) -> [return: bb6, unwind: bb7]; // scope 0 at nodep.rs:19:2: 19:2
+        _0 = ();                         // scope 0 at nodep.rs:13:11: 19:2
+        goto -> bb13;                    // scope 0 at nodep.rs:19:2: 19:2
     }
 
     bb6: {
@@ -74,4 +74,20 @@ fn main() -> () {
         (_1.0: DropHasLifetime) = _6;    // scope 1 at nodep.rs:18:5: 18:14
         goto -> bb4;                     // scope 1 at nodep.rs:18:5: 18:14
     }
+
+    bb10: {
+        goto -> bb6;                     // scope 0 at nodep.rs:19:2: 19:2
+    }
+
+    bb11: {
+        goto -> bb7;                     // scope 0 at nodep.rs:19:2: 19:2
+    }
+
+    bb12: {
+        drop((_1.0: DropHasLifetime)) -> bb11; // scope 0 at nodep.rs:19:2: 19:2
+    }
+
+    bb13: {
+        drop((_1.0: DropHasLifetime)) -> [return: bb10, unwind: bb11]; // scope 0 at nodep.rs:19:2: 19:2
+    }
 }

ElaborateDrops.before.mir.diff

diff --git a/dump2/rustc.node41.002-004.ElaborateDrops.before.mir b/dump/rustc.node41.002-004.ElaborateDrops.before.mir
index c6784ba..2631afb 100644
--- a/dump2/rustc.node41.002-004.ElaborateDrops.before.mir
+++ b/dump/rustc.node41.002-004.ElaborateDrops.before.mir
@@ -22,9 +22,9 @@ fn main() -> () {
         StorageLive(_4);                 // scope 0 at nodep.rs:16:47: 16:54
         _4 = &(main::STATIC: ());        // scope 0 at nodep.rs:16:47: 16:54
         _3 = &(*_4);                     // scope 0 at nodep.rs:16:47: 16:54
-        _2 = DropHasLifetime::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
+        _2 = DropHasLifetime<'_>::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
         StorageDead(_3);                 // scope 0 at nodep.rs:16:55: 16:55
-        _1 = Wrapper::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
+        _1 = Wrapper<'_>::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
         drop(_2) -> bb1;                 // scope 0 at nodep.rs:16:56: 16:56
     }
 
@@ -33,7 +33,7 @@ fn main() -> () {
         StorageDead(_4);                 // scope 0 at nodep.rs:16:57: 16:57
         StorageLive(_6);                 // scope 1 at nodep.rs:18:17: 18:43
         StorageLive(_7);                 // scope 1 at nodep.rs:18:33: 18:42
-        _7 = (_1.0: DropHasLifetime);    // scope 1 at nodep.rs:18:33: 18:42
+        _7 = (_1.0: DropHasLifetime<'_>); // scope 1 at nodep.rs:18:33: 18:42
         _6 = const move_and_return(_7) -> bb2; // scope 1 at nodep.rs:18:17: 18:43
     }
 
@@ -52,7 +52,7 @@ fn main() -> () {
 
     bb5: {
         StorageDead(_6);                 // scope 1 at nodep.rs:18:43: 18:43
-        _0 = ();                         // scope 1 at nodep.rs:13:11: 19:2
+        _0 = ();                         // scope 0 at nodep.rs:13:11: 19:2
         drop(_1) -> bb6;                 // scope 0 at nodep.rs:19:2: 19:2
     }
 

EraseRegions.after.mir.diff

diff --git a/dump2/rustc.node41.002-002.EraseRegions.after.mir b/dump/rustc.node41.002-002.EraseRegions.after.mir
index f44bd48..eb70e72 100644
--- a/dump2/rustc.node41.002-002.EraseRegions.after.mir
+++ b/dump/rustc.node41.002-002.EraseRegions.after.mir
@@ -22,9 +22,9 @@ fn main() -> () {
         StorageLive(_4);                 // scope 0 at nodep.rs:16:47: 16:54
         _4 = &(main::STATIC: ());        // scope 0 at nodep.rs:16:47: 16:54
         _3 = &(*_4);                     // scope 0 at nodep.rs:16:47: 16:54
-        _2 = DropHasLifetime::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
+        _2 = DropHasLifetime<'_>::{{constructor}}(_3,); // scope 0 at nodep.rs:16:31: 16:55
         StorageDead(_3);                 // scope 0 at nodep.rs:16:55: 16:55
-        _1 = Wrapper::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
+        _1 = Wrapper<'_>::{{constructor}}(_2,); // scope 0 at nodep.rs:16:23: 16:56
         drop(_2) -> bb1;                 // scope 0 at nodep.rs:16:56: 16:56
     }
 
@@ -33,7 +33,7 @@ fn main() -> () {
         StorageDead(_4);                 // scope 0 at nodep.rs:16:57: 16:57
         StorageLive(_6);                 // scope 1 at nodep.rs:18:17: 18:43
         StorageLive(_7);                 // scope 1 at nodep.rs:18:33: 18:42
-        _7 = (_1.0: DropHasLifetime);    // scope 1 at nodep.rs:18:33: 18:42
+        _7 = (_1.0: DropHasLifetime<'_>); // scope 1 at nodep.rs:18:33: 18:42
         _6 = const move_and_return(_7) -> bb2; // scope 1 at nodep.rs:18:17: 18:43
     }
 
@@ -52,7 +52,7 @@ fn main() -> () {
 
     bb5: {
         StorageDead(_6);                 // scope 1 at nodep.rs:18:43: 18:43
-        _0 = ();                         // scope 1 at nodep.rs:13:11: 19:2
+        _0 = ();                         // scope 0 at nodep.rs:13:11: 19:2
         drop(_1) -> bb6;                 // scope 0 at nodep.rs:19:2: 19:2
     }
 

EraseRegions.before.mir.diff

diff --git a/dump2/rustc.node41.002-002.EraseRegions.before.mir b/dump/rustc.node41.002-002.EraseRegions.before.mir
index f4a5dc4..f7fd3b8 100644
--- a/dump2/rustc.node41.002-002.EraseRegions.before.mir
+++ b/dump/rustc.node41.002-002.EraseRegions.before.mir
@@ -52,7 +52,7 @@ fn main() -> () {
 
     bb5: {
         StorageDead(_6);                 // scope 1 at nodep.rs:18:43: 18:43
-        _0 = ();                         // scope 1 at nodep.rs:13:11: 19:2
+        _0 = ();                         // scope 0 at nodep.rs:13:11: 19:2
         drop(_1) -> bb6;                 // scope 0 at nodep.rs:19:2: 19:2
     }