commit 4ff3225c1f343c3e0d461a0e387c7c6012cff5ba
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jun 07 17:57:59 2013 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Fri Jun 07 17:57:59 2013 +0000
tree eb54ec666e0739513fa9774c8f1ef114dafb5609
parent 54e6c9d1f15153d1756642080866f10a91cc86ea

Thread the 'Invalid' out parameter through SourceManager::getSLocEntry() and callees of SourceManager::getSLocEntryByID().

Also add an 'Invalid' check in SourceManager::computeMacroArgsCache().

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@183538 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Basic/SourceManager.cpp

diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp
index 0de5129..2e3fb7d 100644
--- a/lib/Basic/SourceManager.cpp
+++ b/lib/Basic/SourceManager.cpp
@@ -1808,7 +1808,10 @@
       return;
     }
 
-    const SrcMgr::SLocEntry &Entry = getSLocEntryByID(ID);
+    bool Invalid = false;
+    const SrcMgr::SLocEntry &Entry = getSLocEntryByID(ID, &Invalid);
+    if (Invalid)
+      return;
     if (Entry.isFile()) {
       SourceLocation IncludeLoc = Entry.getFile().getIncludeLoc();
       if (IncludeLoc.isInvalid())