[MergeICmps][NFC] Re-generate tests with update_test_checks.

And use a more compact name for the tested struct.

llvm-svn: 360319

1 files changed, 15 insertions, 16 deletions

diff --git a/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll b/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll
index dfb369ca0f2..fa4af66e639 100644
--- a/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll
+++ b/llvm/test/Transforms/MergeICmps/X86/alias-merge-blocks.ll
@@ -1,14 +1,15 @@
 ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
 ; RUN: opt < %s -mtriple=x86_64-unknown-unknown -mergeicmps -S | FileCheck %s --check-prefix=X86
 
-%"struct.std::pair" = type { i32, i32, i32, i32 }
+%S = type { i32, i32, i32, i32 }
 
+define zeroext i1 @opeq1(
 ; X86-LABEL: @opeq1(
 ; X86-NEXT:  entry:
 ; X86-NEXT:    [[PTR:%.*]] = alloca i32
 ; X86-NEXT:    store i32 42, i32* [[PTR]]
-; X86-NEXT:    [[FIRST_I:%.*]] = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* [[A:%.*]], i64 0, i32 0
-; X86-NEXT:    [[FIRST1_I:%.*]] = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* [[B:%.*]], i64 0, i32 0
+; X86-NEXT:    [[FIRST_I:%.*]] = getelementptr inbounds [[S:%.*]], %S* [[A:%.*]], i64 0, i32 0
+; X86-NEXT:    [[FIRST1_I:%.*]] = getelementptr inbounds [[S]], %S* [[B:%.*]], i64 0, i32 0
 ; X86-NEXT:    [[CSTR:%.*]] = bitcast i32* [[FIRST_I]] to i8*
 ; X86-NEXT:    [[CSTR1:%.*]] = bitcast i32* [[FIRST1_I]] to i8*
 ; X86-NEXT:    [[MEMCMP:%.*]] = call i32 @memcmp(i8* [[CSTR]], i8* [[CSTR1]], i64 16)
@@ -17,17 +18,15 @@
 ; X86:       opeq1.exit:
 ; X86-NEXT:    [[TMP1:%.*]] = phi i1 [ [[TMP0]], [[ENTRY:%.*]] ]
 ; X86-NEXT:    ret i1 [[TMP1]]
-
-define zeroext i1 @opeq1(
-
-  %"struct.std::pair"* nocapture readonly dereferenceable(16) %a,
-  %"struct.std::pair"* nocapture readonly dereferenceable(16) %b) local_unnamed_addr #0 {
+;
+  %S* nocapture readonly dereferenceable(16) %a,
+  %S* nocapture readonly dereferenceable(16) %b) local_unnamed_addr #0 {
 
 entry:
   %ptr = alloca i32
-  %first.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %a, i64 0, i32 0
+  %first.i = getelementptr inbounds %S, %S* %a, i64 0, i32 0
   %0 = load i32, i32* %first.i, align 4
-  %first1.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %b, i64 0, i32 0
+  %first1.i = getelementptr inbounds %S, %S* %b, i64 0, i32 0
   %1 = load i32, i32* %first1.i, align 4
   ; Does other work, has no interference, merge block
   store i32 42, i32* %ptr
@@ -35,25 +34,25 @@ entry:
   br i1 %cmp.i, label %land.rhs.i, label %opeq1.exit
 
 land.rhs.i:
-  %second.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %a, i64 0, i32 1
+  %second.i = getelementptr inbounds %S, %S* %a, i64 0, i32 1
   %2 = load i32, i32* %second.i, align 4
-  %second2.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %b, i64 0, i32 1
+  %second2.i = getelementptr inbounds %S, %S* %b, i64 0, i32 1
   %3 = load i32, i32* %second2.i, align 4
   %cmp2.i = icmp eq i32 %2, %3
   br i1 %cmp2.i, label %land.rhs.i.2, label %opeq1.exit
 
 land.rhs.i.2:
-  %third.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %a, i64 0, i32 2
+  %third.i = getelementptr inbounds %S, %S* %a, i64 0, i32 2
   %4 = load i32, i32* %third.i, align 4
-  %third2.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %b, i64 0, i32 2
+  %third2.i = getelementptr inbounds %S, %S* %b, i64 0, i32 2
   %5 = load i32, i32* %third2.i, align 4
   %cmp3.i = icmp eq i32 %4, %5
   br i1 %cmp3.i, label %land.rhs.i.3, label %opeq1.exit
 
 land.rhs.i.3:
-  %fourth.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %a, i64 0, i32 3
+  %fourth.i = getelementptr inbounds %S, %S* %a, i64 0, i32 3
   %6 = load i32, i32* %fourth.i, align 4
-  %fourth2.i = getelementptr inbounds %"struct.std::pair", %"struct.std::pair"* %b, i64 0, i32 3
+  %fourth2.i = getelementptr inbounds %S, %S* %b, i64 0, i32 3
   %7 = load i32, i32* %fourth2.i, align 4
   %cmp4.i = icmp eq i32 %6, %7
   br label %opeq1.exit