This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG234c47ae2a8e: [clang][Basic] Make SourceLocation usable as
key in hash maps, NFCI (authored by miyuki).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D89719/new/
https://reviews.llvm.org/D89719
Files:
clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
clang/include/clang/Basic/SourceLocation.h
clang/lib/Basic/SourceLocation.cpp
Index: clang/lib/Basic/SourceLocation.cpp
===================================================================
--- clang/lib/Basic/SourceLocation.cpp
+++ clang/lib/Basic/SourceLocation.cpp
@@ -14,6 +14,7 @@
#include "clang/Basic/LLVM.h"
#include "clang/Basic/PrettyStackTrace.h"
#include "clang/Basic/SourceManager.h"
+#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -40,6 +41,10 @@
// SourceLocation
//===----------------------------------------------------------------------===//
+unsigned SourceLocation::getHashValue() const {
+ return llvm::DenseMapInfo<unsigned>::getHashValue(ID);
+}
+
void SourceLocation::print(raw_ostream &OS, const SourceManager &SM)const{
if (!isValid()) {
OS << "<invalid loc>";
Index: clang/include/clang/Basic/SourceLocation.h
===================================================================
--- clang/include/clang/Basic/SourceLocation.h
+++ clang/include/clang/Basic/SourceLocation.h
@@ -175,6 +175,7 @@
End.isFileID();
}
+ unsigned getHashValue() const;
void print(raw_ostream &OS, const SourceManager &SM) const;
std::string printToString(const SourceManager &SM) const;
void dump(const SourceManager &SM) const;
@@ -479,6 +480,27 @@
}
};
+ /// Define DenseMapInfo so that SourceLocation's can be used as keys in
+ /// DenseMap and DenseSet. This trait class is eqivalent to
+ /// DenseMapInfo<unsigned> which uses SourceLocation::ID is used as a key.
+ template <> struct DenseMapInfo<clang::SourceLocation> {
+ static clang::SourceLocation getEmptyKey() {
+ return clang::SourceLocation::getFromRawEncoding(~0U);
+ }
+
+ static clang::SourceLocation getTombstoneKey() {
+ return clang::SourceLocation::getFromRawEncoding(~0U - 1);
+ }
+
+ static unsigned getHashValue(clang::SourceLocation Loc) {
+ return Loc.getHashValue();
+ }
+
+ static bool isEqual(clang::SourceLocation LHS, clang::SourceLocation RHS) {
+ return LHS == RHS;
+ }
+ };
+
// Teach SmallPtrSet how to handle SourceLocation.
template<>
struct PointerLikeTypeTraits<clang::SourceLocation> {
Index: clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
+++ clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
@@ -33,7 +33,7 @@
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
private:
- llvm::DenseSet<unsigned> MatchedTemplateLocations;
+ llvm::DenseSet<SourceLocation> MatchedTemplateLocations;
};
} // namespace google
Index: clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
+++ clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
@@ -298,8 +298,7 @@
}
if (IsInInstantiation) {
- if (MatchedTemplateLocations.count(
- ReplacementRange.getBegin().getRawEncoding()) == 0) {
+ if (MatchedTemplateLocations.count(ReplacementRange.getBegin()) == 0) {
// For each location matched in a template instantiation, we check if
// the location can also be found in `MatchedTemplateLocations`. If it
// is not found, that means the expression did not create a match
@@ -313,8 +312,7 @@
if (IsInTemplate) {
// We gather source locations from template matches not in template
// instantiations for future matches.
- MatchedTemplateLocations.insert(
- ReplacementRange.getBegin().getRawEncoding());
+ MatchedTemplateLocations.insert(ReplacementRange.getBegin());
}
if (!AddFix) {
Index: clang/lib/Basic/SourceLocation.cpp
===================================================================
--- clang/lib/Basic/SourceLocation.cpp
+++ clang/lib/Basic/SourceLocation.cpp
@@ -14,6 +14,7 @@
#include "clang/Basic/LLVM.h"
#include "clang/Basic/PrettyStackTrace.h"
#include "clang/Basic/SourceManager.h"
+#include "llvm/ADT/DenseMapInfo.h"
#include "llvm/ADT/StringRef.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/MemoryBuffer.h"
@@ -40,6 +41,10 @@
// SourceLocation
//===----------------------------------------------------------------------===//
+unsigned SourceLocation::getHashValue() const {
+ return llvm::DenseMapInfo<unsigned>::getHashValue(ID);
+}
+
void SourceLocation::print(raw_ostream &OS, const SourceManager &SM)const{
if (!isValid()) {
OS << "<invalid loc>";
Index: clang/include/clang/Basic/SourceLocation.h
===================================================================
--- clang/include/clang/Basic/SourceLocation.h
+++ clang/include/clang/Basic/SourceLocation.h
@@ -175,6 +175,7 @@
End.isFileID();
}
+ unsigned getHashValue() const;
void print(raw_ostream &OS, const SourceManager &SM) const;
std::string printToString(const SourceManager &SM) const;
void dump(const SourceManager &SM) const;
@@ -479,6 +480,27 @@
}
};
+ /// Define DenseMapInfo so that SourceLocation's can be used as keys in
+ /// DenseMap and DenseSet. This trait class is eqivalent to
+ /// DenseMapInfo<unsigned> which uses SourceLocation::ID is used as a key.
+ template <> struct DenseMapInfo<clang::SourceLocation> {
+ static clang::SourceLocation getEmptyKey() {
+ return clang::SourceLocation::getFromRawEncoding(~0U);
+ }
+
+ static clang::SourceLocation getTombstoneKey() {
+ return clang::SourceLocation::getFromRawEncoding(~0U - 1);
+ }
+
+ static unsigned getHashValue(clang::SourceLocation Loc) {
+ return Loc.getHashValue();
+ }
+
+ static bool isEqual(clang::SourceLocation LHS, clang::SourceLocation RHS) {
+ return LHS == RHS;
+ }
+ };
+
// Teach SmallPtrSet how to handle SourceLocation.
template<>
struct PointerLikeTypeTraits<clang::SourceLocation> {
Index: clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
===================================================================
--- clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
+++ clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.h
@@ -33,7 +33,7 @@
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
private:
- llvm::DenseSet<unsigned> MatchedTemplateLocations;
+ llvm::DenseSet<SourceLocation> MatchedTemplateLocations;
};
} // namespace google
Index: clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
===================================================================
--- clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
+++ clang-tools-extra/clang-tidy/google/UpgradeGoogletestCaseCheck.cpp
@@ -298,8 +298,7 @@
}
if (IsInInstantiation) {
- if (MatchedTemplateLocations.count(
- ReplacementRange.getBegin().getRawEncoding()) == 0) {
+ if (MatchedTemplateLocations.count(ReplacementRange.getBegin()) == 0) {
// For each location matched in a template instantiation, we check if
// the location can also be found in `MatchedTemplateLocations`. If it
// is not found, that means the expression did not create a match
@@ -313,8 +312,7 @@
if (IsInTemplate) {
// We gather source locations from template matches not in template
// instantiations for future matches.
- MatchedTemplateLocations.insert(
- ReplacementRange.getBegin().getRawEncoding());
+ MatchedTemplateLocations.insert(ReplacementRange.getBegin());
}
if (!AddFix) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
