diff options
| -rw-r--r-- | include/clang/Basic/SourceManager.h | 12 | ||||
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 11 | ||||
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 2 | ||||
| -rw-r--r-- | test/Sema/unused-expr-system-header.c | 6 |
4 files changed, 26 insertions, 5 deletions
diff --git a/include/clang/Basic/SourceManager.h b/include/clang/Basic/SourceManager.h index a2d7a59032..6aa5347231 100644 --- a/include/clang/Basic/SourceManager.h +++ b/include/clang/Basic/SourceManager.h @@ -329,6 +329,11 @@ namespace SrcMgr { SourceLocation::getFromRawEncoding(ExpansionLocEnd).isInvalid(); } + bool isMacroBodyExpansion() const { + return getExpansionLocStart().isValid() && + SourceLocation::getFromRawEncoding(ExpansionLocEnd).isValid(); + } + bool isFunctionMacroExpansion() const { return getExpansionLocStart().isValid() && getExpansionLocStart() != getExpansionLocEnd(); @@ -1126,6 +1131,13 @@ public: /// expanded. bool isMacroArgExpansion(SourceLocation Loc) const; + /// \brief Tests whether the given source location represents the expansion of + /// a macro body. + /// + /// This is equivalent to testing whether the location is part of a macro + /// expansion but not the expansion of an argument to a function-like macro. + bool isMacroBodyExpansion(SourceLocation Loc) const; + /// \brief Returns true if \p Loc is inside the [\p Start, +\p Length) /// chunk of the source location address space. /// diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index f1965e7ebd..691019152c 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -974,11 +974,18 @@ bool SourceManager::isMacroArgExpansion(SourceLocation Loc) const { if (!Loc.isMacroID()) return false; FileID FID = getFileID(Loc); - const SrcMgr::SLocEntry *E = &getSLocEntry(FID); - const SrcMgr::ExpansionInfo &Expansion = E->getExpansion(); + const SrcMgr::ExpansionInfo &Expansion = getSLocEntry(FID).getExpansion(); return Expansion.isMacroArgExpansion(); } +bool SourceManager::isMacroBodyExpansion(SourceLocation Loc) const { + if (!Loc.isMacroID()) return false; + + FileID FID = getFileID(Loc); + const SrcMgr::ExpansionInfo &Expansion = getSLocEntry(FID).getExpansion(); + return Expansion.isMacroBodyExpansion(); +} + //===----------------------------------------------------------------------===// // Queries about the code at a SourceLocation. diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index b738793ef9..a9d3dd5ad3 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -126,7 +126,7 @@ static bool DiagnoseUnusedComparison(Sema &S, const Expr *E) { // Suppress warnings when the operator, suspicious as it may be, comes from // a macro expansion. - if (Loc.isMacroID()) + if (S.SourceMgr.isMacroBodyExpansion(Loc)) return false; S.Diag(Loc, diag::warn_unused_comparison) diff --git a/test/Sema/unused-expr-system-header.c b/test/Sema/unused-expr-system-header.c index dcc8918970..68c7e9962c 100644 --- a/test/Sema/unused-expr-system-header.c +++ b/test/Sema/unused-expr-system-header.c @@ -3,8 +3,10 @@ void f(int i1, int i2) { POSSIBLY_BAD_MACRO(5); STATEMENT_EXPR_MACRO(5); - COMMA_MACRO_1(i1 == i2, f(i1, i2)); // expected-warning {{expression result unused}} + COMMA_MACRO_1(i1 == i2, f(i1, i2)); // expected-warning {{comparison result unused}} \ + // expected-note {{equality comparison}} COMMA_MACRO_2(i1 == i2, f(i1, i2)); - COMMA_MACRO_3(i1 == i2, f(i1, i2)); // expected-warning {{expression result unused}} + COMMA_MACRO_3(i1 == i2, f(i1, i2)); // expected-warning {{comparison result unused}} \ + // expected-note {{equality comparison}} COMMA_MACRO_4(i1 == i2, f(i1, i2)); } |