fix types use in several calls to CreateAdd (#1175)

Fix #1174
google · Aug 14, 2023 · 93ea850 · 93ea850
1 parent 15abfc8
commit 93ea850
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/lib/BitcastUtils.cpp b/lib/BitcastUtils.cpp
@@ -1193,8 +1193,8 @@ GetIdxsForTyFromOffset(const DataLayout &DataLayout, IRBuilder<> &Builder,
           CreateDiv(Builder, NewSmallerBitWidths / SmallerBitWidths, DynVal);
     }
     if (CstVal != 0) {
-      DynVal = Builder.CreateAdd(
-          DynVal, ConstantInt::get(Builder.getInt32Ty(), CstVal));
+      DynVal = Builder.CreateAdd(DynVal,
+                                 ConstantInt::get(DynVal->getType(), CstVal));
     }
     for (unsigned i = startIdx; i < TyBitWidths.size(); i++) {
       size_t size = TyBitWidths[i] / NewSmallerBitWidths;

diff --git a/lib/ReplacePointerBitcastPass.cpp b/lib/ReplacePointerBitcastPass.cpp
@@ -679,7 +679,8 @@ clspv::ReplacePointerBitcastPass::run(Module &M, ModuleAnalysisManager &) {
       if (DynVal == nullptr) {
         OrgGEPIdx = Builder.getInt32(CstVal);
       } else if (CstVal != 0) {
-        OrgGEPIdx = Builder.CreateAdd(Builder.getInt32(CstVal), DynVal);
+        OrgGEPIdx = Builder.CreateAdd(
+            ConstantInt::get(DynVal->getType(), CstVal), DynVal);
       }
 
       DstTy = GEP->getResultElementType();

diff --git a/test/PointerCasts/issue-1174.cl b/test/PointerCasts/issue-1174.cl
@@ -0,0 +1,25 @@
+// RUN: clspv %s -o %t.spv -arch=spir64
+// RUN: spirv-dis %t.spv -o %t.spvasm
+// RUN: spirv-val %t.spv --target-env spv1.0
+
+#define ElementCount 100
+
+struct E {
+    int i;
+    long l;
+};
+
+struct S {
+    struct E e[ElementCount];
+};
+
+kernel void Kernel(global struct S *s)
+{
+
+    for (int i = 0; i < ElementCount; ++i) {
+        global struct E *e = &s->e[i];
+        e->l += e->i;
+    }
+
+    s->e[0].i = s->e[1].i;
+}