From 90ee2a4ecf8ef519ebce5e8fc388d6f818ab1019 Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 19 Nov 2010 20:54:25 +0000 Subject: Don't warn for empty 'if' body if there is a macro that expands to nothing, e.g: if (condition) CALL(0); // empty macro but don't warn for empty body. Fixes rdar://8436021. llvm-svn: 119838 --- clang/lib/Sema/TreeTransform.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'clang/lib/Sema/TreeTransform.h') diff --git a/clang/lib/Sema/TreeTransform.h b/clang/lib/Sema/TreeTransform.h index 807346c4c57..3ae4e5c5f49 100644 --- a/clang/lib/Sema/TreeTransform.h +++ b/clang/lib/Sema/TreeTransform.h @@ -772,9 +772,11 @@ public: /// By default, performs semantic analysis to build the new statement. /// Subclasses may override this routine to provide different behavior. StmtResult RebuildIfStmt(SourceLocation IfLoc, Sema::FullExprArg Cond, - VarDecl *CondVar, Stmt *Then, + VarDecl *CondVar, Stmt *Then, + bool MacroExpandedInThenStmt, SourceLocation ElseLoc, Stmt *Else) { - return getSema().ActOnIfStmt(IfLoc, Cond, CondVar, Then, ElseLoc, Else); + return getSema().ActOnIfStmt(IfLoc, Cond, CondVar, Then, + MacroExpandedInThenStmt, ElseLoc, Else); } /// \brief Start building a new switch statement. @@ -3692,7 +3694,7 @@ TreeTransform::TransformIfStmt(IfStmt *S) { return SemaRef.Owned(S); return getDerived().RebuildIfStmt(S->getIfLoc(), FullCond, ConditionVar, - Then.get(), + Then.get(), S->hasMacroExpandedInThenStmt(), S->getElseLoc(), Else.get()); } -- cgit v1.2.3