AMDGPU/R600: Return correct chain when lowering loads

The other LowerLOAD should be returning the correct chain.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241839 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Matt Arsenault 2015-07-09 18:47:03 +00:00
parent 4db527032a
commit 0685a5c5ed

View File

@ -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 &&