Commit a326829e authored by Clemens Backes's avatar Clemens Backes Committed by Commit Bot

[wasm] Use correct call descriptor for rethrow

The WasmThrow and WasmRethrow runtime functions have the same signature,
but we should still use the correct description in case the signature
changes (which is planned for a follow-up CL).

R=thibaudm@chromium.org

Bug: v8:11453
Change-Id: Iaec9c353d30fa7673ceb8994e3029c4adfc01311
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2697348Reviewed-by: 's avatarThibaud Michaud <thibaudm@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72784}
parent 15d994b1
...@@ -2400,7 +2400,7 @@ Node* WasmGraphBuilder::Rethrow(Node* except_obj) { ...@@ -2400,7 +2400,7 @@ Node* WasmGraphBuilder::Rethrow(Node* except_obj) {
// TODO(v8:8091): Currently the message of the original exception is not being // TODO(v8:8091): Currently the message of the original exception is not being
// preserved when rethrown to the console. The pending message will need to be // preserved when rethrown to the console. The pending message will need to be
// saved when caught and restored here while being rethrown. // saved when caught and restored here while being rethrown.
WasmThrowDescriptor interface_descriptor; WasmRethrowDescriptor interface_descriptor;
auto call_descriptor = Linkage::GetStubCallDescriptor( auto call_descriptor = Linkage::GetStubCallDescriptor(
mcgraph()->zone(), interface_descriptor, mcgraph()->zone(), interface_descriptor,
interface_descriptor.GetStackParameterCount(), CallDescriptor::kNoFlags, interface_descriptor.GetStackParameterCount(), CallDescriptor::kNoFlags,
...@@ -7252,7 +7252,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder { ...@@ -7252,7 +7252,7 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
control()); control());
SetControl( SetControl(
graph()->NewNode(mcgraph()->common()->IfFalse(), exception_branch)); graph()->NewNode(mcgraph()->common()->IfFalse(), exception_branch));
WasmThrowDescriptor interface_descriptor; WasmRethrowDescriptor interface_descriptor;
auto call_descriptor = Linkage::GetStubCallDescriptor( auto call_descriptor = Linkage::GetStubCallDescriptor(
mcgraph()->zone(), interface_descriptor, mcgraph()->zone(), interface_descriptor,
interface_descriptor.GetStackParameterCount(), CallDescriptor::kNoFlags, interface_descriptor.GetStackParameterCount(), CallDescriptor::kNoFlags,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment