diff options
author | Dan Gohman <dan433584@gmail.com> | 2015-11-14 23:02:31 +0000 |
---|---|---|
committer | Dan Gohman <dan433584@gmail.com> | 2015-11-14 23:02:31 +0000 |
commit | c17e140b39d7874feaf049b92539fb7b122c4af9 (patch) | |
tree | 4c8c3253af1cdca016dd62da528292849999c28f | |
parent | ce70b42bce7ede54e6f667f6dd25a4b5c3307349 (diff) | |
download | bcm5719-llvm-c17e140b39d7874feaf049b92539fb7b122c4af9.tar.gz bcm5719-llvm-c17e140b39d7874feaf049b92539fb7b122c4af9.zip |
[WebAssembly] Change int_wasm_memory_size from IntrNoMem to IntrReadMem.
llvm-svn: 253147
-rw-r--r-- | llvm/include/llvm/IR/IntrinsicsWebAssembly.td | 4 | ||||
-rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr32.ll | 2 | ||||
-rw-r--r-- | llvm/test/CodeGen/WebAssembly/memory-addr64.ll | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td index 2a9e406aa8b..3953aef43da 100644 --- a/llvm/include/llvm/IR/IntrinsicsWebAssembly.td +++ b/llvm/include/llvm/IR/IntrinsicsWebAssembly.td @@ -14,7 +14,9 @@ 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], []>; } diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll b/llvm/test/CodeGen/WebAssembly/memory-addr32.ll index 9193d794b5e..2063cc0b22e 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr32.ll +++ b/llvm/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" -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: diff --git a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll b/llvm/test/CodeGen/WebAssembly/memory-addr64.ll index 5748715e7c6..6b9ac04dde7 100644 --- a/llvm/test/CodeGen/WebAssembly/memory-addr64.ll +++ b/llvm/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" -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: |