summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseStmt.cpp
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-05-06 21:39:56 +0000
committerDouglas Gregor <dgregor@apple.com>2010-05-06 21:39:56 +0000
commit12cc7eeb821e536df420c90513936a42c901c263 (patch)
treec7c57e17a52c427277571fe5f09e674f21f8c47f /clang/lib/Parse/ParseStmt.cpp
parent66bfb27545e32172b80581f2c40b9d088ef1cb3b (diff)
downloadbcm5719-llvm-12cc7eeb821e536df420c90513936a42c901c263.tar.gz
bcm5719-llvm-12cc7eeb821e536df420c90513936a42c901c263.zip
Fixed DISABLE_SMART_POINTERS breakage
llvm-svn: 103198
Diffstat (limited to 'clang/lib/Parse/ParseStmt.cpp')
-rw-r--r--clang/lib/Parse/ParseStmt.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 71bda78f6cb..e68e0ead5b7 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -989,6 +989,7 @@ Parser::OwningStmtResult Parser::ParseForStatement(AttributeList *Attr) {
bool ForEach = false;
OwningStmtResult FirstPart(Actions);
+ bool SecondPartIsInvalid = false;
FullExprArg SecondPart(Actions);
OwningExprResult Collection(Actions);
FullExprArg ThirdPart(Actions);
@@ -1062,13 +1063,14 @@ Parser::OwningStmtResult Parser::ParseForStatement(AttributeList *Attr) {
Second = Actions.ActOnBooleanCondition(CurScope, ForLoc,
move(Second));
}
+ SecondPartIsInvalid = Second.isInvalid();
SecondPart = Actions.MakeFullExpr(Second);
}
if (Tok.is(tok::semi)) {
ConsumeToken();
} else {
- if (!SecondPart->isInvalid() || SecondVar.get())
+ if (!SecondPartIsInvalid || SecondVar.get())
Diag(Tok, diag::err_expected_semi_for);
SkipUntil(tok::semi);
}
OpenPOWER on IntegriCloud