<div dir="ltr">The first Chrome DLL build with this change is crashing during compilation:<div><a href="https://build.chromium.org/p/chromium.fyi/builders/ClangToTWin64%28dll%29/builds/8380/">https://build.chromium.org/p/chromium.fyi/builders/ClangToTWin64%28dll%29/builds/8380/</a></div><div><br></div><div>The previous build fails with a link error, so the revision range for the new crash is 292501 - 292526.</div><div><br></div><div>Only the DLL builders are affected, so I think it's very likely that this is the culprit. I speculatively reverted it in r292643.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jan 19, 2017 at 1:33 PM, Hans Wennborg via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: hans<br>
Date: Thu Jan 19 15:33:13 2017<br>
New Revision: 292522<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=292522&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=292522&view=rev</a><br>
Log:<br>
Don't inline dllimport functions referencing non-imported methods<br>
<br>
This is another follow-up to r246338. I had assumed methods were already<br>
handled by the AST visitor, but turns out they weren't.<br>
<br>
Modified:<br>
cfe/trunk/lib/CodeGen/<wbr>CodeGenModule.cpp<br>
cfe/trunk/test/CodeGenCXX/<wbr>dllimport.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/<wbr>CodeGenModule.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=292522&r1=292521&r2=292522&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/CodeGen/<wbr>CodeGenModule.cpp?rev=292522&<wbr>r1=292521&r2=292522&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/<wbr>CodeGenModule.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/<wbr>CodeGenModule.cpp Thu Jan 19 15:33:13 2017<br>
@@ -1751,6 +1751,11 @@ namespace {<br>
SafeToInline = E->getConstructor()->hasAttr<<wbr>DLLImportAttr>();<br>
return SafeToInline;<br>
}<br>
+ bool VisitCXXMemberCallExpr(<wbr>CXXMemberCallExpr *E) {<br>
+ CXXMethodDecl *M = E->getMethodDecl();<br>
+ SafeToInline = M->hasAttr<DLLImportAttr>();<br>
+ return SafeToInline;<br>
+ }<br>
bool VisitCXXDeleteExpr(<wbr>CXXDeleteExpr *E) {<br>
SafeToInline = E->getOperatorDelete()-><wbr>hasAttr<DLLImportAttr>();<br>
return SafeToInline;<br>
<br>
Modified: cfe/trunk/test/CodeGenCXX/<wbr>dllimport.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/dllimport.cpp?rev=292522&r1=292521&r2=292522&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/<wbr>CodeGenCXX/dllimport.cpp?rev=<wbr>292522&r1=292521&r2=292522&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/CodeGenCXX/<wbr>dllimport.cpp (original)<br>
+++ cfe/trunk/test/CodeGenCXX/<wbr>dllimport.cpp Thu Jan 19 15:33:13 2017<br>
@@ -26,6 +26,7 @@ struct ExplicitSpec_NotImported {};<br>
#define USEVARTYPE(type, var) type UNIQ(use)() { return var; }<br>
#define USEVAR(var) USEVARTYPE(int, var)<br>
#define USE(func) void UNIQ(use)() { func(); }<br>
+#define USE1(func) void UNIQ(use)() { func(nullptr); }<br>
#define USEMEMFUNC(class, func) void (class::*UNIQ(use)())() { return &class::func; }<br>
#define USESTATICMEMFUNC(class, func) void (*UNIQ(use)())() { return &class::func; }<br>
#define USECLASS(class) void UNIQ(USE)() { class x; }<br>
@@ -316,10 +317,13 @@ namespace ns { __declspec(dllimport) voi<br>
USE(ns::externalFunc)<br>
<br>
// A dllimport function referencing non-imported vars or functions must not be available_externally.<br>
+<br>
__declspec(dllimport) int ImportedVar;<br>
int NonImportedVar;<br>
__declspec(dllimport) int ImportedFunc();<br>
int NonImportedFunc();<br>
+struct ClassWithNonImportedMethod { int f(); };<br>
+<br>
__declspec(dllimport) inline int ReferencingImportedVar() { return ImportedVar; }<br>
// MO1-DAG: define available_externally dllimport i32 @"\01?ReferencingImportedVar@@<wbr>YAHXZ"<br>
__declspec(dllimport) inline int ReferencingNonImportedVar() { return NonImportedVar; }<br>
@@ -328,10 +332,13 @@ __declspec(dllimport) inline int Referen<br>
// MO1-DAG: define available_externally dllimport i32 @"\01?ReferencingImportedFunc@<wbr>@YAHXZ"<br>
__declspec(dllimport) inline int ReferencingNonImportedFunc() { return NonImportedFunc(); }<br>
// MO1-DAG: declare dllimport i32 @"\01?<wbr>ReferencingNonImportedFunc@@<wbr>YAHXZ"()<br>
+__declspec(dllimport) inline int ReferencingNonImportedMethod(<wbr>ClassWithNonImportedMethod *x) { return x->f(); }<br>
+// MO1-DAG: declare dllimport i32 @"\01?<wbr>ReferencingNonImportedMethod<br>
USE(ReferencingImportedVar)<br>
USE(ReferencingNonImportedVar)<br>
USE(ReferencingImportedFunc)<br>
USE(<wbr>ReferencingNonImportedFunc)<br>
+USE1(<wbr>ReferencingNonImportedMethod)<br>
// References to operator new and delete count too, despite not being DeclRefExprs.<br>
__declspec(dllimport) inline int *ReferencingNonImportedNew() { return new int[2]; }<br>
// MO1-DAG: declare dllimport i32* @"\01?<wbr>ReferencingNonImportedNew@@<wbr>YAPAHXZ"<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>