summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <thomas.stellard@amd.com>2015-11-12 20:04:48 +0000
committerTom Stellard <thomas.stellard@amd.com>2015-11-12 20:04:48 +0000
commitbe5fd180ca9b69466067a57f21ec1b5a67db65e4 (patch)
tree7005cc7ad3056b325c980318acbce47ae3ff43a1
parentf19b328a65dac863a71ebc1f30a30966bd3cd0d0 (diff)
downloadllvm-be5fd180ca9b69466067a57f21ec1b5a67db65e4.tar.gz
Merging r243956:
------------------------------------------------------------------------ r243956 | hfinkel | 2015-08-04 02:29:12 -0400 (Tue, 04 Aug 2015) | 10 lines [SDAG] Fix a result chain in ExpandUnalignedLoad On the code path in ExpandUnalignedLoad which expands an unaligned vector/fp value in terms of a legal integer load of the same size, the ChainResult needs to be the chain result of the integer load. No in-tree test case is currently available. Patch by Jan Hranac! ------------------------------------------------------------------------ llvm-svn: 252937
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
index 21ab07234c81..fbc8f1e89f6e 100644
--- a/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
@@ -439,7 +439,7 @@ ExpandUnalignedLoad(LoadSDNode *LD, SelectionDAG &DAG,
ISD::ANY_EXTEND, dl, VT, Result);
ValResult = Result;
- ChainResult = Chain;
+ ChainResult = newLoad.getValue(1);
return;
}