[InstCombine] Explicitly check for scalable TypeSize.

[craig.topper]

Summary

Instead of assuming it is a fixed size.

[craig.topper]

clang-format

[peterwaller-arm]

LGTM. (With the fix) I've tested this produces the expected output.

llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll

3

opt is missing its input.

[craig.topper]

llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll

3

Thanks for catching that. update_test_checks.py seemed fine with it and I guess I didn't run check-llvm afterwards.

llvm/lib/Transforms/InstCombine/InstCombineLoadStoreAlloca.cpp

do {
     if (AllocaInst *AI = dyn_cast<AllocaInst>(P)) {
       if (!AI->getAllocatedType()->isSized())
         return false;
 
       ConstantInt *CS = dyn_cast<ConstantInt>(AI->getArraySize());
       if (!CS)
         return false;
 
-      uint64_t TypeSize = DL.getTypeAllocSize(AI->getAllocatedType());
+      TypeSize TS = DL.getTypeAllocSize(AI->getAllocatedType());
+      if (TS.isScalable())
+        return false;
       // Make sure that, even if the multiplication below would wrap as an
       // uint64_t, we still do the right thing.
-      if ((CS->getValue().zext(128) * APInt(128, TypeSize)).ugt(MaxSize))
+      if ((CS->getValue().zext(128) * APInt(128, TS.getFixedSize()))
+              .ugt(MaxSize))
         return false;
       continue;
     }
 
     if (GlobalVariable *GV = dyn_cast<GlobalVariable>(P)) {
       if (!GV->hasDefinitiveInitializer() || !GV->isConstant())
         return false;
 

llvm/test/Transforms/InstCombine/gep-object-size-less-than-or-equal-typesize.ll

+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
+; RUN: opt -instcombine -S %s | FileCheck %s
+
+define i8 @foo(<vscale x 1 x i8> %x, i64 %idx) {
+; CHECK-LABEL: @foo(
+; CHECK-NEXT:    [[A:%.*]] = alloca <vscale x 1 x i8>, align 1
+; CHECK-NEXT:    store <vscale x 1 x i8> [[X:%.*]], ptr [[A]], align 1
+; CHECK-NEXT:    [[B:%.*]] = getelementptr i8, ptr [[A]], i64 [[IDX:%.*]]
+; CHECK-NEXT:    [[C:%.*]] = load i8, ptr [[B]], align 1
+; CHECK-NEXT:    ret i8 [[C]]
+;
+  %a = alloca <vscale x 1 x i8>
+  store <vscale x 1 x i8> %x, ptr %a
+  %b = getelementptr i8, ptr %a, i64 %idx
+  %c = load i8, ptr %b
+  ret i8 %c
+}