[cfe-commits] r167426 - /cfe/trunk/lib/Serialization/ASTReader.cpp

[Argyrios Kyrtzidis]

Author: akirtzidis
Date: Mon Nov  5 18:35:04 2012
New Revision: 167426

URL: http://llvm.org/viewvc/llvm-project?rev=167426&view=rev
Log:
[PCH] Take into account the 'include' source location of a SM_SLOC_BUFFER_ENTRY.

Modified:
    cfe/trunk/lib/Serialization/ASTReader.cpp

Modified: cfe/trunk/lib/Serialization/ASTReader.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTReader.cpp?rev=167426&r1=167425&r2=167426&view=diff
==============================================================================
--- cfe/trunk/lib/Serialization/ASTReader.cpp (original)
+++ cfe/trunk/lib/Serialization/ASTReader.cpp Mon Nov  5 18:35:04 2012
@@ -961,6 +961,7 @@
   case SM_SLOC_BUFFER_ENTRY: {
     const char *Name = BlobStart;
     unsigned Offset = Record[0];
+    SourceLocation IncludeLoc = ReadSourceLocation(*F, Record[1]);
     unsigned Code = SLocEntryCursor.ReadCode();
     Record.clear();
     unsigned RecCode
@@ -974,7 +975,8 @@
     llvm::MemoryBuffer *Buffer
       = llvm::MemoryBuffer::getMemBuffer(StringRef(BlobStart, BlobLen - 1),
                                          Name);
-    SourceMgr.createFileIDForMemBuffer(Buffer, ID, BaseOffset + Offset);
+    SourceMgr.createFileIDForMemBuffer(Buffer, ID, BaseOffset + Offset,
+                                       IncludeLoc);
     break;
   }