From f096a6e754d56f90653c7ffad2b003b60a221286 Mon Sep 17 00:00:00 2001
From: Argyrios Kyrtzidis <akyrtzi@gmail.com>
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.

llvm-svn: 133800
---
 clang/lib/Basic/SourceManager.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
index 23ebb4fd5c6e..92557a421f11 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/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<FileID, unsigned> 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<SourceLocation, SourceLocation>
     instRange = getImmediateInstantiationRange(loc);