diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc index f6d65754dd7..8dad452434d 100644 --- a/runtime/vm/class_finalizer.cc +++ b/runtime/vm/class_finalizer.cc @@ -571,6 +571,7 @@ void ClassFinalizer::FinalizeTypesInClass(const Class& cls) { bool has_isolate_unsendable_pragma = cls.is_isolate_unsendable_due_to_pragma(); + bool is_future_subtype = cls.IsFutureClass(); // Finalize super class. Class& super_class = Class::Handle(zone, cls.SuperClass()); @@ -588,7 +589,8 @@ void ClassFinalizer::FinalizeTypesInClass(const Class& cls) { super_type ^= FinalizeType(super_type); cls.set_super_type(super_type); has_isolate_unsendable_pragma |= - Class::IsIsolateUnsendableDueToPragma(super_type.type_class()); + super_class.is_isolate_unsendable_due_to_pragma(); + is_future_subtype |= super_class.is_future_subtype(); } // Finalize interface types (but not necessarily interface classes). const auto& interface_types = Array::Handle(zone, cls.interfaces()); @@ -602,12 +604,17 @@ void ClassFinalizer::FinalizeTypesInClass(const Class& cls) { FinalizeTypesInClass(interface_class); interface_types.SetAt(i, interface_type); has_isolate_unsendable_pragma |= - Class::IsIsolateUnsendableDueToPragma(interface_type.type_class()); + interface_class.is_isolate_unsendable_due_to_pragma(); + is_future_subtype |= interface_class.is_future_subtype(); } cls.set_is_type_finalized(); cls.set_is_isolate_unsendable_due_to_pragma(has_isolate_unsendable_pragma); + cls.set_is_future_subtype(is_future_subtype); + if (is_future_subtype && !cls.is_abstract()) { + MarkClassCanBeFuture(zone, cls); + } - RegisterClassInHierarchy(thread->zone(), cls); + RegisterClassInHierarchy(zone, cls); #endif // defined(DART_PRECOMPILED_RUNTIME) } @@ -654,6 +661,24 @@ void ClassFinalizer::RegisterClassInHierarchy(Zone* zone, const Class& cls) { } } } + +void ClassFinalizer::MarkClassCanBeFuture(Zone* zone, const Class& cls) { + if (cls.can_be_future()) return; + + cls.set_can_be_future(true); + + Class& base = Class::Handle(zone, cls.SuperClass()); + if (!base.IsNull()) { + MarkClassCanBeFuture(zone, base); + } + auto& interfaces = Array::Handle(zone, cls.interfaces()); + auto& type = AbstractType::Handle(zone); + for (intptr_t i = 0; i < interfaces.Length(); ++i) { + type ^= interfaces.At(i); + base = type.type_class(); + MarkClassCanBeFuture(zone, base); + } +} #endif // defined(DART_PRECOMPILED_RUNTIME) void ClassFinalizer::FinalizeClass(const Class& cls) { diff --git a/runtime/vm/class_finalizer.h b/runtime/vm/class_finalizer.h index ec46047e352..351a11ddbe8 100644 --- a/runtime/vm/class_finalizer.h +++ b/runtime/vm/class_finalizer.h @@ -54,6 +54,9 @@ class ClassFinalizer : public AllStatic { #if !defined(DART_PRECOMPILED_RUNTIME) // Register class in the lists of direct subclasses and direct implementors. static void RegisterClassInHierarchy(Zone* zone, const Class& cls); + + // Mark [cls], its superclass and superinterfaces as can_be_future(). + static void MarkClassCanBeFuture(Zone* zone, const Class& cls); #endif // !defined(DART_PRECOMPILED_RUNTIME) // Ensures members of the class are loaded, class layout is finalized and size diff --git a/runtime/vm/compiler/backend/type_propagator.cc b/runtime/vm/compiler/backend/type_propagator.cc index c145c3d7092..659252ead70 100644 --- a/runtime/vm/compiler/backend/type_propagator.cc +++ b/runtime/vm/compiler/backend/type_propagator.cc @@ -949,22 +949,19 @@ bool CompileType::CanBeSmi() { } bool CompileType::CanBeFuture() { - IsolateGroup* isolate_group = IsolateGroup::Current(); - ObjectStore* object_store = isolate_group->object_store(); - + Thread* thread = Thread::Current(); + Zone* zone = thread->zone(); if (cid_ != kIllegalCid && cid_ != kDynamicCid) { if ((cid_ == kNullCid) || (cid_ == kNeverCid) || IsInternalOnlyClassId(cid_) || cid_ == kTypeArgumentsCid) { return false; } - const Class& cls = Class::Handle(isolate_group->class_table()->At(cid_)); - return Class::IsSubtypeOf( - cls, TypeArguments::null_type_arguments(), Nullability::kNonNullable, - Type::Handle(object_store->non_nullable_future_rare_type()), - Heap::kNew); + const Class& cls = + Class::Handle(zone, thread->isolate_group()->class_table()->At(cid_)); + return cls.is_future_subtype(); } - AbstractType& type = AbstractType::Handle(ToAbstractType()->ptr()); + AbstractType& type = AbstractType::Handle(zone, ToAbstractType()->ptr()); if (type.IsTypeParameter()) { type = TypeParameter::Cast(type).bound(); } @@ -980,10 +977,7 @@ bool CompileType::CanBeFuture() { if ((type_class_id == kNullCid) || (type_class_id == kNeverCid)) { return false; } - Type& future_type = - Type::Handle(object_store->non_nullable_future_rare_type()); - future_type = future_type.ToNullability(Nullability::kNullable, Heap::kNew); - return type.IsSubtypeOf(future_type, Heap::kNew); + return Class::Handle(zone, type.type_class()).can_be_future(); } void CompileType::PrintTo(BaseTextBuffer* f) const { diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h index b4db147ffe9..4810d21fca4 100644 --- a/runtime/vm/compiler/runtime_offsets_extracted.h +++ b/runtime/vm/compiler/runtime_offsets_extracted.h @@ -251,39 +251,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -959,39 +959,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -1667,39 +1667,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -2374,39 +2374,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -3086,39 +3086,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -3795,39 +3795,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -4504,39 +4504,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -5213,39 +5213,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -5916,39 +5916,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -6616,39 +6616,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -7316,39 +7316,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -8015,39 +8015,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -8719,39 +8719,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -9420,39 +9420,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -10121,39 +10121,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0xc4; + 0xc0; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x200; + ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd8; + 0xd4; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x284; + ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x228; + ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x24c; + ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x224; + ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x238; + ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x244; + ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x230; + ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x240; + ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -10822,39 +10822,39 @@ static constexpr dart::compiler::target::word NativeArguments_retval_offset = static constexpr dart::compiler::target::word NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word ObjectStore_double_type_offset = - 0x188; + 0x180; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x400; + ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1b0; + 0x1a8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x508; + ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x450; + ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x498; + ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x448; + ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x470; + ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x488; + ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x460; + ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x480; + ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x478; + ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -11559,39 +11559,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0xc4; + AOT_ObjectStore_double_type_offset = 0xc0; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x200; + AOT_ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd8; + AOT_ObjectStore_string_type_offset = 0xd4; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x284; + AOT_ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x228; + AOT_ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x224; + AOT_ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x4; @@ -12342,39 +12342,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -13128,39 +13128,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -13913,39 +13913,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -14698,39 +14698,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -15485,39 +15485,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0xc4; + AOT_ObjectStore_double_type_offset = 0xc0; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x200; + AOT_ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd8; + AOT_ObjectStore_string_type_offset = 0xd4; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x284; + AOT_ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x228; + AOT_ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x224; + AOT_ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x4; @@ -16269,39 +16269,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -17046,39 +17046,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0xc4; + AOT_ObjectStore_double_type_offset = 0xc0; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x200; + AOT_ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd8; + AOT_ObjectStore_string_type_offset = 0xd4; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x284; + AOT_ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x228; + AOT_ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x224; + AOT_ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x4; @@ -17820,39 +17820,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -18597,39 +18597,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -19373,39 +19373,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -20149,39 +20149,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; @@ -20927,39 +20927,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0xc4; + AOT_ObjectStore_double_type_offset = 0xc0; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x98; + 0x94; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x200; + AOT_ObjectStore_record_field_names_offset = 0x1fc; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd8; + AOT_ObjectStore_string_type_offset = 0xd4; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x88; + 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x284; + AOT_ObjectStore_ffi_callback_code_offset = 0x280; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x228; + AOT_ObjectStore_suspend_state_await_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x224; + AOT_ObjectStore_suspend_state_init_async_offset = 0x220; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x4; @@ -21702,39 +21702,39 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_NativeArguments_thread_offset = 0x0; static constexpr dart::compiler::target::word - AOT_ObjectStore_double_type_offset = 0x188; + AOT_ObjectStore_double_type_offset = 0x180; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x130; + 0x128; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x400; + AOT_ObjectStore_record_field_names_offset = 0x3f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1b0; + AOT_ObjectStore_string_type_offset = 0x1a8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = - 0x110; + 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x508; + AOT_ObjectStore_ffi_callback_code_offset = 0x500; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x450; + AOT_ObjectStore_suspend_state_await_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x448; + AOT_ObjectStore_suspend_state_init_async_offset = 0x440; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 0x8; diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc index 75110c700d6..da5e2d23cb8 100644 --- a/runtime/vm/dart_api_impl.cc +++ b/runtime/vm/dart_api_impl.cc @@ -2539,15 +2539,8 @@ DART_EXPORT bool Dart_IsFuture(Dart_Handle handle) { API_TIMELINE_DURATION(T); const Object& obj = Object::Handle(Z, Api::UnwrapHandle(handle)); if (obj.IsInstance()) { - ObjectStore* object_store = T->isolate_group()->object_store(); - const Type& future_rare_type = - Type::Handle(Z, object_store->non_nullable_future_rare_type()); - ASSERT(!future_rare_type.IsNull()); const Class& obj_class = Class::Handle(Z, obj.clazz()); - bool is_future = Class::IsSubtypeOf( - obj_class, Object::null_type_arguments(), Nullability::kNonNullable, - future_rare_type, Heap::kNew); - return is_future; + return obj_class.is_future_subtype(); } return false; } diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index e6d84348599..ea0f243b896 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -3172,6 +3172,16 @@ void Class::set_is_isolate_unsendable_due_to_pragma(bool value) const { IsIsolateUnsendableDueToPragmaBit::update(value, state_bits())); } +void Class::set_is_future_subtype(bool value) const { + ASSERT(IsolateGroup::Current()->program_lock()->IsCurrentThreadWriter()); + set_state_bits(IsFutureSubtypeBit::update(value, state_bits())); +} + +void Class::set_can_be_future(bool value) const { + ASSERT(IsolateGroup::Current()->program_lock()->IsCurrentThreadWriter()); + set_state_bits(CanBeFutureBit::update(value, state_bits())); +} + // Initialize class fields of type Array with empty array. void Class::InitEmptyFields() { if (Object::empty_array().ptr() == Array::null()) { diff --git a/runtime/vm/object.h b/runtime/vm/object.h index 22bfad9758e..58590ff3784 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -1687,10 +1687,6 @@ class Class : public Object { static bool IsIsolateUnsendable(ClassPtr clazz) { return IsIsolateUnsendableBit::decode(clazz->untag()->state_bits_); } - static bool IsIsolateUnsendableDueToPragma(ClassPtr clazz) { - return IsIsolateUnsendableDueToPragmaBit::decode( - clazz->untag()->state_bits_); - } #if !defined(DART_PRECOMPILED_RUNTIME) CodePtr allocation_stub() const { return untag()->allocation_stub(); } @@ -1941,13 +1937,19 @@ class Class : public Object { // Whether instances of the class cannot be sent across ports. // // Will be true iff - // - class is marked with `@pramga('vm:isolate-unsendable') + // - class is marked with `@pragma('vm:isolate-unsendable') // - super class / super interface classes are marked as unsendable. // - class has native fields. kIsIsolateUnsendableBit, - // True if this class has `@pramga('vm:isolate-unsendable') annotation or + // True if this class has `@pragma('vm:isolate-unsendable') annotation or // base class or implemented interfaces has this bit. kIsIsolateUnsendableDueToPragmaBit, + // This class is a subtype of Future. + kIsFutureSubtypeBit, + // This class has a non-abstract subtype which is a subtype of Future. + // It means that variable of static type based on this class may hold + // a Future instance. + kCanBeFutureBit, }; class ConstBit : public BitField {}; class ImplementedBit : public BitField {}; @@ -1981,6 +1983,9 @@ class Class : public Object { class IsIsolateUnsendableDueToPragmaBit : public BitField { }; + class IsFutureSubtypeBit + : public BitField {}; + class CanBeFutureBit : public BitField {}; void set_name(const String& value) const; void set_user_name(const String& value) const; @@ -2033,6 +2038,14 @@ class Class : public Object { return IsIsolateUnsendableDueToPragmaBit::decode(state_bits()); } + void set_is_future_subtype(bool value) const; + bool is_future_subtype() const { + return IsFutureSubtypeBit::decode(state_bits()); + } + + void set_can_be_future(bool value) const; + bool can_be_future() const { return CanBeFutureBit::decode(state_bits()); } + private: void set_functions(const Array& value) const; void set_fields(const Array& value) const; diff --git a/runtime/vm/object_store.cc b/runtime/vm/object_store.cc index 75d95384a27..a87ab0b4e06 100644 --- a/runtime/vm/object_store.cc +++ b/runtime/vm/object_store.cc @@ -494,9 +494,8 @@ void ObjectStore::LazyInitAsyncMembers() { auto* const thread = Thread::Current(); SafepointWriteRwLocker locker(thread, thread->isolate_group()->program_lock()); - if (non_nullable_future_rare_type_.load() == Type::null()) { + if (nullable_future_null_type_.load() == Type::null()) { ASSERT(non_nullable_future_never_type_.load() == Type::null()); - ASSERT(nullable_future_null_type_.load() == Type::null()); auto* const zone = thread->zone(); const auto& cls = Class::Handle(zone, future_class()); @@ -521,9 +520,6 @@ void ObjectStore::LazyInitAsyncMembers() { type.SetIsFinalized(); type ^= type.Canonicalize(thread); nullable_future_null_type_.store(type.ptr()); - - type = cls.RareType(); - non_nullable_future_rare_type_.store(type.ptr()); } } diff --git a/runtime/vm/object_store.h b/runtime/vm/object_store.h index 076feba6a0d..97f67b1abb5 100644 --- a/runtime/vm/object_store.h +++ b/runtime/vm/object_store.h @@ -60,7 +60,6 @@ class ObjectPointerVisitor; LAZY_FFI(Class, varargs_class) \ LAZY_FFI(Function, handle_finalizer_message_function) \ LAZY_FFI(Function, handle_native_finalizer_message_function) \ - LAZY_ASYNC(Type, non_nullable_future_rare_type) \ LAZY_ASYNC(Type, non_nullable_future_never_type) \ LAZY_ASYNC(Type, nullable_future_null_type) \ LAZY_ISOLATE(Class, send_port_class) \ diff --git a/tests/language/async/await_flatten_test.dart b/tests/language/async/await_flatten_test.dart index 0fc9c628928..872b8d490dc 100644 --- a/tests/language/async/await_flatten_test.dart +++ b/tests/language/async/await_flatten_test.dart @@ -2,6 +2,8 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +// Requirements=nnbd-strong + import 'dart:async'; import 'package:expect/expect.dart'; import '../static_type_helper.dart';