mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-07-15 19:24:33 +00:00
Revert "unique_ptrify LiveRange::segmentSet"
Apparently something does care about ordering of LiveIntervals... so revert all that stuff (r231175, r231176, r231177) & take some time to re-evaluate. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231184 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -199,7 +199,7 @@ namespace llvm {
|
||||
// of live ranges of physical registers in computeRegUnitRange.
|
||||
// After that the set is flushed to the segment vector and deleted.
|
||||
typedef std::set<Segment> SegmentSet;
|
||||
std::unique_ptr<SegmentSet> segmentSet;
|
||||
SegmentSet *segmentSet;
|
||||
|
||||
typedef Segments::iterator iterator;
|
||||
iterator begin() { return segments.begin(); }
|
||||
@@ -218,13 +218,15 @@ namespace llvm {
|
||||
const_vni_iterator vni_end() const { return valnos.end(); }
|
||||
|
||||
/// Constructs a new LiveRange object.
|
||||
LiveRange(bool UseSegmentSet = false)
|
||||
: segmentSet(UseSegmentSet ? llvm::make_unique<SegmentSet>()
|
||||
: nullptr) {}
|
||||
LiveRange(bool UseSegmentSet = false) : segmentSet(nullptr) {
|
||||
if (UseSegmentSet)
|
||||
segmentSet = new SegmentSet();
|
||||
}
|
||||
|
||||
/// Constructs a new LiveRange object by copying segments and valnos from
|
||||
/// another LiveRange.
|
||||
LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator) {
|
||||
LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator)
|
||||
: segmentSet(nullptr) {
|
||||
assert(Other.segmentSet == nullptr &&
|
||||
"Copying of LiveRanges with active SegmentSets is not supported");
|
||||
|
||||
@@ -238,6 +240,8 @@ namespace llvm {
|
||||
}
|
||||
}
|
||||
|
||||
~LiveRange() { delete segmentSet; }
|
||||
|
||||
/// advanceTo - Advance the specified iterator to point to the Segment
|
||||
/// containing the specified position, or end() if the position is past the
|
||||
/// end of the range. If no Segment contains this position, but the
|
||||
@@ -741,6 +745,8 @@ namespace llvm {
|
||||
#endif
|
||||
|
||||
private:
|
||||
LiveInterval& operator=(const LiveInterval& rhs) = delete;
|
||||
|
||||
/// Appends @p Range to SubRanges list.
|
||||
void appendSubRange(SubRange *Range) {
|
||||
Range->Next = SubRanges;
|
||||
|
Reference in New Issue
Block a user