[PATCH] D46750: [SROA] pr37267: fix assertion failure while integer widening

[Hiroshi Inoue via Phabricator via llvm-commits]

inouehrs updated this revision to Diff 146754.
inouehrs added a comment.

- modified test case


https://reviews.llvm.org/D46750

Files:
  lib/Transforms/Scalar/SROA.cpp
  test/Transforms/SROA/pr37267.ll


Index: test/Transforms/SROA/pr37267.ll
===================================================================
--- /dev/null
+++ test/Transforms/SROA/pr37267.ll
@@ -0,0 +1,45 @@
+; RUN: opt < %s -sroa -S | FileCheck %s
+target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32:64-S128"
+target triple = "sparcv9-sun-solaris"
+
+; PR37267
+; Check that we don't crash on this test.
+
+define [6 x i16] @f2() {
+; CHECK-LABEL: @f2
+; CHECK: %[[tmp0:.*]] = insertvalue [6 x i16] undef, i16 undef, 0
+; CHECK: %[[tmp1:.*]] = insertvalue [6 x i16] %[[tmp0]], i16 2, 1
+; CHECK: %[[tmp2:.*]] = insertvalue [6 x i16] %[[tmp1]], i16 2, 2
+; CHECK: %[[tmp3:.*]] = insertvalue [6 x i16] %[[tmp2]], i16 undef, 3
+; CHECK: %[[tmp4:.*]] = insertvalue [6 x i16] %[[tmp3]], i16 2, 4
+; CHECK: %[[retval:.*]] = insertvalue [6 x i16] %[[tmp4]], i16 2, 5
+; CHECK: ret [6 x i16] %[[retval]]
+
+bb1:
+; This 12-byte alloca is split into partitions as [0,2), [2,4), [4,8), [8,10), [10, 12).
+; The reported error happened when rewriteIntegerStore try to widen a split tail of slice 1 for [4, 8) partition.
+; alloca  012345678901
+; slice 1:  WWWW
+; slice 2:        WWWW
+; slice 3:        RR
+; slice 4:  RR
+
+  %a.3 = alloca [6 x i16], align 1
+  %_tmp3 = getelementptr inbounds [6 x i16], [6 x i16]* %a.3, i16 0, i16 1
+; slice 1: [2,6)
+  %_tmp5 = bitcast i16* %_tmp3 to i32*
+  store i32 131074, i32* %_tmp5, align 1
+; slice 2: [8,12)
+  %_tmp8 = getelementptr inbounds [6 x i16], [6 x i16]* %a.3, i16 0, i16 4
+  %_tmp10 = bitcast i16* %_tmp8 to i32*
+  store i32 131074, i32* %_tmp10, align 1
+; slice 3: [8,10)
+  %_tmp12 = getelementptr inbounds [6 x i16], [6 x i16]* %a.3, i16 0, i16 4
+  %_tmp13 = load i16, i16* %_tmp12, align 1
+; slice 4: [2,4)
+  %_tmp15 = getelementptr inbounds [6 x i16], [6 x i16]* %a.3, i16 0, i16 1
+  %_tmp16 = load i16, i16* %_tmp15, align 1
+
+  %rc = load [6 x i16], [6 x i16]* %a.3, align 1
+  ret [6 x i16] %rc
+}
Index: lib/Transforms/Scalar/SROA.cpp
===================================================================
--- lib/Transforms/Scalar/SROA.cpp
+++ lib/Transforms/Scalar/SROA.cpp
@@ -1950,7 +1950,7 @@
                                             bool &WholeAllocaOp) {
   uint64_t Size = DL.getTypeStoreSize(AllocaTy);
 
-  uint64_t RelBegin = S.beginOffset() - AllocBeginOffset;
+  int64_t RelBegin = S.beginOffset() - AllocBeginOffset;
   uint64_t RelEnd = S.endOffset() - AllocBeginOffset;
 
   // We can't reasonably handle cases where the load or store extends past
@@ -1966,6 +1966,9 @@
     // We can't handle loads that extend past the allocated memory.
     if (DL.getTypeStoreSize(LI->getType()) > Size)
       return false;
+    // We can't handle split slice tails.
+    if (RelBegin < 0)
+      return false;
     // Note that we don't count vector loads or stores as whole-alloca
     // operations which enable integer widening because we would prefer to use
     // vector widening instead.
@@ -1987,6 +1990,9 @@
     // We can't handle stores that extend past the allocated memory.
     if (DL.getTypeStoreSize(ValueTy) > Size)
       return false;
+    // We can't handle split slice tails.
+    if (RelBegin < 0)
+      return false;
     // Note that we don't count vector loads or stores as whole-alloca
     // operations which enable integer widening because we would prefer to use
     // vector widening instead.


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D46750.146754.patch
Type: text/x-patch
Size: 3426 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180515/cade64f2/attachment.bin>