From: Reid Kleckner <rnk@google.com>
Date: Fri, 30 Jun 2017 16:11:49 +0000 (+0000)
Subject: Revert "[CodeGen] Propagate dllexport to thunks"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=813f275eefb9ba53f20d56badfde964016f16341;p=clang

Revert "[CodeGen] Propagate dllexport to thunks"

This reverts r306770, it causes LNK4102 warnings in MSVC builds.

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

diff --git a/lib/CodeGen/CGVTables.cpp b/lib/CodeGen/CGVTables.cpp
index 7c9f07d32d..64b6d0d3fe 100644
--- a/lib/CodeGen/CGVTables.cpp
+++ b/lib/CodeGen/CGVTables.cpp
@@ -64,10 +64,6 @@ static void setThunkProperties(CodeGenModule &CGM, const ThunkInfo &Thunk,
   const CXXMethodDecl *MD = cast<CXXMethodDecl>(GD.getDecl());
   setThunkVisibility(CGM, MD, Thunk, ThunkFn);
 
-  // Propagate dllexport storage.
-  if (MD->hasAttr<DLLExportAttr>())
-    ThunkFn->setDLLStorageClass(llvm::GlobalValue::DLLExportStorageClass);
-
   if (CGM.supportsCOMDAT() && ThunkFn->isWeakForLinker())
     ThunkFn->setComdat(CGM.getModule().getOrInsertComdat(ThunkFn->getName()));
 }
diff --git a/test/CodeGenCXX/windows-itanium-dllexport.cpp b/test/CodeGenCXX/windows-itanium-dllexport.cpp
index ffb8f610f5..ff780c7778 100644
--- a/test/CodeGenCXX/windows-itanium-dllexport.cpp
+++ b/test/CodeGenCXX/windows-itanium-dllexport.cpp
@@ -53,12 +53,3 @@ USEMEMFUNC(outer<char>::inner, f)
 
 // CHECK: declare dllimport {{.*}} @_ZN5outerIcE1fEv
 // CHECK: define {{.*}} @_ZN5outerIcE5inner1fEv
-
-struct base {
-  virtual ~base();
-};
-struct __declspec(dllexport) derived : public virtual base {
-  virtual ~derived() {}
-};
-
-// CHECK: define {{.*}} dllexport {{.*}} @_ZTv0_n12_N7derivedD0Ev