Commit 59c2d0cd authored by Clemens Backes's avatar Clemens Backes Committed by Commit Bot

[wasm] Fix variable naming and comments in from-js conversion

The code did originally only handle the int32 case, but was then
extended to all wasm types in https://crrev.com/c/1965577. The comments
and variable names still mention the int32 type only though.
This CL fixes that.

R=ecmziegler@chromium.org

Bug: v8:10070
Change-Id: I3b1fa4047ee7ee9f283dce3758f6b8a39c964b22
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2017723
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: 's avatarAndreas Haas <ahaas@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65970}
parent 9c3099ee
...@@ -5529,17 +5529,17 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder { ...@@ -5529,17 +5529,17 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
// Build a graph implementing this diagram: // Build a graph implementing this diagram:
// input smi? // input smi?
// ├─ true: ───────────────────────┬─ smi-to-int32 ──────┬─ result // ├─ true: ───────────────────────┬─ smi-to-wasm ──────┬─ result
// └─ false: ToNumber -> smi? │ // └─ false: ToNumber -> smi? │ │
// ├─ true: ─┘ // ├─ true: ─┘ │
// └─ false: load -> f64-to-int32 ─┘ // └─ false: load -> f64-to-wasm ─┘
auto smi_to_int32 = gasm_->MakeLabel(MachineRepresentation::kTaggedSigned); auto smi_to_wasm = gasm_->MakeLabel(MachineRepresentation::kTaggedSigned);
auto done = auto done =
gasm_->MakeLabel(wasm::ValueTypes::MachineRepresentationFor(type)); gasm_->MakeLabel(wasm::ValueTypes::MachineRepresentationFor(type));
// If the input is Smi, directly convert to int32. // If the input is Smi, directly convert to the wasm type.
gasm_->GotoIf(BuildTestSmi(input), &smi_to_int32, input); gasm_->GotoIf(BuildTestSmi(input), &smi_to_wasm, input);
// Otherwise, call ToNumber which returns a Smi or HeapNumber. // Otherwise, call ToNumber which returns a Smi or HeapNumber.
auto to_number_descriptor = Linkage::GetStubCallDescriptor( auto to_number_descriptor = Linkage::GetStubCallDescriptor(
...@@ -5552,20 +5552,20 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder { ...@@ -5552,20 +5552,20 @@ class WasmWrapperGraphBuilder : public WasmGraphBuilder {
gasm_->Call(to_number_descriptor, to_number_target, input, js_context); gasm_->Call(to_number_descriptor, to_number_target, input, js_context);
SetSourcePosition(number, 1); SetSourcePosition(number, 1);
// If the ToNumber result is Smi, convert to int32. // If the ToNumber result is Smi, convert to wasm.
gasm_->GotoIf(BuildTestSmi(number), &smi_to_int32, number); gasm_->GotoIf(BuildTestSmi(number), &smi_to_wasm, number);
// Otherwise the ToNumber result is a HeapNumber. Load its value and convert // Otherwise the ToNumber result is a HeapNumber. Load its value and convert
// to {type}. // to wasm.
Node* heap_number_value = gasm_->LoadHeapNumberValue(number); Node* heap_number_value = gasm_->LoadHeapNumberValue(number);
Node* converted_heap_number_value = Node* converted_heap_number_value =
BuildFloat64ToWasm(heap_number_value, type); BuildFloat64ToWasm(heap_number_value, type);
gasm_->Goto(&done, converted_heap_number_value); gasm_->Goto(&done, converted_heap_number_value);
// Now implement the smi to int32 conversion. // Now implement the smi to wasm conversion.
gasm_->Bind(&smi_to_int32); gasm_->Bind(&smi_to_wasm);
Node* smi_int32 = BuildSmiToWasm(smi_to_int32.PhiAt(0), type); Node* smi_to_wasm_result = BuildSmiToWasm(smi_to_wasm.PhiAt(0), type);
gasm_->Goto(&done, smi_int32); gasm_->Goto(&done, smi_to_wasm_result);
// Done. Update effect and control and return the final Phi. // Done. Update effect and control and return the final Phi.
gasm_->Bind(&done); gasm_->Bind(&done);
......
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