Fix failing codegen test on non-x86_64 platforms

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@331697 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 39 insertions, 38 deletions

diff --git a/test/CodeGenCXX/cxx2a-compare.cpp b/test/CodeGenCXX/cxx2a-compare.cpp
index 64dd60ef3d..607c8334bf 100644
--- a/test/CodeGenCXX/cxx2a-compare.cpp
+++ b/test/CodeGenCXX/cxx2a-compare.cpp
@@ -17,54 +17,54 @@
 
 // CHECK-LABEL: @_Z11test_signedii
 auto test_signed(int x, int y) {
-  // CHECK: %retval = alloca %[[SO]]
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.lt = icmp slt i32 %0, %1
   // CHECK: %sel.lt = select i1 %cmp.lt, i8 [[LT]], i8 [[GT]]
   // CHECK: %cmp.eq = icmp eq i32 %0, %1
   // CHECK: %sel.eq = select i1 %cmp.eq, i8 [[EQ]], i8 %sel.lt
-  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %retval, i32 0, i32 0
+  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %[[DEST]]
   // CHECK: store i8 %sel.eq, i8* %__value_, align 1
-  // CHECK: %[[FINAL:.*]] = getelementptr inbounds %[[SO]], %[[SO]]* %retval
-  // CHECK: %[[RET:.*]] = load i8, i8* %[[FINAL]]
-  // CHECK: ret i8 %[[RET]]
+  // CHECK: ret
   return x <=> y;
 }
 
 // CHECK-LABEL: @_Z13test_unsignedjj
 auto test_unsigned(unsigned x, unsigned y) {
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.lt = icmp ult i32 %0, %1
   // CHECK: %sel.lt = select i1 %cmp.lt, i8 [[LT]], i8 [[GT]]
   // CHECK: %cmp.eq = icmp eq i32 %0, %1
   // CHECK: %sel.eq = select i1 %cmp.eq, i8 [[EQ]], i8 %sel.lt
-  // CHECK: %retval
-  // CHECK: %sel.eq
+  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %[[DEST]]
+  // CHECK: store i8 %sel.eq, i8* %__value_
   // CHECK: ret
   return x <=> y;
 }
 
 // CHECK-LABEL: @_Z10float_testdd
 auto float_test(double x, double y) {
-  // CHECK: %retval = alloca %[[PO]]
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.eq = fcmp oeq double %0, %1
   // CHECK: %sel.eq = select i1 %cmp.eq, i8 [[EQ]], i8 [[UNORD]]
   // CHECK: %cmp.gt = fcmp ogt double %0, %1
   // CHECK: %sel.gt = select i1 %cmp.gt, i8 [[GT]], i8 %sel.eq
   // CHECK: %cmp.lt = fcmp olt double %0, %1
   // CHECK: %sel.lt = select i1 %cmp.lt, i8 [[LT]], i8 %sel.gt
-  // CHECK: %retval
-  // CHECK: %sel.lt
+  // CHECK: %__value_ = getelementptr inbounds %[[PO]], %[[PO]]* %[[DEST]]
+  // CHECK: store i8 %sel.lt, i8* %__value_
   // CHECK: ret
   return x <=> y;
 }
 
 // CHECK-LABEL: @_Z8ptr_testPiS_
 auto ptr_test(int *x, int *y) {
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.lt = icmp ult i32* %0, %1
   // CHECK: %sel.lt = select i1 %cmp.lt, i8 [[LT]], i8 [[GT]]
   // CHECK: %cmp.eq = icmp eq i32* %0, %1
   // CHECK: %sel.eq = select i1 %cmp.eq, i8 [[EQ]], i8 %sel.lt
-  // CHECK: %retval
-  // CHECK: %sel.eq
+  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %[[DEST]]
+  // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   // CHECK: ret
   return x <=> y;
 }
