diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2015-07-09 18:47:03 +0000 |
|---|---|---|
| committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2015-07-09 18:47:03 +0000 |
| commit | 8b03e6c16451eadc3a133d69c000585a0d75cb57 (patch) | |
| tree | 174dd54c1b42cf20133fb6b77d2c57dd17d11432 | |
| parent | 6f062c8c2a3de7140341dbe03af80ae840c91492 (diff) | |
| download | bcm5719-llvm-8b03e6c16451eadc3a133d69c000585a0d75cb57.tar.gz bcm5719-llvm-8b03e6c16451eadc3a133d69c000585a0d75cb57.zip | |
AMDGPU/R600: Return correct chain when lowering loads
The other LowerLOAD should be returning the correct chain.
llvm-svn: 241839
| -rw-r--r-- | llvm/lib/Target/AMDGPU/R600ISelLowering.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp b/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp index 035edf6591e..18dafa65a81 100644 --- a/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp +++ b/llvm/lib/Target/AMDGPU/R600ISelLowering.cpp @@ -1460,14 +1460,8 @@ SDValue R600TargetLowering::LowerLOAD(SDValue Op, SelectionDAG &DAG) const SDValue Ptr = Op.getOperand(1); SDValue LoweredLoad; - SDValue Ret = AMDGPUTargetLowering::LowerLOAD(Op, DAG); - if (Ret.getNode()) { - SDValue Ops[2] = { - Ret, - Chain - }; - return DAG.getMergeValues(Ops, DL); - } + if (SDValue Ret = AMDGPUTargetLowering::LowerLOAD(Op, DAG)) + return Ret; // Lower loads constant address space global variable loads if (LoadNode->getAddressSpace() == AMDGPUAS::CONSTANT_ADDRESS && |
