diff options
author | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-01-23 16:58:33 +0000 |
---|---|---|
committer | Argyrios Kyrtzidis <akyrtzi@gmail.com> | 2012-01-23 16:58:33 +0000 |
commit | 7f6cf9764b33381e03fcf7c44f7985a333212b06 (patch) | |
tree | 68d66b1860a5b4e471e3d320fa1a28d67310d4c6 | |
parent | f5cd27d7eef3fd4021545dd76a1faf7152fda344 (diff) |
Improve Lexer::getImmediateMacroName to take into account inner macros
of macro arguments.
For "MAC1( MAC2(foo) )" and location of 'foo' token it would return
"MAC1" instead of "MAC2".
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148704 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Frontend/DiagnosticRenderer.cpp | 39 | ||||
-rw-r--r-- | lib/Lex/Lexer.cpp | 32 | ||||
-rw-r--r-- | unittests/Lex/LexerTest.cpp | 23 |
3 files changed, 88 insertions, 6 deletions
diff --git a/lib/Frontend/DiagnosticRenderer.cpp b/lib/Frontend/DiagnosticRenderer.cpp index 913aa82d51..9c4976c210 100644 --- a/lib/Frontend/DiagnosticRenderer.cpp +++ b/lib/Frontend/DiagnosticRenderer.cpp @@ -69,6 +69,43 @@ static SourceLocation getImmediateMacroCalleeLoc(const SourceManager &SM, return SM.getImmediateSpellingLoc(Loc); } +/// \brief Retrieve the name of the immediate macro expansion. +/// +/// This routine starts from a source location, and finds the name of the macro +/// responsible for its immediate expansion. It looks through any intervening +/// macro argument expansions to compute this. It returns a StringRef which +/// refers to the SourceManager-owned buffer of the source where that macro +/// name is spelled. Thus, the result shouldn't out-live that SourceManager. +/// +/// This differs from Lexer::getImmediateMacroName in that any macro argument +/// location will result in the topmost function macro that accepted it. +/// e.g. +/// \code +/// MAC1( MAC2(foo) ) +/// \endcode +/// for location of 'foo' token, this function will return "MAC1" while +/// Lexer::getImmediateMacroName will return "MAC2". +static StringRef getImmediateMacroName(SourceLocation Loc, + const SourceManager &SM, + const LangOptions &LangOpts) { + assert(Loc.isMacroID() && "Only reasonble to call this on macros"); + // Walk past macro argument expanions. + while (SM.isMacroArgExpansion(Loc)) + Loc = SM.getImmediateExpansionRange(Loc).first; + + // Find the spelling location of the start of the non-argument expansion + // range. This is where the macro name was spelled in order to begin + // expanding this macro. + Loc = SM.getSpellingLoc(SM.getImmediateExpansionRange(Loc).first); + + // Dig out the buffer where the macro name was spelled and the extents of the + // name so that we can render it into the expansion note. + std::pair<FileID, unsigned> ExpansionInfo = SM.getDecomposedLoc(Loc); + unsigned MacroTokenLength = Lexer::MeasureTokenLength(Loc, SM, LangOpts); + StringRef ExpansionBuffer = SM.getBufferData(ExpansionInfo.first); + return ExpansionBuffer.substr(ExpansionInfo.second, MacroTokenLength); +} + /// Get the presumed location of a diagnostic message. This computes the /// presumed location for the top of any macro backtrace when present. static PresumedLoc getDiagnosticPresumedLoc(const SourceManager &SM, @@ -260,7 +297,7 @@ void DiagnosticRenderer::emitMacroExpansionsAndCarets( llvm::SmallString<100> MessageStorage; llvm::raw_svector_ostream Message(MessageStorage); Message << "expanded from macro '" - << Lexer::getImmediateMacroName(MacroLoc, SM, LangOpts) << "'"; + << getImmediateMacroName(MacroLoc, SM, LangOpts) << "'"; emitDiagnostic(SM.getSpellingLoc(Loc), DiagnosticsEngine::Note, Message.str(), Ranges, ArrayRef<FixItHint>()); diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp index 967359f261..8ae6e98a4f 100644 --- a/lib/Lex/Lexer.cpp +++ b/lib/Lex/Lexer.cpp @@ -917,14 +917,40 @@ StringRef Lexer::getImmediateMacroName(SourceLocation Loc, const SourceManager &SM, const LangOptions &LangOpts) { assert(Loc.isMacroID() && "Only reasonble to call this on macros"); - // Walk past macro argument expanions. - while (SM.isMacroArgExpansion(Loc)) + + // Find the location of the immediate macro expansion. + while (1) { + FileID FID = SM.getFileID(Loc); + const SrcMgr::SLocEntry *E = &SM.getSLocEntry(FID); + const SrcMgr::ExpansionInfo &Expansion = E->getExpansion(); + Loc = Expansion.getExpansionLocStart(); + if (!Expansion.isMacroArgExpansion()) + break; + + // For macro arguments we need to check that the argument did not come + // from an inner macro, e.g: "MAC1( MAC2(foo) )" + + // Loc points to the argument id of the macro definition, move to the + // macro expansion. Loc = SM.getImmediateExpansionRange(Loc).first; + SourceLocation SpellLoc = Expansion.getSpellingLoc(); + if (SpellLoc.isFileID()) + break; // No inner macro. + + // If spelling location resides in the same FileID as macro expansion + // location, it means there is no inner macro. + FileID MacroFID = SM.getFileID(Loc); + if (SM.isInFileID(SpellLoc, MacroFID)) + break; + + // Argument came from inner macro. + Loc = SpellLoc; + } // Find the spelling location of the start of the non-argument expansion // range. This is where the macro name was spelled in order to begin // expanding this macro. - Loc = SM.getSpellingLoc(SM.getImmediateExpansionRange(Loc).first); + Loc = SM.getSpellingLoc(Loc); // Dig out the buffer where the macro name was spelled and the extents of the // name so that we can render it into the expansion note. diff --git a/unittests/Lex/LexerTest.cpp b/unittests/Lex/LexerTest.cpp index 7d9e9e9cbc..de94d1d016 100644 --- a/unittests/Lex/LexerTest.cpp +++ b/unittests/Lex/LexerTest.cpp @@ -59,7 +59,12 @@ TEST_F(LexerTest, LexAPI) { const char *source = "#define M(x) [x]\n" "#define N(x) x\n" - "M(foo) N([bar])"; + "#define INN(x) x\n" + "#define NOF1 INN(val)\n" + "#define NOF2 val\n" + "M(foo) N([bar])\n" + "N(INN(val)) N(NOF1) N(NOF2) N(val)"; + MemoryBuffer *buf = MemoryBuffer::getMemBuffer(source); SourceMgr.createMainFileIDForMemBuffer(buf); @@ -83,13 +88,17 @@ TEST_F(LexerTest, LexAPI) { } // Make sure we got the tokens that we expected. - ASSERT_EQ(6U, toks.size()); + ASSERT_EQ(10U, toks.size()); ASSERT_EQ(tok::l_square, toks[0].getKind()); ASSERT_EQ(tok::identifier, toks[1].getKind()); ASSERT_EQ(tok::r_square, toks[2].getKind()); ASSERT_EQ(tok::l_square, toks[3].getKind()); ASSERT_EQ(tok::identifier, toks[4].getKind()); ASSERT_EQ(tok::r_square, toks[5].getKind()); + ASSERT_EQ(tok::identifier, toks[6].getKind()); + ASSERT_EQ(tok::identifier, toks[7].getKind()); + ASSERT_EQ(tok::identifier, toks[8].getKind()); + ASSERT_EQ(tok::identifier, toks[9].getKind()); SourceLocation lsqrLoc = toks[0].getLocation(); SourceLocation idLoc = toks[1].getLocation(); @@ -151,6 +160,16 @@ TEST_F(LexerTest, LexAPI) { CharSourceRange::getTokenRange(SourceRange(macroLsqrLoc, macroIdLoc)), SourceMgr, LangOpts); EXPECT_EQ(text, "[bar"); + + + SourceLocation idLoc1 = toks[6].getLocation(); + SourceLocation idLoc2 = toks[7].getLocation(); + SourceLocation idLoc3 = toks[8].getLocation(); + SourceLocation idLoc4 = toks[9].getLocation(); + EXPECT_EQ("INN", Lexer::getImmediateMacroName(idLoc1, SourceMgr, LangOpts)); + EXPECT_EQ("INN", Lexer::getImmediateMacroName(idLoc2, SourceMgr, LangOpts)); + EXPECT_EQ("NOF2", Lexer::getImmediateMacroName(idLoc3, SourceMgr, LangOpts)); + EXPECT_EQ("N", Lexer::getImmediateMacroName(idLoc4, SourceMgr, LangOpts)); } } // anonymous namespace |