[cfe-commits] r155870 - in /cfe/trunk/lib: Parse/ParseTentative.cpp Sema/SemaExprMember.cpp

[Kaelyn Uhrain]

Author: rikka
Date: Mon Apr 30 20:16:25 2012
New Revision: 155870

URL: http://llvm.org/viewvc/llvm-project?rev=155870&view=rev
Log:
A couple of very small tweaks suggested by Doug in reply to r155580 and r155163.

Modified:
    cfe/trunk/lib/Parse/ParseTentative.cpp
    cfe/trunk/lib/Sema/SemaExprMember.cpp

Modified: cfe/trunk/lib/Parse/ParseTentative.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseTentative.cpp?rev=155870&r1=155869&r2=155870&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseTentative.cpp (original)
+++ cfe/trunk/lib/Parse/ParseTentative.cpp Mon Apr 30 20:16:25 2012
@@ -933,8 +933,7 @@
       return TPResult::Error();
     if (Tok.is(tok::identifier)) {
       const Token &Next = NextToken();
-      bool NotObjC = !(getLangOpts().ObjC1 || getLangOpts().ObjC2);
-      return (NotObjC && Next.is(tok::identifier)) ?
+      return (!getLangOpts().ObjC1 && Next.is(tok::identifier)) ?
           TPResult::True() : TPResult::False();
     }
     return isCXXDeclarationSpecifier(BracedCastResult);

Modified: cfe/trunk/lib/Sema/SemaExprMember.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaExprMember.cpp?rev=155870&r1=155869&r2=155870&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaExprMember.cpp (original)
+++ cfe/trunk/lib/Sema/SemaExprMember.cpp Mon Apr 30 20:16:25 2012
@@ -839,7 +839,7 @@
     if (ExtraArgs) {
       ExprResult RetryExpr;
       if (!IsArrow && BaseExpr) {
-        SFINAETrap Trap(*this);
+        SFINAETrap Trap(*this, false);
         ParsedType ObjectType;
         bool MayBePseudoDestructor = false;
         RetryExpr = ActOnStartCXXMemberReference(getCurScope(), BaseExpr,