From 7b81aab2ac627b96bd7ddd64a4a24787c65aa9dc Mon Sep 17 00:00:00 2001 From: LU-JOHN <111294400+LU-JOHN@users.noreply.github.com> Date: Fri, 31 Mar 2023 11:53:15 -0500 Subject: [PATCH] [PATCH 31/79] [Backport to 15] Check for nullptr from getDbgInst (#1919) Ensure that ExprLB is non-NULL before using it. Signed-off-by: Lu, John Gbp-Pq: Name 0031-Backport-to-15-Check-for-nullptr-from-getDbgInst-191.patch --- lib/SPIRV/SPIRVToLLVMDbgTran.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/SPIRV/SPIRVToLLVMDbgTran.cpp b/lib/SPIRV/SPIRVToLLVMDbgTran.cpp index 28b2170..54339fb 100644 --- a/lib/SPIRV/SPIRVToLLVMDbgTran.cpp +++ b/lib/SPIRV/SPIRVToLLVMDbgTran.cpp @@ -271,10 +271,11 @@ SPIRVToLLVMDbgTran::transTypeArrayOpenCL(const SPIRVExtInst *DebugInst) { UpperBound, nullptr)); continue; } - if (auto *ExprUB = getDbgInst(Ops[I])) { + const SPIRVExtInst *ExprUB, *ExprLB; + if ((ExprUB = getDbgInst(Ops[I])) && + (ExprLB = + getDbgInst(Ops[Ops.size() / 2 + I]))) { auto *UpperBound = transDebugInst(ExprUB); - auto *ExprLB = - getDbgInst(Ops[Ops.size() / 2 + I]); auto *LowerBound = transDebugInst(ExprLB); Subscripts.push_back(Builder.getOrCreateSubrange(nullptr, LowerBound, UpperBound, nullptr)); -- 2.30.2