summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
diff options
context:
space:
mode:
authorVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>2016-03-01 20:25:43 +0000
committerVasileios Kalintiris <Vasileios.Kalintiris@imgtec.com>2016-03-01 20:25:43 +0000
commit36901dd1c3b27b5a954c6f78b8ae7d6580ce2e12 (patch)
tree06dc0adb91b78e4dbdf3dc16e01fe19ccc4f6507 /llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
parent01cd2e7a4bc6af6fd33f1c4f8284b5d184dcec7b (diff)
downloadbcm5719-llvm-36901dd1c3b27b5a954c6f78b8ae7d6580ce2e12.tar.gz
bcm5719-llvm-36901dd1c3b27b5a954c6f78b8ae7d6580ce2e12.zip
Revert "[mips] Promote the result of SETCC nodes to GPR width."
This reverts commit r262316. It seems that my change breaks an out-of-tree chromium buildbot, so I'm reverting this in order to investigate the situation further. llvm-svn: 262387
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index d2d48ea936b..4120e79e667 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -14159,7 +14159,8 @@ SDValue DAGCombiner::SimplifySelectCC(SDLoc DL, SDValue N0, SDValue N1,
Temp = DAG.getZeroExtendInReg(SCC, SDLoc(N2),
N2.getValueType());
else
- Temp = DAG.getZExtOrTrunc(SCC, SDLoc(N2), N2.getValueType());
+ Temp = DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N2),
+ N2.getValueType(), SCC);
} else {
SCC = DAG.getSetCC(SDLoc(N0), MVT::i1, N0, N1, CC);
Temp = DAG.getNode(ISD::ZERO_EXTEND, SDLoc(N2),
OpenPOWER on IntegriCloud