commit 32038bb8486a1f31e8bd8e19ef388049669e9ed2
author Douglas Gregor <dgregor@apple.com> Tue Dec 21 19:07:48 2010 +0000
committer Douglas Gregor <dgregor@apple.com> Tue Dec 21 19:07:48 2010 +0000
tree e1dcb49741a62a51d203767635aad12096b4d75c
parent 52e64c88133c6c3153208f216d53112db5c09e8b

When determining which preprocessed entities to traverse in libclang,
take into account the region of interest. Otherwise, we may fail to
traverse some important preprocessed entity cursors. 
Fixes <rdar://problem/8554072>.


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

test/Index/Inputs/get-cursor-includes-1.h

diff --git a/test/Index/Inputs/get-cursor-includes-1.h b/test/Index/Inputs/get-cursor-includes-1.h
new file mode 100644
index 0000000..48439d2
--- /dev/null
+++ b/test/Index/Inputs/get-cursor-includes-1.h
@@ -0,0 +1,6 @@
+#ifndef GET_CURSOR_INCLUDES_1_H
+#define GET_CURSOR_INCLUDES_1_H
+
+extern int blah;
+
+#endif // GET_CURSOR_INCLUDES_1_H

test/Index/Inputs/get-cursor-includes-2.h

diff --git a/test/Index/Inputs/get-cursor-includes-2.h b/test/Index/Inputs/get-cursor-includes-2.h
new file mode 100644
index 0000000..cf95c18
--- /dev/null
+++ b/test/Index/Inputs/get-cursor-includes-2.h
@@ -0,0 +1,2 @@
+#include "get-cursor-includes-1.h"
+#include "get-cursor-includes-1.h"

test/Index/get-cursor-includes.c

diff --git a/test/Index/get-cursor-includes.c b/test/Index/get-cursor-includes.c
new file mode 100644
index 0000000..68d64f1
--- /dev/null
+++ b/test/Index/get-cursor-includes.c
@@ -0,0 +1,7 @@
+#include "get-cursor-includes-2.h"
+#include "get-cursor-includes-2.h"
+
+// RUN: c-index-test -write-pch %t.h.pch -I%S/Inputs -Xclang -detailed-preprocessing-record %S/Inputs/get-cursor-includes-2.h
+// RUN: c-index-test -cursor-at=%S/Inputs/get-cursor-includes-2.h:1:5 -I%S/Inputs -include %t.h %s | FileCheck %s
+
+// CHECK: inclusion directive=get-cursor-includes-1.h

tools/libclang/CIndex.cpp

diff --git a/tools/libclang/CIndex.cpp b/tools/libclang/CIndex.cpp
index 38b58e0..bd39925 100644
--- a/tools/libclang/CIndex.cpp
+++ b/tools/libclang/CIndex.cpp
@@ -410,7 +410,20 @@
     = *AU->getPreprocessor().getPreprocessingRecord();
   
   bool OnlyLocalDecls
-    = !AU->isMainFileAST() && AU->getOnlyLocalDecls();
+    = !AU->isMainFileAST() && AU->getOnlyLocalDecls(); 
+  
+  if (OnlyLocalDecls && RegionOfInterest.isValid()) {
+    // If we would only look at local declarations but we have a region of 
+    // interest, check whether that region of interest is in the main file.
+    // If not, we should traverse all declarations.
+    // FIXME: My kingdom for a proper binary search approach to finding
+    // cursors!
+    std::pair<FileID, unsigned> Location
+      = AU->getSourceManager().getDecomposedInstantiationLoc(
+                                                   RegionOfInterest.getBegin());
+    if (Location.first != AU->getSourceManager().getMainFileID())
+      OnlyLocalDecls = false;
+  }
   
   PreprocessingRecord::iterator StartEntity, EndEntity;
   if (OnlyLocalDecls) {