[llvm-commits] [llvm] r106569 - in /llvm/trunk/test/FrontendC++: thunk-linkonce-odr.cpp thunk-weak-odr.cpp

[Bill Wendling]

Author: void
Date: Tue Jun 22 15:30:14 2010
New Revision: 106569

URL: http://llvm.org/viewvc/llvm-project?rev=106569&view=rev
Log:
Corresponding test changes for r106564.

Added:
    llvm/trunk/test/FrontendC++/thunk-linkonce-odr.cpp
      - copied, changed from r106499, llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp
Removed:
    llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp

Copied: llvm/trunk/test/FrontendC++/thunk-linkonce-odr.cpp (from r106499, llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/thunk-linkonce-odr.cpp?p2=llvm/trunk/test/FrontendC%2B%2B/thunk-linkonce-odr.cpp&p1=llvm/trunk/test/FrontendC%2B%2B/thunk-weak-odr.cpp&r1=106499&r2=106569&rev=106569&view=diff
==============================================================================
--- llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp (original)
+++ llvm/trunk/test/FrontendC++/thunk-linkonce-odr.cpp Tue Jun 22 15:30:14 2010
@@ -1,5 +1,5 @@
 // RUN: %llvmgxx %s -S -o - | FileCheck %s
-// <rdar://problem/7929157>
+// <rdar://problem/7929157> & <rdar://problem/8104369>
 
 struct A {
   virtual int f() { return 1; }
@@ -27,7 +27,7 @@
   return f(&d);
 }
 
-// Thunks should be marked as "weak ODR", not just "weak".
+// Thunks should be marked as "linkonce ODR" not "weak".
 //
-// CHECK: define weak_odr i32 @_ZThn{{[48]}}_N1C1fEv
-// CHECK: define weak_odr i32 @_ZThn{{[48]}}_N1D1fEv
+// CHECK: define linkonce_odr i32 @_ZThn{{[48]}}_N1C1fEv
+// CHECK: define linkonce_odr i32 @_ZThn{{[48]}}_N1D1fEv

Removed: llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC%2B%2B/thunk-weak-odr.cpp?rev=106568&view=auto
==============================================================================
--- llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp (original)
+++ llvm/trunk/test/FrontendC++/thunk-weak-odr.cpp (removed)
@@ -1,33 +0,0 @@
-// RUN: %llvmgxx %s -S -o - | FileCheck %s
-// <rdar://problem/7929157>
-
-struct A {
-  virtual int f() { return 1; }
-};
-
-struct B {
-  virtual int f() { return 2; }
-};
-
-struct C : A, B {
-  virtual int f() { return 3; }
-};
-
-struct D : C {
-  virtual int f() { return 4; }
-};
-
-static int f(D* d) {
-  B* b = d;
-  return b->f();
-};
-
-int g() {
-  D d;
-  return f(&d);
-}
-
-// Thunks should be marked as "weak ODR", not just "weak".
-//
-// CHECK: define weak_odr i32 @_ZThn{{[48]}}_N1C1fEv
-// CHECK: define weak_odr i32 @_ZThn{{[48]}}_N1D1fEv