From 8f99e9413f49f89d1c29e1c083068b9aedbbee4e Mon Sep 17 00:00:00 2001 From: Stephen Lin Date: Tue, 18 Jun 2013 20:51:51 +0000 Subject: Partially revert r184225 test changes and make a smaller and more generic fix. llvm-svn: 184232 --- clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp | 10 +++------- .../test/CodeGenCXX/default-constructor-template-member.cpp | 13 ++++--------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp index e84ffd93bee..03c66339947 100644 --- a/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp +++ b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp @@ -1,11 +1,7 @@ -// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-linux | FileCheck --check-prefix=CHECKX86 %s -// RUN: %clang_cc1 %s -emit-llvm -o - -triple=arm-linux-gnueabihf | FileCheck --check-prefix=CHECKARM %s +// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s struct A { virtual void a(); }; A x(A& y) { return y; } -// CHECKX86: define linkonce_odr {{.*}} @_ZN1AC1ERKS_(%struct.A* %this, %struct.A*) unnamed_addr -// CHECKX86: store i8** getelementptr inbounds ([3 x i8*]* @_ZTV1A, i64 0, i64 2) - -// CHECKARM: define linkonce_odr {{.*}} @_ZN1AC1ERKS_(%struct.A* returned %this, %struct.A*) unnamed_addr -// CHECKARM: store i8** getelementptr inbounds ([3 x i8*]* @_ZTV1A, i64 0, i64 2) +// CHECK: define linkonce_odr {{.*}} @_ZN1AC1ERKS_(%struct.A* {{.*}}%this, %struct.A*) unnamed_addr +// CHECK: store i8** getelementptr inbounds ([3 x i8*]* @_ZTV1A, i64 0, i64 2) diff --git a/clang/test/CodeGenCXX/default-constructor-template-member.cpp b/clang/test/CodeGenCXX/default-constructor-template-member.cpp index 27f2ba26202..215696405a4 100644 --- a/clang/test/CodeGenCXX/default-constructor-template-member.cpp +++ b/clang/test/CodeGenCXX/default-constructor-template-member.cpp @@ -1,5 +1,4 @@ -// RUN: %clang_cc1 %s -emit-llvm -o - -triple=i686-unknown-linux | FileCheck --check-prefix=CHECKX86 %s -// RUN: %clang_cc1 %s -emit-llvm -o - -triple=arm-linux-gnueabihf | FileCheck --check-prefix=CHECKARM %s +// RUN: %clang_cc1 -emit-llvm %s -o - | FileCheck %s template struct A { A(); }; struct B { A x; }; @@ -7,10 +6,6 @@ void a() { B b; } -// CHECKX86: call {{.*}} @_ZN1BC1Ev -// CHECKX86: define linkonce_odr {{.*}} @_ZN1BC1Ev(%struct.B* %this) unnamed_addr -// CHECKX86: call {{.*}} @_ZN1AIiEC1Ev - -// CHECKARM: call {{.*}} @_ZN1BC1Ev -// CHECKARM: define linkonce_odr {{.*}} @_ZN1BC1Ev(%struct.B* returned %this) unnamed_addr -// CHECKARM: call {{.*}} @_ZN1AIiEC1Ev +// CHECK: call {{.*}} @_ZN1BC1Ev +// CHECK: define linkonce_odr {{.*}} @_ZN1BC1Ev(%struct.B* {{.*}}%this) unnamed_addr +// CHECK: call {{.*}} @_ZN1AIiEC1Ev -- cgit v1.2.3