<html><head><meta http-equiv="Content-Type" content="text/html charset=windows-1252"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">No. It’s too late for the branch.<div><br></div><div>-bw</div><div><br><div style=""><div>On Aug 21, 2014, at 7:08 PM, Richard Smith <<a href="mailto:richard@metafoo.co.uk">richard@metafoo.co.uk</a>> wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div dir="ltr">Looks good for branch.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 21, 2014 at 6:59 PM, Richard Trieu <span dir="ltr"><<a href="mailto:rtrieu@google.com" target="_blank">rtrieu@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Candidate for 3.5, one-line change to fix a crash on invalid. 3.4 did not crash on this code.<div><div class="h5">
<div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Aug 21, 2014 at 6:16 PM, Richard Trieu <span dir="ltr"><<a href="mailto:rtrieu@google.com" target="_blank">rtrieu@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rtrieu<br>
Date: Thu Aug 21 20:16:44 2014<br>
New Revision: 216254<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=216254&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=216254&view=rev</a><br>
Log:<br>
Fix PR20705, crash on invalid.<br>
<br>
dyn_cast -> dyn_cast_or_null to handle a null pointer.<br>
<br>
Added:<br>
cfe/trunk/test/SemaCXX/PR20705.cpp<br>
Modified:<br>
cfe/trunk/lib/Sema/SemaDecl.cpp<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=216254&r1=216253&r2=216254&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=216254&r1=216253&r2=216254&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Thu Aug 21 20:16:44 2014<br>
@@ -9300,7 +9300,7 @@ Sema::FinalizeDeclaration(Decl *ThisDecl<br>
// Static locals inherit dll attributes from their function.<br>
if (VD->isStaticLocal()) {<br>
if (FunctionDecl *FD =<br>
- dyn_cast<FunctionDecl>(VD->getParentFunctionOrMethod())) {<br>
+ dyn_cast_or_null<FunctionDecl>(VD->getParentFunctionOrMethod())) {<br>
if (Attr *A = getDLLAttr(FD)) {<br>
auto *NewAttr = cast<InheritableAttr>(A->clone(getASTContext()));<br>
NewAttr->setInherited(true);<br>
<br>
Added: cfe/trunk/test/SemaCXX/PR20705.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/PR20705.cpp?rev=216254&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/PR20705.cpp?rev=216254&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/PR20705.cpp (added)<br>
+++ cfe/trunk/test/SemaCXX/PR20705.cpp Thu Aug 21 20:16:44 2014<br>
@@ -0,0 +1,21 @@<br>
+// RUN: %clang_cc1 -fsyntax-only -std=c++11 -verify %s<br>
+<br>
+template <typename T><br>
+struct X {};<br>
+auto b = []() {<br>
+ struct S {<br>
+ static typename X<decltype(int)>::type Run(){};<br>
+ // expected-error@-1 4{{}}<br>
+ };<br>
+ return 5;<br>
+}();<br>
+<br>
+template <typename T1, typename T2><br>
+class PC {<br>
+};<br>
+<br>
+template <typename T><br>
+class P {<br>
+ static typename PC<T, Invalid>::Type Foo();<br>
+ // expected-error@-1 4{{}}<br>
+};<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div></div></div>
</blockquote></div><br></div>
</blockquote></div><br></div></body></html>