[CGP] Fix missing sign extension for base offset in optimizeMemoryInst

If we have integers larger than 64-bit we need to
explicitly sign extend them, otherwise we will get
wrong zero extended values.

Signed-off-by: Vladimir Radosavljevic <[email protected]>

Author: vladimirradosavljevic

llvm/lib/CodeGen/CodeGenPrepare.cpp

@@ -5706,7 +5706,7 @@ bool CodeGenPrepare::optimizeMemoryInst(Instruction *MemoryInst, Value *Addr,
 
       // Add in the Base Offset if present.
       if (AddrMode.BaseOffs) {
-        Value *V = ConstantInt::get(IntPtrTy, AddrMode.BaseOffs);
+        Value *V = ConstantInt::get(IntPtrTy, AddrMode.BaseOffs, true);
         if (ResultIndex) {
           // We need to add this separately from the scale above to help with
           // SDAG consecutive load/store merging.
@@ -5825,7 +5825,7 @@ bool CodeGenPrepare::optimizeMemoryInst(Instruction *MemoryInst, Value *Addr,
 
     // Add in the Base Offset if present.
     if (AddrMode.BaseOffs) {
-      Value *V = ConstantInt::get(IntPtrTy, AddrMode.BaseOffs);
+      Value *V = ConstantInt::get(IntPtrTy, AddrMode.BaseOffs, true);
       if (Result)
         Result = Builder.CreateAdd(Result, V, "sunkaddr");
       else

llvm/test/CodeGen/EVM/cgp-fix-baseoffset-signextension.ll

@@ -0,0 +1,29 @@
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' < %s | FileCheck --check-prefix=GEP %s
+; RUN: opt -S -passes='require<profile-summary>,function(codegenprepare)' -addr-sink-using-gep=false < %s | FileCheck --check-prefix=NO-GEP %s
+
+target datalayout = "E-p:256:256-i256:256:256-S256-a:256:256"
+target triple = "evm"
+
+; GEP-LABEL: @test(
+; GEP: getelementptr i8, ptr addrspace(1) {{.*}}, i256 -32
+; GEP-NOT: getelementptr i8, ptr addrspace(1) {{.*}}, i256 18446744073709551584
+
+; NO-GEP-LABEL: @test(
+; NO-GEP: add i256 {{.*}}, -32
+; NO-GEP-NOT: add i256 {{.*}}, 18446744073709551584
+
+define i256 @test(i256 %arg) {
+entry:
+  %add = add i256 %arg, -32
+  %cmp = icmp ugt i256 %arg, 10
+  br i1 %cmp, label %then, label %exit
+
+then:
+  %inttoptr = inttoptr i256 %add to ptr addrspace(1)
+  %load = load i256, ptr addrspace(1) %inttoptr, align 1
+  br label %exit
+
+exit:
+  %phi = phi i256 [ %load, %then ], [ 0, %entry ]
+  ret i256 %phi
+}