<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:#0563C1;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:#954F72;
text-decoration:underline;}
p.MsoPlainText, li.MsoPlainText, div.MsoPlainText
{mso-style-priority:99;
mso-style-link:"Plain Text Char";
margin:0in;
margin-bottom:.0001pt;
font-size:10.0pt;
font-family:"Courier New";
color:#2F5496;}
span.PlainTextChar
{mso-style-name:"Plain Text Char";
mso-style-priority:99;
mso-style-link:"Plain Text";
font-family:"Courier New";
color:#2F5496;}
.MsoChpDefault
{mso-style-type:export-only;
font-family:"Calibri",sans-serif;}
@page WordSection1
{size:8.5in 11.0in;
margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-US" link="#0563C1" vlink="#954F72">
<div class="WordSection1">
<p class="MsoPlainText">Hans,<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">The reproducer below generates wrong export symbols compared to MSVC but I am not sure it is related to my change.<o:p></o:p></p>
<p class="MsoPlainText">Compiling this with MSVC generates these symbols:<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><a name="_MailEndCompose">ksh-3.2$ dumpbin /directives t3.obj | grep EXPORT<o:p></o:p></a></p>
<p class="MsoPlainText"> /EXPORT:??4?$d@H@@QEAAAEAV0@AEBV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$d@H@@QEAAAEAV0@$$QEAV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$h@H@f@@QEAAAEAV01@AEBV01@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$h@H@f@@QEAAAEAV01@$$QEAV01@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4i@@QEAAAEAV0@AEBV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4i@@QEAAAEAV0@$$QEAV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Compiling with clang (my patches no included) generate these symbols:<o:p></o:p></p>
<p class="MsoPlainText">ksh-3.2$ dumpbin /directives t3.o | grep EXPORT<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$d@H@@QEAAAEAV0@AEBV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$d@H@@QEAAAEAV0@$$QEAV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$h@H@f@@QEAAAEAV01@AEBV01@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4?$h@H@f@@QEAAAEAV01@$$QEAV01@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4i@@QEAAAEAV0@AEBV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> /EXPORT:??4i@@QEAAAEAV0@$$QEAV0@@Z<o:p></o:p></p>
<p class="MsoPlainText"> <b>/EXPORT:?e@?$d@H@@0W4b@a@@B,DATA </b><b><span style="font-family:Wingdings">รง</span> This is not generated in MSVC.<o:p></o:p></b></p>
<p class="MsoPlainText"><b><o:p> </o:p></b></p>
<p class="MsoPlainText">Although this is a bug that needs to be fixes, it is in my opinion un-related to the patches I have proposed.
<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Your thoughts?<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Thanks.<o:p></o:p></p>
<p class="MsoPlainText">-Zahira<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText"><a name="_____replyseparator"></a>-----Original Message-----<br>
From: hwennborg@google.com [mailto:hwennborg@google.com] On Behalf Of Hans Wennborg<br>
Sent: Monday, February 19, 2018 5:11 AM<br>
To: cfe-commits <cfe-commits@lists.llvm.org>; Ammarguellat, Zahira <zahira.ammarguellat@intel.com><br>
Subject: Re: r324991 - Fix for PR32992. Static const classes not exported.</p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">Reduced repro:<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">$ clang -cc1 -triple i386-pc-windows-msvc19.11.0 -emit-pch -fms-extensions -fms-compatibility -fms-compatibility-version=19.11<o:p></o:p></p>
<p class="MsoPlainText">-std=c++14 -fdelayed-template-parsing -x c++-header a.ii -o /dev/null<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">a.ii:<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">namespace a {<o:p></o:p></p>
<p class="MsoPlainText">enum b { c };<o:p></o:p></p>
<p class="MsoPlainText">}<o:p></o:p></p>
<p class="MsoPlainText">template <typename> class d { static constexpr a::b e = a::c; }; namespace f { template <typename g = int> class h : d<g> {}; } using f::h; class __declspec(dllexport) i : h<> {};<o:p></o:p></p>
<p class="MsoPlainText"><o:p> </o:p></p>
<p class="MsoPlainText">On Wed, Feb 14, 2018 at 4:22 PM, Hans Wennborg <<a href="mailto:hans@chromium.org"><span style="color:#2F5496;text-decoration:none">hans@chromium.org</span></a>> wrote:<o:p></o:p></p>
<p class="MsoPlainText">> I ended up having to revert this in r325133 as it broke the Chromium
<o:p></o:p></p>
<p class="MsoPlainText">> build. Please see<o:p></o:p></p>
<p class="MsoPlainText">> <a href="https://bugs.chromium.org/p/chromium/issues/detail?id=812231#c1">
<span style="color:#2F5496;text-decoration:none">https://bugs.chromium.org/p/chromium/issues/detail?id=812231#c1</span></a> for a
<o:p></o:p></p>
<p class="MsoPlainText">> reproducer.<o:p></o:p></p>
<p class="MsoPlainText">><o:p> </o:p></p>
<p class="MsoPlainText">> On Tue, Feb 13, 2018 at 10:19 AM, Hans Wennborg via cfe-commits
<o:p></o:p></p>
<p class="MsoPlainText">> <<a href="mailto:cfe-commits@lists.llvm.org"><span style="color:#2F5496;text-decoration:none">cfe-commits@lists.llvm.org</span></a>> wrote:<o:p></o:p></p>
<p class="MsoPlainText">>> Author: hans<o:p></o:p></p>
<p class="MsoPlainText">>> Date: Tue Feb 13 01:19:43 2018<o:p></o:p></p>
<p class="MsoPlainText">>> New Revision: 324991<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=324991&view=rev">
<span style="color:#2F5496;text-decoration:none">http://llvm.org/viewvc/llvm-project?rev=324991&view=rev</span></a><o:p></o:p></p>
<p class="MsoPlainText">>> Log:<o:p></o:p></p>
<p class="MsoPlainText">>> Fix for PR32992. Static const classes not exported.<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Patch by zahiraam!<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Differential Revision: <a href="https://reviews.llvm.org/D42968">
<span style="color:#2F5496;text-decoration:none">https://reviews.llvm.org/D42968</span></a><o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Modified:<o:p></o:p></p>
<p class="MsoPlainText">>> cfe/trunk/lib/Sema/SemaDeclCXX.cpp<o:p></o:p></p>
<p class="MsoPlainText">>> cfe/trunk/test/CodeGenCXX/dllexport.cpp<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Modified: cfe/trunk/lib/Sema/SemaDeclCXX.cpp<o:p></o:p></p>
<p class="MsoPlainText">>> URL: <o:p></o:p></p>
<p class="MsoPlainText">>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cp">
<span style="color:#2F5496;text-decoration:none">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclCXX.cp</span></a><o:p></o:p></p>
<p class="MsoPlainText">>> p?rev=324991&r1=324990&r2=324991&view=diff<o:p></o:p></p>
<p class="MsoPlainText">>> =====================================================================<o:p></o:p></p>
<p class="MsoPlainText">>> =========<o:p></o:p></p>
<p class="MsoPlainText">>> --- cfe/trunk/lib/Sema/SemaDeclCXX.cpp (original)<o:p></o:p></p>
<p class="MsoPlainText">>> +++ cfe/trunk/lib/Sema/SemaDeclCXX.cpp Tue Feb 13 01:19:43 2018<o:p></o:p></p>
<p class="MsoPlainText">>> @@ -5476,7 +5476,7 @@ static void CheckAbstractClassUsage(Abst<o:p></o:p></p>
<p class="MsoPlainText">>> }<o:p></o:p></p>
<p class="MsoPlainText">>> }<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> -static void ReferenceDllExportedMethods(Sema &S, CXXRecordDecl
<o:p></o:p></p>
<p class="MsoPlainText">>> *Class) {<o:p></o:p></p>
<p class="MsoPlainText">>> +static void ReferenceDllExportedMembers(Sema &S, CXXRecordDecl
<o:p></o:p></p>
<p class="MsoPlainText">>> +*Class) {<o:p></o:p></p>
<p class="MsoPlainText">>> Attr *ClassAttr = getDLLAttr(Class);<o:p></o:p></p>
<p class="MsoPlainText">>> if (!ClassAttr)<o:p></o:p></p>
<p class="MsoPlainText">>> return;<o:p></o:p></p>
<p class="MsoPlainText">>> @@ -5491,6 +5491,16 @@ static void ReferenceDllExportedMethods(<o:p></o:p></p>
<p class="MsoPlainText">>> return;<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> for (Decl *Member : Class->decls()) {<o:p></o:p></p>
<p class="MsoPlainText">>> + // Defined static variables that are members of an exported base<o:p></o:p></p>
<p class="MsoPlainText">>> + // class must be marked export too. Push them to implicit instantiation<o:p></o:p></p>
<p class="MsoPlainText">>> + // queue.<o:p></o:p></p>
<p class="MsoPlainText">>> + auto *VD = dyn_cast<VarDecl>(Member);<o:p></o:p></p>
<p class="MsoPlainText">>> + if (VD && Member->getAttr<DLLExportAttr>() &&<o:p></o:p></p>
<p class="MsoPlainText">>> + VD->getStorageClass() == SC_Static &&<o:p></o:p></p>
<p class="MsoPlainText">>> + TSK == TSK_ImplicitInstantiation)<o:p></o:p></p>
<p class="MsoPlainText">>> + S.PendingLocalImplicitInstantiations.push_back(<o:p></o:p></p>
<p class="MsoPlainText">>> + std::make_pair(VD, VD->getLocation()));<o:p></o:p></p>
<p class="MsoPlainText">>> +<o:p></o:p></p>
<p class="MsoPlainText">>> auto *MD = dyn_cast<CXXMethodDecl>(Member);<o:p></o:p></p>
<p class="MsoPlainText">>> if (!MD)<o:p></o:p></p>
<p class="MsoPlainText">>> continue;<o:p></o:p></p>
<p class="MsoPlainText">>> @@ -10902,12 +10912,12 @@ void Sema::ActOnFinishCXXNonNestedClass(<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> void Sema::referenceDLLExportedClassMethods() {<o:p></o:p></p>
<p class="MsoPlainText">>> if (!DelayedDllExportClasses.empty()) {<o:p></o:p></p>
<p class="MsoPlainText">>> - // Calling ReferenceDllExportedMethods might cause the current function to<o:p></o:p></p>
<p class="MsoPlainText">>> + // Calling ReferenceDllExportedMembers might cause the current
<o:p></o:p></p>
<p class="MsoPlainText">>> + function to<o:p></o:p></p>
<p class="MsoPlainText">>> // be called again, so use a local copy of DelayedDllExportClasses.<o:p></o:p></p>
<p class="MsoPlainText">>> SmallVector<CXXRecordDecl *, 4> WorkList;<o:p></o:p></p>
<p class="MsoPlainText">>> std::swap(DelayedDllExportClasses, WorkList);<o:p></o:p></p>
<p class="MsoPlainText">>> for (CXXRecordDecl *Class : WorkList)<o:p></o:p></p>
<p class="MsoPlainText">>> - ReferenceDllExportedMethods(*this, Class);<o:p></o:p></p>
<p class="MsoPlainText">>> + ReferenceDllExportedMembers(*this, Class);<o:p></o:p></p>
<p class="MsoPlainText">>> }<o:p></o:p></p>
<p class="MsoPlainText">>> }<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> Modified: cfe/trunk/test/CodeGenCXX/dllexport.cpp<o:p></o:p></p>
<p class="MsoPlainText">>> URL: <o:p></o:p></p>
<p class="MsoPlainText">>> <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dllexpo">
<span style="color:#2F5496;text-decoration:none">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dllexpo</span></a><o:p></o:p></p>
<p class="MsoPlainText">>> rt.cpp?rev=324991&r1=324990&r2=324991&view=diff<o:p></o:p></p>
<p class="MsoPlainText">>> =====================================================================<o:p></o:p></p>
<p class="MsoPlainText">>> =========<o:p></o:p></p>
<p class="MsoPlainText">>> --- cfe/trunk/test/CodeGenCXX/dllexport.cpp (original)<o:p></o:p></p>
<p class="MsoPlainText">>> +++ cfe/trunk/test/CodeGenCXX/dllexport.cpp Tue Feb 13 01:19:43 2018<o:p></o:p></p>
<p class="MsoPlainText">>> @@ -28,6 +28,7 @@ struct External { int v; };<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> // The vftable for struct W is comdat largest because we have RTTI.<o:p></o:p></p>
<p class="MsoPlainText">>> // M32-DAG: $"\01??_7W@@6B@" = comdat largest<o:p></o:p></p>
<p class="MsoPlainText">>> +// M32-DAG: $"\01?smember@?$Base@H@PR32992@@0HA" = comdat any<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> <o:p></o:p></p>
<p class="MsoPlainText">>> //===----------------------------------------------------------------<o:p></o:p></p>
<p class="MsoPlainText">>> ------===// @@ -977,3 +978,21 @@ class __declspec(dllexport)
<o:p></o:p></p>
<p class="MsoPlainText">>> ACE_Service_ // MSVC2015-DAG: define weak_odr dllexport
<o:p></o:p></p>
<p class="MsoPlainText">>> {{.+}}ACE_Service_Object@@Q{{.+}}@$$Q<o:p></o:p></p>
<p class="MsoPlainText">>> // The declarations should not be exported.<o:p></o:p></p>
<p class="MsoPlainText">>> // MSVC2013-NOT: define weak_odr dllexport <o:p></o:p></p>
<p class="MsoPlainText">>> {{.+}}ACE_Service_Object@@Q{{.+}}@$$Q<o:p></o:p></p>
<p class="MsoPlainText">>> +<o:p></o:p></p>
<p class="MsoPlainText">>> +namespace PR32992 {<o:p></o:p></p>
<p class="MsoPlainText">>> +// Static data members of a instantiated base class should be exported.<o:p></o:p></p>
<p class="MsoPlainText">>> +template <class T><o:p></o:p></p>
<p class="MsoPlainText">>> +class Base {<o:p></o:p></p>
<p class="MsoPlainText">>> + virtual void myfunc() {}<o:p></o:p></p>
<p class="MsoPlainText">>> + static int smember;<o:p></o:p></p>
<p class="MsoPlainText">>> +};<o:p></o:p></p>
<p class="MsoPlainText">>> +// MS-DAG: @"\01?smember@?$Base@H@PR32992@@0HA" = weak_odr
<o:p></o:p></p>
<p class="MsoPlainText">>> +dllexport global i32 77, comdat, align 4 template <class T> int
<o:p></o:p></p>
<p class="MsoPlainText">>> +Base<T>::smember = 77; template <class T> class <o:p>
</o:p></p>
<p class="MsoPlainText">>> +__declspec(dllexport) Derived2 : Base<T> {<o:p></o:p></p>
<p class="MsoPlainText">>> + void myfunc() {}<o:p></o:p></p>
<p class="MsoPlainText">>> +};<o:p></o:p></p>
<p class="MsoPlainText">>> +class Derived : public Derived2<int> {<o:p></o:p></p>
<p class="MsoPlainText">>> + void myfunc() {}<o:p></o:p></p>
<p class="MsoPlainText">>> +};<o:p></o:p></p>
<p class="MsoPlainText">>> +} // namespace PR32992<o:p></o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>><o:p> </o:p></p>
<p class="MsoPlainText">>> _______________________________________________<o:p></o:p></p>
<p class="MsoPlainText">>> cfe-commits mailing list<o:p></o:p></p>
<p class="MsoPlainText">>> <a href="mailto:cfe-commits@lists.llvm.org"><span style="color:#2F5496;text-decoration:none">cfe-commits@lists.llvm.org</span></a><o:p></o:p></p>
<p class="MsoPlainText">>> <a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits">
<span style="color:#2F5496;text-decoration:none">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</span></a><o:p></o:p></p>
</div>
</body>
</html>