diff options
| author | Justin Bogner <mail@justinbogner.com> | 2016-05-06 18:42:16 +0000 |
|---|---|---|
| committer | Justin Bogner <mail@justinbogner.com> | 2016-05-06 18:42:16 +0000 |
| commit | c45c960006bc23923879c15cd314d819c5da00d0 (patch) | |
| tree | 5d8051efe0857e4f207819aa6696beaecfd13baf /llvm/lib | |
| parent | 3d066e13d79c5fc8189d28ddce9f7245d3a980e3 (diff) | |
| download | bcm5719-llvm-c45c960006bc23923879c15cd314d819c5da00d0.tar.gz bcm5719-llvm-c45c960006bc23923879c15cd314d819c5da00d0.zip | |
SDAG: Don't leave dangling dead nodes after SelectCodeCommon
Relying on the caller to clean up after we've replaced all uses of a
node won't work when we've migrated to the `void Select(...)` API.
llvm-svn: 268774
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 0aafbbae6db..a036a31c317 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -2179,7 +2179,7 @@ void SelectionDAGISel::UpdateChains( CurDAG->ReplaceAllUsesOfValueWith(ChainVal, InputChain); // If the node became dead and we haven't already seen it, delete it. - if (ChainNode->use_empty() && + if (ChainNode != NodeToMatch && ChainNode->use_empty() && !std::count(NowDeadNodes.begin(), NowDeadNodes.end(), ChainNode)) NowDeadNodes.push_back(ChainNode); } @@ -2741,6 +2741,7 @@ SelectCodeCommon(SDNode *NodeToMatch, const unsigned char *MatcherTable, case ISD::AssertZext: CurDAG->ReplaceAllUsesOfValueWith(SDValue(NodeToMatch, 0), NodeToMatch->getOperand(0)); + CurDAG->RemoveDeadNode(NodeToMatch); return nullptr; case ISD::INLINEASM: return Select_INLINEASM(NodeToMatch); case ISD::READ_REGISTER: return Select_READ_REGISTER(NodeToMatch); @@ -3474,6 +3475,7 @@ SelectCodeCommon(SDNode *NodeToMatch, const unsigned char *MatcherTable, assert(NodeToMatch->use_empty() && "Didn't replace all uses of the node?"); + CurDAG->RemoveDeadNode(NodeToMatch); // FIXME: We just return here, which interacts correctly with SelectRoot // above. We should fix this to not return an SDNode* anymore. |
