From ed37ab82c7790569bcd39f4ba421b17433ef530a Mon Sep 17 00:00:00 2001 From: Argyrios Kyrtzidis Date: Fri, 24 Jun 2011 17:28:26 +0000 Subject: [PATCH] SourceManager::isAtStartOfMacroInstantiation should check not only if the location is at the first token but that the location's offset is not inside the token as well. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@133800 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/SourceManager.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 23ebb4fd5c..92557a421f 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -1218,7 +1218,11 @@ PresumedLoc SourceManager::getPresumedLoc(SourceLocation Loc) const { bool SourceManager::isAtStartOfMacroInstantiation(SourceLocation loc) const { assert(loc.isValid() && loc.isMacroID() && "Expected a valid macro loc"); - unsigned FID = getFileID(loc).ID; + std::pair infoLoc = getDecomposedLoc(loc); + if (infoLoc.second > 0) + return false; // Does not point at the start of token. + + unsigned FID = infoLoc.first.ID; assert(FID > 1); std::pair instRange = getImmediateInstantiationRange(loc); -- 2.40.0