RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-19 01:48:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[PBQP] Re-commit r220642 with a workaround for quirky Visual Studio behavior.

Browse Source 
Apparently unique_ptr'ifying NodeMetadata exposed an issue in VS where it
occasionally tries to synthesize copy constructors instead of moves. Hopefully
explicitly deleting the copy constructor and defining the move constructor will
fix this.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@220649 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2014-10-26 20:57:16 +00:00
parent bd116514bc
commit 9a6482a840
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/llvm/CodeGen/RegAllocPBQP.h
View File

@ -62,20 +62,15 @@ public:
delete[] ColCounts;
}
~MatrixMetadata() {
delete[] UnsafeRows;
delete[] UnsafeCols;
}
unsigned getWorstRow() const { return WorstRow; }
unsigned getWorstCol() const { return WorstCol; }
const bool* getUnsafeRows() const { return UnsafeRows; }
const bool* getUnsafeCols() const { return UnsafeCols; }
const bool* getUnsafeRows() const { return UnsafeRows.get(); }
const bool* getUnsafeCols() const { return UnsafeCols.get(); }
private:
unsigned WorstRow, WorstCol;
bool* UnsafeRows;
bool* UnsafeCols;
std::unique_ptr<bool[]> UnsafeRows;
std::unique_ptr<bool[]> UnsafeCols;
};
class NodeMetadata {
@ -88,7 +83,21 @@ public:
NotProvablyAllocatable } ReductionState;
NodeMetadata() : RS(Unprocessed), DeniedOpts(0), OptUnsafeEdges(nullptr){}
~NodeMetadata() { delete[] OptUnsafeEdges; }
NodeMetadata(NodeMetadata &&Other)
: RS(Other.RS), NumOpts(Other.NumOpts), DeniedOpts(Other.DeniedOpts),
OptUnsafeEdges(std::move(Other.OptUnsafeEdges)), VReg(Other.VReg),
OptionRegs(std::move(Other.OptionRegs)) {}
NodeMetadata& operator=(NodeMetadata &&Other) {
RS = Other.RS;
NumOpts = Other.NumOpts;
DeniedOpts = Other.DeniedOpts;
OptUnsafeEdges = std::move(Other.OptUnsafeEdges);
VReg = Other.VReg;
OptionRegs = std::move(Other.OptionRegs);
return *this;
}
void setVReg(unsigned VReg) { this->VReg = VReg; }
unsigned getVReg() const { return VReg; }
@ -100,7 +109,7 @@ public:
void setup(const Vector& Costs) {
NumOpts = Costs.getLength() - 1;
OptUnsafeEdges = new unsigned[NumOpts]();
OptUnsafeEdges = std::unique_ptr<unsigned[]>(new unsigned[NumOpts]());
}
ReductionState getReductionState() const { return RS; }
@ -124,15 +133,18 @@ public:
bool isConservativelyAllocatable() const {
return (DeniedOpts < NumOpts) ||
(std::find(OptUnsafeEdges, OptUnsafeEdges + NumOpts, 0) !=
OptUnsafeEdges + NumOpts);
(std::find(&OptUnsafeEdges[0], &OptUnsafeEdges[NumOpts], 0) !=
&OptUnsafeEdges[NumOpts]);
}
private:
NodeMetadata(const NodeMetadata&) LLVM_DELETED_FUNCTION;
void operator=(const NodeMetadata&) LLVM_DELETED_FUNCTION;
ReductionState RS;
unsigned NumOpts;
unsigned DeniedOpts;
unsigned* OptUnsafeEdges;
std::unique_ptr<unsigned[]> OptUnsafeEdges;
unsigned VReg;
OptionToRegMap OptionRegs;
};