[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 <john.lu@intel.com>
Gbp-Pq: Name 0031-Backport-to-15-Check-for-nullptr-from-getDbgInst-191.patch

diff --git a/lib/SPIRV/SPIRVToLLVMDbgTran.cpp b/lib/SPIRV/SPIRVToLLVMDbgTran.cpp
index 28b2170ebf65df0472670e159e64d32191a3a638..54339fbcdf279ae1d687e0bdf1a77f623bfdd912 100644 (file)
--- 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<SPIRVDebug::Expression>(Ops[I])) {
+    const SPIRVExtInst *ExprUB, *ExprLB;
+    if ((ExprUB = getDbgInst<SPIRVDebug::Expression>(Ops[I])) &&
+        (ExprLB =
+             getDbgInst<SPIRVDebug::Expression>(Ops[Ops.size() / 2 + I]))) {
       auto *UpperBound = transDebugInst<DIExpression>(ExprUB);
-      auto *ExprLB =
-          getDbgInst<SPIRVDebug::Expression>(Ops[Ops.size() / 2 + I]);
       auto *LowerBound = transDebugInst<DIExpression>(ExprLB);
       Subscripts.push_back(Builder.getOrCreateSubrange(nullptr, LowerBound,
                                                        UpperBound, nullptr));