diff options
| author | Kaelyn Uhrain <rikka@google.com> | 2012-05-01 01:16:25 +0000 |
|---|---|---|
| committer | Kaelyn Uhrain <rikka@google.com> | 2012-05-01 01:16:25 +0000 |
| commit | 1a200a87c1bacee11b7c4283ae5f3f3f74a3c1b2 (patch) | |
| tree | b8576d5c4df6391e91e044a75ca91f9305c40b09 | |
| parent | bd4fa45e7cf6a2f0adcb0ab66d5b3d338ec56c3c (diff) | |
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
| -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, |