squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[clang-tools-extra] reimplement PreprocessorTracker in terms of StringSet.

Browse source 
Summary:
PreprocessorTracker is the last user of the old StringPool class, which
isn't super loved and isn't a great improvement over a plan StringSet.
Once this goes in we can remove StringPool entirely.

This is as discussed on cfe-dev.

Subscribers: cfe-commits

Tags: #clang

Differential Revision: https://reviews.llvm.org/D78273
This commit is contained in:
Chris Lattner 2020-04-15 22:27:19 -07:00
parent 75c4408653
commit 39c9c12b76
1 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
clang-tools-extra/modularize/PreprocessorTracker.cpp
View file

@ -243,19 +243,19 @@
//
//===--------------------------------------------------------------------===//
#include "clang/Lex/LexDiagnostic.h"
#include "PreprocessorTracker.h"
#include "ModularizeUtilities.h"
#include "clang/Lex/LexDiagnostic.h"
#include "clang/Lex/MacroArgs.h"
#include "clang/Lex/PPCallbacks.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/Support/StringPool.h"
#include "llvm/ADT/StringSet.h"
#include "llvm/Support/raw_ostream.h"
#include "ModularizeUtilities.h"
namespace Modularize {
// Some handle types
typedef llvm::PooledStringPtr StringHandle;
typedef llvm::StringRef StringHandle;
typedef int HeaderHandle;
const HeaderHandle HeaderHandleInvalid = -1;
@ -463,19 +463,6 @@ ConditionValueKindStrings[] = {
"(not evaluated)", "false", "true"
};
bool operator<(const StringHandle &H1, const StringHandle &H2) {
const char *S1 = (H1 ? *H1 : "");
const char *S2 = (H2 ? *H2 : "");
int Diff = strcmp(S1, S2);
return Diff < 0;
}
bool operator>(const StringHandle &H1, const StringHandle &H2) {
const char *S1 = (H1 ? *H1 : "");
const char *S2 = (H2 ? *H2 : "");
int Diff = strcmp(S1, S2);
return Diff > 0;
}
// Preprocessor item key.
//
// This class represents a location in a source file, for use
@ -922,7 +909,9 @@ public:
}
// Lookup/add string.
StringHandle addString(llvm::StringRef Str) { return Strings.intern(Str); }
StringHandle addString(llvm::StringRef Str) {
return Strings.insert(Str).first->first();
}
// Convert to a canonical path.
std::string getCanonicalPath(llvm::StringRef path) const {
@ -950,7 +939,7 @@ public:
HeaderHandle H = 0;
for (auto I = HeaderPaths.begin(), E = HeaderPaths.end(); I != E;
++I, ++H) {
if (**I == CanonicalPath)
if (*I == CanonicalPath)
return H;
}
return HeaderHandleInvalid;
@ -1143,10 +1132,10 @@ public:
// Tell caller we found one or more errors.
ReturnValue = true;
// Start the error message.
OS << *MacroExpTracker.InstanceSourceLine;
OS << MacroExpTracker.InstanceSourceLine;
if (ItemKey.Column > 0)
OS << std::string(ItemKey.Column - 1, ' ') << "^\n";
OS << "error: Macro instance '" << *MacroExpTracker.MacroUnexpanded
OS << "error: Macro instance '" << MacroExpTracker.MacroUnexpanded
<< "' has different values in this header, depending on how it was "
"included.\n";
// Walk all the instances.
@ -1154,8 +1143,8 @@ public:
EMT = MacroExpTracker.MacroExpansionInstances.end();
IMT != EMT; ++IMT) {
MacroExpansionInstance &MacroInfo = *IMT;
OS << " '" << *MacroExpTracker.MacroUnexpanded << "' expanded to: '"
<< *MacroInfo.MacroExpanded
OS << " '" << MacroExpTracker.MacroUnexpanded << "' expanded to: '"
<< MacroInfo.MacroExpanded
<< "' with respect to these inclusion paths:\n";
// Walk all the inclusion path hierarchies.
for (auto IIP = MacroInfo.InclusionPathHandles.begin(),
@ -1165,7 +1154,7 @@ public:
auto Count = (int)ip.size();
for (int Index = 0; Index < Count; ++Index) {
HeaderHandle H = ip[Index];
OS << std::string((Index * 2) + 4, ' ') << *getHeaderFilePath(H)
OS << std::string((Index * 2) + 4, ' ') << getHeaderFilePath(H)
<< "\n";
}
}
@ -1173,7 +1162,7 @@ public:
// instance location.
// If there is a definition...
if (MacroInfo.DefinitionLocation.Line != ItemKey.Line) {
OS << *MacroInfo.DefinitionSourceLine;
OS << MacroInfo.DefinitionSourceLine;
if (MacroInfo.DefinitionLocation.Column > 0)
OS << std::string(MacroInfo.DefinitionLocation.Column - 1, ' ')
<< "^\n";
@ -1201,13 +1190,13 @@ public:
// Tell caller we found one or more errors.
ReturnValue = true;
// Start the error message.
OS << *HeaderPaths[ItemKey.File] << ":" << ItemKey.Line << ":"
OS << HeaderPaths[ItemKey.File] << ":" << ItemKey.Line << ":"
<< ItemKey.Column << "\n";
OS << "#" << getDirectiveSpelling(CondTracker.DirectiveKind) << " "
<< *CondTracker.ConditionUnexpanded << "\n";
<< CondTracker.ConditionUnexpanded << "\n";
OS << "^\n";
OS << "error: Conditional expression instance '"
<< *CondTracker.ConditionUnexpanded
<< CondTracker.ConditionUnexpanded
<< "' has different values in this header, depending on how it was "
"included.\n";
// Walk all the instances.
@ -1215,7 +1204,7 @@ public:
EMT = CondTracker.ConditionalExpansionInstances.end();
IMT != EMT; ++IMT) {
ConditionalExpansionInstance &MacroInfo = *IMT;
OS << " '" << *CondTracker.ConditionUnexpanded << "' expanded to: '"
OS << " '" << CondTracker.ConditionUnexpanded << "' expanded to: '"
<< ConditionValueKindStrings[MacroInfo.ConditionValue]
<< "' with respect to these inclusion paths:\n";
// Walk all the inclusion path hierarchies.
@ -1226,7 +1215,7 @@ public:
auto Count = (int)ip.size();
for (int Index = 0; Index < Count; ++Index) {
HeaderHandle H = ip[Index];
OS << std::string((Index * 2) + 4, ' ') << *getHeaderFilePath(H)
OS << std::string((Index * 2) + 4, ' ') << getHeaderFilePath(H)
<< "\n";
}
}
@ -1255,7 +1244,7 @@ private:
llvm::SmallVector<std::string, 32> HeaderList;
// Only do extern, namespace check for headers in HeaderList.
bool BlockCheckHeaderListOnly;
llvm::StringPool Strings;
llvm::StringSet<> Strings;
std::vector<StringHandle> HeaderPaths;
std::vector<HeaderHandle> HeaderStack;
std::vector<HeaderInclusionPath> InclusionPaths;