<div dir="ltr">Looks like this caused the following on SLi's bot:<div><br></div><div><b style="color:rgb(0,0,0);font-family:Times;font-size:medium">Was:</b><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> OK</span><br style="color:rgb(0,0,0);font-family:Times;font-size:medium"><b style="color:rgb(0,0,0);font-family:Times;font-size:medium">New:</b><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> Assertion `is<T>() && "Invalid accessor called"' failed.</span><br style="color:rgb(0,0,0);font-family:Times;font-size:medium"><b style="color:rgb(0,0,0);font-family:Times;font-size:medium">Cases:</b><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> (num=2)</span><br style="color:rgb(0,0,0);font-family:Times;font-size:medium"><a href="http://sli.dy.fi/~sliedes/clang-triage/sha/2/9/2982998a6c97b30873e794202da368dae5314e7f.cpp" class="" style="font-family:monospace">298299</a><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> </span><a href="http://sli.dy.fi/~sliedes/clang-triage/cr/e/a/ead92ec6b3611fe230a330df0c4e797613052e03.cpp" style="font-family:Times;font-size:medium"><small>(reduced)</small></a><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> </span><a href="http://sli.dy.fi/~sliedes/clang-triage/out/0/a/0a0a65952d4154157f1c41e8b801bcd9420ebc2e.txt" style="font-family:Times;font-size:medium"><small>(output)</small></a><span style="color:rgb(0,0,0);font-family:Times;font-size:medium">, </span><a href="http://sli.dy.fi/~sliedes/clang-triage/sha/d/f/dfc4d76ed07129ef327792aa179695a0cb2a9336.cpp" class="" style="font-family:monospace">dfc4d7</a><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> </span><a href="http://sli.dy.fi/~sliedes/clang-triage/cr/8/1/81d24ed956bff966e47f174add3055ddce8a1d93.cpp" style="font-family:Times;font-size:medium"><small>(reduced)</small></a><span style="color:rgb(0,0,0);font-family:Times;font-size:medium"> </span><a href="http://sli.dy.fi/~sliedes/clang-triage/out/c/1/c1f79dd07dcc9e257fedc06ca0c9839bb1158a2a.txt" style="font-family:Times;font-size:medium"><small>(output)</small></a><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 29, 2014 at 11:19 AM, David Majnemer <span dir="ltr"><<a href="mailto:david.majnemer@gmail.com" target="_blank">david.majnemer@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: majnemer<br>
Date: Mon Dec 29 13:19:18 2014<br>
New Revision: 224945<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=224945&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=224945&view=rev</a><br>
Log:<br>
Parse: Ignore '::' in 'struct :: {'<br>
<br>
Let's pretend that we didn't see the '::' instead of go on believing<br>
that we've got some anonymous, but globally qualified, struct.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/AST/Decl.h<br>
cfe/trunk/lib/Parse/ParseExprCXX.cpp<br>
cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp<br>
<br>
Modified: cfe/trunk/include/clang/AST/Decl.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=224945&r1=224944&r2=224945&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=224945&r1=224944&r2=224945&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/AST/Decl.h (original)<br>
+++ cfe/trunk/include/clang/AST/Decl.h Mon Dec 29 13:19:18 2014<br>
@@ -2823,18 +2823,16 @@ public:<br>
<br>
bool hasDeclaratorForAnonDecl() const {<br>
return dyn_cast_or_null<DeclaratorDecl>(<br>
- NamedDeclOrQualifier.dyn_cast<NamedDecl *>());<br>
+ NamedDeclOrQualifier.get<NamedDecl *>());<br>
}<br>
DeclaratorDecl *getDeclaratorForAnonDecl() const {<br>
- return hasExtInfo() ? nullptr<br>
- : dyn_cast_or_null<DeclaratorDecl>(<br>
- NamedDeclOrQualifier.dyn_cast<NamedDecl *>());<br>
+ return hasExtInfo() ? nullptr : dyn_cast_or_null<DeclaratorDecl>(<br>
+ NamedDeclOrQualifier.get<NamedDecl *>());<br>
}<br>
<br>
TypedefNameDecl *getTypedefNameForAnonDecl() const {<br>
- return hasExtInfo() ? nullptr<br>
- : dyn_cast_or_null<TypedefNameDecl>(<br>
- NamedDeclOrQualifier.dyn_cast<NamedDecl *>());<br>
+ return hasExtInfo() ? nullptr : dyn_cast_or_null<TypedefNameDecl>(<br>
+ NamedDeclOrQualifier.get<NamedDecl *>());<br>
}<br>
<br>
void setDeclaratorForAnonDecl(DeclaratorDecl *DD) { NamedDeclOrQualifier = DD; }<br>
<br>
Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=224945&r1=224944&r2=224945&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=224945&r1=224944&r2=224945&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original)<br>
+++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Mon Dec 29 13:19:18 2014<br>
@@ -219,13 +219,19 @@ bool Parser::ParseOptionalCXXScopeSpecif<br>
if (NextKind == tok::kw_new || NextKind == tok::kw_delete)<br>
return false;<br>
<br>
- // '::' - Global scope qualifier.<br>
- if (Actions.ActOnCXXGlobalScopeSpecifier(ConsumeToken(), SS))<br>
- return true;<br>
+ if (NextKind == tok::l_brace) {<br>
+ // It is invalid to have :: {, consume the scope qualifier and pretend<br>
+ // like we never saw it.<br>
+ Diag(ConsumeToken(), diag::err_expected) << tok::identifier;<br>
+ } else {<br>
+ // '::' - Global scope qualifier.<br>
+ if (Actions.ActOnCXXGlobalScopeSpecifier(ConsumeToken(), SS))<br>
+ return true;<br>
<br>
- CheckForLParenAfterColonColon();<br>
+ CheckForLParenAfterColonColon();<br>
<br>
- HasScopeSpecifier = true;<br>
+ HasScopeSpecifier = true;<br>
+ }<br>
}<br>
<br>
if (Tok.is(tok::kw___super)) {<br>
<br>
Modified: cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp?rev=224945&r1=224944&r2=224945&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp?rev=224945&r1=224944&r2=224945&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp (original)<br>
+++ cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp Mon Dec 29 13:19:18 2014<br>
@@ -44,5 +44,4 @@ namespace NS {<br>
template<typename T> void NS::wibble(T) { } // expected-warning{{extra qualification on member 'wibble'}}<br>
}<br>
<br>
-// expected-warning@+1{{extra qualification on member}}<br>
struct ::{} a; // expected-error{{expected identifier}}<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>