Bug fix: use dyn_cast_or_null instead of dyn_cast

[• hulx2000]

Summary

My earlier patch failed to check null ptr before dyn_cast.

[arsenm]

You could also use dyn_cast_or_null

[mcrosier]

lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp

831

You might consider using dyn_cast_or_null(), so you can reduce indent and fold the null checks into the inner if condition.

test/CodeGen/AArch64/gep-nullptr.ll

7

Can you please simplify some of the names, so this is more human readable?

30

Please drop the attribute/metadata if it's not relevant to reproducing the issue.

[mcrosier]

lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp

829

I believe you still need to add the nullptr checks for FirstGEP and SecondGEP.

[• hulx2000]

lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp

829

Thanks, Chad:

That's not needed because I checked in isLegalToSwapOperand().

[mcrosier]

Can you please cleanup the test case to be more human readable?

Is the test just verifying that we don't get a compiler ICE due to dereferencing a nullptr? If so, please add a comment to the test case expressing this.

lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp

829

Okay, that's fine.

test/CodeGen/AArch64/gep-nullptr.ll

11

Is the lifetime intrinsic relevant to the test?

18

You should probably use a CHECK-LABEL directive like

; CHECK-LABEL: test

[mehdi_amini]

test/CodeGen/AArch64/gep-nullptr.ll

3

Why is an assert build required?

[mcrosier]

LGTM.

lib/Transforms/Scalar/SeparateConstOffsetFromGEP.cpp

if (AccumulativeByteOffset != 0) {
     ResultPtr =
         Builder.CreateGEP(Builder.getInt8Ty(), ResultPtr, Offset, "uglygep");
   } else
     isSwapCandidate = false;
 
   // If we created a GEP with constant index, and the base is loop invariant,
   // then we swap the first one with it, so LICM can move constant GEP out
   // later.
-  GetElementPtrInst *FirstGEP = dyn_cast<GetElementPtrInst>(FirstResult);
-  GetElementPtrInst *SecondGEP = dyn_cast<GetElementPtrInst>(ResultPtr);
+  GetElementPtrInst *FirstGEP = dyn_cast_or_null<GetElementPtrInst>(FirstResult);
+  GetElementPtrInst *SecondGEP = dyn_cast_or_null<GetElementPtrInst>(ResultPtr);
   if (isSwapCandidate && isLegalToSwapOperand(FirstGEP, SecondGEP, L))
     swapGEPOperand(FirstGEP, SecondGEP);
 
   if (ResultPtr->getType() != Variadic->getType())
     ResultPtr = Builder.CreateBitCast(ResultPtr, Variadic->getType());
 
   Variadic->replaceAllUsesWith(ResultPtr);
   Variadic->eraseFromParent();
 }
 
 void

test/CodeGen/AArch64/gep-nullptr.ll

+; RUN: llc -O3 -aarch64-gep-opt=true   < %s
+; REQUIRES: asserts
+target datalayout = "e-m:e-i64:64-i128:128-n8:16:32:64-S128"
+target triple = "aarch64--linux-gnu"
+
+%struct.b_ctxt_t.23.226.487.516.545.661.690.719.748.777.1038.1219 = type { i8, i8, i8, i8, i8, i8, [4 x i8], i8, i8, [2 x i32], [2 x %union.MV.9.212.473.502.531.647.676.705.734.763.1024.1218], [4 x [2 x %union.MV.9.212.473.502.531.647.676.705.734.763.1024.1218]], [4 x [2 x %union.MV.9.212.473.502.531.647.676.705.734.763.1024.1218]], [4 x i8], i8*, i8*, i32, i8* }
+%union.MV.9.212.473.502.531.647.676.705.734.763.1024.1218 = type { i32 }
+
+; Function Attrs: argmemonly nounwind
+declare void @llvm.lifetime.end(i64, i8* nocapture)
+
+; Function Attrs: nounwind
+define void @test(%struct.b_ctxt_t.23.226.487.516.545.661.690.719.748.777.1038.1219* %mi_block) #1 {
+entry:
+  br i1 undef, label %for.body13.us, label %if.else
+
+; CHECK:  .text
+for.body13.us:                                    ; preds = %entry
+  %indvars.iv.next40 = or i64 0, 1
+  %packed4.i.us.1 = getelementptr inbounds %struct.b_ctxt_t.23.226.487.516.545.661.690.719.748.777.1038.1219, %struct.b_ctxt_t.23.226.487.516.545.661.690.719.748.777.1038.1219* %mi_block, i64 0, i32 11, i64 0, i64 %indvars.iv.next40, i32 0
+  call void @llvm.lifetime.end(i64 8, i8* nonnull undef) #2
+  unreachable
+
+if.else:                                          ; preds = %entry
+  ret void
+}
+
+attributes #0 = { argmemonly nounwind }
+attributes #1 = { nounwind "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="true" "no-nans-fp-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="cortex-a57" "target-features"="+crc,+crypto,+neon" "unsafe-fp-math"="true" "use-soft-float"="false" }
+attributes #2 = { nounwind }
+