diff --git a/llvm/lib/Analysis/Loads.cpp b/llvm/lib/Analysis/Loads.cpp --- a/llvm/lib/Analysis/Loads.cpp +++ b/llvm/lib/Analysis/Loads.cpp @@ -405,7 +405,10 @@ Instruction *ScanFrom, const DominatorTree *DT, const TargetLibraryInfo *TLI) { - APInt Size(DL.getIndexTypeSizeInBits(V->getType()), DL.getTypeStoreSize(Ty)); + TypeSize TySize = DL.getTypeStoreSize(Ty); + if (TySize.isScalable()) + return false; + APInt Size(DL.getIndexTypeSizeInBits(V->getType()), TySize.getFixedValue()); return isSafeToLoadUnconditionally(V, Alignment, Size, DL, ScanFrom, DT, TLI); } diff --git a/llvm/test/Transforms/InstCombine/scalable-select.ll b/llvm/test/Transforms/InstCombine/scalable-select.ll --- a/llvm/test/Transforms/InstCombine/scalable-select.ll +++ b/llvm/test/Transforms/InstCombine/scalable-select.ll @@ -15,3 +15,28 @@ %d = select %m, %c, %b ret %d } + +define @load_scalable_of_selected_ptrs(ptr %p0, ptr %p1, i64 %idx) { +; CHECK-LABEL: @load_scalable_of_selected_ptrs( +; CHECK-NEXT: entry: +; CHECK-NEXT: [[ARRAYIDX0:%.*]] = getelementptr inbounds i32, ptr [[P0:%.*]], i64 [[IDX:%.*]] +; CHECK-NEXT: [[ARRAYIDX1:%.*]] = getelementptr inbounds i32, ptr [[P1:%.*]], i64 [[IDX]] +; CHECK-NEXT: [[L0:%.*]] = load i32, ptr [[ARRAYIDX0]], align 4 +; CHECK-NEXT: [[L1:%.*]] = load i32, ptr [[ARRAYIDX1]], align 4 +; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[L0]], [[L1]] +; CHECK-NEXT: [[SEL:%.*]] = select i1 [[CMP]], ptr [[ARRAYIDX0]], ptr [[ARRAYIDX1]] +; CHECK-NEXT: [[RET:%.*]] = load , ptr [[SEL]], align 16 +; CHECK-NEXT: ret [[RET]] +; +entry: + ; Test introduced in response to a TypeSize warning arising from isSafeToLoadUnconditionally via instcombine. + ; deref (p0[0] < p1[0] ? p0 : p1) as . + %arrayidx0 = getelementptr inbounds i32, ptr %p0, i64 %idx + %arrayidx1 = getelementptr inbounds i32, ptr %p1, i64 %idx + %l0 = load i32, ptr %arrayidx0 + %l1 = load i32, ptr %arrayidx1 + %cmp = icmp slt i32 %l0, %l1 + %sel = select i1 %cmp, ptr %arrayidx0, ptr %arrayidx1 + %ret = load , ptr %sel + ret %ret +}