<div dir="ltr"><div dir="ltr">Done in 358232. Thanks!</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Apr 11, 2019 at 5:19 PM Yu, Jennifer <<a href="mailto:jennifer.yu@intel.com">jennifer.yu@intel.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div lang="EN-US">
<div class="gmail-m_-3378690069479697153WordSection1">
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Hi Nico,<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Iet’s revert it now. I will try to re-submit latter.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Thanks.<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Jennifer<u></u><u></u></span></p>
<p class="MsoNormal"><a name="m_-3378690069479697153__MailEndCompose"><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></a></p>
<p class="MsoNormal"><a name="m_-3378690069479697153______replyseparator"></a><b><span style="font-size:11pt;font-family:Calibri,sans-serif">From:</span></b><span style="font-size:11pt;font-family:Calibri,sans-serif"> Nico Weber [mailto:<a href="mailto:thakis@chromium.org" target="_blank">thakis@chromium.org</a>]
<br>
<b>Sent:</b> Thursday, April 11, 2019 2:04 PM<br>
<b>To:</b> Yu, Jennifer <<a href="mailto:jennifer.yu@intel.com" target="_blank">jennifer.yu@intel.com</a>><br>
<b>Cc:</b> cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>><br>
<b>Subject:</b> Re: r357610 - Bug-40323: MS ABI adding template static member in the linker directive section to make sure init function can be called before main.<u></u><u></u></span></p>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal">Hi Jennifer,<u></u><u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">this caused <a href="https://bugs.llvm.org/show_bug.cgi?id=41471" target="_blank">https://bugs.llvm.org/show_bug.cgi?id=41471</a><u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><br>
Do you think this is easy to fix, or should we revert for now?<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">Thanks,<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal">Nico<u></u><u></u></p>
</div>
</div>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<div>
<p class="MsoNormal">On Wed, Apr 3, 2019 at 1:20 PM Jennifer Yu via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>> wrote:<u></u><u></u></p>
</div>
<blockquote style="border-top:none;border-right:none;border-bottom:none;border-left:1pt solid rgb(204,204,204);padding:0in 0in 0in 6pt;margin-left:4.8pt;margin-right:0in">
<p class="MsoNormal">Author: jyu2<br>
Date: Wed Apr 3 10:21:40 2019<br>
New Revision: 357610<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=357610&view=rev" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=357610&view=rev</a><br>
Log:<br>
Bug-40323: MS ABI adding template static member in the linker directive section to make sure init function can be called before main.<br>
<br>
Added:<br>
cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp<br>
Modified:<br>
cfe/trunk/lib/CodeGen/CGDeclCXX.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/CGDeclCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDeclCXX.cpp?rev=357610&r1=357609&r2=357610&view=diff" target="_blank">
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGDeclCXX.cpp?rev=357610&r1=357609&r2=357610&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/CGDeclCXX.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/CGDeclCXX.cpp Wed Apr 3 10:21:40 2019<br>
@@ -481,6 +481,12 @@ CodeGenModule::EmitCXXGlobalVarDeclInitF<br>
// minor startup time optimization. In the MS C++ ABI, there are no guard<br>
// variables, so this COMDAT key is required for correctness.<br>
AddGlobalCtor(Fn, 65535, COMDATKey);<br>
+ if (getTarget().getCXXABI().isMicrosoft()) {<br>
+ // In The MS C++, MS add template static data member in the linker<br>
+ // drective.<br>
+ assert(COMDATKey);<br>
+ addUsedGlobal(COMDATKey);<br>
+ }<br>
} else if (D->hasAttr<SelectAnyAttr>()) {<br>
// SelectAny globals will be comdat-folded. Put the initializer into a<br>
// COMDAT group associated with the global, so the initializers get folded<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp?rev=357610&view=auto" target="_blank">
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp?rev=357610&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/microsoft-abi-template-static-init.cpp Wed Apr 3 10:21:40 2019<br>
@@ -0,0 +1,57 @@<br>
+// RUN: %clang_cc1 %s -triple=i686-pc-win32 -fms-extensions -emit-llvm -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple=x86_64-pc-win32 -fms-extensions -emit-llvm -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple=i686-pc-windows-msvc -fms-extensions -emit-llvm -o - | FileCheck %s<br>
+// RUN: %clang_cc1 %s -triple=x86_64-pc-windows-msvc -fms-extensions -emit-llvm -o - | FileCheck %s<br>
+<br>
+struct S {<br>
+ S();<br>
+ ~S();<br>
+};<br>
+<br>
+template <typename T> struct __declspec(dllexport) ExportedTemplate {<br>
+ static S s;<br>
+};<br>
+template <typename T> S ExportedTemplate<T>::s;<br>
+void useExportedTemplate(ExportedTemplate<int> x) {<br>
+ (void)x.s;<br>
+}<br>
+int f();<br>
+namespace selectany_init {<br>
+// MS don't put selectany static var in the linker directive, init routine<br>
+// f() is not getting called if x is not referenced.<br>
+int __declspec(selectany) x = f();<br>
+}<br>
+<br>
+namespace explicit_template_instantiation {<br>
+template <typename T> struct A { static int x; };<br>
+template <typename T> int A<T>::x = f();<br>
+template struct A<int>;<br>
+}<br>
+<br>
+namespace implicit_template_instantiation {<br>
+template <typename T> struct A { static int x; };<br>
+template <typename T> int A<T>::x = f();<br>
+int g() { return A<int>::x; }<br>
+}<br>
+<br>
+<br>
+template <class T><br>
+struct X_ {<br>
+ static T ioo;<br>
+ static T init();<br>
+};<br>
+template <class T> T X_<T>::ioo = X_<T>::init();<br>
+template struct X_<int>;<br>
+<br>
+template <class T><br>
+struct X {<br>
+ static T ioo;<br>
+ static T init();<br>
+};<br>
+// template specialized static data don't need in llvm.used,<br>
+// the static init routine get call from _GLOBAL__sub_I_ routines.<br>
+template <> int X<int>::ioo = X<int>::init();<br>
+template struct X<int>;<br>
+// CHECK: @llvm.global_ctors = appending global [6 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @"??__Ex@selectany_init@@YAXXZ", i8* bitcast (i32* @"?x@selectany_init@@3HA" to i8*) }, { i32, void ()*, i8* } { i32 65535, void ()*
@"??__E?x@?$A@H@explicit_template_instantiation@@2HA@@YAXXZ", i8* bitcast (i32* @"?x@?$A@H@explicit_template_instantiation@@2HA" to i8*) }, { i32, void ()*, i8* } { i32 65535, void ()* @"??__E?ioo@?$X_@H@@2HA@@YAXXZ", i8* bitcast (i32* @"?ioo@?$X_@H@@2HA"
to i8*) }, { i32, void ()*, i8* } { i32 65535, void ()* @"??__E?s@?$ExportedTemplate@H@@2US@@A@@YAXXZ", i8* getelementptr inbounds (%struct.S, %struct.S* @"?s@?$ExportedTemplate@H@@2US@@A", i32 0, i32 0) }, { i32, void ()*, i8* } { i32 65535, void ()* @"??__E?x@?$A@H@implicit_template_instantiation@@2HA@@YAXXZ",
i8* bitcast (i32* @"?x@?$A@H@implicit_template_instantiation@@2HA" to i8*) }, { i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_microsoft_abi_template_static_init.cpp, i8* null }]<br>
+// CHECK: @llvm.used = appending global [4 x i8*] [i8* bitcast (i32* @"?x@?$A@H@explicit_template_instantiation@@2HA" to i8*), i8* bitcast (i32* @"?ioo@?$X_@H@@2HA" to i8*), i8* getelementptr inbounds (%struct.S, %struct.S* @"?s@?$ExportedTemplate@H@@2US@@A",
i32 0, i32 0), i8* bitcast (i32* @"?x@?$A@H@implicit_template_instantiation@@2HA" to i8*)], section "llvm.metadata"<br>
+<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><u></u><u></u></p>
</blockquote>
</div>
</div>
</div>
</blockquote></div>