[llvm-branch-commits] [cfe-branch] r134794 - in /cfe/branches/type-system-rewrite/test: CXX/except/except.spec/p14-ir.cpp CodeGenObjC/arc.m

[Chris Lattner]

Author: lattner
Date: Sat Jul  9 00:34:07 2011
New Revision: 134794

URL: http://llvm.org/viewvc/llvm-project?rev=134794&view=rev
Log:
tweak tests now that IR isn't unifying unrelated types that happen to be strucuturally equiv.

Modified:
    cfe/branches/type-system-rewrite/test/CXX/except/except.spec/p14-ir.cpp
    cfe/branches/type-system-rewrite/test/CodeGenObjC/arc.m

Modified: cfe/branches/type-system-rewrite/test/CXX/except/except.spec/p14-ir.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/type-system-rewrite/test/CXX/except/except.spec/p14-ir.cpp?rev=134794&r1=134793&r2=134794&view=diff
==============================================================================
--- cfe/branches/type-system-rewrite/test/CXX/except/except.spec/p14-ir.cpp (original)
+++ cfe/branches/type-system-rewrite/test/CXX/except/except.spec/p14-ir.cpp Sat Jul  9 00:34:07 2011
@@ -26,12 +26,12 @@
 struct X5 : X0, X4 { };
 
 void test(X2 x2, X3 x3, X5 x5) {
-  // CHECK: define linkonce_odr void @_ZN2X2C1ERKS_(%struct.X0* %this, %struct.X0*) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X2C1ERKS_(%struct.X2* %this, %struct.X2*) unnamed_addr
   // CHECK:      call void @_ZN2X2C2ERKS_({{.*}}) nounwind
   // CHECK-NEXT: ret void
   // CHECK-NEXT: }
   X2 x2a(x2);
-  // CHECK: define linkonce_odr void @_ZN2X3C1ERKS_(%struct.X0* %this, %struct.X0*) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X3C1ERKS_(%struct.X3* %this, %struct.X3*) unnamed_addr
   // CHECK:      call void @_ZN2X3C2ERKS_({{.*}}) nounwind
   // CHECK-NEXT: ret void
   // CHECK-NEXT: }
@@ -55,24 +55,25 @@
 struct X9 : X6, X7 { };
 
 void test() {
-  // CHECK: define linkonce_odr void @_ZN2X8C1Ev(%struct.X0* %this) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X8C1Ev(%struct.X8* %this) unnamed_addr
   // CHECK:      call void @_ZN2X8C2Ev({{.*}}) nounwind
   // CHECK-NEXT: ret void
   X8();
 
-  // CHECK: define linkonce_odr void @_ZN2X9C1Ev(%struct.X0* %this) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X9C1Ev(%struct.X9* %this) unnamed_addr
   //   FIXME: check that this is the end of the line here:
   // CHECK:      call void @_ZN2X9C2Ev({{.*}})
   // CHECK-NEXT: ret void
   X9();
 
-  // CHECK: define linkonce_odr void @_ZN2X9C2Ev(%struct.X0* %this) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X9C2Ev(%struct.X9* %this) unnamed_addr
   // CHECK:      call void @_ZN2X6C2Ev({{.*}}) nounwind
   //   FIXME: and here:
+  // CHECK-NEXT: bitcast
   // CHECK-NEXT: call void @_ZN2X7C2Ev({{.*}})
   // CHECK: ret void
 
-  // CHECK: define linkonce_odr void @_ZN2X8C2Ev(%struct.X0* %this) unnamed_addr
+  // CHECK: define linkonce_odr void @_ZN2X8C2Ev(%struct.X8* %this) unnamed_addr
   // CHECK:      call void @_ZN2X6C2Ev({{.*}}) nounwind
   // CHECK-NEXT: ret void
 }

Modified: cfe/branches/type-system-rewrite/test/CodeGenObjC/arc.m
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/type-system-rewrite/test/CodeGenObjC/arc.m?rev=134794&r1=134793&r2=134794&view=diff
==============================================================================
--- cfe/branches/type-system-rewrite/test/CodeGenObjC/arc.m (original)
+++ cfe/branches/type-system-rewrite/test/CodeGenObjC/arc.m Sat Jul  9 00:34:07 2011
@@ -1200,7 +1200,7 @@
   // CHECK-NEXT: call void @objc_release(i8* [[T1]])
 
   // CHECK:    define internal void @__test38_block_invoke_
-  // CHECK:      [[SLOT:%.*]] = getelementptr inbounds [[BYREF_T]]* {{.*}}, i32 0, i32 6
+  // CHECK:      [[SLOT:%.*]] = getelementptr inbounds {{.*}}, i32 0, i32 6
   // CHECK-NEXT: [[T0:%.*]] = load i8** [[SLOT]], align 8
   // CHECK-NEXT: store i8* null, i8** [[SLOT]],
   // CHECK-NEXT: call void @objc_release(i8* [[T0]])
@@ -1276,7 +1276,7 @@
   // CHECK-NEXT: call void @objc_destroyWeak(i8** [[T0]])
 
   // CHECK:    define internal void @__test40_block_invoke_
-  // CHECK:      [[SLOT:%.*]] = getelementptr inbounds [[BYREF_T]]* {{%.*}}, i32 0, i32 6
+  // CHECK:      [[SLOT:%.*]] = getelementptr inbounds {{.*}}, i32 0, i32 6
   // CHECK-NEXT: call i8* @objc_storeWeak(i8** [[SLOT]], i8* null)
   // CHECK-NEXT: ret void