6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 23:32:27 +00:00
Code Issues Projects Releases Wiki Activity

Revert "unique_ptrify LiveRange::segmentSet"

Browse Source 
GCC 4.7 *shakes fist* (doesn't have std::map::emplace... )

This reverts commit r231168.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@231173 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2015-03-03 23:44:07 +00:00
parent 87a61e97b7
commit c4a74461e4
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/llvm/CodeGen/LiveInterval.h
View File

@ -199,7 +199,7 @@ namespace llvm {
// of live ranges of physical registers in computeRegUnitRange. // of live ranges of physical registers in computeRegUnitRange.
// After that the set is flushed to the segment vector and deleted. // After that the set is flushed to the segment vector and deleted.
typedef std::set<Segment> SegmentSet; typedef std::set<Segment> SegmentSet;
std::unique_ptr<SegmentSet> segmentSet; SegmentSet *segmentSet;
typedef Segments::iterator iterator; typedef Segments::iterator iterator;
iterator begin() { return segments.begin(); } iterator begin() { return segments.begin(); }
@ -218,13 +218,15 @@ namespace llvm {
const_vni_iterator vni_end() const { return valnos.end(); } const_vni_iterator vni_end() const { return valnos.end(); }
/// Constructs a new LiveRange object. /// Constructs a new LiveRange object.
LiveRange(bool UseSegmentSet = false) LiveRange(bool UseSegmentSet = false) : segmentSet(nullptr) {
: segmentSet(UseSegmentSet ? llvm::make_unique<SegmentSet>() if (UseSegmentSet)
: nullptr) {} segmentSet = new SegmentSet();
}
/// Constructs a new LiveRange object by copying segments and valnos from /// Constructs a new LiveRange object by copying segments and valnos from
/// another LiveRange. /// another LiveRange.
LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator) { LiveRange(const LiveRange &Other, BumpPtrAllocator &Allocator)
: segmentSet(nullptr) {
assert(Other.segmentSet == nullptr && assert(Other.segmentSet == nullptr &&
"Copying of LiveRanges with active SegmentSets is not supported"); "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 /// advanceTo - Advance the specified iterator to point to the Segment
/// containing the specified position, or end() if the position is past the /// containing the specified position, or end() if the position is past the
/// end of the range. If no Segment contains this position, but the /// end of the range. If no Segment contains this position, but the
@ -741,6 +745,8 @@ namespace llvm {
#endif #endif
private: private:
LiveInterval& operator=(const LiveInterval& rhs) = delete;
/// Appends @p Range to SubRanges list. /// Appends @p Range to SubRanges list.
void appendSubRange(SubRange *Range) { void appendSubRange(SubRange *Range) {
Range->Next = SubRanges; Range->Next = SubRanges;

1
lib/CodeGen/LiveInterval.cpp
View File

@ -743,6 +743,7 @@ void LiveRange::flushSegmentSet() {
segments.empty() && segments.empty() &&
"segment set can be used only initially before switching to the array"); "segment set can be used only initially before switching to the array");
segments.append(segmentSet->begin(), segmentSet->end()); segments.append(segmentSet->begin(), segmentSet->end());
delete segmentSet;
segmentSet = nullptr; segmentSet = nullptr;
verify(); verify();
} }

6
lib/CodeGen/LiveStackAnalysis.cpp
View File

@ -61,10 +61,8 @@ LiveStacks::getOrCreateInterval(int Slot, const TargetRegisterClass *RC) {
assert(Slot >= 0 && "Spill slot indice must be >= 0"); assert(Slot >= 0 && "Spill slot indice must be >= 0");
SS2IntervalMap::iterator I = S2IMap.find(Slot); SS2IntervalMap::iterator I = S2IMap.find(Slot);
if (I == S2IMap.end()) { if (I == S2IMap.end()) {
I = S2IMap.emplace(std::piecewise_construct, std::forward_as_tuple(Slot), I = S2IMap.insert(I, std::make_pair(Slot,
std::forward_as_tuple( LiveInterval(TargetRegisterInfo::index2StackSlot(Slot), 0.0F)));
TargetRegisterInfo::index2StackSlot(Slot), 0.0F))
.first;
S2RCMap.insert(std::make_pair(Slot, RC)); S2RCMap.insert(std::make_pair(Slot, RC));
} else { } else {
// Use the largest common subclass register class. // Use the largest common subclass register class.