fix ExprMap and constant check in setcc
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19870 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Target/Alpha/AlphaISelPattern.cpp b/lib/Target/Alpha/AlphaISelPattern.cpp
index eb3594c..e6efc03 100644
--- a/lib/Target/Alpha/AlphaISelPattern.cpp
+++ b/lib/Target/Alpha/AlphaISelPattern.cpp
@@ -653,7 +653,7 @@
}
} else if (dir == 2) {
Tmp1 = SelectExpr(N.getOperand(1));
- if (isConst2) {
+ if (isConst1) {
Tmp2 = cast<ConstantSDNode>(N.getOperand(0))->getValue();
BuildMI(BB, Opc, 2, Result).addReg(Tmp1).addImm(Tmp2);
} else {
@@ -866,9 +866,9 @@
void ISel::Select(SDOperand N) {
unsigned Tmp1, Tmp2, Opc;
- if(ExprMap[N])
- return; //alread selected
- ExprMap[N] = 1;
+ // FIXME: Disable for our current expansion model!
+ if (/*!N->hasOneUse() &&*/ !ExprMap.insert(std::make_pair(N, 1)).second)
+ return; // Already selected.
SDNode *Node = N.Val;
@@ -977,6 +977,7 @@
case ISD::CopyFromReg:
case ISD::CALL:
// case ISD::DYNAMIC_STACKALLOC:
+ ExprMap.erase(N);
SelectExpr(N);
return;