shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

GlobalISel: Guard return in llvm::getIConstantSplatVal (#71989)

Browse Source 
getIConstantVRegValWithLookThrough could return NULL.
This commit is contained in:
Changpeng Fang 2023-11-14 12:23:54 -08:00 committed by GitHub
parent d2fd1106f6
commit 011c9eeb9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/CodeGen/GlobalISel/Utils.cpp
View File

@ -1116,9 +1116,9 @@ std::optional<APInt>
llvm::getIConstantSplatVal(const Register Reg, const MachineRegisterInfo &MRI) {
if (auto SplatValAndReg =
getAnyConstantSplat(Reg, MRI, /* AllowUndef */ false)) {
std::optional<ValueAndVReg> ValAndVReg =
getIConstantVRegValWithLookThrough(SplatValAndReg->VReg, MRI);
return ValAndVReg->Value;
if (std::optional<ValueAndVReg> ValAndVReg =
getIConstantVRegValWithLookThrough(SplatValAndReg->VReg, MRI))
return ValAndVReg->Value;
}
return std::nullopt;

26
llvm/test/CodeGen/AMDGPU/GlobalISel/amdgpu-prelegalizer-combiner-crash.mir Normal file
View File

@ -0,0 +1,26 @@
# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py UTC_ARGS: --version 3
# RUN: llc -march=amdgcn -mcpu=gfx1030 -run-pass amdgpu-prelegalizer-combiner %s -o - | FileCheck -check-prefix=GCN %s
---
name: non_inlineable_imm_splat
body: |
bb.1:
liveins: $vgpr0
; GCN-LABEL: name: non_inlineable_imm_splat
; GCN: liveins: $vgpr0
; GCN-NEXT: {{ $}}
; GCN-NEXT: [[COPY:%[0-9]+]]:_(<2 x s16>) = COPY $vgpr0
; GCN-NEXT: [[C:%[0-9]+]]:_(s16) = G_FCONSTANT half 0xH4200
; GCN-NEXT: [[BUILD_VECTOR:%[0-9]+]]:_(<2 x s16>) = G_BUILD_VECTOR [[C]](s16), [[C]](s16)
; GCN-NEXT: [[SUB:%[0-9]+]]:_(<2 x s16>) = G_SUB [[COPY]], [[BUILD_VECTOR]]
; GCN-NEXT: $vgpr0 = COPY [[SUB]](<2 x s16>)
; GCN-NEXT: SI_RETURN implicit $vgpr0
%0:_(<2 x s16>) = COPY $vgpr0
%2:_(s16) = G_FCONSTANT half 0xH4200
%1:_(<2 x s16>) = G_BUILD_VECTOR %2(s16), %2(s16)
%3:_(<2 x s16>) = G_SUB %0, %1
$vgpr0 = COPY %3(<2 x s16>)
SI_RETURN implicit $vgpr0
...