From 6d9e0cc0e7abf2b6b4063b32a266fab1d379925b Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Sat, 14 Nov 2015 23:02:31 +0000 Subject: [PATCH] [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 --- include/llvm/IR/IntrinsicsWebAssembly.td | 4 +++- test/CodeGen/WebAssembly/memory-addr32.ll | 2 +- test/CodeGen/WebAssembly/memory-addr64.ll | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/llvm/IR/IntrinsicsWebAssembly.td b/include/llvm/IR/IntrinsicsWebAssembly.td index 2a9e406aa8b..3953aef43da 100644 --- 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.". -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/test/CodeGen/WebAssembly/memory-addr32.ll b/test/CodeGen/WebAssembly/memory-addr32.ll index 9193d794b5e..2063cc0b22e 100644 --- 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" -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/test/CodeGen/WebAssembly/memory-addr64.ll b/test/CodeGen/WebAssembly/memory-addr64.ll index 5748715e7c6..6b9ac04dde7 100644 --- 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" -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: -- 2.11.0