aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/llvm/CodeGen/SelectionDAG.h1
-rw-r--r--include/llvm/CodeGen/SelectionDAGNodes.h37
-rw-r--r--lib/CodeGen/SelectionDAG/SelectionDAG.cpp67
3 files changed, 16 insertions, 89 deletions
diff --git a/include/llvm/CodeGen/SelectionDAG.h b/include/llvm/CodeGen/SelectionDAG.h
index 7ad7afa441..d7802d3cde 100644
--- a/include/llvm/CodeGen/SelectionDAG.h
+++ b/include/llvm/CodeGen/SelectionDAG.h
@@ -800,6 +800,7 @@ private:
void *&InsertPos);
void DeleteNodeNotInCSEMaps(SDNode *N);
+ void DeallocateNode(SDNode *N);
unsigned getMVTAlignment(MVT MemoryVT) const;
diff --git a/include/llvm/CodeGen/SelectionDAGNodes.h b/include/llvm/CodeGen/SelectionDAGNodes.h
index 3b7d208e3b..a429855a9d 100644
--- a/include/llvm/CodeGen/SelectionDAGNodes.h
+++ b/include/llvm/CodeGen/SelectionDAGNodes.h
@@ -1119,14 +1119,7 @@ private:
/// addUse - add SDUse to the list of uses.
void addUse(SDUse &U) { U.addToList(&Uses); }
- // Out-of-line virtual method to give class a home.
- virtual void ANCHOR();
public:
- virtual ~SDNode() {
- assert(NumOperands == 0 && "Operand list not cleared before deletion");
- NodeType = ISD::DELETED_NODE;
- }
-
//===--------------------------------------------------------------------===//
// Accessors
//
@@ -1470,7 +1463,6 @@ inline bool SDValue::hasOneUse() const {
/// UnarySDNode - This class is used for single-operand SDNodes. This is solely
/// to allow co-allocation of node operands with the node itself.
class UnarySDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
SDUse Op;
public:
UnarySDNode(unsigned Opc, SDVTList VTs, SDValue X)
@@ -1483,7 +1475,6 @@ public:
/// BinarySDNode - This class is used for two-operand SDNodes. This is solely
/// to allow co-allocation of node operands with the node itself.
class BinarySDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
SDUse Ops[2];
public:
BinarySDNode(unsigned Opc, SDVTList VTs, SDValue X, SDValue Y)
@@ -1497,7 +1488,6 @@ public:
/// TernarySDNode - This class is used for three-operand SDNodes. This is solely
/// to allow co-allocation of node operands with the node itself.
class TernarySDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
SDUse Ops[3];
public:
TernarySDNode(unsigned Opc, SDVTList VTs, SDValue X, SDValue Y,
@@ -1516,7 +1506,6 @@ public:
/// operand. This node should be directly created by end-users and not added to
/// the AllNodes list.
class HandleSDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
SDUse Op;
public:
// FIXME: Remove the "noinline" attribute once <rdar://problem/5852746> is
@@ -1536,8 +1525,6 @@ public:
/// Abstact virtual class for operations for memory operations
class MemSDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
-
private:
// MemoryVT - VT of in-memory value.
MVT MemoryVT;
@@ -1613,10 +1600,9 @@ public:
/// AtomicSDNode - A SDNode reprenting atomic operations.
///
class AtomicSDNode : public MemSDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
SDUse Ops[4];
- public:
+public:
// Opc: opcode for atomic
// VTL: value type list
// Chain: memory chain for operaand
@@ -1678,7 +1664,6 @@ class AtomicSDNode : public MemSDNode {
/// memory and need an associated memory operand.
///
class MemIntrinsicSDNode : public MemSDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
bool ReadMem; // Intrinsic reads memory
bool WriteMem; // Intrinsic writes memory
public:
@@ -1706,7 +1691,6 @@ public:
class ConstantSDNode : public SDNode {
const ConstantInt *Value;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
ConstantSDNode(bool isTarget, const ConstantInt *val, MVT VT)
@@ -1732,7 +1716,6 @@ public:
class ConstantFPSDNode : public SDNode {
const ConstantFP *Value;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
ConstantFPSDNode(bool isTarget, const ConstantFP *val, MVT VT)
@@ -1776,7 +1759,6 @@ public:
class GlobalAddressSDNode : public SDNode {
GlobalValue *TheGlobal;
int64_t Offset;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
GlobalAddressSDNode(bool isTarget, const GlobalValue *GA, MVT VT,
@@ -1797,7 +1779,6 @@ public:
class FrameIndexSDNode : public SDNode {
int FI;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
FrameIndexSDNode(int fi, MVT VT, bool isTarg)
@@ -1817,7 +1798,6 @@ public:
class JumpTableSDNode : public SDNode {
int JTI;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
JumpTableSDNode(int jti, MVT VT, bool isTarg)
@@ -1842,7 +1822,6 @@ class ConstantPoolSDNode : public SDNode {
} Val;
int Offset; // It's a MachineConstantPoolValue if top bit is set.
unsigned Alignment;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
ConstantPoolSDNode(bool isTarget, Constant *c, MVT VT, int o=0)
@@ -1908,7 +1887,6 @@ public:
class BasicBlockSDNode : public SDNode {
MachineBasicBlock *MBB;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
explicit BasicBlockSDNode(MachineBasicBlock *mbb)
@@ -1934,7 +1912,6 @@ public:
///
class SrcValueSDNode : public SDNode {
const Value *V;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
/// Create a SrcValue for a general value.
@@ -1957,7 +1934,6 @@ public:
/// and ISD::STORE have been lowered.
///
class MemOperandSDNode : public SDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
/// Create a MachineMemOperand node
@@ -1977,7 +1953,6 @@ public:
class RegisterSDNode : public SDNode {
unsigned Reg;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
RegisterSDNode(unsigned reg, MVT VT)
@@ -1998,7 +1973,6 @@ class DbgStopPointSDNode : public SDNode {
unsigned Line;
unsigned Column;
Value *CU;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
DbgStopPointSDNode(SDValue ch, unsigned l, unsigned c,
@@ -2022,7 +1996,6 @@ public:
class LabelSDNode : public SDNode {
SDUse Chain;
unsigned LabelID;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
LabelSDNode(unsigned NodeTy, SDValue ch, unsigned id)
@@ -2042,7 +2015,6 @@ public:
class ExternalSymbolSDNode : public SDNode {
const char *Symbol;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
ExternalSymbolSDNode(bool isTarget, const char *Sym, MVT VT)
@@ -2062,7 +2034,6 @@ public:
class CondCodeSDNode : public SDNode {
ISD::CondCode Condition;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
explicit CondCodeSDNode(ISD::CondCode Cond)
@@ -2082,7 +2053,6 @@ public:
/// future and most targets don't support it.
class CvtRndSatSDNode : public SDNode {
ISD::CvtCode CvtCode;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
explicit CvtRndSatSDNode(MVT VT, const SDValue *Ops, unsigned NumOps,
@@ -2187,7 +2157,6 @@ namespace ISD {
/// ARG_FLAGSSDNode - Leaf node holding parameter flags.
class ARG_FLAGSSDNode : public SDNode {
ISD::ArgFlagsTy TheFlags;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
explicit ARG_FLAGSSDNode(ISD::ArgFlagsTy Flags)
@@ -2211,7 +2180,6 @@ class CallSDNode : public SDNode {
// will expand the size of the representation. At the moment we only
// need Inreg.
bool Inreg;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
CallSDNode(unsigned cc, bool isvararg, bool istailcall, bool isinreg,
@@ -2256,7 +2224,6 @@ public:
/// to parameterize some operations.
class VTSDNode : public SDNode {
MVT ValueType;
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
explicit VTSDNode(MVT VT)
@@ -2323,7 +2290,6 @@ public:
/// LoadSDNode - This class is used to represent ISD::LOAD nodes.
///
class LoadSDNode : public LSBaseSDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
LoadSDNode(SDValue *ChainPtrOff, SDVTList VTs,
@@ -2353,7 +2319,6 @@ public:
/// StoreSDNode - This class is used to represent ISD::STORE nodes.
///
class StoreSDNode : public LSBaseSDNode {
- virtual void ANCHOR(); // Out-of-line virtual method to give class a home.
protected:
friend class SelectionDAG;
StoreSDNode(SDValue *ChainValuePtrOff, SDVTList VTs,
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index d8124e6d7c..2a456dce33 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -557,14 +557,7 @@ void SelectionDAG::RemoveDeadNodes(SmallVectorImpl<SDNode *> &DeadNodes,
DeadNodes.push_back(Operand);
}
- if (N->OperandsNeedDelete)
- delete[] N->OperandList;
-
- N->OperandList = 0;
- N->NumOperands = 0;
-
- // Finally, remove N itself.
- NodeAllocator.Deallocate(AllNodes.remove(N));
+ DeallocateNode(N);
}
}
@@ -585,16 +578,23 @@ void SelectionDAG::DeleteNode(SDNode *N) {
}
void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode *N) {
+ assert(N != AllNodes.begin());
+
// Drop all of the operands and decrement used node's use counts.
for (SDNode::op_iterator I = N->op_begin(), E = N->op_end(); I != E; ++I)
I->getVal()->removeUser(std::distance(N->op_begin(), I), N);
- if (N->OperandsNeedDelete) {
+ DeallocateNode(N);
+}
+
+void SelectionDAG::DeallocateNode(SDNode *N) {
+ if (N->OperandsNeedDelete)
delete[] N->OperandList;
- N->OperandList = 0;
- }
- assert(N != AllNodes.begin());
+ // Set the opcode to DELETED_NODE to help catch bugs when node
+ // memory is reallocated.
+ N->NodeType = ISD::DELETED_NODE;
+
NodeAllocator.Deallocate(AllNodes.remove(N));
}
@@ -786,17 +786,8 @@ SelectionDAG::~SelectionDAG() {
void SelectionDAG::allnodes_clear() {
assert(&*AllNodes.begin() == &EntryNode);
AllNodes.remove(AllNodes.begin());
- while (!AllNodes.empty()) {
- SDNode *N = AllNodes.remove(AllNodes.begin());
- N->SetNextInBucket(0);
-
- if (N->OperandsNeedDelete) {
- delete [] N->OperandList;
- N->OperandList = 0;
- }
-
- NodeAllocator.Deallocate(N);
- }
+ while (!AllNodes.empty())
+ DeallocateNode(AllNodes.begin());
}
void SelectionDAG::clear() {
@@ -4737,36 +4728,6 @@ unsigned SelectionDAG::AssignTopologicalOrder() {
// SDNode Class
//===----------------------------------------------------------------------===//
-// Out-of-line virtual method to give class a home.
-void SDNode::ANCHOR() {}
-void UnarySDNode::ANCHOR() {}
-void BinarySDNode::ANCHOR() {}
-void TernarySDNode::ANCHOR() {}
-void HandleSDNode::ANCHOR() {}
-void ConstantSDNode::ANCHOR() {}
-void ConstantFPSDNode::ANCHOR() {}
-void GlobalAddressSDNode::ANCHOR() {}
-void FrameIndexSDNode::ANCHOR() {}
-void JumpTableSDNode::ANCHOR() {}
-void ConstantPoolSDNode::ANCHOR() {}
-void BasicBlockSDNode::ANCHOR() {}
-void SrcValueSDNode::ANCHOR() {}
-void MemOperandSDNode::ANCHOR() {}
-void RegisterSDNode::ANCHOR() {}
-void DbgStopPointSDNode::ANCHOR() {}
-void LabelSDNode::ANCHOR() {}
-void ExternalSymbolSDNode::ANCHOR() {}
-void CondCodeSDNode::ANCHOR() {}
-void ARG_FLAGSSDNode::ANCHOR() {}
-void VTSDNode::ANCHOR() {}
-void MemSDNode::ANCHOR() {}
-void LoadSDNode::ANCHOR() {}
-void StoreSDNode::ANCHOR() {}
-void AtomicSDNode::ANCHOR() {}
-void MemIntrinsicSDNode::ANCHOR() {}
-void CallSDNode::ANCHOR() {}
-void CvtRndSatSDNode::ANCHOR() {}
-
HandleSDNode::~HandleSDNode() {
DropOperands();
}
generated by cgit v1.2.3-18-g5258 (git 2.32.0) at 2025-08-03 23:04:03 +0000