[WebAssembly] Change int_wasm_memory_size from IntrNoMem to IntrReadMem.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253147 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/IR/IntrinsicsWebAssembly.td b/include/llvm/IR/IntrinsicsWebAssembly.td
index 2a9e406aa8b619bf926df08d5eb8d416308e76f5..3953aef43dad8d19ed94e77e44f5a9147ddd9afe 100644 (file)
--- a/include/llvm/IR/IntrinsicsWebAssembly.td
+++ b/include/llvm/IR/IntrinsicsWebAssembly.td
@@ -14,7 +14,9 @@
 
 let TargetPrefix = "wasm" in {  // All intrinsics start with "llvm.wasm.".
 
 
 let TargetPrefix = "wasm" in {  // All intrinsics start with "llvm.wasm.".
 

-def int_wasm_memory_size : Intrinsic<[llvm_anyint_ty], [], [IntrNoMem]>;
+// Note that memory_size is not IntrNoMem because it must be sequenced with
+// respect to grow_memory calls.
+def int_wasm_memory_size : Intrinsic<[llvm_anyint_ty], [], [IntrReadMem]>;

 def int_wasm_grow_memory : Intrinsic<[], [llvm_anyint_ty], []>;
 
 }
 def int_wasm_grow_memory : Intrinsic<[], [llvm_anyint_ty], []>;
 
 }

diff --git a/test/CodeGen/WebAssembly/memory-addr32.ll b/test/CodeGen/WebAssembly/memory-addr32.ll
index 9193d794b5e1a43941ac9b1678ca40b0c809ffad..2063cc0b22e388e8823988c95b93f407ccea0ef2 100644 (file)
--- a/test/CodeGen/WebAssembly/memory-addr32.ll
+++ b/test/CodeGen/WebAssembly/memory-addr32.ll
@@ -5,7 +5,7 @@
 target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 
 target datalayout = "e-p:32:32-i64:64-n32:64-S128"
 target triple = "wasm32-unknown-unknown"
 

-declare i32 @llvm.wasm.memory.size.i32() nounwind readnone
+declare i32 @llvm.wasm.memory.size.i32() nounwind readonly

 declare void @llvm.wasm.grow.memory.i32(i32) nounwind
 
 ; CHECK-LABEL: memory_size:
 declare void @llvm.wasm.grow.memory.i32(i32) nounwind
 
 ; CHECK-LABEL: memory_size:

diff --git a/test/CodeGen/WebAssembly/memory-addr64.ll b/test/CodeGen/WebAssembly/memory-addr64.ll
index 5748715e7c67efcad5dd2bd8f509c31791e8781a..6b9ac04dde7db9c06c3ca86066d96375ca05572a 100644 (file)
--- a/test/CodeGen/WebAssembly/memory-addr64.ll
+++ b/test/CodeGen/WebAssembly/memory-addr64.ll
@@ -5,7 +5,7 @@
 target datalayout = "e-p:64:64-i64:64-n32:64-S128"
 target triple = "wasm64-unknown-unknown"
 
 target datalayout = "e-p:64:64-i64:64-n32:64-S128"
 target triple = "wasm64-unknown-unknown"
 

-declare i64 @llvm.wasm.memory.size.i64() nounwind readnone
+declare i64 @llvm.wasm.memory.size.i64() nounwind readonly

 declare void @llvm.wasm.grow.memory.i64(i64) nounwind
 
 ; CHECK-LABEL: memory_size:
 declare void @llvm.wasm.grow.memory.i64(i64) nounwind
 
 ; CHECK-LABEL: memory_size: