Update SourceManager::getLineNumber to return the correct line # for macro

instantiations.

llvm-svn: 38558

Author: lattner

clang/Basic/SourceManager.cpp

@@ -159,7 +159,16 @@ unsigned SourceManager::getColumnNumber(SourceLocation IncludePos) const {
 /// line offsets for the SourceBuffer, so this is not cheap: use only when
 /// about to emit a diagnostic.
 unsigned SourceManager::getLineNumber(SourceLocation IncludePos) {
-  FileInfo *FileInfo = getFileInfo(IncludePos.getFileID());
+  unsigned FileID = IncludePos.getFileID();
+  // If this is a macro, we need to get the instantiation location.
+  const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
+  if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion) {
+    IncludePos = FIDInfo->IncludeLoc;
+    FileID = IncludePos.getFileID();
+    FIDInfo = getFIDInfo(FileID);
+  }
+
+  FileInfo *FileInfo = getFileInfo(FileID);
 
   // If this is the first use of line information for this buffer, compute the
   /// SourceLineCache for it on demand. 

clang/include/clang/Basic/SourceManager.h

@@ -258,16 +258,22 @@ class SourceManager {
 
   /// Return the InfoRec structure for the specified FileID.  This is always the
   /// physical reference for the ID.
-  const SrcMgr::InfoRec *getInfoRec(unsigned FileID) const {
-    const SrcMgr::FileIDInfo *FIDInfo = getFIDInfo(FileID);
-
+  const SrcMgr::InfoRec *getInfoRec(const SrcMgr::FileIDInfo *FIDInfo) const {
     // For Macros, the physical loc is specified by the MacroTokenFileID.
     if (FIDInfo->IDType == SrcMgr::FileIDInfo::MacroExpansion)
       FIDInfo = &FileIDs[FIDInfo->u.MacroTokenFileID-1];
 
     return FIDInfo->getNormalBufferInfo();
   }
+  const SrcMgr::InfoRec *getInfoRec(unsigned FileID) const {
+    return getInfoRec(getFIDInfo(FileID));
+  }
 
+  SrcMgr::FileInfo *getFileInfo(const SrcMgr::FileIDInfo *FIDInfo) const {
+    if (const SrcMgr::InfoRec *IR = getInfoRec(FIDInfo))
+      return const_cast<SrcMgr::FileInfo *>(&IR->second);
+    return 0;
+  }
   SrcMgr::FileInfo *getFileInfo(unsigned FileID) const {
     if (const SrcMgr::InfoRec *IR = getInfoRec(FileID))
       return const_cast<SrcMgr::FileInfo *>(&IR->second);