miyuki created this revision.
miyuki added reviewers: aprantl, dexonsmith, arphaman.
miyuki requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
The class `SymbolOccurrences` can store either a single `SourceRange`
in-place or multiple `SourceRanges` on the heap. In the latter case
the number of source ranges is stored in the internal representation
of the beginning `SourceLocation` of the in-place `SourceRange`
object.
This change gets rid of such hack by placing `SourceRange` in a union
which holds either a valid `SourceRange` or an `unsigned int` (a number
of ranges).
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D94599
Files:
clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
Index: clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
===================================================================
--- clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
+++ clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
@@ -21,13 +21,12 @@
"mismatching number of locations and lengths");
assert(!Locations.empty() && "no locations");
if (Locations.size() == 1) {
- RangeOrNumRanges = SourceRange(
+ new (&SingleRange) SourceRange(
Locations[0], Locations[0].getLocWithOffset(NamePieces[0].size()));
return;
}
MultipleRanges = std::make_unique<SourceRange[]>(Locations.size());
- RangeOrNumRanges.setBegin(
- SourceLocation::getFromRawEncoding(Locations.size()));
+ NumRanges = Locations.size();
for (const auto &Loc : llvm::enumerate(Locations)) {
MultipleRanges[Loc.index()] = SourceRange(
Loc.value(),
Index: clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
===================================================================
--- clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
+++ clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
@@ -69,17 +69,18 @@
OccurrenceKind getKind() const { return Kind; }
ArrayRef<SourceRange> getNameRanges() const {
- if (MultipleRanges) {
- return llvm::makeArrayRef(MultipleRanges.get(),
- RangeOrNumRanges.getBegin().getRawEncoding());
- }
- return RangeOrNumRanges;
+ if (MultipleRanges)
+ return llvm::makeArrayRef(MultipleRanges.get(), NumRanges);
+ return SingleRange;
}
private:
OccurrenceKind Kind;
std::unique_ptr<SourceRange[]> MultipleRanges;
- SourceRange RangeOrNumRanges;
+ union {
+ SourceRange SingleRange;
+ unsigned NumRanges;
+ };
};
using SymbolOccurrences = std::vector<SymbolOccurrence>;
Index: clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
===================================================================
--- clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
+++ clang/lib/Tooling/Refactoring/Rename/SymbolOccurrences.cpp
@@ -21,13 +21,12 @@
"mismatching number of locations and lengths");
assert(!Locations.empty() && "no locations");
if (Locations.size() == 1) {
- RangeOrNumRanges = SourceRange(
+ new (&SingleRange) SourceRange(
Locations[0], Locations[0].getLocWithOffset(NamePieces[0].size()));
return;
}
MultipleRanges = std::make_unique<SourceRange[]>(Locations.size());
- RangeOrNumRanges.setBegin(
- SourceLocation::getFromRawEncoding(Locations.size()));
+ NumRanges = Locations.size();
for (const auto &Loc : llvm::enumerate(Locations)) {
MultipleRanges[Loc.index()] = SourceRange(
Loc.value(),
Index: clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
===================================================================
--- clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
+++ clang/include/clang/Tooling/Refactoring/Rename/SymbolOccurrences.h
@@ -69,17 +69,18 @@
OccurrenceKind getKind() const { return Kind; }
ArrayRef<SourceRange> getNameRanges() const {
- if (MultipleRanges) {
- return llvm::makeArrayRef(MultipleRanges.get(),
- RangeOrNumRanges.getBegin().getRawEncoding());
- }
- return RangeOrNumRanges;
+ if (MultipleRanges)
+ return llvm::makeArrayRef(MultipleRanges.get(), NumRanges);
+ return SingleRange;
}
private:
OccurrenceKind Kind;
std::unique_ptr<SourceRange[]> MultipleRanges;
- SourceRange RangeOrNumRanges;
+ union {
+ SourceRange SingleRange;
+ unsigned NumRanges;
+ };
};
using SymbolOccurrences = std::vector<SymbolOccurrence>;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
