[cfe-commits] r152559 - in /cfe/trunk: lib/Parse/ParseDeclCXX.cpp test/Parser/cxx0x-ambig.cpp

[David Blaikie]

Author: dblaikie
Date: Mon Mar 12 10:39:49 2012
New Revision: 152559

URL: http://llvm.org/viewvc/llvm-project?rev=152559&view=rev
Log:
Fix a crash-on-invalid found by -Wlogical-op-parentheses.

Modified:
    cfe/trunk/lib/Parse/ParseDeclCXX.cpp
    cfe/trunk/test/Parser/cxx0x-ambig.cpp

Modified: cfe/trunk/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseDeclCXX.cpp?rev=152559&r1=152558&r2=152559&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/trunk/lib/Parse/ParseDeclCXX.cpp Mon Mar 12 10:39:49 2012
@@ -1136,7 +1136,7 @@
   else if (Tok.is(tok::l_brace) ||
            (getLangOpts().CPlusPlus && Tok.is(tok::colon)) ||
            (isCXX0XFinalKeyword() &&
-            NextToken().is(tok::l_brace) || NextToken().is(tok::colon))) {
+            (NextToken().is(tok::l_brace) || NextToken().is(tok::colon)))) {
     if (DS.isFriendSpecified()) {
       // C++ [class.friend]p2:
       //   A class shall not be defined in a friend declaration.

Modified: cfe/trunk/test/Parser/cxx0x-ambig.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx0x-ambig.cpp?rev=152559&r1=152558&r2=152559&view=diff
==============================================================================
--- cfe/trunk/test/Parser/cxx0x-ambig.cpp (original)
+++ cfe/trunk/test/Parser/cxx0x-ambig.cpp Mon Mar 12 10:39:49 2012
@@ -23,6 +23,7 @@
     };
     // This too.
     struct T final : S {}; // expected-error {{base 'S' is marked 'final'}}
+    struct T bar : S {}; // expected-error {{expected ';' after top level declarator}} expected-error {{expected unqualified-id}}
   }
 }