A couple of very small tweaks suggested by Doug in reply to r155580 and r155163.

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

diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp
index b5251a61777629611cf628cc650177f8ca183c8c..e9685d25fe0894413b3c32003e89752b0e896898 100644 (file)
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -933,8 +933,7 @@ Parser::isCXXDeclarationSpecifier(Parser::TPResult BracedCastResult) {
       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);

diff --git a/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp
index 81aba6ac0e2be453767c6d1e41db65777953a1a0..223a7f1f8db97c2a7a41423435c6ff2a928a6ada 100644 (file)
--- a/lib/Sema/SemaExprMember.cpp
+++ b/lib/Sema/SemaExprMember.cpp
@@ -839,7 +839,7 @@ Sema::BuildMemberReferenceExpr(Expr *BaseExpr, QualType BaseExprType,
     if (ExtraArgs) {
       ExprResult RetryExpr;
       if (!IsArrow && BaseExpr) {
-        SFINAETrap Trap(*this);
+        SFINAETrap Trap(*this, false);
         ParsedType ObjectType;
         bool MayBePseudoDestructor = false;
         RetryExpr = ActOnStartCXXMemberReference(getCurScope(), BaseExpr,