diff options
| -rw-r--r-- | lib/Parse/ParseTentative.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaExprMember.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Parse/ParseTentative.cpp b/lib/Parse/ParseTentative.cpp index b5251a6177..e9685d25fe 100644 --- 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 81aba6ac0e..223a7f1f8d 100644 --- 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, |