r224945 - Parse: Ignore '::' in 'struct :: {'

[David Majnemer]

I figured that would happen, my old fix allowed funny looking ASTs to
survive when they probably should've crashed.

I've fixed this in r224966.

On Mon, Dec 29, 2014 at 4:32 PM, Nico Weber <thakis at chromium.org> wrote:

> Looks like this caused the following on SLi's bot:
>
> *Was:* OK
> *New:* Assertion `is<T>() && "Invalid accessor called"' failed.
> *Cases:* (num=2)
> 298299
> <http://sli.dy.fi/~sliedes/clang-triage/sha/2/9/2982998a6c97b30873e794202da368dae5314e7f.cpp>
>  (reduced)
> <http://sli.dy.fi/~sliedes/clang-triage/cr/e/a/ead92ec6b3611fe230a330df0c4e797613052e03.cpp>
>  (output)
> <http://sli.dy.fi/~sliedes/clang-triage/out/0/a/0a0a65952d4154157f1c41e8b801bcd9420ebc2e.txt>
> , dfc4d7
> <http://sli.dy.fi/~sliedes/clang-triage/sha/d/f/dfc4d76ed07129ef327792aa179695a0cb2a9336.cpp>
>  (reduced)
> <http://sli.dy.fi/~sliedes/clang-triage/cr/8/1/81d24ed956bff966e47f174add3055ddce8a1d93.cpp>
>  (output)
> <http://sli.dy.fi/~sliedes/clang-triage/out/c/1/c1f79dd07dcc9e257fedc06ca0c9839bb1158a2a.txt>
>
> On Mon, Dec 29, 2014 at 11:19 AM, David Majnemer <david.majnemer at gmail.com
> > wrote:
>
>> Author: majnemer
>> Date: Mon Dec 29 13:19:18 2014
>> New Revision: 224945
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=224945&view=rev
>> Log:
>> Parse: Ignore '::' in 'struct :: {'
>>
>> Let's pretend that we didn't see the '::' instead of go on believing
>> that we've got some anonymous, but globally qualified, struct.
>>
>> Modified:
>>     cfe/trunk/include/clang/AST/Decl.h
>>     cfe/trunk/lib/Parse/ParseExprCXX.cpp
>>     cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp
>>
>> Modified: cfe/trunk/include/clang/AST/Decl.h
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Decl.h?rev=224945&r1=224944&r2=224945&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/include/clang/AST/Decl.h (original)
>> +++ cfe/trunk/include/clang/AST/Decl.h Mon Dec 29 13:19:18 2014
>> @@ -2823,18 +2823,16 @@ public:
>>
>>    bool hasDeclaratorForAnonDecl() const {
>>      return dyn_cast_or_null<DeclaratorDecl>(
>> -        NamedDeclOrQualifier.dyn_cast<NamedDecl *>());
>> +        NamedDeclOrQualifier.get<NamedDecl *>());
>>    }
>>    DeclaratorDecl *getDeclaratorForAnonDecl() const {
>> -    return hasExtInfo() ? nullptr
>> -                        : dyn_cast_or_null<DeclaratorDecl>(
>> -                              NamedDeclOrQualifier.dyn_cast<NamedDecl
>> *>());
>> +    return hasExtInfo() ? nullptr : dyn_cast_or_null<DeclaratorDecl>(
>> +                                  NamedDeclOrQualifier.get<NamedDecl
>> *>());
>>    }
>>
>>    TypedefNameDecl *getTypedefNameForAnonDecl() const {
>> -    return hasExtInfo() ? nullptr
>> -                        : dyn_cast_or_null<TypedefNameDecl>(
>> -                              NamedDeclOrQualifier.dyn_cast<NamedDecl
>> *>());
>> +    return hasExtInfo() ? nullptr : dyn_cast_or_null<TypedefNameDecl>(
>> +                                  NamedDeclOrQualifier.get<NamedDecl
>> *>());
>>    }
>>
>>    void setDeclaratorForAnonDecl(DeclaratorDecl *DD) {
>> NamedDeclOrQualifier = DD; }
>>
>> Modified: cfe/trunk/lib/Parse/ParseExprCXX.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseExprCXX.cpp?rev=224945&r1=224944&r2=224945&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/lib/Parse/ParseExprCXX.cpp (original)
>> +++ cfe/trunk/lib/Parse/ParseExprCXX.cpp Mon Dec 29 13:19:18 2014
>> @@ -219,13 +219,19 @@ bool Parser::ParseOptionalCXXScopeSpecif
>>      if (NextKind == tok::kw_new || NextKind == tok::kw_delete)
>>        return false;
>>
>> -    // '::' - Global scope qualifier.
>> -    if (Actions.ActOnCXXGlobalScopeSpecifier(ConsumeToken(), SS))
>> -      return true;
>> +    if (NextKind == tok::l_brace) {
>> +      // It is invalid to have :: {, consume the scope qualifier and
>> pretend
>> +      // like we never saw it.
>> +      Diag(ConsumeToken(), diag::err_expected) << tok::identifier;
>> +    } else {
>> +      // '::' - Global scope qualifier.
>> +      if (Actions.ActOnCXXGlobalScopeSpecifier(ConsumeToken(), SS))
>> +        return true;
>>
>> -    CheckForLParenAfterColonColon();
>> +      CheckForLParenAfterColonColon();
>>
>> -    HasScopeSpecifier = true;
>> +      HasScopeSpecifier = true;
>> +    }
>>    }
>>
>>    if (Tok.is(tok::kw___super)) {
>>
>> Modified: cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp
>> URL:
>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp?rev=224945&r1=224944&r2=224945&view=diff
>>
>> ==============================================================================
>> --- cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp (original)
>> +++ cfe/trunk/test/CXX/dcl.decl/dcl.meaning/p1.cpp Mon Dec 29 13:19:18
>> 2014
>> @@ -44,5 +44,4 @@ namespace NS {
>>    template<typename T> void NS::wibble(T) { } // expected-warning{{extra
>> qualification on member 'wibble'}}
>>  }
>>
>> -// expected-warning at +1{{extra qualification on member}}
>>  struct ::{} a; // expected-error{{expected identifier}}
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20141229/48e48c0e/attachment.html>