<html><head></head><body bgcolor="#FFFFFF"><div>Trivial fix for a regression. Approved. <br><br>Sent from my iPhone</div><div><br>On Apr 29, 2012, at 5:20 PM, Richard Smith <<a href="mailto:richard@metafoo.co.uk">richard@metafoo.co.uk</a>> wrote:<br><br></div><div></div><blockquote type="cite"><div>This and r155784 fix crash-on-invalid bugs, and this one is a regression from 3.0. Do we want these on the branch?<br><br><div class="gmail_quote">On Sun, Apr 29, 2012 at 12:31 AM, Richard Smith <span dir="ltr"><<a href="mailto:richard-llvm@metafoo.co.uk">richard-llvm@metafoo.co.uk</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rsmith<br>
Date: Sun Apr 29 02:31:09 2012<br>
New Revision: 155788<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=155788&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=155788&view=rev</a><br>
Log:<br>
PR12688: ParseCXXClassMemberDeclaration's sometimes-null ThisDecl takes another<br>
victim. Don't crash if we have a delay-parsed exception specification for a<br>
class member which is invalid in a way which precludes building a FunctionDecl.<br>
<br>
Modified:<br>
cfe/trunk/lib/Parse/ParseDeclCXX.cpp<br>
cfe/trunk/test/CXX/class/class.mem/p2.cpp<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=155788&r1=155787&r2=155788&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=155788&r1=155787&r2=155788&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Sun Apr 29 02:31:09 2012<br>
@@ -2065,7 +2065,7 @@<br>
DeclsInGroup.push_back(ThisDecl);<br>
}<br>
<br>
- if (DeclaratorInfo.isFunctionDeclarator() &&<br>
+ if (ThisDecl && DeclaratorInfo.isFunctionDeclarator() &&<br>
DeclaratorInfo.getDeclSpec().getStorageClassSpec()<br>
!= DeclSpec::SCS_typedef) {<br>
HandleMemberFunctionDeclDelays(DeclaratorInfo, ThisDecl);<br>
<br>
Modified: cfe/trunk/test/CXX/class/class.mem/p2.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/class/class.mem/p2.cpp?rev=155788&r1=155787&r2=155788&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/class/class.mem/p2.cpp?rev=155788&r1=155787&r2=155788&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CXX/class/class.mem/p2.cpp (original)<br>
+++ cfe/trunk/test/CXX/class/class.mem/p2.cpp Sun Apr 29 02:31:09 2012<br>
@@ -73,3 +73,16 @@<br>
static_assert(!noexcept(S().h()), "");<br>
static_assert(noexcept(S::i()), "");<br>
}<br>
+<br>
+namespace PR12688 {<br>
+ struct S {<br>
+ // FIXME: Producing one error saying this can't have the same name<br>
+ // as the class because it's not a constructor, then producing<br>
+ // another error saying this can't have a return type because<br>
+ // it is a constructor, is redundant and inconsistent.<br>
+ nonsense S() throw (more_nonsense); // \<br>
+ // expected-error {{'nonsense'}} \<br>
+ // expected-error {{has the same name as its class}} \<br>
+ // expected-error {{constructor cannot have a return type}}<br>
+ };<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">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></blockquote></body></html>