diff options
| -rw-r--r-- | src/wasm-interpreter.h | 8 | ||||
| -rw-r--r-- | test/lit/exec/memory.grow.wast | 26 |
2 files changed, 30 insertions, 4 deletions
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h index 56336b237..69434a297 100644 --- a/src/wasm-interpreter.h +++ b/src/wasm-interpreter.h @@ -3322,15 +3322,15 @@ public: } Flow visitMemoryGrow(MemoryGrow* curr) { NOTE_ENTER("MemoryGrow"); + Flow flow = self()->visit(curr->delta); + if (flow.breaking()) { + return flow; + } auto info = getMemoryInstanceInfo(curr->memory); auto memorySize = info.instance->getMemorySize(info.name); auto* memory = info.instance->wasm.getMemory(info.name); auto indexType = memory->indexType; auto fail = Literal::makeFromInt64(-1, memory->indexType); - Flow flow = self()->visit(curr->delta); - if (flow.breaking()) { - return flow; - } Flow ret = Literal::makeFromInt64(memorySize, indexType); uint64_t delta = flow.getSingleValue().getUnsigned(); if (delta > uint32_t(-1) / Memory::kPageSize && indexType == Type::i32) { diff --git a/test/lit/exec/memory.grow.wast b/test/lit/exec/memory.grow.wast new file mode 100644 index 000000000..64d88bfc7 --- /dev/null +++ b/test/lit/exec/memory.grow.wast @@ -0,0 +1,26 @@ +;; NOTE: Assertions have been generated by update_lit_checks.py --output=fuzz-exec and should not be edited. + +;; RUN: wasm-opt %s -all --fuzz-exec-before -q -o /dev/null 2>&1 | filecheck %s + +(module + (memory $0 1) + + ;; CHECK: [fuzz-exec] calling grow_twice + ;; CHECK-NEXT: [fuzz-exec] note result: grow_twice => 3 + (func "grow_twice" (result i32) + ;; The nested grow will increase the size from 1 to 3, and return the old + ;; size, 1. Then the outer grow will grow by that amount 1, from 3 to 4. + (memory.grow + (memory.grow + (i32.const 2) + ) + ) + ) + + ;; CHECK: [fuzz-exec] calling measure + ;; CHECK-NEXT: [fuzz-exec] note result: measure => 4 + (func "measure" (export "measure") (result i32) + ;; This should return the final size, 4. + (memory.size) + ) +) |