From 0f8f77fcc20cc5c44b5aa56b5e43620c0c44128e Mon Sep 17 00:00:00 2001
From: Camille GILLOT <gillot.camille@gmail.com>
Date: Wed, 1 Nov 2023 16:55:18 +0000
Subject: [PATCH] Rebase fallout.

---
 ...8_print_invalid_constant.main.GVN.32bit.panic-abort.diff | 6 +-----
 ...8_print_invalid_constant.main.GVN.64bit.panic-abort.diff | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff
index e521b789b6007..50189d192ceb2 100644
--- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff
+++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.32bit.panic-abort.diff
@@ -85,7 +85,7 @@
           StorageLive(_12);
           StorageLive(_15);
           _12 = discriminant(_6);
-          switchInt(move _12) -> [0: bb7, 1: bb5, otherwise: bb6];
+          switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb2];
       }
   
       bb5: {
@@ -99,10 +99,6 @@
       }
   
       bb6: {
-          unreachable;
-      }
-  
-      bb7: {
           _5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
           StorageDead(_15);
           StorageDead(_12);
diff --git a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff
index f6c4b785bf1ba..08a185bad9cdb 100644
--- a/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff
+++ b/tests/mir-opt/pre-codegen/issue_117368_print_invalid_constant.main.GVN.64bit.panic-abort.diff
@@ -85,7 +85,7 @@
           StorageLive(_12);
           StorageLive(_15);
           _12 = discriminant(_6);
-          switchInt(move _12) -> [0: bb7, 1: bb5, otherwise: bb6];
+          switchInt(move _12) -> [0: bb6, 1: bb5, otherwise: bb2];
       }
   
       bb5: {
@@ -99,10 +99,6 @@
       }
   
       bb6: {
-          unreachable;
-      }
-  
-      bb7: {
           _5 = move ((_6 as Ok).0: std::ptr::NonNull<[u8]>);
           StorageDead(_15);
           StorageDead(_12);