Make sure to auto-cse nullary ops
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23224 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index cf4700e..bf94825 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -326,7 +326,10 @@
break;
default:
if (N->getNumValues() == 1) {
- if (N->getNumOperands() == 1) {
+ if (N->getNumOperands() == 0) {
+ Erased = NullaryOps.erase(std::make_pair(N->getOpcode(),
+ N->getValueType(0)));
+ } else if (N->getNumOperands() == 1) {
Erased =
UnaryOps.erase(std::make_pair(N->getOpcode(),
std::make_pair(N->getOperand(0),
@@ -1010,8 +1013,11 @@
/// getNode - Gets or creates the specified node.
///
SDOperand SelectionDAG::getNode(unsigned Opcode, MVT::ValueType VT) {
- SDNode *N = new SDNode(Opcode, VT);
- AllNodes.push_back(N);
+ SDNode *&N = NullaryOps[std::make_pair(Opcode, VT)];
+ if (!N) {
+ N = new SDNode(Opcode, VT);
+ AllNodes.push_back(N);
+ }
return SDOperand(N, 0);
}