[clang] 7c2cb14 - Revert "[clang][SourceManager] cache Macro Expansions"
Nick Desaulniers via cfe-commits
cfe-commits at lists.llvm.org
Mon Jun 29 12:54:45 PDT 2020
Author: Nick Desaulniers
Date: 2020-06-29T12:54:32-07:00
New Revision: 7c2cb1448ad2d20e251db5e3ae4a0c84c12aa970
URL: https://github.com/llvm/llvm-project/commit/7c2cb1448ad2d20e251db5e3ae4a0c84c12aa970
DIFF: https://github.com/llvm/llvm-project/commit/7c2cb1448ad2d20e251db5e3ae4a0c84c12aa970.diff
LOG: Revert "[clang][SourceManager] cache Macro Expansions"
This reverts commit dffc1420451f674731cb36799c8ae084104ff0b5.
Missed a hunk (D82690).
Added:
Modified:
clang/lib/Basic/SourceManager.cpp
Removed:
################################################################################
diff --git a/clang/lib/Basic/SourceManager.cpp b/clang/lib/Basic/SourceManager.cpp
index 5c5a9974d7f9..425bef717574 100644
--- a/clang/lib/Basic/SourceManager.cpp
+++ b/clang/lib/Basic/SourceManager.cpp
@@ -861,8 +861,11 @@ FileID SourceManager::getFileIDLocal(unsigned SLocOffset) const {
--I;
if (I->getOffset() <= SLocOffset) {
FileID Res = FileID::get(int(I - LocalSLocEntryTable.begin()));
- // Remember it. We have good locality across FileID lookups.
- LastFileIDLookup = Res;
+
+ // If this isn't an expansion, remember it. We have good locality across
+ // FileID lookups.
+ if (!I->isExpansion())
+ LastFileIDLookup = Res;
NumLinearScans += NumProbes+1;
return Res;
}
@@ -937,7 +940,9 @@ FileID SourceManager::getFileIDLoaded(unsigned SLocOffset) const {
const SrcMgr::SLocEntry &E = getLoadedSLocEntry(I);
if (E.getOffset() <= SLocOffset) {
FileID Res = FileID::get(-int(I) - 2);
- LastFileIDLookup = Res;
+
+ if (!E.isExpansion())
+ LastFileIDLookup = Res;
NumLinearScans += NumProbes + 1;
return Res;
}
@@ -970,7 +975,8 @@ FileID SourceManager::getFileIDLoaded(unsigned SLocOffset) const {
if (isOffsetInFileID(FileID::get(-int(MiddleIndex) - 2), SLocOffset)) {
FileID Res = FileID::get(-int(MiddleIndex) - 2);
- LastFileIDLookup = Res;
+ if (!E.isExpansion())
+ LastFileIDLookup = Res;
NumBinaryProbes += NumProbes;
return Res;
}
More information about the cfe-commits
mailing list