2020-04-21 16:45:53 +00:00
|
|
|
// Copyright 2020 the V8 project authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
|
|
// found in the LICENSE file.
|
|
|
|
|
|
|
|
#include <stdint.h>
|
|
|
|
|
|
|
|
#include "src/utils/utils.h"
|
|
|
|
#include "src/utils/vector.h"
|
|
|
|
#include "src/wasm/module-decoder.h"
|
|
|
|
#include "src/wasm/struct-types.h"
|
2020-07-07 19:14:38 +00:00
|
|
|
#include "src/wasm/wasm-arguments.h"
|
2020-04-21 16:45:53 +00:00
|
|
|
#include "src/wasm/wasm-engine.h"
|
|
|
|
#include "src/wasm/wasm-module-builder.h"
|
|
|
|
#include "src/wasm/wasm-module.h"
|
|
|
|
#include "src/wasm/wasm-objects-inl.h"
|
|
|
|
#include "src/wasm/wasm-opcodes.h"
|
|
|
|
#include "test/cctest/cctest.h"
|
|
|
|
#include "test/cctest/compiler/value-helper.h"
|
|
|
|
#include "test/cctest/wasm/wasm-run-utils.h"
|
|
|
|
#include "test/common/wasm/test-signatures.h"
|
|
|
|
#include "test/common/wasm/wasm-macro-gen.h"
|
|
|
|
#include "test/common/wasm/wasm-module-runner.h"
|
|
|
|
|
|
|
|
namespace v8 {
|
|
|
|
namespace internal {
|
|
|
|
namespace wasm {
|
|
|
|
namespace test_gc {
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
using F = std::pair<ValueType, bool>;
|
|
|
|
|
|
|
|
class WasmGCTester {
|
|
|
|
public:
|
2020-12-15 12:22:59 +00:00
|
|
|
explicit WasmGCTester(
|
|
|
|
TestExecutionTier execution_tier = TestExecutionTier::kTurbofan)
|
2020-06-03 14:37:37 +00:00
|
|
|
: flag_gc(&v8::internal::FLAG_experimental_wasm_gc, true),
|
2020-06-09 15:54:14 +00:00
|
|
|
flag_reftypes(&v8::internal::FLAG_experimental_wasm_reftypes, true),
|
2020-06-03 14:37:37 +00:00
|
|
|
flag_typedfuns(&v8::internal::FLAG_experimental_wasm_typed_funcref,
|
|
|
|
true),
|
2020-12-15 12:22:59 +00:00
|
|
|
flag_liftoff(
|
|
|
|
&v8::internal::FLAG_liftoff,
|
|
|
|
execution_tier == TestExecutionTier::kTurbofan ? false : true),
|
|
|
|
flag_liftoff_only(
|
|
|
|
&v8::internal::FLAG_liftoff_only,
|
|
|
|
execution_tier == TestExecutionTier::kLiftoff ? true : false),
|
2020-12-16 22:29:12 +00:00
|
|
|
flag_tierup(&v8::internal::FLAG_wasm_tier_up, false),
|
2020-06-03 14:37:37 +00:00
|
|
|
zone(&allocator, ZONE_NAME),
|
2020-07-07 19:14:38 +00:00
|
|
|
builder_(&zone),
|
2020-06-30 11:17:53 +00:00
|
|
|
isolate_(CcTest::InitIsolateOnce()),
|
|
|
|
scope(isolate_),
|
|
|
|
thrower(isolate_, "Test wasm GC") {
|
|
|
|
testing::SetupIsolateForWasmModule(isolate_);
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
byte AddGlobal(ValueType type, bool mutability, WasmInitExpr init) {
|
2020-07-09 13:21:45 +00:00
|
|
|
return builder_.AddGlobal(type, mutability, std::move(init));
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
byte DefineFunction(FunctionSig* sig, std::initializer_list<ValueType> locals,
|
|
|
|
std::initializer_list<byte> code) {
|
2020-07-07 19:14:38 +00:00
|
|
|
WasmFunctionBuilder* fun = builder_.AddFunction(sig);
|
2020-06-03 14:37:37 +00:00
|
|
|
for (ValueType local : locals) {
|
|
|
|
fun->AddLocal(local);
|
|
|
|
}
|
|
|
|
fun->EmitCode(code.begin(), static_cast<uint32_t>(code.size()));
|
2020-07-07 19:14:38 +00:00
|
|
|
return fun->func_index();
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-08-03 18:16:25 +00:00
|
|
|
void DefineExportedFunction(const char* name, FunctionSig* sig,
|
|
|
|
std::initializer_list<byte> code) {
|
|
|
|
WasmFunctionBuilder* fun = builder_.AddFunction(sig);
|
|
|
|
fun->EmitCode(code.begin(), static_cast<uint32_t>(code.size()));
|
|
|
|
builder_.AddExport(CStrVector(name), fun);
|
|
|
|
}
|
|
|
|
|
|
|
|
MaybeHandle<Object> CallExportedFunction(const char* name, int argc,
|
|
|
|
Handle<Object> args[]) {
|
|
|
|
Handle<WasmExportedFunction> func =
|
|
|
|
testing::GetExportedFunction(isolate_, instance_, name)
|
|
|
|
.ToHandleChecked();
|
|
|
|
return Execution::Call(isolate_, func,
|
|
|
|
isolate_->factory()->undefined_value(), argc, args);
|
|
|
|
}
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
byte DefineStruct(std::initializer_list<F> fields) {
|
2020-06-03 14:37:37 +00:00
|
|
|
StructType::Builder type_builder(&zone,
|
|
|
|
static_cast<uint32_t>(fields.size()));
|
|
|
|
for (F field : fields) {
|
|
|
|
type_builder.AddField(field.first, field.second);
|
|
|
|
}
|
2020-07-07 19:14:38 +00:00
|
|
|
return builder_.AddStructType(type_builder.Build());
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
byte DefineArray(ValueType element_type, bool mutability) {
|
2020-07-09 11:51:58 +00:00
|
|
|
return builder_.AddArrayType(zone.New<ArrayType>(element_type, mutability));
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-08-05 11:12:29 +00:00
|
|
|
byte DefineSignature(FunctionSig* sig) { return builder_.AddSignature(sig); }
|
|
|
|
|
2020-10-02 05:31:50 +00:00
|
|
|
byte DefineTable(ValueType type, uint32_t min_size, uint32_t max_size) {
|
|
|
|
return builder_.AddTable(type, min_size, max_size);
|
|
|
|
}
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
void CompileModule() {
|
|
|
|
ZoneBuffer buffer(&zone);
|
2020-07-07 19:14:38 +00:00
|
|
|
builder_.WriteTo(&buffer);
|
2020-06-03 14:37:37 +00:00
|
|
|
MaybeHandle<WasmInstanceObject> maybe_instance =
|
|
|
|
testing::CompileAndInstantiateForTesting(
|
2020-06-30 11:17:53 +00:00
|
|
|
isolate_, &thrower, ModuleWireBytes(buffer.begin(), buffer.end()));
|
2020-06-03 14:37:37 +00:00
|
|
|
if (thrower.error()) FATAL("%s", thrower.error_msg());
|
2020-06-23 14:18:46 +00:00
|
|
|
instance_ = maybe_instance.ToHandleChecked();
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
void CallFunctionImpl(uint32_t function_index, const FunctionSig* sig,
|
|
|
|
CWasmArgumentsPacker* packer) {
|
|
|
|
WasmCodeRefScope scope;
|
2020-09-16 07:37:24 +00:00
|
|
|
NativeModule* native_module = instance_->module_object().native_module();
|
|
|
|
WasmCode* code = native_module->GetCode(function_index);
|
2020-07-07 19:14:38 +00:00
|
|
|
Address wasm_call_target = code->instruction_start();
|
|
|
|
Handle<Object> object_ref = instance_;
|
2020-09-16 07:37:24 +00:00
|
|
|
Handle<Code> c_wasm_entry =
|
|
|
|
compiler::CompileCWasmEntry(isolate_, sig, native_module->module());
|
2020-07-07 19:14:38 +00:00
|
|
|
Execution::CallWasm(isolate_, c_wasm_entry, wasm_call_target, object_ref,
|
|
|
|
packer->argv());
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
void CheckResult(uint32_t function_index, int32_t expected) {
|
|
|
|
FunctionSig* sig = sigs.i_v();
|
|
|
|
DCHECK(*sig == *instance_->module()->functions[function_index].sig);
|
|
|
|
CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
|
|
|
|
CallFunctionImpl(function_index, sig, &packer);
|
2020-11-12 22:30:45 +00:00
|
|
|
CHECK(!isolate_->has_pending_exception());
|
2020-07-07 19:14:38 +00:00
|
|
|
packer.Reset();
|
|
|
|
CHECK_EQ(expected, packer.Pop<int32_t>());
|
|
|
|
}
|
|
|
|
|
|
|
|
void CheckResult(uint32_t function_index, int32_t expected, int32_t arg) {
|
|
|
|
FunctionSig* sig = sigs.i_i();
|
|
|
|
DCHECK(*sig == *instance_->module()->functions[function_index].sig);
|
|
|
|
CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
|
|
|
|
packer.Push(arg);
|
|
|
|
CallFunctionImpl(function_index, sig, &packer);
|
2020-11-12 22:30:45 +00:00
|
|
|
CHECK(!isolate_->has_pending_exception());
|
2020-07-07 19:14:38 +00:00
|
|
|
packer.Reset();
|
|
|
|
CHECK_EQ(expected, packer.Pop<int32_t>());
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
MaybeHandle<Object> GetResultObject(uint32_t function_index) {
|
|
|
|
const FunctionSig* sig = instance_->module()->functions[function_index].sig;
|
|
|
|
CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
|
|
|
|
CallFunctionImpl(function_index, sig, &packer);
|
2020-11-12 22:30:45 +00:00
|
|
|
CHECK(!isolate_->has_pending_exception());
|
2020-07-07 19:14:38 +00:00
|
|
|
packer.Reset();
|
|
|
|
return Handle<Object>(Object(packer.Pop<Address>()), isolate_);
|
|
|
|
}
|
|
|
|
|
2020-11-12 22:30:45 +00:00
|
|
|
void CheckHasThrown(uint32_t function_index) {
|
|
|
|
const FunctionSig* sig = instance_->module()->functions[function_index].sig;
|
|
|
|
CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
|
|
|
|
CallFunctionImpl(function_index, sig, &packer);
|
|
|
|
CHECK(isolate_->has_pending_exception());
|
|
|
|
isolate_->clear_pending_exception();
|
|
|
|
}
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
void CheckHasThrown(uint32_t function_index, int32_t arg) {
|
|
|
|
FunctionSig* sig = sigs.i_i();
|
|
|
|
DCHECK(*sig == *instance_->module()->functions[function_index].sig);
|
|
|
|
CWasmArgumentsPacker packer(CWasmArgumentsPacker::TotalSize(sig));
|
|
|
|
packer.Push(arg);
|
|
|
|
CallFunctionImpl(function_index, sig, &packer);
|
|
|
|
CHECK(isolate_->has_pending_exception());
|
2020-06-30 11:17:53 +00:00
|
|
|
isolate_->clear_pending_exception();
|
2020-06-03 14:37:37 +00:00
|
|
|
}
|
|
|
|
|
2020-06-23 14:18:46 +00:00
|
|
|
Handle<WasmInstanceObject> instance() { return instance_; }
|
2020-06-30 11:17:53 +00:00
|
|
|
Isolate* isolate() { return isolate_; }
|
2020-07-07 19:14:38 +00:00
|
|
|
WasmModuleBuilder* builder() { return &builder_; }
|
2020-06-23 14:18:46 +00:00
|
|
|
|
2020-04-21 16:45:53 +00:00
|
|
|
TestSignatures sigs;
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
private:
|
|
|
|
const FlagScope<bool> flag_gc;
|
|
|
|
const FlagScope<bool> flag_reftypes;
|
|
|
|
const FlagScope<bool> flag_typedfuns;
|
2020-12-15 12:22:59 +00:00
|
|
|
const FlagScope<bool> flag_liftoff;
|
|
|
|
const FlagScope<bool> flag_liftoff_only;
|
2020-12-16 22:29:12 +00:00
|
|
|
const FlagScope<bool> flag_tierup;
|
2020-06-03 14:37:37 +00:00
|
|
|
|
|
|
|
v8::internal::AccountingAllocator allocator;
|
|
|
|
Zone zone;
|
2020-07-07 19:14:38 +00:00
|
|
|
WasmModuleBuilder builder_;
|
2020-06-03 14:37:37 +00:00
|
|
|
|
2020-06-30 11:17:53 +00:00
|
|
|
Isolate* const isolate_;
|
2020-06-03 14:37:37 +00:00
|
|
|
const HandleScope scope;
|
2020-06-23 14:18:46 +00:00
|
|
|
Handle<WasmInstanceObject> instance_;
|
2020-06-03 14:37:37 +00:00
|
|
|
ErrorThrower thrower;
|
|
|
|
};
|
|
|
|
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType ref(uint32_t type_index) {
|
2020-06-29 09:24:51 +00:00
|
|
|
return ValueType::Ref(type_index, kNonNullable);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
}
|
|
|
|
ValueType optref(uint32_t type_index) {
|
2020-06-29 09:24:51 +00:00
|
|
|
return ValueType::Ref(type_index, kNullable);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 12:22:59 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmBasicStruct) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index =
|
2020-06-03 14:37:37 +00:00
|
|
|
tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
|
2020-09-21 13:51:42 +00:00
|
|
|
const byte empty_struct_index = tester.DefineStruct({});
|
|
|
|
ValueType kRefType = ref(type_index);
|
|
|
|
ValueType kEmptyStructType = ref(empty_struct_index);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType kOptRefType = optref(type_index);
|
2020-09-21 13:51:42 +00:00
|
|
|
FunctionSig sig_q_v(1, 0, &kRefType);
|
|
|
|
FunctionSig sig_qe_v(1, 0, &kEmptyStructType);
|
2020-04-21 16:45:53 +00:00
|
|
|
|
2020-05-08 10:47:50 +00:00
|
|
|
// Test struct.new and struct.get.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kGet1 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-06-03 14:37:37 +00:00
|
|
|
{WASM_STRUCT_GET(
|
|
|
|
type_index, 0,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(64),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-04-21 16:45:53 +00:00
|
|
|
|
2020-05-08 10:47:50 +00:00
|
|
|
// Test struct.new and struct.get.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kGet2 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-06-03 14:37:37 +00:00
|
|
|
{WASM_STRUCT_GET(
|
|
|
|
type_index, 1,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(64),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-04-21 16:45:53 +00:00
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
// Test struct.new, returning struct reference.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kGetStruct = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
&sig_q_v, {},
|
2020-07-21 09:03:20 +00:00
|
|
|
{WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(64),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
2020-04-21 16:45:53 +00:00
|
|
|
|
2020-09-21 13:51:42 +00:00
|
|
|
// Test struct.new, returning reference to an empty struct.
|
|
|
|
const byte kGetEmptyStruct = tester.DefineFunction(
|
|
|
|
&sig_qe_v, {},
|
|
|
|
{WASM_STRUCT_NEW_WITH_RTT(empty_struct_index,
|
|
|
|
WASM_RTT_CANON(empty_struct_index)),
|
|
|
|
kExprEnd});
|
|
|
|
|
2020-05-08 10:47:50 +00:00
|
|
|
// Test struct.set, struct refs types in locals.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte j_local_index = 0;
|
|
|
|
const byte j_field_index = 0;
|
|
|
|
const byte kSet = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {kOptRefType},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(
|
2020-07-21 09:03:20 +00:00
|
|
|
j_local_index,
|
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(64),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_SET(type_index, j_field_index, WASM_LOCAL_GET(j_local_index),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(-99)),
|
|
|
|
WASM_STRUCT_GET(type_index, j_field_index,
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(j_local_index)),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-05-08 10:47:50 +00:00
|
|
|
|
2020-06-19 03:50:30 +00:00
|
|
|
tester.CompileModule();
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kGet1, 42);
|
|
|
|
tester.CheckResult(kGet2, 64);
|
|
|
|
CHECK(tester.GetResultObject(kGetStruct).ToHandleChecked()->IsWasmStruct());
|
2020-09-21 13:51:42 +00:00
|
|
|
CHECK(tester.GetResultObject(kGetEmptyStruct)
|
|
|
|
.ToHandleChecked()
|
|
|
|
->IsWasmStruct());
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kSet, -99);
|
2020-06-19 03:50:30 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Test struct.set, ref.as_non_null,
|
|
|
|
// struct refs types in globals and if-results.
|
2020-12-15 19:49:59 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmRefAsNonNull) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index =
|
2020-06-19 03:50:30 +00:00
|
|
|
tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
|
|
|
|
ValueType kRefTypes[] = {ref(type_index)};
|
|
|
|
ValueType kOptRefType = optref(type_index);
|
|
|
|
FunctionSig sig_q_v(1, 0, kRefTypes);
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte global_index =
|
2020-07-09 13:21:45 +00:00
|
|
|
tester.AddGlobal(kOptRefType, true,
|
|
|
|
WasmInitExpr::RefNullConst(
|
|
|
|
static_cast<HeapType::Representation>(type_index)));
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte field_index = 0;
|
|
|
|
const byte kFunc = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-12-17 16:56:08 +00:00
|
|
|
{WASM_GLOBAL_SET(
|
2020-07-21 09:03:20 +00:00
|
|
|
global_index,
|
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(55), WASM_I32V(66),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_STRUCT_GET(
|
2020-07-02 11:18:47 +00:00
|
|
|
type_index, field_index,
|
2020-08-04 09:13:30 +00:00
|
|
|
WASM_REF_AS_NON_NULL(WASM_IF_ELSE_R(kOptRefType, WASM_I32V(1),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(global_index),
|
2020-08-04 09:13:30 +00:00
|
|
|
WASM_REF_NULL(type_index)))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-05-05 10:43:58 +00:00
|
|
|
|
2020-06-19 03:50:30 +00:00
|
|
|
tester.CompileModule();
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kFunc, 55);
|
2020-06-19 03:50:30 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 19:49:59 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmBrOnNull) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index =
|
2020-06-19 03:50:30 +00:00
|
|
|
tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
|
|
|
|
ValueType kRefTypes[] = {ref(type_index)};
|
|
|
|
ValueType kOptRefType = optref(type_index);
|
|
|
|
FunctionSig sig_q_v(1, 0, kRefTypes);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte l_local_index = 0;
|
|
|
|
const byte kTaken = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {kOptRefType},
|
2020-06-03 14:37:37 +00:00
|
|
|
{WASM_BLOCK_I(WASM_I32V(42),
|
|
|
|
// Branch will be taken.
|
|
|
|
// 42 left on stack outside the block (not 52).
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_BR_ON_NULL(0, WASM_LOCAL_GET(l_local_index)),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(52), WASM_BR(0)),
|
|
|
|
kExprEnd});
|
2020-05-11 15:13:34 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte m_field_index = 0;
|
|
|
|
const byte kNotTaken = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-06-03 14:37:37 +00:00
|
|
|
{WASM_BLOCK_I(
|
|
|
|
WASM_I32V(42),
|
|
|
|
WASM_STRUCT_GET(
|
|
|
|
type_index, m_field_index,
|
|
|
|
// Branch will not be taken.
|
|
|
|
// 52 left on stack outside the block (not 42).
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_BR_ON_NULL(0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(52), WASM_I32V(62),
|
|
|
|
WASM_RTT_CANON(type_index)))),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_BR(0)),
|
|
|
|
kExprEnd});
|
2020-05-11 15:13:34 +00:00
|
|
|
|
2020-06-19 03:50:30 +00:00
|
|
|
tester.CompileModule();
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kTaken, 42);
|
|
|
|
tester.CheckResult(kNotTaken, 52);
|
2020-06-19 03:50:30 +00:00
|
|
|
}
|
|
|
|
|
2020-12-15 19:49:59 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(BrOnCast) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2021-01-28 16:21:57 +00:00
|
|
|
ValueType kDataRefNull = ValueType::Ref(HeapType::kData, kNullable);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineStruct({F(kWasmI32, true)});
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
const byte other_type_index = tester.DefineStruct({F(kWasmF32, true)});
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte rtt_index =
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
tester.AddGlobal(ValueType::Rtt(type_index, 0), false,
|
2020-07-22 14:22:33 +00:00
|
|
|
WasmInitExpr::RttCanon(
|
|
|
|
static_cast<HeapType::Representation>(type_index)));
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kTestStruct = tester.DefineFunction(
|
2021-01-28 16:21:57 +00:00
|
|
|
tester.sigs.i_v(), {kWasmI32, kDataRefNull},
|
2021-01-31 21:08:05 +00:00
|
|
|
{WASM_BLOCK_R(ValueType::Ref(type_index, kNullable),
|
|
|
|
WASM_LOCAL_SET(0, WASM_I32V(111)),
|
|
|
|
// Pipe a struct through a local so it's statically typed
|
|
|
|
// as dataref.
|
|
|
|
WASM_LOCAL_SET(1, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
other_type_index, WASM_F32(1.0),
|
|
|
|
WASM_RTT_CANON(other_type_index))),
|
|
|
|
WASM_LOCAL_GET(1),
|
|
|
|
// The type check fails, so this branch isn't taken.
|
|
|
|
WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)), WASM_DROP,
|
|
|
|
|
|
|
|
WASM_LOCAL_SET(0, WASM_I32V(221)), // (Final result) - 1
|
|
|
|
WASM_LOCAL_SET(1, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(1),
|
|
|
|
WASM_GLOBAL_GET(rtt_index))),
|
|
|
|
WASM_LOCAL_GET(1),
|
|
|
|
// This branch is taken.
|
|
|
|
WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
|
|
|
|
WASM_GLOBAL_GET(rtt_index), WASM_GC_OP(kExprRefCast),
|
|
|
|
|
|
|
|
// Not executed due to the branch.
|
|
|
|
WASM_LOCAL_SET(0, WASM_I32V(333))),
|
|
|
|
WASM_GC_OP(kExprStructGet), type_index, 0, WASM_LOCAL_GET(0),
|
|
|
|
kExprI32Add, kExprEnd});
|
2020-07-22 14:22:33 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kTestNull = tester.DefineFunction(
|
2021-01-28 16:21:57 +00:00
|
|
|
tester.sigs.i_v(), {kWasmI32, kDataRefNull},
|
2021-01-31 21:08:05 +00:00
|
|
|
{WASM_BLOCK_R(ValueType::Ref(type_index, kNullable),
|
|
|
|
WASM_LOCAL_SET(0, WASM_I32V(111)),
|
|
|
|
WASM_LOCAL_GET(1), // Put a nullref onto the value stack.
|
|
|
|
// Not taken for nullref.
|
|
|
|
WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
|
|
|
|
WASM_RTT_CANON(type_index), WASM_GC_OP(kExprRefCast),
|
|
|
|
|
|
|
|
WASM_LOCAL_SET(0, WASM_I32V(222))), // Final result.
|
|
|
|
WASM_DROP, WASM_LOCAL_GET(0), kExprEnd});
|
2020-07-22 14:22:33 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kTypedAfterBranch = tester.DefineFunction(
|
2021-01-28 16:21:57 +00:00
|
|
|
tester.sigs.i_v(), {kWasmI32, kDataRefNull},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(1, WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(rtt_index))),
|
2021-01-31 21:08:05 +00:00
|
|
|
WASM_BLOCK_I(
|
|
|
|
// The inner block should take the early branch with a struct
|
|
|
|
// on the stack.
|
|
|
|
WASM_BLOCK_R(ValueType::Ref(type_index, kNonNullable),
|
|
|
|
WASM_LOCAL_GET(1),
|
|
|
|
WASM_BR_ON_CAST(0, WASM_GLOBAL_GET(rtt_index)),
|
|
|
|
// Returning 123 is the unreachable failure case.
|
|
|
|
WASM_I32V(123), WASM_BR(1)),
|
2020-07-22 14:22:33 +00:00
|
|
|
// The outer block catches the struct left behind by the inner block
|
|
|
|
// and reads its field.
|
2021-01-31 21:08:05 +00:00
|
|
|
WASM_GC_OP(kExprStructGet), type_index, 0),
|
|
|
|
kExprEnd});
|
2020-07-22 14:22:33 +00:00
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
tester.CheckResult(kTestStruct, 222);
|
2021-01-31 21:08:05 +00:00
|
|
|
tester.CheckResult(kTestNull, 222);
|
2020-07-22 14:22:33 +00:00
|
|
|
tester.CheckResult(kTypedAfterBranch, 42);
|
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmRefEq) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
byte type_index = tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
|
2020-06-19 03:50:30 +00:00
|
|
|
ValueType kRefTypes[] = {ref(type_index)};
|
|
|
|
ValueType kOptRefType = optref(type_index);
|
|
|
|
FunctionSig sig_q_v(1, 0, kRefTypes);
|
|
|
|
|
2020-07-02 11:18:47 +00:00
|
|
|
byte local_index = 0;
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kFunc = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {kOptRefType},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(local_index, WASM_STRUCT_NEW_WITH_RTT(
|
2020-07-21 09:03:20 +00:00
|
|
|
type_index, WASM_I32V(55), WASM_I32V(66),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32_ADD(
|
2020-07-02 11:18:47 +00:00
|
|
|
WASM_I32_SHL(
|
|
|
|
WASM_REF_EQ( // true
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(local_index), WASM_LOCAL_GET(local_index)),
|
2020-07-02 11:18:47 +00:00
|
|
|
WASM_I32V(0)),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32_ADD(
|
|
|
|
WASM_I32_SHL(WASM_REF_EQ( // false
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(local_index),
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(55), WASM_I32V(66),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(1)),
|
|
|
|
WASM_I32_ADD(WASM_I32_SHL( // false
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_REF_EQ(WASM_LOCAL_GET(local_index),
|
2020-06-24 17:29:00 +00:00
|
|
|
WASM_REF_NULL(type_index)),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(2)),
|
|
|
|
WASM_I32_SHL(WASM_REF_EQ( // true
|
2020-06-24 17:29:00 +00:00
|
|
|
WASM_REF_NULL(type_index),
|
|
|
|
WASM_REF_NULL(type_index)),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(3))))),
|
|
|
|
kExprEnd});
|
2020-05-20 22:29:59 +00:00
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
tester.CompileModule();
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kFunc, 0b1001);
|
2020-04-21 16:45:53 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmPackedStructU) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineStruct(
|
2020-06-05 20:22:45 +00:00
|
|
|
{F(kWasmI8, true), F(kWasmI16, true), F(kWasmI32, true)});
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType struct_type = optref(type_index);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte local_index = 0;
|
2020-06-05 20:22:45 +00:00
|
|
|
|
|
|
|
int32_t expected_output_0 = 0x1234;
|
|
|
|
int32_t expected_output_1 = -1;
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kF0 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {struct_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(local_index,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(expected_output_0),
|
|
|
|
WASM_I32V(expected_output_1), WASM_I32V(0x12345678),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_GET_U(type_index, 0, WASM_LOCAL_GET(local_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kF1 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {struct_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(local_index,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(expected_output_0),
|
|
|
|
WASM_I32V(expected_output_1), WASM_I32V(0x12345678),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_GET_U(type_index, 1, WASM_LOCAL_GET(local_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
tester.CompileModule();
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF0, static_cast<uint8_t>(expected_output_0));
|
|
|
|
tester.CheckResult(kF1, static_cast<uint16_t>(expected_output_1));
|
2020-06-05 20:22:45 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmPackedStructS) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineStruct(
|
2020-06-05 20:22:45 +00:00
|
|
|
{F(kWasmI8, true), F(kWasmI16, true), F(kWasmI32, true)});
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType struct_type = optref(type_index);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte local_index = 0;
|
2020-06-05 20:22:45 +00:00
|
|
|
|
|
|
|
int32_t expected_output_0 = 0x80;
|
|
|
|
int32_t expected_output_1 = 42;
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kF0 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {struct_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(
|
2020-06-05 20:22:45 +00:00
|
|
|
local_index,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(expected_output_0),
|
|
|
|
WASM_I32V(expected_output_1), WASM_I32V(0),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_GET_S(type_index, 0, WASM_LOCAL_GET(local_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kF1 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {struct_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(
|
2020-07-21 09:03:20 +00:00
|
|
|
local_index,
|
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(0x80),
|
|
|
|
WASM_I32V(expected_output_1), WASM_I32V(0),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_GET_S(type_index, 1, WASM_LOCAL_GET(local_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF0, static_cast<int8_t>(expected_output_0));
|
|
|
|
tester.CheckResult(kF1, static_cast<int16_t>(expected_output_1));
|
2020-06-05 20:22:45 +00:00
|
|
|
}
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
TEST(WasmLetInstruction) {
|
|
|
|
WasmGCTester tester;
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index =
|
2020-06-03 14:37:37 +00:00
|
|
|
tester.DefineStruct({F(kWasmI32, true), F(kWasmI32, true)});
|
2020-05-20 22:29:59 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte let_local_index = 0;
|
|
|
|
const byte let_field_index = 0;
|
|
|
|
const byte kLetTest1 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-07-21 09:03:20 +00:00
|
|
|
{WASM_LET_1_I(
|
2020-09-29 07:46:36 +00:00
|
|
|
WASM_SEQ(kRefCode, type_index),
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(52),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
WASM_STRUCT_GET(type_index, let_field_index,
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(let_local_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte let_2_field_index = 0;
|
|
|
|
const byte kLetTest2 = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-07-21 09:03:20 +00:00
|
|
|
{WASM_LET_2_I(
|
2020-09-29 07:46:36 +00:00
|
|
|
kI32Code, WASM_I32_ADD(WASM_I32V(42), WASM_I32V(-32)),
|
|
|
|
WASM_SEQ(kRefCode, type_index),
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(52),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
WASM_I32_MUL(WASM_STRUCT_GET(type_index, let_2_field_index,
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(1)),
|
|
|
|
WASM_LOCAL_GET(0))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kLetTestLocals = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {kWasmI32},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(1, WASM_I32V(100)),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_LET_2_I(
|
2020-09-29 07:46:36 +00:00
|
|
|
kI32Code, WASM_I32V(1), kI32Code, WASM_I32V(10),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_I32_SUB(WASM_I32_ADD(WASM_LOCAL_GET(0), // 1st let-local
|
|
|
|
WASM_LOCAL_GET(2)), // Parameter
|
|
|
|
WASM_I32_ADD(WASM_LOCAL_GET(1), // 2nd let-local
|
|
|
|
WASM_LOCAL_GET(3)))), // Function local
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-05-20 22:29:59 +00:00
|
|
|
// Result: (1 + 1000) - (10 + 100) = 891
|
2020-06-03 14:37:37 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte let_erase_local_index = 0;
|
|
|
|
const byte kLetTestErase = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {kWasmI32},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(let_erase_local_index, WASM_I32V(0)),
|
2020-09-29 07:46:36 +00:00
|
|
|
WASM_LET_1_V(kI32Code, WASM_I32V(1), WASM_NOP),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(let_erase_local_index), kExprEnd});
|
2020-05-20 22:29:59 +00:00
|
|
|
// The result should be 0 and not 1, as local_get(0) refers to the original
|
|
|
|
// local.
|
|
|
|
|
2021-01-08 08:19:18 +00:00
|
|
|
const byte kLetInLoop = tester.DefineFunction(
|
|
|
|
tester.sigs.i_i(), {},
|
|
|
|
{WASM_LOOP(WASM_LET_1_V(
|
|
|
|
kI32Code, WASM_I32V(10), // --
|
|
|
|
WASM_LOCAL_SET(1, WASM_I32_SUB(WASM_LOCAL_GET(1), WASM_I32V(10))),
|
|
|
|
WASM_BR_IF(1, WASM_I32_GES(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))))),
|
|
|
|
WASM_LOCAL_GET(0), WASM_END});
|
|
|
|
|
|
|
|
const byte kLetInBlock = tester.DefineFunction(
|
|
|
|
tester.sigs.i_i(), {},
|
|
|
|
{WASM_BLOCK(WASM_LET_1_V(
|
|
|
|
kI32Code, WASM_I32V(10), // --
|
|
|
|
WASM_BR_IF(1, WASM_I32_GES(WASM_LOCAL_GET(1), WASM_LOCAL_GET(0))),
|
|
|
|
WASM_LOCAL_SET(1, WASM_I32V(30)))),
|
|
|
|
WASM_LOCAL_GET(0), WASM_END});
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
tester.CompileModule();
|
2020-05-20 22:29:59 +00:00
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kLetTest1, 42);
|
|
|
|
tester.CheckResult(kLetTest2, 420);
|
|
|
|
tester.CheckResult(kLetTestLocals, 891, 1000);
|
|
|
|
tester.CheckResult(kLetTestErase, 0);
|
2021-01-08 08:19:18 +00:00
|
|
|
tester.CheckResult(kLetInLoop, 2, 52);
|
|
|
|
tester.CheckResult(kLetInLoop, -11, -1);
|
|
|
|
tester.CheckResult(kLetInBlock, 15, 15);
|
|
|
|
tester.CheckResult(kLetInBlock, 30, 5);
|
2020-05-20 22:29:59 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmBasicArray) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineArray(wasm::kWasmI32, true);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType kRefTypes[] = {ref(type_index)};
|
2020-05-07 14:55:58 +00:00
|
|
|
FunctionSig sig_q_v(1, 0, kRefTypes);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType kOptRefType = optref(type_index);
|
2020-05-11 15:17:49 +00:00
|
|
|
|
|
|
|
// f: a = [12, 12, 12]; a[1] = 42; return a[arg0]
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte local_index = 1;
|
|
|
|
const byte kGetElem = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {kOptRefType},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(local_index, WASM_ARRAY_NEW_WITH_RTT(
|
2020-07-21 09:03:20 +00:00
|
|
|
type_index, WASM_I32V(12), WASM_I32V(3),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(type_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
|
2020-06-03 14:37:37 +00:00
|
|
|
WASM_I32V(42)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_GET(type_index, WASM_LOCAL_GET(local_index),
|
|
|
|
WASM_LOCAL_GET(0)),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
2020-05-07 14:55:58 +00:00
|
|
|
|
2020-05-11 16:19:06 +00:00
|
|
|
// Reads and returns an array's length.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kGetLength = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2020-07-21 09:03:20 +00:00
|
|
|
{WASM_ARRAY_LEN(type_index, WASM_ARRAY_NEW_WITH_RTT(
|
|
|
|
type_index, WASM_I32V(0), WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2020-06-03 14:37:37 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-05-07 14:55:58 +00:00
|
|
|
// Create an array of length 2, initialized to [42, 42].
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kAllocate = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
&sig_q_v, {},
|
2020-07-21 09:03:20 +00:00
|
|
|
{WASM_ARRAY_NEW_WITH_RTT(type_index, WASM_I32V(42), WASM_I32V(2),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
2020-05-11 15:17:49 +00:00
|
|
|
|
2020-11-16 22:30:52 +00:00
|
|
|
const uint32_t kLongLength = 1u << 16;
|
2020-11-12 22:30:45 +00:00
|
|
|
const byte kAllocateLarge = tester.DefineFunction(
|
|
|
|
&sig_q_v, {},
|
|
|
|
{WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(kLongLength),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const uint32_t kTooLong = kV8MaxWasmArrayLength + 1;
|
|
|
|
const byte kAllocateTooLarge = tester.DefineFunction(
|
|
|
|
&sig_q_v, {},
|
|
|
|
{WASM_ARRAY_NEW_DEFAULT(type_index, WASM_I32V(kTooLong),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
|
|
|
|
2020-06-03 14:37:37 +00:00
|
|
|
tester.CompileModule();
|
2020-05-11 16:19:06 +00:00
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kGetElem, 12, 0);
|
|
|
|
tester.CheckResult(kGetElem, 42, 1);
|
|
|
|
tester.CheckResult(kGetElem, 12, 2);
|
|
|
|
tester.CheckHasThrown(kGetElem, 3);
|
|
|
|
tester.CheckHasThrown(kGetElem, -1);
|
|
|
|
tester.CheckResult(kGetLength, 42);
|
2020-06-03 14:37:37 +00:00
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
MaybeHandle<Object> h_result = tester.GetResultObject(kAllocate);
|
2020-06-03 14:37:37 +00:00
|
|
|
CHECK(h_result.ToHandleChecked()->IsWasmArray());
|
2020-05-07 14:55:58 +00:00
|
|
|
#if OBJECT_PRINT
|
2020-06-03 14:37:37 +00:00
|
|
|
h_result.ToHandleChecked()->Print();
|
2020-05-07 14:55:58 +00:00
|
|
|
#endif
|
2020-11-12 22:30:45 +00:00
|
|
|
|
|
|
|
MaybeHandle<Object> maybe_large_result =
|
|
|
|
tester.GetResultObject(kAllocateLarge);
|
|
|
|
Handle<Object> large_result = maybe_large_result.ToHandleChecked();
|
|
|
|
CHECK(large_result->IsWasmArray());
|
|
|
|
CHECK(Handle<WasmArray>::cast(large_result)->Size() >
|
|
|
|
kMaxRegularHeapObjectSize);
|
|
|
|
|
|
|
|
tester.CheckHasThrown(kAllocateTooLarge);
|
2020-05-07 14:55:58 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmPackedArrayU) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte array_index = tester.DefineArray(kWasmI8, true);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType array_type = optref(array_index);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte param_index = 0;
|
|
|
|
const byte local_index = 1;
|
2020-06-05 20:22:45 +00:00
|
|
|
|
|
|
|
int32_t expected_output_3 = 258;
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kF = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {array_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(local_index, WASM_ARRAY_NEW_WITH_RTT(
|
2020-07-21 09:03:20 +00:00
|
|
|
array_index, WASM_I32V(0), WASM_I32V(4),
|
|
|
|
WASM_RTT_CANON(array_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(0),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(1)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(10)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(2),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(200)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(3),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(expected_output_3)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_GET_U(array_index, WASM_LOCAL_GET(local_index),
|
|
|
|
WASM_LOCAL_GET(param_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF, 1, 0);
|
|
|
|
tester.CheckResult(kF, 10, 1);
|
|
|
|
tester.CheckResult(kF, 200, 2);
|
2020-06-05 20:22:45 +00:00
|
|
|
// Only the 2 lsb's of 258 should be stored in the array.
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF, static_cast<uint8_t>(expected_output_3), 3);
|
2020-06-05 20:22:45 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 15:22:52 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(WasmPackedArrayS) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte array_index = tester.DefineArray(kWasmI16, true);
|
[wasm-gc] Change ValueType representation to account for new types
Motivation:
Changes to the typed function references and gc proposals solidified
the notion of heap type, clarified nullable vs. non-nullable reference
types, and introduced rtts, which contain an integer depth field in
addition to a heap type. This required us to overhaul our ValueType
representation, which results in extensive changes.
To keep this CL "small", we do not try to implement the binary encoding
as described in the proposals, but rather devise a simpler one of our
own (see below). Also, we do not try to implement additional
functionality for the new types.
Changes:
- Introduce HeapType. Move heap types from ValueType to HeapType.
- Introduce Nullability for reference types.
- Rework ValueType helper methods.
- Introduce rtts in ValueType with an integer depth field. Include depth
in the ValueType encoding.
- Make the constructor of ValueType private, instead expose static
functions which explicitly state what they create.
- Change every switch statement on ValueType::Kind. Sometimes, we need
nested switches.
- Introduce temporary constants in ValueTypeCode for nullable types,
use them for decoding.
- In WasmGlobalObject, split 'flags' into 'raw_type' and 'is_mutable'.
- Change IsSubtypeOfRef to IsSubtypeOfHeap and implement changes in
subtyping.
- kWasmFuncRef initializers are now non-nullable. Initializers are
only required to be subtypes of the declared global type.
- Change tests and fuzzers as needed.
Bug: v8:7748
Change-Id: If41f783bd4128443b07e94188cea7dd53ab0bfa5
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2247657
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68408}
2020-06-18 11:24:07 +00:00
|
|
|
ValueType array_type = optref(array_index);
|
2020-06-05 20:22:45 +00:00
|
|
|
|
|
|
|
int32_t expected_outputs[] = {0x12345678, 10, 0xFEDC, 0xFF1234};
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte param_index = 0;
|
|
|
|
const byte local_index = 1;
|
|
|
|
const byte kF = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {array_type},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(
|
2020-06-05 20:22:45 +00:00
|
|
|
local_index,
|
2020-07-21 09:03:20 +00:00
|
|
|
WASM_ARRAY_NEW_WITH_RTT(array_index, WASM_I32V(0x12345678),
|
|
|
|
WASM_I32V(4), WASM_RTT_CANON(array_index))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(1),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(10)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(2),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(0xFEDC)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_SET(array_index, WASM_LOCAL_GET(local_index), WASM_I32V(3),
|
2020-06-05 20:22:45 +00:00
|
|
|
WASM_I32V(0xFF1234)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_GET_S(array_index, WASM_LOCAL_GET(local_index),
|
|
|
|
WASM_LOCAL_GET(param_index)),
|
2020-06-05 20:22:45 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
// Exactly the 2 lsb's should be stored by array.new.
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF, static_cast<int16_t>(expected_outputs[0]), 0);
|
|
|
|
tester.CheckResult(kF, static_cast<int16_t>(expected_outputs[1]), 1);
|
2020-06-05 20:22:45 +00:00
|
|
|
// Sign should be extended.
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF, static_cast<int16_t>(expected_outputs[2]), 2);
|
2020-06-05 20:22:45 +00:00
|
|
|
// Exactly the 2 lsb's should be stored by array.set.
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kF, static_cast<int16_t>(expected_outputs[3]), 3);
|
2020-06-05 20:22:45 +00:00
|
|
|
}
|
|
|
|
|
2020-12-17 00:37:09 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(NewDefault) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-07 13:14:23 +00:00
|
|
|
const byte struct_type = tester.DefineStruct(
|
|
|
|
{F(wasm::kWasmI32, true), F(wasm::kWasmF64, true), F(optref(0), true)});
|
|
|
|
const byte array_type = tester.DefineArray(wasm::kWasmI32, true);
|
|
|
|
// Returns: struct[0] + f64_to_i32(struct[1]) + (struct[2].is_null ^ 1) == 0.
|
|
|
|
const byte allocate_struct = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(struct_type)},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(0, WASM_STRUCT_NEW_DEFAULT(struct_type,
|
2020-08-07 13:14:23 +00:00
|
|
|
WASM_RTT_CANON(struct_type))),
|
|
|
|
WASM_I32_ADD(
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_I32_ADD(WASM_STRUCT_GET(struct_type, 0, WASM_LOCAL_GET(0)),
|
2020-08-07 13:14:23 +00:00
|
|
|
WASM_I32_SCONVERT_F64(WASM_STRUCT_GET(
|
2020-12-17 16:55:33 +00:00
|
|
|
struct_type, 1, WASM_LOCAL_GET(0)))),
|
2020-08-07 13:14:23 +00:00
|
|
|
WASM_I32_XOR(WASM_REF_IS_NULL(
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_GET(struct_type, 2, WASM_LOCAL_GET(0))),
|
2020-08-07 13:14:23 +00:00
|
|
|
WASM_I32V(1))),
|
|
|
|
kExprEnd});
|
|
|
|
const byte allocate_array = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(array_type)},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(0, WASM_ARRAY_NEW_DEFAULT(array_type, WASM_I32V(2),
|
2020-08-07 13:14:23 +00:00
|
|
|
WASM_RTT_CANON(array_type))),
|
|
|
|
WASM_I32_ADD(
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_ARRAY_GET(array_type, WASM_LOCAL_GET(0), WASM_I32V(0)),
|
|
|
|
WASM_ARRAY_GET(array_type, WASM_LOCAL_GET(0), WASM_I32V(1))),
|
2020-08-07 13:14:23 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckResult(allocate_struct, 0);
|
|
|
|
tester.CheckResult(allocate_array, 0);
|
|
|
|
}
|
|
|
|
|
2021-02-05 05:14:32 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(BasicRtt) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2021-01-27 15:13:43 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
|
|
|
|
const byte subtype_index =
|
2020-07-01 20:44:47 +00:00
|
|
|
tester.DefineStruct({F(wasm::kWasmI32, true), F(wasm::kWasmI32, true)});
|
2021-01-27 15:13:43 +00:00
|
|
|
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType kRttTypes[] = {ValueType::Rtt(type_index, 0)};
|
2020-06-23 14:18:46 +00:00
|
|
|
FunctionSig sig_t_v(1, 0, kRttTypes);
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType kRttSubtypes[] = {ValueType::Rtt(subtype_index, 1)};
|
2020-06-29 14:15:41 +00:00
|
|
|
FunctionSig sig_t2_v(1, 0, kRttSubtypes);
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType kRttTypesDeeper[] = {ValueType::Rtt(type_index, 1)};
|
2020-07-09 12:44:30 +00:00
|
|
|
FunctionSig sig_t3_v(1, 0, kRttTypesDeeper);
|
2020-07-01 20:44:47 +00:00
|
|
|
ValueType kRefTypes[] = {ref(type_index)};
|
2020-06-30 18:11:27 +00:00
|
|
|
FunctionSig sig_q_v(1, 0, kRefTypes);
|
2020-06-23 14:18:46 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRttCanon = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
&sig_t_v, {}, {WASM_RTT_CANON(type_index), kExprEnd});
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRttSub = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
&sig_t2_v, {},
|
2020-07-23 11:24:18 +00:00
|
|
|
{WASM_RTT_SUB(subtype_index, WASM_RTT_CANON(type_index)), kExprEnd});
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kStructWithRtt = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
&sig_q_v, {},
|
|
|
|
{WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
2021-01-27 15:13:43 +00:00
|
|
|
|
2020-07-01 20:44:47 +00:00
|
|
|
const int kFieldIndex = 1;
|
2021-02-05 05:14:32 +00:00
|
|
|
const int kStructIndexCode = 0;
|
2020-07-01 20:44:47 +00:00
|
|
|
// This implements the following function:
|
|
|
|
// var local_struct: type0;
|
2021-02-05 05:14:32 +00:00
|
|
|
// local_struct = new type1 with rtt 'kRttSub()';
|
|
|
|
// return (ref.test local_struct kRttSub()) +
|
|
|
|
// ((ref.cast local_struct kRttSub())[field0]);
|
2020-07-01 20:44:47 +00:00
|
|
|
// }
|
|
|
|
// The expected return value is 1+42 = 43.
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRefCast = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
2021-02-05 05:14:32 +00:00
|
|
|
{WASM_LOCAL_SET(
|
|
|
|
kStructIndexCode,
|
|
|
|
WASM_STRUCT_NEW_WITH_RTT(subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_CALL_FUNCTION0(kRttSub))),
|
|
|
|
WASM_I32_ADD(
|
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(kStructIndexCode),
|
|
|
|
WASM_CALL_FUNCTION0(kRttSub)),
|
|
|
|
WASM_STRUCT_GET(subtype_index, kFieldIndex,
|
|
|
|
WASM_REF_CAST(WASM_LOCAL_GET(kStructIndexCode),
|
|
|
|
WASM_CALL_FUNCTION0(kRttSub)))),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
2020-06-23 14:18:46 +00:00
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
Handle<Object> ref_result =
|
|
|
|
tester.GetResultObject(kRttCanon).ToHandleChecked();
|
2020-06-23 14:18:46 +00:00
|
|
|
|
|
|
|
CHECK(ref_result->IsMap());
|
|
|
|
Handle<Map> map = Handle<Map>::cast(ref_result);
|
|
|
|
CHECK(map->IsWasmStructMap());
|
|
|
|
CHECK_EQ(reinterpret_cast<Address>(
|
|
|
|
tester.instance()->module()->struct_type(type_index)),
|
|
|
|
map->wasm_type_info().foreign_address());
|
2020-06-29 14:15:41 +00:00
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
Handle<Object> subref_result =
|
|
|
|
tester.GetResultObject(kRttSub).ToHandleChecked();
|
2020-06-29 14:15:41 +00:00
|
|
|
CHECK(subref_result->IsMap());
|
|
|
|
Handle<Map> submap = Handle<Map>::cast(subref_result);
|
|
|
|
CHECK_EQ(reinterpret_cast<Address>(
|
|
|
|
tester.instance()->module()->struct_type(subtype_index)),
|
|
|
|
submap->wasm_type_info().foreign_address());
|
2020-07-09 12:44:30 +00:00
|
|
|
Handle<Object> subref_result_canonicalized =
|
|
|
|
tester.GetResultObject(kRttSub).ToHandleChecked();
|
|
|
|
CHECK(subref_result.is_identical_to(subref_result_canonicalized));
|
|
|
|
|
2020-07-07 19:14:38 +00:00
|
|
|
Handle<Object> s = tester.GetResultObject(kStructWithRtt).ToHandleChecked();
|
2020-06-30 18:11:27 +00:00
|
|
|
CHECK(s->IsWasmStruct());
|
|
|
|
CHECK_EQ(Handle<WasmStruct>::cast(s)->map(), *map);
|
2020-07-07 19:14:38 +00:00
|
|
|
|
|
|
|
tester.CheckResult(kRefCast, 43);
|
2020-06-23 14:18:46 +00:00
|
|
|
}
|
|
|
|
|
2021-02-05 03:35:19 +00:00
|
|
|
WASM_EXEC_TEST(NoDepthRtt) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2021-01-27 15:13:43 +00:00
|
|
|
|
|
|
|
const byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
|
|
|
|
const byte subtype_index =
|
|
|
|
tester.DefineStruct({F(wasm::kWasmI32, true), F(wasm::kWasmI32, true)});
|
|
|
|
const byte empty_struct_index = tester.DefineStruct({});
|
|
|
|
|
|
|
|
ValueType kRttSubtypeNoDepth = ValueType::Rtt(subtype_index);
|
|
|
|
FunctionSig sig_t2_v_nd(1, 0, &kRttSubtypeNoDepth);
|
|
|
|
|
|
|
|
const byte kRttSubtypeCanon = tester.DefineFunction(
|
|
|
|
&sig_t2_v_nd, {}, {WASM_RTT_CANON(subtype_index), kExprEnd});
|
|
|
|
const byte kRttSubtypeSub = tester.DefineFunction(
|
|
|
|
&sig_t2_v_nd, {},
|
|
|
|
{WASM_RTT_SUB(subtype_index, WASM_RTT_CANON(type_index)), kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestCanon = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(subtype_index))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeCanon)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestSub = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(
|
|
|
|
0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_RTT_SUB(subtype_index, WASM_RTT_CANON(type_index)))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeSub)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestSubVsEmpty = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_RTT_SUB(subtype_index,
|
|
|
|
WASM_RTT_CANON(empty_struct_index)))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeSub)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestSubVsCanon = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(subtype_index))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeSub)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestCanonVsSub = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(
|
|
|
|
0, WASM_STRUCT_NEW_WITH_RTT(
|
|
|
|
subtype_index, WASM_I32V(11), WASM_I32V(42),
|
|
|
|
WASM_RTT_SUB(subtype_index, WASM_RTT_CANON(type_index)))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeCanon)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
const byte kTestSuperVsSub = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {optref(type_index)},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index))),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_CALL_FUNCTION0(kRttSubtypeCanon)),
|
2021-01-27 15:13:43 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckResult(kTestCanon, 1);
|
|
|
|
tester.CheckResult(kTestSub, 1);
|
|
|
|
tester.CheckResult(kTestSubVsEmpty, 0);
|
|
|
|
tester.CheckResult(kTestSubVsCanon, 0);
|
|
|
|
tester.CheckResult(kTestCanonVsSub, 0);
|
|
|
|
tester.CheckResult(kTestSuperVsSub, 0);
|
|
|
|
}
|
|
|
|
|
2020-12-17 00:37:09 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(ArrayNewMap) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte type_index = tester.DefineArray(kWasmI32, true);
|
2020-07-21 07:57:27 +00:00
|
|
|
|
|
|
|
ValueType array_type = ValueType::Ref(type_index, kNonNullable);
|
|
|
|
FunctionSig sig(1, 0, &array_type);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte array_new_with_rtt = tester.DefineFunction(
|
2020-07-21 07:57:27 +00:00
|
|
|
&sig, {},
|
|
|
|
{WASM_ARRAY_NEW_WITH_RTT(type_index, WASM_I32V(10), WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
|
|
|
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType rtt_type = ValueType::Rtt(type_index, 0);
|
2020-07-21 07:57:27 +00:00
|
|
|
FunctionSig rtt_canon_sig(1, 0, &rtt_type);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRttCanon = tester.DefineFunction(
|
2020-07-21 07:57:27 +00:00
|
|
|
&rtt_canon_sig, {}, {WASM_RTT_CANON(type_index), kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
Handle<Object> map = tester.GetResultObject(kRttCanon).ToHandleChecked();
|
|
|
|
|
|
|
|
Handle<Object> result =
|
|
|
|
tester.GetResultObject(array_new_with_rtt).ToHandleChecked();
|
|
|
|
CHECK(result->IsWasmArray());
|
|
|
|
CHECK_EQ(Handle<WasmArray>::cast(result)->map(), *map);
|
|
|
|
}
|
|
|
|
|
2021-01-22 20:44:31 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(FunctionRefs) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-05 11:12:29 +00:00
|
|
|
const byte func_index =
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {}, {WASM_I32V(42), kExprEnd});
|
|
|
|
const byte sig_index = 0;
|
|
|
|
|
|
|
|
const byte other_sig_index = tester.DefineSignature(tester.sigs.d_d());
|
|
|
|
|
|
|
|
// This is just so func_index counts as "declared".
|
|
|
|
tester.AddGlobal(ValueType::Ref(sig_index, kNullable), false,
|
|
|
|
WasmInitExpr::RefFuncConst(func_index));
|
|
|
|
|
2021-01-27 09:58:43 +00:00
|
|
|
ValueType func_type = ValueType::Ref(sig_index, kNullable);
|
2020-08-05 11:12:29 +00:00
|
|
|
FunctionSig sig_func(1, 0, &func_type);
|
|
|
|
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType rtt0 = ValueType::Rtt(sig_index, 0);
|
|
|
|
FunctionSig sig_rtt0(1, 0, &rtt0);
|
2020-08-05 11:12:29 +00:00
|
|
|
const byte rtt_canon = tester.DefineFunction(
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
&sig_rtt0, {}, {WASM_RTT_CANON(sig_index), kExprEnd});
|
2020-08-05 11:12:29 +00:00
|
|
|
|
|
|
|
const byte cast = tester.DefineFunction(
|
|
|
|
&sig_func, {kWasmFuncRef},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
|
2021-01-28 15:18:41 +00:00
|
|
|
WASM_REF_CAST(WASM_LOCAL_GET(0), WASM_RTT_CANON(sig_index)), kExprEnd});
|
2020-08-05 11:12:29 +00:00
|
|
|
|
|
|
|
const byte cast_reference = tester.DefineFunction(
|
|
|
|
&sig_func, {}, {WASM_REF_FUNC(sig_index), kExprEnd});
|
|
|
|
|
2021-01-28 15:18:41 +00:00
|
|
|
const byte test = tester.DefineFunction(
|
2021-02-01 06:39:50 +00:00
|
|
|
tester.sigs.i_v(), {kWasmFuncRef},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
|
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_RTT_CANON(sig_index)), kExprEnd});
|
|
|
|
|
|
|
|
const byte test_fail_1 = tester.DefineFunction(
|
2021-01-28 15:18:41 +00:00
|
|
|
tester.sigs.i_v(), {kWasmFuncRef},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
|
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0), WASM_RTT_CANON(other_sig_index)),
|
|
|
|
kExprEnd});
|
2020-08-05 11:12:29 +00:00
|
|
|
|
2021-02-01 06:39:50 +00:00
|
|
|
const byte test_fail_2 = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {kWasmFuncRef},
|
|
|
|
{WASM_LOCAL_SET(0, WASM_REF_FUNC(func_index)),
|
|
|
|
WASM_REF_TEST(WASM_LOCAL_GET(0),
|
|
|
|
WASM_RTT_SUB(sig_index, WASM_RTT_CANON(sig_index))),
|
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-05 11:12:29 +00:00
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
Handle<Object> result_canon =
|
|
|
|
tester.GetResultObject(rtt_canon).ToHandleChecked();
|
|
|
|
CHECK(result_canon->IsMap());
|
|
|
|
Handle<Map> map_canon = Handle<Map>::cast(result_canon);
|
|
|
|
CHECK(map_canon->IsJSFunctionMap());
|
|
|
|
|
|
|
|
Handle<Object> result_cast = tester.GetResultObject(cast).ToHandleChecked();
|
|
|
|
CHECK(result_cast->IsJSFunction());
|
|
|
|
Handle<JSFunction> cast_function = Handle<JSFunction>::cast(result_cast);
|
|
|
|
|
|
|
|
Handle<Object> result_cast_reference =
|
|
|
|
tester.GetResultObject(cast_reference).ToHandleChecked();
|
|
|
|
CHECK(result_cast_reference->IsJSFunction());
|
|
|
|
Handle<JSFunction> cast_function_reference =
|
|
|
|
Handle<JSFunction>::cast(result_cast_reference);
|
|
|
|
|
|
|
|
CHECK_EQ(cast_function->code().raw_instruction_start(),
|
|
|
|
cast_function_reference->code().raw_instruction_start());
|
|
|
|
|
2021-02-01 06:39:50 +00:00
|
|
|
tester.CheckResult(test, 1);
|
|
|
|
tester.CheckResult(test_fail_1, 0);
|
|
|
|
tester.CheckResult(test_fail_2, 0);
|
2020-08-05 11:12:29 +00:00
|
|
|
}
|
|
|
|
|
2021-01-22 20:44:31 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(CallRef) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-14 17:17:54 +00:00
|
|
|
byte callee = tester.DefineFunction(
|
|
|
|
tester.sigs.i_ii(), {},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_I32_ADD(WASM_LOCAL_GET(0), WASM_LOCAL_GET(1)), kExprEnd});
|
2020-08-14 17:17:54 +00:00
|
|
|
byte caller = tester.DefineFunction(
|
|
|
|
tester.sigs.i_i(), {},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_CALL_REF(WASM_REF_FUNC(callee), WASM_I32V(42), WASM_LOCAL_GET(0)),
|
2020-08-14 17:17:54 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
// This is just so func_index counts as "declared".
|
|
|
|
tester.AddGlobal(ValueType::Ref(0, kNullable), false,
|
|
|
|
WasmInitExpr::RefFuncConst(callee));
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckResult(caller, 47, 5);
|
|
|
|
}
|
|
|
|
|
2020-12-17 00:37:09 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(RefTestCastNull) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
|
2020-07-10 15:16:47 +00:00
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRefTestNull = tester.DefineFunction(
|
2020-07-10 15:16:47 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2021-01-28 15:18:41 +00:00
|
|
|
{WASM_REF_TEST(WASM_REF_NULL(type_index), WASM_RTT_CANON(type_index)),
|
2020-07-10 15:16:47 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kRefCastNull = tester.DefineFunction(
|
2021-01-27 09:58:43 +00:00
|
|
|
tester.sigs.i_v(), {},
|
2021-01-28 15:18:41 +00:00
|
|
|
{WASM_REF_IS_NULL(WASM_REF_CAST(WASM_REF_NULL(type_index),
|
2021-01-27 09:58:43 +00:00
|
|
|
WASM_RTT_CANON(type_index))),
|
|
|
|
kExprEnd});
|
2020-07-10 15:16:47 +00:00
|
|
|
tester.CompileModule();
|
|
|
|
tester.CheckResult(kRefTestNull, 0);
|
2021-01-27 09:58:43 +00:00
|
|
|
tester.CheckResult(kRefCastNull, 1);
|
2020-07-10 15:16:47 +00:00
|
|
|
}
|
|
|
|
|
2021-02-01 06:11:17 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(AbstractTypeChecks) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2021-01-29 13:58:08 +00:00
|
|
|
|
|
|
|
byte array_index = tester.DefineArray(kWasmI32, true);
|
|
|
|
byte function_index =
|
|
|
|
tester.DefineFunction(tester.sigs.v_v(), {}, {kExprEnd});
|
|
|
|
byte sig_index = 1;
|
|
|
|
|
|
|
|
// This is just so func_index counts as "declared".
|
|
|
|
tester.AddGlobal(ValueType::Ref(sig_index, kNullable), false,
|
|
|
|
WasmInitExpr::RefFuncConst(function_index));
|
|
|
|
|
|
|
|
byte kDataCheckNull = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_IS_DATA(WASM_REF_NULL(kAnyRefCode)), kExprEnd});
|
|
|
|
byte kFuncCheckNull = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_IS_FUNC(WASM_REF_NULL(kAnyRefCode)), kExprEnd});
|
|
|
|
byte kI31CheckNull = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_IS_I31(WASM_REF_NULL(kAnyRefCode)), kExprEnd});
|
|
|
|
|
|
|
|
byte kDataCastNull =
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_AS_DATA(WASM_REF_NULL(kAnyRefCode)),
|
|
|
|
WASM_DROP, WASM_I32V(1), kExprEnd});
|
|
|
|
byte kFuncCastNull =
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_AS_FUNC(WASM_REF_NULL(kAnyRefCode)),
|
|
|
|
WASM_DROP, WASM_I32V(1), kExprEnd});
|
|
|
|
byte kI31CastNull =
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {},
|
|
|
|
{WASM_REF_AS_I31(WASM_REF_NULL(kAnyRefCode)),
|
|
|
|
WASM_DROP, WASM_I32V(1), kExprEnd});
|
|
|
|
|
|
|
|
#define TYPE_CHECK(type, value) \
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {kWasmAnyRef}, \
|
|
|
|
{WASM_LOCAL_SET(0, WASM_SEQ(value)), \
|
|
|
|
WASM_REF_IS_##type(WASM_LOCAL_GET(0)), kExprEnd})
|
|
|
|
|
|
|
|
byte kDataCheckSuccess =
|
|
|
|
TYPE_CHECK(DATA, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
byte kDataCheckFailure = TYPE_CHECK(DATA, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kFuncCheckSuccess = TYPE_CHECK(FUNC, WASM_REF_FUNC(function_index));
|
|
|
|
byte kFuncCheckFailure =
|
|
|
|
TYPE_CHECK(FUNC, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
byte kI31CheckSuccess = TYPE_CHECK(I31, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kI31CheckFailure =
|
|
|
|
TYPE_CHECK(I31, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
#undef TYPE_CHECK
|
|
|
|
|
|
|
|
#define TYPE_CAST(type, value) \
|
|
|
|
tester.DefineFunction(tester.sigs.i_v(), {kWasmAnyRef}, \
|
|
|
|
{WASM_LOCAL_SET(0, WASM_SEQ(value)), \
|
|
|
|
WASM_REF_AS_##type(WASM_LOCAL_GET(0)), WASM_DROP, \
|
|
|
|
WASM_I32V(1), kExprEnd})
|
|
|
|
|
|
|
|
byte kDataCastSuccess =
|
|
|
|
TYPE_CAST(DATA, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
byte kDataCastFailure = TYPE_CAST(DATA, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kFuncCastSuccess = TYPE_CAST(FUNC, WASM_REF_FUNC(function_index));
|
|
|
|
byte kFuncCastFailure =
|
|
|
|
TYPE_CAST(FUNC, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
byte kI31CastSuccess = TYPE_CAST(I31, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kI31CastFailure =
|
|
|
|
TYPE_CAST(I31, WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
#undef TYPE_CAST
|
|
|
|
|
|
|
|
// If the branch is not taken, we return 0. If it is taken, then the respective
|
|
|
|
// type check should succeed, and we return 1.
|
|
|
|
#define BR_ON(TYPE, type, value) \
|
|
|
|
tester.DefineFunction( \
|
|
|
|
tester.sigs.i_v(), {kWasmAnyRef}, \
|
|
|
|
{WASM_LOCAL_SET(0, WASM_SEQ(value)), \
|
|
|
|
WASM_REF_IS_##TYPE(WASM_BLOCK_R( \
|
|
|
|
kWasm##type##Ref, WASM_BR_ON_##TYPE(0, WASM_LOCAL_GET(0)), \
|
|
|
|
WASM_RETURN(WASM_I32V(0)))), \
|
|
|
|
kExprEnd})
|
|
|
|
|
|
|
|
byte kBrOnDataTaken =
|
|
|
|
BR_ON(DATA, Data,
|
|
|
|
WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
byte kBrOnDataNotTaken = BR_ON(DATA, Data, WASM_REF_FUNC(function_index));
|
|
|
|
byte kBrOnFuncTaken = BR_ON(FUNC, Func, WASM_REF_FUNC(function_index));
|
|
|
|
byte kBrOnFuncNotTaken = BR_ON(FUNC, Func, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kBrOnI31Taken = BR_ON(I31, I31, WASM_I31_NEW(WASM_I32V(42)));
|
|
|
|
byte kBrOnI31NotTaken =
|
|
|
|
BR_ON(I31, I31,
|
|
|
|
WASM_ARRAY_NEW_DEFAULT(array_index, WASM_I32V(10),
|
|
|
|
WASM_RTT_CANON(array_index)));
|
|
|
|
#undef BR_ON
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckResult(kDataCheckNull, 0);
|
|
|
|
tester.CheckHasThrown(kDataCastNull);
|
|
|
|
tester.CheckResult(kDataCheckSuccess, 1);
|
|
|
|
tester.CheckResult(kDataCheckFailure, 0);
|
|
|
|
tester.CheckResult(kDataCastSuccess, 1);
|
|
|
|
tester.CheckHasThrown(kDataCastFailure);
|
|
|
|
tester.CheckResult(kBrOnDataTaken, 1);
|
|
|
|
tester.CheckResult(kBrOnDataNotTaken, 0);
|
|
|
|
|
|
|
|
tester.CheckResult(kFuncCheckNull, 0);
|
|
|
|
tester.CheckHasThrown(kFuncCastNull);
|
|
|
|
tester.CheckResult(kFuncCheckSuccess, 1);
|
|
|
|
tester.CheckResult(kFuncCheckFailure, 0);
|
|
|
|
tester.CheckResult(kFuncCastSuccess, 1);
|
|
|
|
tester.CheckHasThrown(kFuncCastFailure);
|
|
|
|
tester.CheckResult(kBrOnFuncTaken, 1);
|
|
|
|
tester.CheckResult(kBrOnFuncNotTaken, 0);
|
|
|
|
|
|
|
|
tester.CheckResult(kI31CheckNull, 0);
|
|
|
|
tester.CheckHasThrown(kI31CastNull);
|
|
|
|
tester.CheckResult(kI31CheckSuccess, 1);
|
|
|
|
tester.CheckResult(kI31CheckFailure, 0);
|
|
|
|
tester.CheckResult(kI31CastSuccess, 1);
|
|
|
|
tester.CheckHasThrown(kI31CastFailure);
|
|
|
|
tester.CheckResult(kBrOnI31Taken, 1);
|
|
|
|
tester.CheckResult(kBrOnI31NotTaken, 0);
|
|
|
|
}
|
|
|
|
|
2020-12-16 22:29:12 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(BasicI31) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kSigned = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_I31_GET_S(WASM_I31_NEW(WASM_LOCAL_GET(0))), kExprEnd});
|
2020-08-04 09:13:30 +00:00
|
|
|
const byte kUnsigned = tester.DefineFunction(
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.sigs.i_i(), {},
|
2020-12-17 16:55:33 +00:00
|
|
|
{WASM_I31_GET_U(WASM_I31_NEW(WASM_LOCAL_GET(0))), kExprEnd});
|
2020-06-30 11:17:53 +00:00
|
|
|
tester.CompileModule();
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kSigned, 123, 123);
|
|
|
|
tester.CheckResult(kUnsigned, 123, 123);
|
2020-06-30 11:17:53 +00:00
|
|
|
// Truncation:
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kSigned, 0x1234, static_cast<int32_t>(0x80001234));
|
|
|
|
tester.CheckResult(kUnsigned, 0x1234, static_cast<int32_t>(0x80001234));
|
2020-06-30 11:17:53 +00:00
|
|
|
// Sign/zero extension:
|
2020-07-07 19:14:38 +00:00
|
|
|
tester.CheckResult(kSigned, -1, 0x7FFFFFFF);
|
|
|
|
tester.CheckResult(kUnsigned, 0x7FFFFFFF, 0x7FFFFFFF);
|
|
|
|
}
|
|
|
|
|
2020-11-12 22:30:45 +00:00
|
|
|
// This flushed out a few bugs, so it serves as a regression test. It can also
|
|
|
|
// be modified (made to run longer) to measure performance of casts.
|
2020-12-16 22:29:12 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(CastsBenchmark) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-11-12 22:30:45 +00:00
|
|
|
const byte SuperType = tester.DefineStruct({F(wasm::kWasmI32, true)});
|
|
|
|
const byte SubType =
|
|
|
|
tester.DefineStruct({F(wasm::kWasmI32, true), F(wasm::kWasmI32, true)});
|
2021-01-28 16:21:57 +00:00
|
|
|
|
|
|
|
ValueType kDataRefNull = ValueType::Ref(HeapType::kData, kNullable);
|
|
|
|
const byte ListType = tester.DefineArray(kDataRefNull, true);
|
2020-11-12 22:30:45 +00:00
|
|
|
|
|
|
|
const byte List =
|
|
|
|
tester.AddGlobal(ValueType::Ref(ListType, kNullable), true,
|
|
|
|
WasmInitExpr::RefNullConst(
|
|
|
|
static_cast<HeapType::Representation>(ListType)));
|
|
|
|
const byte RttSuper = tester.AddGlobal(
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType::Rtt(SuperType, 0), false,
|
2020-11-12 22:30:45 +00:00
|
|
|
WasmInitExpr::RttCanon(static_cast<HeapType::Representation>(SuperType)));
|
|
|
|
const byte RttSub = tester.AddGlobal(
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType::Rtt(SubType, 1), false,
|
2020-11-12 22:30:45 +00:00
|
|
|
WasmInitExpr::RttSub(static_cast<HeapType::Representation>(SubType),
|
|
|
|
WasmInitExpr::GlobalGet(RttSuper)));
|
|
|
|
const byte RttList = tester.AddGlobal(
|
Reland "[wasm-gc] Remove abstract rtts"
This is a reland of b77deeca4bd65b006a3a6c7344c2bbabd4514122
Changes compared to original: Add explicit narrowing casts in tests
for MSVC.
Original change's description:
> [wasm-gc] Remove abstract rtts
>
> In the latest wasm-gc spec, rtts of abstract types are no longer
> allowed. Consequently, canonical rtts of concrete types always have
> a depth of 0.
>
> Changes:
> - Change the immediate argument of rtts to a type index over a heap
> type. Abstract it with TypeIndexImmediate in function body decoding.
> This affects:
> value_type.h, read_value_type(), decoding of relevant opcodes,
> wasm subtyping, WasmInitExpr, consume_init_expr(), and
> wasm-module-builder.cc.
> - In function-body-decoder-impl.h, update rtt.canon to always produce
> an rtt of depth 0.
> - Pass a unit32_t type index over a HeapType to all rtt-related
> utilities.
> - Remove infrastructure for abstract-type rtts from the wasm compilers,
> setup-heap-internal.cc, roots.h, and module-instantiate.cc.
> - Remove ObjectReferenceKnowledge::rtt_is_i31. Remove related branches
> from ref.test, ref.cast and br_on_cast implementations in the wasm
> compilers.
> - Remove unused 'parent' field from WasmTypeInfo.
> - Make the parent argument optional in NewWasmTypeInfo, CreateStructMap,
> and CreateArrayMap.
> - Use more convenient arguments in IsHeapSubtypeOf.
> - Update tests.
>
> Bug: v8:7748
> Change-Id: Ib45efe0741e6558c9b291fc8b4a75ae303146bdc
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2642248
> Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
> Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
> Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#72321}
Bug: v8:7748
Change-Id: I22b204b486fd185077cd6c7f15d492f5143f48fe
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2650207
Commit-Queue: Manos Koukoutos <manoskouk@chromium.org>
Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#72355}
2021-01-27 08:33:32 +00:00
|
|
|
ValueType::Rtt(ListType, 0), false,
|
2020-11-12 22:30:45 +00:00
|
|
|
WasmInitExpr::RttCanon(static_cast<HeapType::Representation>(ListType)));
|
|
|
|
|
|
|
|
const uint32_t kListLength = 1024;
|
|
|
|
const uint32_t i = 0;
|
|
|
|
const byte Prepare = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(), {wasm::kWasmI32},
|
|
|
|
{// List = new eqref[kListLength];
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_SET(List,
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_ARRAY_NEW_DEFAULT(ListType, WASM_I32V(kListLength),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(RttList))),
|
2020-11-12 22:30:45 +00:00
|
|
|
// for (int i = 0; i < kListLength; ) {
|
|
|
|
// List[i] = new Super(i);
|
|
|
|
// i++;
|
|
|
|
// List[i] = new Sub(i, 0);
|
|
|
|
// i++;
|
|
|
|
// }
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(i, WASM_I32V_1(0)),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_LOOP(
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_ARRAY_SET(ListType, WASM_GLOBAL_GET(List), WASM_LOCAL_GET(i),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(SuperType, WASM_LOCAL_GET(i),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(RttSuper))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_ARRAY_SET(ListType, WASM_GLOBAL_GET(List), WASM_LOCAL_GET(i),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_STRUCT_NEW_WITH_RTT(SubType, WASM_LOCAL_GET(i),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_I32V_1(0),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(RttSub))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_BR_IF(0,
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_I32_NE(WASM_LOCAL_GET(i), WASM_I32V(kListLength)))),
|
2020-11-12 22:30:45 +00:00
|
|
|
// return 42; // Dummy value, due to test framework.
|
|
|
|
WASM_I32V_1(42), kExprEnd});
|
|
|
|
|
|
|
|
const uint32_t sum = 1; // Index of the local.
|
|
|
|
const uint32_t list = 2;
|
|
|
|
const uint32_t kLoops = 2;
|
|
|
|
const uint32_t kIterations = kLoops * kListLength;
|
|
|
|
const byte Main = tester.DefineFunction(
|
|
|
|
tester.sigs.i_v(),
|
|
|
|
{
|
|
|
|
wasm::kWasmI32,
|
|
|
|
wasm::kWasmI32,
|
|
|
|
ValueType::Ref(ListType, kNullable),
|
|
|
|
},
|
2020-12-17 16:56:08 +00:00
|
|
|
{WASM_LOCAL_SET(list, WASM_GLOBAL_GET(List)),
|
2020-11-12 22:30:45 +00:00
|
|
|
// sum = 0;
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(sum, WASM_I32V_1(0)),
|
2020-11-12 22:30:45 +00:00
|
|
|
// for (int i = 0; i < kIterations; i++) {
|
|
|
|
// sum += ref.cast<super>(List[i & kListLength]).x
|
|
|
|
// }
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(i, WASM_I32V_1(0)),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_LOOP(
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(
|
2020-11-12 22:30:45 +00:00
|
|
|
sum, WASM_I32_ADD(
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(sum),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_STRUCT_GET(
|
|
|
|
SuperType, 0,
|
|
|
|
WASM_REF_CAST(
|
|
|
|
WASM_ARRAY_GET(
|
2020-12-17 16:55:33 +00:00
|
|
|
ListType, WASM_LOCAL_GET(list),
|
|
|
|
WASM_I32_AND(WASM_LOCAL_GET(i),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_I32V(kListLength - 1))),
|
2020-12-17 16:56:08 +00:00
|
|
|
WASM_GLOBAL_GET(RttSuper))))),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_SET(i, WASM_I32_ADD(WASM_LOCAL_GET(i), WASM_I32V_1(1))),
|
2020-11-12 22:30:45 +00:00
|
|
|
WASM_BR_IF(0,
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_I32_LTS(WASM_LOCAL_GET(i), WASM_I32V(kIterations)))),
|
2020-11-12 22:30:45 +00:00
|
|
|
// return sum;
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_LOCAL_GET(sum), kExprEnd});
|
2020-11-12 22:30:45 +00:00
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
tester.CheckResult(Prepare, 42);
|
|
|
|
|
|
|
|
// Time this section to get a benchmark for subtyping checks.
|
|
|
|
// Note: if you bump kIterations or kListLength, you may have to take i32
|
|
|
|
// overflow into account.
|
|
|
|
tester.CheckResult(Main, (kListLength * (kListLength - 1) / 2) * kLoops);
|
|
|
|
}
|
|
|
|
|
2020-12-17 00:37:09 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(GlobalInitReferencingGlobal) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-09-28 18:30:35 +00:00
|
|
|
const byte from = tester.AddGlobal(kWasmI32, false, WasmInitExpr(42));
|
|
|
|
const byte to =
|
|
|
|
tester.AddGlobal(kWasmI32, false, WasmInitExpr::GlobalGet(from));
|
|
|
|
|
|
|
|
const byte func = tester.DefineFunction(tester.sigs.i_v(), {},
|
2020-12-17 16:56:08 +00:00
|
|
|
{WASM_GLOBAL_GET(to), kExprEnd});
|
2020-09-28 18:30:35 +00:00
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckResult(func, 42);
|
|
|
|
}
|
|
|
|
|
2020-12-17 00:37:09 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(IndirectNullSetManually) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2020-10-02 05:31:50 +00:00
|
|
|
byte sig_index = tester.DefineSignature(tester.sigs.i_i());
|
|
|
|
tester.DefineTable(ValueType::Ref(sig_index, kNullable), 1, 1);
|
|
|
|
byte func_index = tester.DefineFunction(
|
|
|
|
tester.sigs.i_i(), {},
|
|
|
|
{WASM_TABLE_SET(0, WASM_I32V(0), WASM_REF_NULL(sig_index)),
|
2020-12-17 16:55:33 +00:00
|
|
|
WASM_CALL_INDIRECT(sig_index, WASM_I32V(0), WASM_LOCAL_GET(0)),
|
2020-10-02 05:31:50 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
|
|
|
|
tester.CheckHasThrown(func_index, 42);
|
|
|
|
}
|
|
|
|
|
2021-02-01 06:12:34 +00:00
|
|
|
WASM_COMPILED_EXEC_TEST(JsAccess) {
|
|
|
|
WasmGCTester tester(execution_tier);
|
2021-01-28 11:53:37 +00:00
|
|
|
const byte type_index = tester.DefineStruct({F(wasm::kWasmI32, true)});
|
|
|
|
ValueType kRefType = ref(type_index);
|
|
|
|
ValueType kSupertypeToI[] = {kWasmI32, kWasmDataRef};
|
|
|
|
FunctionSig sig_t_v(1, 0, &kRefType);
|
|
|
|
FunctionSig sig_super_v(1, 0, &kWasmDataRef);
|
|
|
|
FunctionSig sig_i_super(1, 1, kSupertypeToI);
|
|
|
|
|
|
|
|
tester.DefineExportedFunction(
|
|
|
|
"disallowed", &sig_t_v,
|
|
|
|
{WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
|
|
|
// Same code, different signature.
|
|
|
|
tester.DefineExportedFunction(
|
|
|
|
"producer", &sig_super_v,
|
|
|
|
{WASM_STRUCT_NEW_WITH_RTT(type_index, WASM_I32V(42),
|
|
|
|
WASM_RTT_CANON(type_index)),
|
|
|
|
kExprEnd});
|
|
|
|
tester.DefineExportedFunction(
|
|
|
|
"consumer", &sig_i_super,
|
2021-01-28 15:18:41 +00:00
|
|
|
{WASM_STRUCT_GET(
|
|
|
|
type_index, 0,
|
|
|
|
WASM_REF_CAST(WASM_LOCAL_GET(0), WASM_RTT_CANON(type_index))),
|
2021-01-28 11:53:37 +00:00
|
|
|
kExprEnd});
|
|
|
|
|
|
|
|
tester.CompileModule();
|
|
|
|
Isolate* isolate = tester.isolate();
|
|
|
|
TryCatch try_catch(reinterpret_cast<v8::Isolate*>(isolate));
|
|
|
|
MaybeHandle<Object> maybe_result =
|
|
|
|
tester.CallExportedFunction("disallowed", 0, nullptr);
|
|
|
|
CHECK(maybe_result.is_null());
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
try_catch.Reset();
|
|
|
|
isolate->clear_pending_exception();
|
|
|
|
|
|
|
|
maybe_result = tester.CallExportedFunction("producer", 0, nullptr);
|
|
|
|
if (maybe_result.is_null()) {
|
|
|
|
FATAL("Calling 'producer' failed: %s",
|
|
|
|
*v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
|
|
|
|
try_catch.Message()->Get()));
|
|
|
|
}
|
|
|
|
{
|
|
|
|
Handle<Object> args[] = {maybe_result.ToHandleChecked()};
|
|
|
|
maybe_result = tester.CallExportedFunction("consumer", 1, args);
|
|
|
|
}
|
|
|
|
if (maybe_result.is_null()) {
|
|
|
|
FATAL("Calling 'consumer' failed: %s",
|
|
|
|
*v8::String::Utf8Value(reinterpret_cast<v8::Isolate*>(isolate),
|
|
|
|
try_catch.Message()->Get()));
|
|
|
|
}
|
|
|
|
Handle<Object> result = maybe_result.ToHandleChecked();
|
|
|
|
CHECK(result->IsSmi());
|
|
|
|
CHECK_EQ(42, Smi::cast(*result).value());
|
|
|
|
// Calling {consumer} with any other object (e.g. the Smi we just got as
|
|
|
|
// {result}) should trap.
|
|
|
|
{
|
|
|
|
Handle<Object> args[] = {result};
|
|
|
|
maybe_result = tester.CallExportedFunction("consumer", 1, args);
|
2020-08-03 18:16:25 +00:00
|
|
|
}
|
2021-01-28 11:53:37 +00:00
|
|
|
CHECK(maybe_result.is_null());
|
|
|
|
CHECK(try_catch.HasCaught());
|
|
|
|
try_catch.Reset();
|
|
|
|
isolate->clear_pending_exception();
|
2020-06-30 11:17:53 +00:00
|
|
|
}
|
|
|
|
|
2020-04-21 16:45:53 +00:00
|
|
|
} // namespace test_gc
|
|
|
|
} // namespace wasm
|
|
|
|
} // namespace internal
|
|
|
|
} // namespace v8
|