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 b5251a6..e9685d2 100644
--- a/lib/Parse/ParseTentative.cpp
+++ b/lib/Parse/ParseTentative.cpp
@@ -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);
diff --git a/lib/Sema/SemaExprMember.cpp b/lib/Sema/SemaExprMember.cpp
index 81aba6a..223a7f1 100644
--- a/lib/Sema/SemaExprMember.cpp
+++ b/lib/Sema/SemaExprMember.cpp
@@ -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,