diff options
| -rw-r--r-- | lib/Basic/SourceManager.cpp | 5 | ||||
| -rw-r--r-- | test/Index/annotate-tokens-include.c | 6 | ||||
| -rw-r--r-- | test/Index/annotate-tokens-include.h | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lib/Basic/SourceManager.cpp b/lib/Basic/SourceManager.cpp index 3ecab1d8c1..3fb52a100b 100644 --- a/lib/Basic/SourceManager.cpp +++ b/lib/Basic/SourceManager.cpp @@ -1170,15 +1170,20 @@ bool SourceManager::isBeforeInTranslationUnit(SourceLocation LHS, if (LOffs.first == ROffs.first) return LOffs.second < ROffs.second; +#if 0 // If we are comparing a source location with multiple locations in the same // file, we get a big win by caching the result. + // FIXME: This caching is wrong, but I don't know enough about this code + // to immediately fix it. There are cases where passing the same input + // values to this method causes it to return different results. if (LastLFIDForBeforeTUCheck == LOffs.first && LastRFIDForBeforeTUCheck == ROffs.first) return LastResForBeforeTUCheck; LastLFIDForBeforeTUCheck = LOffs.first; LastRFIDForBeforeTUCheck = ROffs.first; +#endif // "Traverse" the include/instantiation stacks of both locations and try to // find a common "ancestor". diff --git a/test/Index/annotate-tokens-include.c b/test/Index/annotate-tokens-include.c new file mode 100644 index 0000000000..3c3c43b746 --- /dev/null +++ b/test/Index/annotate-tokens-include.c @@ -0,0 +1,6 @@ +#include "annotate-tokens-include.h" + +// RUN: c-index-test -test-annotate-tokens=%s:1:1:2:1 %s | FileCheck %s +// CHECK: Identifier: "include" [1:2 - 1:9] preprocessing directive= +// CHECK: Literal: ""annotate-tokens-include.h"" [1:10 - 1:37] preprocessing directive= + diff --git a/test/Index/annotate-tokens-include.h b/test/Index/annotate-tokens-include.h new file mode 100644 index 0000000000..5d5f8f0c9e --- /dev/null +++ b/test/Index/annotate-tokens-include.h @@ -0,0 +1 @@ +int foo(); |