Revert r236879, "Do not emit thunks with available_externally linkage in comdats"

It broke pecoff, at least i686-cygwin.

llvm-svn: 236937

1 files changed, 1 insertions, 26 deletions

diff --git a/clang/test/CodeGenCXX/thunks.cpp b/clang/test/CodeGenCXX/thunks.cpp
index 255017057ca..2287d65a286 100644
--- a/clang/test/CodeGenCXX/thunks.cpp
+++ b/clang/test/CodeGenCXX/thunks.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 %s -triple=x86_64-pc-linux-gnu -munwind-tables -emit-llvm -o - | FileCheck %s
-// RUN: %clang_cc1 %s -triple=x86_64-pc-linux-gnu -munwind-tables -emit-llvm -o - -O1 -disable-llvm-optzns | FileCheck %s --check-prefix=CHECK --check-prefix=CHECKOPT
+// RUN: %clang_cc1 %s -triple=x86_64-pc-linux-gnu -munwind-tables -emit-llvm -o - -O1 -disable-llvm-optzns | FileCheck %s
 
 namespace Test1 {
 
@@ -361,28 +361,6 @@ namespace Test15 {
   // CHECK: declare void @_ZThn8_N6Test151C1fEiz
 }
 
-namespace Test16 {
-
-// Check that the thunk for 'B::f' has available_externally linkage
-// and is not in a comdat.
-
-template <class C>
-struct A {
-  virtual void f();
-};
-
-template <class D>
-struct B : virtual A<D> {
-  virtual void f() { }
-};
-
-extern template struct B<int>;
-
-void f(B<int> b) {
-  b.f();
-}
-}
-
 /**** The following has to go at the end of the file ****/
 
 // This is from Test5:
@@ -393,7 +371,4 @@ void f(B<int> b) {
 // CHECK-LABEL: define linkonce_odr void @_ZN6Test101C3fooEv
 // CHECK-LABEL: define linkonce_odr void @_ZThn8_N6Test101C3fooEv
 
-// CHECKOPT-LABEL: define available_externally void @_ZTv0_n24_N6Test161BIiE1fEv
-// CHECKOPT-NOT: comdat
-
 // CHECK: attributes [[NUW]] = { nounwind uwtable{{.*}} }