<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jul 11, 2016 at 11:45 AM, Robinson, Paul <span dir="ltr"><<a href="mailto:paul.robinson@sony.com" target="_blank">paul.robinson@sony.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">





<div lang="EN-US" link="blue" vlink="purple">
<div>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">It was not particularly obvious that by "static local variables" you actually meant "template static data members."<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">Now I can tell that this is not addressing what I was asking about in the comment on r274986.</span></p></div></div></blockquote><div><br></div><div>I'm not sure I understand.  How is this not addressing what you are asking for?  We will no longer emit a DIGlobalVariable for the imported static data member.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div lang="EN-US" link="blue" vlink="purple"><div><p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u><u></u></span></p>
<p class="MsoNormal"><a name="m_3121086262564605376__MailEndCompose"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d">--paulr<u></u><u></u></span></a></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1f497d"><u></u> <u></u></span></p>
<div style="border:none;border-left:solid blue 1.5pt;padding:0in 0in 0in 4.0pt">
<div>
<div style="border:none;border-top:solid #b5c4df 1.0pt;padding:3.0pt 0in 0in 0in">
<p class="MsoNormal"><b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> David Majnemer [mailto:<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>]
<br>
<b>Sent:</b> Monday, July 11, 2016 9:53 AM<br>
<b>To:</b> Robinson, Paul<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: r275040 - [CodeGen] Treat imported static local variables as declarations<u></u><u></u></span></p>
</div>
</div><div><div class="h5">
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
<div>
<p class="MsoNormal">On Mon, Jul 11, 2016 at 9:48 AM, Robinson, Paul <<a href="mailto:paul.robinson@sony.com" target="_blank">paul.robinson@sony.com</a>> wrote:<u></u><u></u></p>
<p class="MsoNormal">This changes the IR but not the debug-info metadata?<br>
--paulr<u></u><u></u></p>
<div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
<div>
<p class="MsoNormal">The net effect is that the debug-info metadata is not generated for such static members.<u></u><u></u></p>
</div>
<div>
<p class="MsoNormal"> <u></u><u></u></p>
</div>
<blockquote style="border:none;border-left:solid #cccccc 1.0pt;padding:0in 0in 0in 6.0pt;margin-left:4.8pt;margin-right:0in">
<div>
<div>
<p class="MsoNormal"><br>
> -----Original Message-----<br>
> From: cfe-commits [mailto:<a href="mailto:cfe-commits-bounces@lists.llvm.org" target="_blank">cfe-commits-bounces@lists.llvm.org</a>] On Behalf Of<br>
> David Majnemer via cfe-commits<br>
> Sent: Sunday, July 10, 2016 9:28 PM<br>
> To: <a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
> Subject: r275040 - [CodeGen] Treat imported static local variables as<br>
> declarations<br>
><br>
> Author: majnemer<br>
> Date: Sun Jul 10 23:28:21 2016<br>
> New Revision: 275040<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=275040&view=rev" target="_blank">
http://llvm.org/viewvc/llvm-project?rev=275040&view=rev</a><br>
> Log:<br>
> [CodeGen] Treat imported static local variables as declarations<br>
><br>
> Imported variables cannot really be definitions for the purposes of<br>
> IR generation.<br>
><br>
> Modified:<br>
>     cfe/trunk/lib/CodeGen/CGDeclCXX.cpp<br>
>     cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
>     cfe/trunk/test/CodeGenCXX/dllimport.cpp<br>
><br>
> Modified: cfe/trunk/lib/CodeGen/CGDeclCXX.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> project/cfe/trunk/lib/CodeGen/CGDeclCXX.cpp?rev=275040&r1=275039&r2=275040<br>
> &view=diff<br>
> ==========================================================================<br>
> ====<br>
> --- cfe/trunk/lib/CodeGen/CGDeclCXX.cpp (original)<br>
> +++ cfe/trunk/lib/CodeGen/CGDeclCXX.cpp Sun Jul 10 23:28:21 2016<br>
> @@ -323,10 +323,6 @@ CodeGenModule::EmitCXXGlobalVarDeclInitF<br>
>         D->hasAttr<CUDASharedAttr>()))<br>
>      return;<br>
><br>
> -  // DLL imported variables will be initialized by the export side.<br>
> -  if (D->hasAttr<DLLImportAttr>())<br>
> -    return;<br>
> -<br>
>    // Check if we've already initialized this decl.<br>
>    auto I = DelayedCXXInitPosition.find(D);<br>
>    if (I != DelayedCXXInitPosition.end() && I->second == ~0U)<br>
><br>
> Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=275040&r1=275039&r2=27<br>
> 5040&view=diff<br>
> ==========================================================================<br>
> ====<br>
> --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)<br>
> +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Sun Jul 10 23:28:21 2016<br>
> @@ -2851,6 +2851,10 @@ static void ReplaceUsesOfNonProtoTypeWit<br>
>  }<br>
><br>
>  void CodeGenModule::HandleCXXStaticMemberVarInstantiation(VarDecl *VD) {<br>
> +  auto DK = VD->isThisDeclarationADefinition();<br>
> +  if (DK == VarDecl::Definition && VD->hasAttr<DLLImportAttr>())<br>
> +    return;<br>
> +<br>
>    TemplateSpecializationKind TSK = VD->getTemplateSpecializationKind();<br>
>    // If we have a definition, this might be a deferred decl. If the<br>
>    // instantiation is explicit, make sure we emit it at the end.<br>
><br>
> Modified: cfe/trunk/test/CodeGenCXX/dllimport.cpp<br>
> URL: <a href="http://llvm.org/viewvc/llvm-" target="_blank">http://llvm.org/viewvc/llvm-</a><br>
> project/cfe/trunk/test/CodeGenCXX/dllimport.cpp?rev=275040&r1=275039&r2=27<br>
> 5040&view=diff<br>
> ==========================================================================<br>
> ====<br>
> --- cfe/trunk/test/CodeGenCXX/dllimport.cpp (original)<br>
> +++ cfe/trunk/test/CodeGenCXX/dllimport.cpp Sun Jul 10 23:28:21 2016<br>
> @@ -676,7 +676,7 @@ namespace ClassTemplateStaticDef {<br>
>      static int x;<br>
>    };<br>
>    template <typename T> int S<T>::x;<br>
> -  // MSC-DAG: @"\01?x@?$S@H@ClassTemplateStaticDef@@2HA" =<br>
> available_externally dllimport global i32 0<br>
> +  // MSC-DAG: @"\01?x@?$S@H@ClassTemplateStaticDef@@2HA" = external<br>
> dllimport global i32<br>
>    int f() { return S<int>::x; }<br>
><br>
>    // Partial class template specialization static field:<br>
> @@ -685,7 +685,7 @@ namespace ClassTemplateStaticDef {<br>
>      static int x;<br>
>    };<br>
>    template <typename A> int T<A*>::x;<br>
> -  // GNU-DAG: @_ZN22ClassTemplateStaticDef1TIPvE1xE =<br>
> available_externally dllimport global i32 0<br>
> +  // GNU-DAG: @_ZN22ClassTemplateStaticDef1TIPvE1xE = external dllimport<br>
> global i32<br>
>    int g() { return T<void*>::x; }<br>
>  }<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="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" target="_blank">
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><u></u><u></u></p>
</div>
</div>
</blockquote>
</div>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
</div></div></div>
</div>
</div>

</blockquote></div><br></div></div>