[EVM] Set that staticcall can't change storage

From the description, staticcall can't change storage,
so update the code to ensure no storage modifications
occur during staticcall.

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

Author: vladimirradosavljevic

llvm/lib/Target/EVM/EVMAliasAnalysis.cpp

@@ -109,6 +109,7 @@ ModRefInfo EVMAAResult::getModRefInfo(const CallBase *Call,
   unsigned AS = Loc.Ptr->getType()->getPointerAddressSpace();
   switch (II->getIntrinsicID()) {
   case Intrinsic::evm_return:
+  case Intrinsic::evm_staticcall:
     if (AS == EVMAS::AS_STORAGE || AS == EVMAS::AS_TSTORAGE)
       return ModRefInfo::Ref;
     break;
@@ -117,7 +118,6 @@ ModRefInfo EVMAAResult::getModRefInfo(const CallBase *Call,
   case Intrinsic::evm_call:
   case Intrinsic::evm_callcode:
   case Intrinsic::evm_delegatecall:
-  case Intrinsic::evm_staticcall:
     if (AS == EVMAS::AS_STORAGE || AS == EVMAS::AS_TSTORAGE)
       return ModRefInfo::ModRef;
     break;

llvm/test/CodeGen/EVM/aa-eval.ll

@@ -343,8 +343,8 @@ define i256 @test_as1_alias_call(ptr addrspace(1) %ptr1) {
 }
 
 ; CHECK-LABEL: Function: test_as6_as5_alias_staticcall
-; CHECK: Both ModRef: Ptr: i256* %ptr1	<->  %ret = call i256 @llvm.evm.staticcall
-; CHECK: Both ModRef: Ptr: i256* %ptr2	<->  %ret = call i256 @llvm.evm.staticcall
+; CHECK: Just Ref: Ptr: i256* %ptr1	<->  %ret = call i256 @llvm.evm.staticcall
+; CHECK: Just Ref: Ptr: i256* %ptr2	<->  %ret = call i256 @llvm.evm.staticcall
 define i256 @test_as6_as5_alias_staticcall(ptr addrspace(5) %ptr1) {
   store i256 1, ptr addrspace(5) %ptr1, align 32
   %ptr2 = inttoptr i256 32 to ptr addrspace(6)

llvm/test/CodeGen/EVM/aa-memory-opt.ll

@@ -285,6 +285,23 @@ define i256 @test_as6_large() {
   ret i256 %ret
 }
 
+define i256 @test_opt_staticcall(ptr addrspace(5) %ptr1, ptr addrspace(6) %ptr2) {
+; CHECK-LABEL: define noundef i256 @test_opt_staticcall
+; CHECK-SAME: (ptr addrspace(5) nocapture writeonly [[PTR1:%.*]], ptr addrspace(6) nocapture writeonly [[PTR2:%.*]]) local_unnamed_addr #[[ATTR3]] {
+; CHECK-NEXT:    store i256 1, ptr addrspace(5) [[PTR1]], align 32
+; CHECK-NEXT:    store i256 2, ptr addrspace(6) [[PTR2]], align 32
+; CHECK-NEXT:    [[TMP1:%.*]] = tail call i256 @llvm.evm.staticcall(i256 1, i256 1, ptr addrspace(1) null, i256 1, ptr addrspace(1) null, i256 1)
+; CHECK-NEXT:    ret i256 3
+;
+  store i256 1, ptr addrspace(5) %ptr1, align 32
+  store i256 2, ptr addrspace(6) %ptr2, align 32
+  call i256 @llvm.evm.staticcall(i256 1, i256 1, ptr addrspace(1) null, i256 1, ptr addrspace(1) null, i256 1)
+  %ret1 = load i256, ptr addrspace(5) %ptr1
+  %ret2 = load i256, ptr addrspace(6) %ptr2
+  %ret = add i256 %ret1, %ret2
+  ret i256 %ret
+}
+
 ; Verify that in the following tests all load operations are preserved.
 
 define i256 @test_noopt_create(ptr addrspace(5) %ptr1, ptr addrspace(6) %ptr2) {
@@ -347,26 +364,6 @@ define i256 @test_noopt_call(ptr addrspace(5) %ptr1, ptr addrspace(6) %ptr2) {
   ret i256 %ret
 }
 
-define i256 @test_noopt_staticcall(ptr addrspace(5) %ptr1, ptr addrspace(6) %ptr2) {
-; CHECK-LABEL: define i256 @test_noopt_staticcall
-; CHECK-SAME: (ptr addrspace(5) nocapture [[PTR1:%.*]], ptr addrspace(6) nocapture [[PTR2:%.*]]) local_unnamed_addr #[[ATTR3]] {
-; CHECK-NEXT:    store i256 1, ptr addrspace(5) [[PTR1]], align 32
-; CHECK-NEXT:    store i256 2, ptr addrspace(6) [[PTR2]], align 32
-; CHECK-NEXT:    [[TMP1:%.*]] = tail call i256 @llvm.evm.staticcall(i256 1, i256 1, ptr addrspace(1) null, i256 1, ptr addrspace(1) null, i256 1)
-; CHECK-NEXT:    [[RET1:%.*]] = load i256, ptr addrspace(5) [[PTR1]], align 32
-; CHECK-NEXT:    [[RET2:%.*]] = load i256, ptr addrspace(6) [[PTR2]], align 32
-; CHECK-NEXT:    [[RET:%.*]] = add i256 [[RET2]], [[RET1]]
-; CHECK-NEXT:    ret i256 [[RET]]
-;
-  store i256 1, ptr addrspace(5) %ptr1, align 32
-  store i256 2, ptr addrspace(6) %ptr2, align 32
-  call i256 @llvm.evm.staticcall(i256 1, i256 1, ptr addrspace(1) null, i256 1, ptr addrspace(1) null, i256 1)
-  %ret1 = load i256, ptr addrspace(5) %ptr1
-  %ret2 = load i256, ptr addrspace(6) %ptr2
-  %ret = add i256 %ret1, %ret2
-  ret i256 %ret
-}
-
 define i256 @test_noopt_callcode(ptr addrspace(5) %ptr1, ptr addrspace(6) %ptr2) {
 ; CHECK-LABEL: define i256 @test_noopt_callcode
 ; CHECK-SAME: (ptr addrspace(5) nocapture [[PTR1:%.*]], ptr addrspace(6) nocapture [[PTR2:%.*]]) local_unnamed_addr #[[ATTR3]] {