Skip to content

Commit d4d2637

Browse files
committed
[AMDGPU] Modify the builtins and intrinsics for named barrier
fix the reused variable name.
1 parent 40221f3 commit d4d2637

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

llvm/lib/Target/AMDGPU/AMDGPUMachineFunction.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,11 @@ unsigned AMDGPUMachineFunction::allocateLDSGlobal(const DataLayout &DL,
104104
unsigned Offset;
105105
if (GV.getAddressSpace() == AMDGPUAS::LOCAL_ADDRESS) {
106106
if (TargetExtType *TTy = AMDGPU::isNamedBarrier(GV)) {
107-
auto Offset = getLDSAbsoluteAddress(GV);
108-
assert(Offset && "named barrier should have an absolute address");
109-
Entry.first->second = Offset.value();
110-
return Offset.value();
107+
std::optional<unsigned> BarAddr = getLDSAbsoluteAddress(GV);
108+
if (!BarAddr)
109+
llvm_unreachable("named barrier should have an assigned address");
110+
Entry.first->second = BarAddr.value();
111+
return BarAddr.value();
111112
}
112113

113114
std::optional<uint32_t> MaybeAbs = getLDSAbsoluteAddress(GV);

0 commit comments

Comments
 (0)