[llvm-branch-commits] [llvm-branch] r252937 - Merging r243956:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Thu Nov 12 14:04:48 2015
New Revision: 252937

URL: http://llvm.org/viewvc/llvm-project?rev=252937&view=rev
Log:
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!

------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp

Modified: llvm/branches/release_37/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp?rev=252937&r1=252936&r2=252937&view=diff
==============================================================================
--- llvm/branches/release_37/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp (original)
+++ llvm/branches/release_37/lib/CodeGen/SelectionDAG/LegalizeDAG.cpp Thu Nov 12 14:04:48 2015
@@ -439,7 +439,7 @@ ExpandUnalignedLoad(LoadSDNode *LD, Sele
                              ISD::ANY_EXTEND, dl, VT, Result);
 
       ValResult = Result;
-      ChainResult = Chain;
+      ChainResult = newLoad.getValue(1);
       return;
     }