AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

[wasm][liftoff][eh] Fix locals in FinishTryCatch

Browse Source 
When dropping the exception from the stack, we have to
take locals into account when computing the right stack
slot.

Fixed: chromium:1187836
Change-Id: I76acb1e4dc50992524123cc369dea8e51242164c
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2764749
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Thibaud Michaud <thibaudm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#73469}
This commit is contained in:
Jakob Kummerow 2021-03-17 13:01:57 +01:00 committed by Commit Bot
parent a3b1233e16
commit c4568e43b9
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wasm/baseline/liftoff-assembler.h
View File

@ -422,6 +422,8 @@ class LiftoffAssembler : public TurboAssembler {
void DropValues(int count);
// Careful: this indexes "from the other end", i.e. depth=0 is the value
// at the bottom of the stack!
void DropValue(int depth);
// Ensure that the loop inputs are either in a register or spilled to the

2
src/wasm/baseline/liftoff-compiler.cc
View File

@ -1302,7 +1302,7 @@ class LiftoffCompiler {
if (!c->end_merge.reached) {
if (c->try_info->catch_reached) {
// Drop the implicit exception ref.
__ DropValue(c->stack_depth + c->num_exceptions);
__ DropValue(__ num_locals() + c->stack_depth + c->num_exceptions);
}
// Else we did not enter the catch state, continue with the current state.
} else {

28
test/mjsunit/wasm/exceptions.js
View File

@ -440,6 +440,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
let builder = new WasmModuleBuilder();
let except = builder.addException(kSig_v_l);
builder.addFunction("throw_catch_param", kSig_i_i)
.addLocals(kWasmI64, 1)
.addBody([
kExprLocalGet, 0,
kExprI64UConvertI32,
@ -457,7 +458,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
kExprI32Const, 0,
kExprEnd,
kExprEnd,
]).addLocals(kWasmI64, 1).exportFunc();
]).exportFunc();
let instance = builder.instantiate();
assertEquals(1, instance.exports.throw_catch_param(5));
@ -663,6 +664,7 @@ load("test/mjsunit/wasm/exceptions-utils.js");
// p == 2 -> path == 298
// p == 3 -> path == 338
// else -> path == 146
.addLocals(kWasmI32, 1)
.addBody([
kExprTry, kWasmI32,
kExprTry, kWasmI32,
@ -719,7 +721,6 @@ load("test/mjsunit/wasm/exceptions-utils.js");
kExprI32Ior,
kExprEnd,
])
.addLocals(kWasmI32, 1)
.exportFunc();
// Scenario 2: Catches an exception raised from the direct callee.
@ -1067,3 +1068,26 @@ load("test/mjsunit/wasm/exceptions-utils.js");
let instance = builder.instantiate();
})();
(function TestThrowWithLocal() {
print(arguments.callee.name);
let builder = new WasmModuleBuilder();
let except = builder.addException(kSig_v_v);
builder.addFunction('throw_with_local', kSig_i_v)
.addLocals(kWasmI32, 4)
.addBody([
kExprI32Const, 42,
kExprF64Const, 0, 0, 0, 0, 0, 0, 0, 0,
kExprTry, kWasmF32,
kExprThrow, except,
kExprCatchAll,
kExprF32Const, 0, 0, 0, 0,
kExprEnd,
kExprDrop, // Drop the f32.
kExprDrop, // Drop the f64.
// Leave the '42' on the stack.
]).exportFunc();
let instance = builder.instantiate();
assertEquals(42, instance.exports.throw_with_local());
})();