Corresponding test changes for r106564.

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

diff --git a/test/FrontendC++/thunk-linkonce-odr.cpp b/test/FrontendC++/thunk-linkonce-odr.cpp
new file mode 100644 (file)
index 0000000..ad72e64
--- /dev/null
+++ b/test/FrontendC++/thunk-linkonce-odr.cpp
@@ -0,0 +1,33 @@
+// RUN: %llvmgxx %s -S -o - | FileCheck %s
+// <rdar://problem/7929157> & <rdar://problem/8104369>
+
+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 "linkonce ODR" not "weak".
+//
+// CHECK: define linkonce_odr i32 @_ZThn{{[48]}}_N1C1fEv
+// CHECK: define linkonce_odr i32 @_ZThn{{[48]}}_N1D1fEv

diff --git a/test/FrontendC++/thunk-weak-odr.cpp b/test/FrontendC++/thunk-weak-odr.cpp
deleted file mode 100644 (file)
index 1d9d4dd..0000000
--- a/test/FrontendC++/thunk-weak-odr.cpp
+++ /dev/null
@@ -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