Skip to content

Fix bug in SIMDLoadStoreLane interpretation #7237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Fix bug in SIMDLoadStoreLane interpretation #7237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe0e84f
Fix bug in SIMDLoadStoreLane interpretation
tlively Jan 23, 2025
aa7de7f
fix test output
tlively Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3812,20 +3812,20 @@ class ModuleRunnerBase : public ExpressionRunner<SubType> {
}
Flow visitSIMDLoadStoreLane(SIMDLoadStoreLane* curr) {
NOTE_ENTER("SIMDLoadStoreLane");
Flow flow = self()->visit(curr->ptr);
if (flow.breaking()) {
return flow;
Flow ptrFlow = self()->visit(curr->ptr);
if (ptrFlow.breaking()) {
return ptrFlow;
}
NOTE_EVAL1(flow);
Flow vecFlow = self()->visit(curr->vec);
if (vecFlow.breaking()) {
return vecFlow;
}
auto info = getMemoryInstanceInfo(curr->memory);
auto memorySize = info.instance->getMemorySize(info.name);
Address addr = info.instance->getFinalAddress(
curr, flow.getSingleValue(), curr->getMemBytes(), memorySize);
flow = self()->visit(curr->vec);
if (flow.breaking()) {
return flow;
}
Literal vec = flow.getSingleValue();
curr, ptrFlow.getSingleValue(), curr->getMemBytes(), memorySize);
Literal vec = vecFlow.getSingleValue();
switch (curr->op) {
case Load8LaneVec128:
case Store8LaneVec128: {
Expand Down
42 changes: 42 additions & 0 deletions test/lit/exec/simd-load-lane-oob.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
;; 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 -q -o /dev/null 2>&1 | filecheck %s

;; Regression test for a bug where the vector operand to SIMDLoadStoreLane was
;; not evaluated if the preceding ptr operand was OOB.

(module
(memory $mem 1 1)
(global $g (mut i32) (i32.const 0))

;; CHECK: [fuzz-exec] calling oob
;; CHECK-NEXT: [trap final > memory: 18446744073709551615 > 65536]
(func $oob (export "oob")
(drop
;; This should trap, but not until after setting the global.
(v128.load64_lane 0
(i32.const -1)
(block (result v128)
(global.set $g
(i32.const 1)
)
(v128.const i32x4 0 0 0 0)
)
)
)
)

;; CHECK: [fuzz-exec] calling get
;; CHECK-NEXT: [fuzz-exec] note result: get => 1
(func $get (export "get") (result i32)
;; This should be 1
(global.get $g)
)
)
;; CHECK: [fuzz-exec] calling oob
;; CHECK-NEXT: [trap final > memory: 18446744073709551615 > 65536]

;; CHECK: [fuzz-exec] calling get
;; CHECK-NEXT: [fuzz-exec] note result: get => 1
;; CHECK-NEXT: [fuzz-exec] comparing get
;; CHECK-NEXT: [fuzz-exec] comparing oob
Loading