summaryrefslogtreecommitdiffstats
path: root/llvm/lib
diff options
context:
space:
mode:
authorNirav Dave <niravd@google.com>2017-04-06 19:05:41 +0000
committerNirav Dave <niravd@google.com>2017-04-06 19:05:41 +0000
commit974f7c23ae084f830f94f5749f4f24b48e98f77d (patch)
tree784a5768de5e70570599a3db0b10c47deb94b6bd /llvm/lib
parent8ef20ea7c24c96670e8ef3d3b77772d17ada581b (diff)
downloadbcm5719-llvm-974f7c23ae084f830f94f5749f4f24b48e98f77d.tar.gz
bcm5719-llvm-974f7c23ae084f830f94f5749f4f24b48e98f77d.zip
[SDAG] Fix visitAND optimization to deal with vector extract case again.
Summary: Fix case elided by rL298920. Fixes PR32545. Reviewers: eli.friedman, RKSimon Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D31759 llvm-svn: 299688
Diffstat (limited to 'llvm/lib')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
index 8a7a8904539..8f05c61a957 100644
--- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp
@@ -3589,7 +3589,7 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
SDValue NewLoad(Load, 0);
// Fold the AND away. NewLoad may get replaced immediately.
- CombineTo(N, NewLoad);
+ CombineTo(N, (N0.getNode() == Load) ? NewLoad : N0);
if (Load->getExtensionType() == ISD::EXTLOAD) {
NewLoad = DAG.getLoad(Load->getAddressingMode(), ISD::ZEXTLOAD,
OpenPOWER on IntegriCloud