@@ -75,38 +75,36 @@ using MemDataT = int(MemPtr::*);
 
 // CHECK-LABEL: @_Z12mem_ptr_testM6MemPtrFvvES1_
 auto mem_ptr_test(MemPtrT x, MemPtrT y) {
-  // CHECK: %retval = alloca %[[SE]]
-  // CHECK: %cmp.ptr = icmp eq i64 %lhs.memptr.ptr, %rhs.memptr.ptr
-  // CHECK: %cmp.ptr.null = icmp eq i64 %lhs.memptr.ptr, 0
-  // CHECK: %cmp.adj = icmp eq i64 %lhs.memptr.adj, %rhs.memptr.adj
-  // CHECK: %6 = or i1 %cmp.ptr.null, %cmp.adj
-  // CHECK: %memptr.eq = and i1 %cmp.ptr, %6
+  // CHECK: %[[DEST:retval|agg.result]]
+  // CHECK: %cmp.ptr = icmp eq [[TY:i[0-9]+]] %lhs.memptr.ptr, %rhs.memptr.ptr
+  // CHECK: %cmp.ptr.null = icmp eq [[TY]] %lhs.memptr.ptr, 0
+  // CHECK: %cmp.adj = icmp eq [[TY]] %lhs.memptr.adj, %rhs.memptr.adj
+  // CHECK: %[[OR:.*]] = or i1 %cmp.ptr.null, %cmp.adj
+  // CHECK: %memptr.eq = and i1 %cmp.ptr, %[[OR]]
   // CHECK: %sel.eq = select i1 %memptr.eq, i8 [[EQ]], i8 [[NE]]
-  // CHECK: %retval
-  // CHECK: %sel.eq
+  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %[[DEST]]
+  // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   // CHECK: ret
   return x <=> y;
 }
 
 // CHECK-LABEL: @_Z13mem_data_testM6MemPtriS0_
 auto mem_data_test(MemDataT x, MemDataT y) {
-  // CHECK: %retval = alloca %[[SE]]
-  // CHECK: %[[CMP:.*]] = icmp eq i64 %0, %1
+  // CHECK: %[[DEST:retval|agg.result]]
+  // CHECK: %[[CMP:.*]] = icmp eq i{{[0-9]+}} %0, %1
   // CHECK: %sel.eq = select i1 %[[CMP]], i8 [[EQ]], i8 [[NE]]
-  // CHECK: %retval
-  // CHECK: %sel.eq
+  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %[[DEST]]
+  // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   return x <=> y;
 }
 
 // CHECK-LABEL: @_Z13test_constantv
 auto test_constant() {
-  // CHECK: entry:
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK-NOT: icmp
-  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %retval
-  // CHECK-NEXT: store i8 [[LT]], i8* %__value_
-  // CHECK-NEXT: %[[TMP:.*]] = getelementptr inbounds %[[SO]], %[[SO]]* %retval
-  // CHECK-NEXT: %[[RET:.*]] = load i8, i8* %[[TMP]]
-  // CHECK-NEXT: ret i8 %[[RET]]
+  // CHECK: %__value_ = getelementptr inbounds %[[SO]], %[[SO]]* %[[DEST]]
+  // CHECK-NEXT: store i8 -1, i8* %__value_
+  // CHECK: ret
   const int x = 42;
   const int y = 101;
   return x <=> y;
@@ -114,16 +112,16 @@ auto test_constant() {
 
 // CHECK-LABEL: @_Z16test_nullptr_objPiDn
 auto test_nullptr_obj(int* x, decltype(nullptr) y) {
-  // CHECK: %retval = alloca %[[SE]]
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.eq = icmp eq i32* %0, null
   // CHECK: %sel.eq = select i1 %cmp.eq, i8 [[EQ]], i8 [[NE]]
-  // CHECK: %retval
-  // CHECK: %sel.eq
+  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %[[DEST]]
+  // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   return x <=> y;
 }
 
-// CHECK-LABEL: @_Z18unscoped_enum_testijlm
-void unscoped_enum_test(int i, unsigned u, long l, unsigned long ul) {
+// CHECK-LABEL: @_Z18unscoped_enum_testijxy
+void unscoped_enum_test(int i, unsigned u, long long l, unsigned long long ul) {
   enum EnumA : int { A };
   enum EnumB : unsigned { B };
   // CHECK: %[[I:.*]] = load {{.*}} %i.addr
@@ -152,8 +150,9 @@ using nullptr_t = decltype(nullptr);
 
 // CHECK-LABEL: @_ZN11NullptrTest4testEDnDn(
 auto test(nullptr_t x, nullptr_t y) {
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK-NOT: select
-  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %retval
+  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %[[DEST]]
   // CHECK-NEXT: store i8 [[EQ]], i8* %__value_
   // CHECK: ret
   return x <=> y;
@@ -163,22 +162,24 @@ auto test(nullptr_t x, nullptr_t y) {
 namespace ComplexTest {
 
 auto test_float(_Complex float x, _Complex float y) {
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.eq.r = fcmp oeq float %x.real, %y.real
   // CHECK: %cmp.eq.i = fcmp oeq float %x.imag, %y.imag
   // CHECK: %and.eq = and i1 %cmp.eq.r, %cmp.eq.i
   // CHECK: %sel.eq = select i1 %and.eq, i8 [[EQ]], i8 [[NE]]
-  // CHECK: %__value_ = getelementptr inbounds %[[WE]], %[[WE]]* %retval
+  // CHECK: %__value_ = getelementptr inbounds %[[WE]], %[[WE]]* %[[DEST]]
   // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   return x <=> y;
 }
 
 // CHECK-LABEL: @_ZN11ComplexTest8test_intECiS0_(
 auto test_int(_Complex int x, _Complex int y) {
+  // CHECK: %[[DEST:retval|agg.result]]
   // CHECK: %cmp.eq.r = icmp eq i32 %x.real, %y.real
   // CHECK: %cmp.eq.i = icmp eq i32 %x.imag, %y.imag
   // CHECK: %and.eq = and i1 %cmp.eq.r, %cmp.eq.i
   // CHECK: %sel.eq = select i1 %and.eq, i8 [[EQ]], i8 [[NE]]
-  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %retval
+  // CHECK: %__value_ = getelementptr inbounds %[[SE]], %[[SE]]* %[[DEST]]
   // CHECK: store i8 %sel.eq, i8* %__value_, align 1
   return x <=> y;
 }