diff options
| author | Matt Arsenault <Matthew.Arsenault@amd.com> | 2018-03-27 18:39:45 +0000 |
|---|---|---|
| committer | Matt Arsenault <Matthew.Arsenault@amd.com> | 2018-03-27 18:39:45 +0000 |
| commit | 0a0c871f601aae4a26694eea06f37becba78d1e4 (patch) | |
| tree | d86517493e06fa8a5349df43c1bb03fcf45ea37f /llvm/lib/Target/AMDGPU/SIISelLowering.cpp | |
| parent | 126a874952d76a19bfc4bbd1b0a69cac65c8b35c (diff) | |
| download | bcm5719-llvm-0a0c871f601aae4a26694eea06f37becba78d1e4.tar.gz bcm5719-llvm-0a0c871f601aae4a26694eea06f37becba78d1e4.zip | |
AMDGPU: Fix crash when MachinePointerInfo invalid
The combine on a select of a load only triggers for
addrspace 0, and discards the MachinePointerInfo. The
conservative default needs to be used for this.
llvm-svn: 328652
Diffstat (limited to 'llvm/lib/Target/AMDGPU/SIISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/SIISelLowering.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp index 58afd167e0c..51c27b0b1f7 100644 --- a/llvm/lib/Target/AMDGPU/SIISelLowering.cpp +++ b/llvm/lib/Target/AMDGPU/SIISelLowering.cpp @@ -1087,7 +1087,7 @@ bool SITargetLowering::isNoopAddrSpaceCast(unsigned SrcAS, bool SITargetLowering::isMemOpHasNoClobberedMemOperand(const SDNode *N) const { const MemSDNode *MemNode = cast<MemSDNode>(N); const Value *Ptr = MemNode->getMemOperand()->getValue(); - const Instruction *I = dyn_cast<Instruction>(Ptr); + const Instruction *I = dyn_cast_or_null<Instruction>(Ptr); return I && I->getMetadata("amdgpu.noclobber"); } |
