<div dir="ltr">On Thu, Feb 4, 2016 at 8:12 PM, Saleem Abdulrasool 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><div class="gmail_extra"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Thu Feb  4 22:12:40 2016<br>
New Revision: 259874<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=259874&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=259874&view=rev</a><br>
Log:<br>
CodeGen: correct Windows ARM C++ assertion<br></blockquote><div><br></div><div>Id like to merge this to the 3.8 release.  It only effects Windows ARM code generation, so should be quite safe.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Because the Decl is explicitly passed as nullptr further up the call chain, it<br>
is possible to invoke isa on a nullptr, which will assert.  Guard against the<br>
nullptr.<br>
<br>
Take the opportunity to reuse the helper method rather than re-implementing this<br>
logic.<br>
<br>
Added:<br>
    cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp<br>
Modified:<br>
    cfe/trunk/lib/CodeGen/TargetInfo.cpp<br>
<br>
Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=259874&r1=259873&r2=259874&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=259874&r1=259873&r2=259874&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Thu Feb  4 22:12:40 2016<br>
@@ -4889,9 +4889,6 @@ public:<br>
 };<br>
<br>
 class WindowsARMTargetCodeGenInfo : public ARMTargetCodeGenInfo {<br>
-  void addStackProbeSizeTargetAttribute(const Decl *D, llvm::GlobalValue *GV,<br>
-                                        CodeGen::CodeGenModule &CGM) const;<br>
-<br>
 public:<br>
   WindowsARMTargetCodeGenInfo(CodeGenTypes &CGT, ARMABIInfo::ABIKind K)<br>
       : ARMTargetCodeGenInfo(CGT, K) {}<br>
@@ -4900,18 +4897,6 @@ public:<br>
                            CodeGen::CodeGenModule &CGM) const override;<br>
 };<br>
<br>
-void WindowsARMTargetCodeGenInfo::addStackProbeSizeTargetAttribute(<br>
-    const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &CGM) const {<br>
-  if (!isa<FunctionDecl>(D))<br>
-    return;<br>
-  if (CGM.getCodeGenOpts().StackProbeSize == 4096)<br>
-    return;<br>
-<br>
-  llvm::Function *F = cast<llvm::Function>(GV);<br>
-  F->addFnAttr("stack-probe-size",<br>
-               llvm::utostr(CGM.getCodeGenOpts().StackProbeSize));<br>
-}<br>
-<br>
 void WindowsARMTargetCodeGenInfo::setTargetAttributes(<br>
     const Decl *D, llvm::GlobalValue *GV, CodeGen::CodeGenModule &CGM) const {<br>
   ARMTargetCodeGenInfo::setTargetAttributes(D, GV, CGM);<br>
<br>
Added: cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp?rev=259874&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp?rev=259874&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp (added)<br>
+++ cfe/trunk/test/CodeGenCXX/windows-on-arm-stack-probe-size.cpp Thu Feb  4 22:12:40 2016<br>
@@ -0,0 +1,13 @@<br>
+// RUN: %clang_cc1 -triple thumbv7--windows-msvc -S -emit-llvm -o - -x c++ %s | FileCheck %s<br>
+// RUN: %clang_cc1 -triple thumbv7--windows-itanium -fno-use-cxa-atexit -S -emit-llvm -o - -x c++ %s | FileCheck %s<br>
+<br>
+class C {<br>
+public:<br>
+  ~C();<br>
+};<br>
+<br>
+static C sc;<br>
+void f(const C &ci) { sc = ci; }<br>
+<br>
+// CHECK: atexit<br>
+<br>
<br>
<br>
_______________________________________________<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/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature">Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org</div>
</div></div>