diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2016-10-21 20:25:11 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2016-10-21 20:25:11 +0000 |
| commit | 6c7dd980e4eb68da22abaae5ac749a6b3e465969 (patch) | |
| tree | c038e4b9258d2a10f0c9e3a201ca3c03afbbb079 /llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | |
| parent | ca92c36e014bc806458c0a75e039881030e885e6 (diff) | |
| download | bcm5719-llvm-6c7dd980e4eb68da22abaae5ac749a6b3e465969.tar.gz bcm5719-llvm-6c7dd980e4eb68da22abaae5ac749a6b3e465969.zip | |
AMDGPU/SI: Fix crash caused by r284267
Reviewers: arsenm, nhaehnle
Subscribers: kzhuravl, wdng, nhaehnle, yaxunl, tony-tye, llvm-commits
Differential Revision: https://reviews.llvm.org/D25782
llvm-svn: 284875
Diffstat (limited to 'llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp index ac6c7e33fb3..a7fd748e85d 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUISelLowering.cpp @@ -2631,8 +2631,9 @@ SDValue AMDGPUTargetLowering::PerformDAGCombine(SDNode *N, case AMDGPUISD::MUL_U24: case AMDGPUISD::MULHI_I24: case AMDGPUISD::MULHI_U24: { - simplifyI24(N, 0, DCI); - simplifyI24(N, 1, DCI); + // If the first call to simplify is successfull, then N may end up being + // deleted, so we shouldn't call simplifyI24 again. + simplifyI24(N, 0, DCI) || simplifyI24(N, 1, DCI); return SDValue(); } case AMDGPUISD::MUL_LOHI_I24: |
