diff options
| author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2010-11-20 02:04:01 +0000 |
|---|---|---|
| committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2010-11-20 02:04:01 +0000 |
| commit | de2bdf637ed7f2ade02bebde801ee1a9fe3ea68d (patch) | |
| tree | 3abece97fff722b40ebff9f6b3f76d12096fe583 /clang/lib/Serialization/ASTReaderStmt.cpp | |
| parent | 9331ed89f8d3466c9389b7e9ef7b69c877ffbea2 (diff) | |
| download | bcm5719-llvm-de2bdf637ed7f2ade02bebde801ee1a9fe3ea68d.tar.gz bcm5719-llvm-de2bdf637ed7f2ade02bebde801ee1a9fe3ea68d.zip | |
Revert r119838 "Don't warn for empty 'if' body if there is a macro that expands to nothing"
and use a better and more general approach, where NullStmt has a flag to indicate whether it was preceded by an empty macro.
Thanks to Abramo Bagnara for the hint!
llvm-svn: 119887
Diffstat (limited to 'clang/lib/Serialization/ASTReaderStmt.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderStmt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReaderStmt.cpp b/clang/lib/Serialization/ASTReaderStmt.cpp index a7b42cd3fcf..5aba1f8ada7 100644 --- a/clang/lib/Serialization/ASTReaderStmt.cpp +++ b/clang/lib/Serialization/ASTReaderStmt.cpp @@ -202,6 +202,7 @@ void ASTStmtReader::VisitStmt(Stmt *S) { void ASTStmtReader::VisitNullStmt(NullStmt *S) { VisitStmt(S); S->setSemiLoc(ReadSourceLocation(Record, Idx)); + S->LeadingEmptyMacro = Record[Idx++]; } void ASTStmtReader::VisitCompoundStmt(CompoundStmt *S) { @@ -256,7 +257,6 @@ void ASTStmtReader::VisitIfStmt(IfStmt *S) { S->setElse(Reader.ReadSubStmt()); S->setIfLoc(ReadSourceLocation(Record, Idx)); S->setElseLoc(ReadSourceLocation(Record, Idx)); - S->MacroExpandedInThenStmt = Record[Idx++]; } void ASTStmtReader::VisitSwitchStmt(SwitchStmt *S) { |
