commit 6f42669b7c0b81b07a15a0483aa5e897ce57cb45
author David Blaikie <dblaikie@gmail.com> Mon Mar 12 15:39:49 2012 +0000
committer David Blaikie <dblaikie@gmail.com> Mon Mar 12 15:39:49 2012 +0000
tree 597045de7196910d95da45ff2f15818d7f3b26d9
parent e45b9b71b9ead9873c50ccd149a10f554f71bd9f

Fix a crash-on-invalid found by -Wlogical-op-parentheses.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152559 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Parse/ParseDeclCXX.cpp

diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 979b4dd..cf18a5b 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -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.