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

[wasm] Enable and fix GCMole for Wasm

Browse Source 
which the "no-wasm" build refactoring had accidentally disabled.

Bug: v8:11238
Change-Id: Ia2a4be89024f0bc22a1548dcef21e065e4bb5268
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3468341
Reviewed-by: Thibaud Michaud <thibaudm@chromium.org>
Commit-Queue: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/main@{#79140}
This commit is contained in:
Jakob Kummerow 2022-02-17 00:10:41 +01:00 committed by V8 LUCI CQ
parent a75fb00b67
commit 35fefc5976
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD.gn
View File

@ -4451,7 +4451,7 @@ v8_source_set("v8_base_without_compiler") {
]
if (v8_enable_webassembly) {
sources += [
sources += [ ### gcmole(all) ###
"src/asmjs/asm-js.cc",
"src/asmjs/asm-parser.cc",
"src/asmjs/asm-scanner.cc",

16
src/wasm/wasm-js.cc
View File

@ -1668,7 +1668,7 @@ uint32_t GetEncodedSize(i::Handle<i::WasmTagObject> tag_object) {
}
void EncodeExceptionValues(v8::Isolate* isolate,
i::PodArray<i::wasm::ValueType> signature,
i::Handle<i::PodArray<i::wasm::ValueType>> signature,
const Local<Value>& arg,
ScheduledErrorThrower* thrower,
i::Handle<i::FixedArray> values_out) {
@ -1679,10 +1679,10 @@ void EncodeExceptionValues(v8::Isolate* isolate,
return;
}
auto values = arg.As<Object>();
for (int i = 0; i < signature.length(); ++i) {
for (int i = 0; i < signature->length(); ++i) {
MaybeLocal<Value> maybe_value = values->Get(context, i);
Local<Value> value = maybe_value.ToLocalChecked();
i::wasm::ValueType type = signature.get(i);
i::wasm::ValueType type = signature->get(i);
switch (type.kind()) {
case i::wasm::kI32: {
int32_t i32 = 0;
@ -1761,17 +1761,19 @@ void WebAssemblyException(const v8::FunctionCallbackInfo<v8::Value>& args) {
thrower.TypeError("Argument 0 must be a WebAssembly tag");
return;
}
auto tag_object = i::Handle<i::WasmTagObject>::cast(arg0);
auto tag = i::Handle<i::WasmExceptionTag>(
i::Handle<i::WasmTagObject> tag_object =
i::Handle<i::WasmTagObject>::cast(arg0);
i::Handle<i::WasmExceptionTag> tag(
i::WasmExceptionTag::cast(tag_object->tag()), i_isolate);
uint32_t size = GetEncodedSize(tag_object);
i::Handle<i::WasmExceptionPackage> runtime_exception =
i::WasmExceptionPackage::New(i_isolate, tag, size);
// The constructor above should guarantee that the cast below succeeds.
auto values = i::Handle<i::FixedArray>::cast(
i::Handle<i::FixedArray> values = i::Handle<i::FixedArray>::cast(
i::WasmExceptionPackage::GetExceptionValues(i_isolate,
runtime_exception));
auto signature = tag_object->serialized_signature();
i::Handle<i::PodArray<i::wasm::ValueType>> signature(
tag_object->serialized_signature(), i_isolate);
EncodeExceptionValues(isolate, signature, args[1], &thrower, values);
if (thrower.error()) return;
args.GetReturnValue().Set(