diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b066dade9c..f784ad1d7a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -89,6 +89,13 @@ [#34233]: https://github.com/dart-lang/sdk/issues/34233 [`ServiceExtensionResponse`]: https://api.dart.dev/stable/2.17.6/dart-developer/ServiceExtensionResponse-class.html#constants +#### `dart:ffi` + +- **Breaking change** [#49935][]: The runtime type argument of `Pointer` has + changed to `Never` in preparation of completely removing the runtime type + argument. `Pointer.toString` has changed to not report any type argument. + +[#49935]: https://github.com/dart-lang/sdk/issues/49935 #### `dart:html` diff --git a/runtime/lib/ffi.cc b/runtime/lib/ffi.cc index 803f2cc61b9..e50c84b8fba 100644 --- a/runtime/lib/ffi.cc +++ b/runtime/lib/ffi.cc @@ -122,7 +122,6 @@ DEFINE_NATIVE_ENTRY(Ffi_nativeCallbackFunction, 1, 2) { } DEFINE_NATIVE_ENTRY(Ffi_pointerFromFunction, 1, 1) { - GET_NATIVE_TYPE_ARGUMENT(type_arg, arguments->NativeTypeArgAt(0)); const Function& function = Function::CheckedHandle(zone, arguments->NativeArg0()); @@ -164,7 +163,7 @@ DEFINE_NATIVE_ENTRY(Ffi_pointerFromFunction, 1, 1) { } #endif - return Pointer::New(type_arg, entry_point); + return Pointer::New(entry_point); } DEFINE_NATIVE_ENTRY(DartNativeApiFunctionPointer, 0, 1) { diff --git a/runtime/lib/ffi_dynamic_library.cc b/runtime/lib/ffi_dynamic_library.cc index 7bd6523c09b..e04c881411e 100644 --- a/runtime/lib/ffi_dynamic_library.cc +++ b/runtime/lib/ffi_dynamic_library.cc @@ -180,8 +180,6 @@ DEFINE_NATIVE_ENTRY(Ffi_dl_executableLibrary, 0, 0) { } DEFINE_NATIVE_ENTRY(Ffi_dl_lookup, 1, 2) { - GET_NATIVE_TYPE_ARGUMENT(type_arg, arguments->NativeTypeArgAt(0)); - GET_NON_NULL_NATIVE_ARGUMENT(DynamicLibrary, dlib, arguments->NativeArgAt(0)); GET_NON_NULL_NATIVE_ARGUMENT(String, argSymbolName, arguments->NativeArgAt(1)); @@ -197,7 +195,7 @@ DEFINE_NATIVE_ENTRY(Ffi_dl_lookup, 1, 2) { free(error); Exceptions::ThrowArgumentError(msg); } - return Pointer::New(type_arg, pointer); + return Pointer::New(pointer); } DEFINE_NATIVE_ENTRY(Ffi_dl_getHandle, 0, 1) { @@ -291,8 +289,7 @@ static intptr_t FfiResolve(Dart_Handle asset_handle, // Bootstrap to get the FFI Native resolver through a `native` call. DEFINE_NATIVE_ENTRY(Ffi_GetFfiNativeResolver, 1, 0) { - GET_NATIVE_TYPE_ARGUMENT(type_arg, arguments->NativeTypeArgAt(0)); - return Pointer::New(type_arg, reinterpret_cast(FfiResolve)); + return Pointer::New(reinterpret_cast(FfiResolve)); } #endif // defined(USING_SIMULATOR) || \ diff --git a/runtime/vm/compiler/frontend/kernel_to_il.cc b/runtime/vm/compiler/frontend/kernel_to_il.cc index 73224d21588..2c169fde348 100644 --- a/runtime/vm/compiler/frontend/kernel_to_il.cc +++ b/runtime/vm/compiler/frontend/kernel_to_il.cc @@ -1324,29 +1324,15 @@ FlowGraph* FlowGraphBuilder::BuildGraphOfRecognizedMethod( body += Box(LoadIndexedInstr::RepresentationOfArrayElement(typed_data_cid)); if (kind == MethodRecognizer::kFfiLoadPointer) { - const auto class_table = thread_->isolate_group()->class_table(); - ASSERT(class_table->HasValidClassAt(kPointerCid)); const auto& pointer_class = - Class::ZoneHandle(H.zone(), class_table->At(kPointerCid)); + Class::ZoneHandle(Z, IG->object_store()->ffi_pointer_class()); + const auto& type_arguments = TypeArguments::ZoneHandle( + Z, IG->object_store()->type_argument_never()); - // We find the reified type to use for the pointer allocation. - // - // Call sites to this recognized method are guaranteed to pass a - // Pointer> as RawParameterVariable(0). This function - // will return a Pointer object - for which we inspect the - // reified type on the argument. - // - // The following is safe to do, as (1) we are guaranteed to have a - // Pointer> as argument, and (2) the bound on the pointer - // type parameter guarantees X is an interface type. + // We do not reify Pointer type arguments ASSERT(function.NumTypeParameters() == 1); LocalVariable* address = MakeTemporary(); - body += LoadLocal(parsed_function_->RawParameterVariable(0)); - body += LoadNativeField( - Slot::GetTypeArgumentsSlotFor(thread_, pointer_class)); - body += LoadNativeField(Slot::GetTypeArgumentsIndexSlot( - thread_, Pointer::kNativeTypeArgPos)); - body += LoadNativeField(Slot::Type_arguments()); + body += Constant(type_arguments); body += AllocateObject(TokenPosition::kNoSource, pointer_class, 1); LocalVariable* pointer = MakeTemporary(); body += LoadLocal(pointer); @@ -1381,37 +1367,6 @@ FlowGraph* FlowGraphBuilder::BuildGraphOfRecognizedMethod( LocalVariable* arg_offset = parsed_function_->RawParameterVariable(1); LocalVariable* arg_value = parsed_function_->RawParameterVariable(2); - if (kind == MethodRecognizer::kFfiStorePointer) { - // Do type check before anything untagged is on the stack. - const auto class_table = thread_->isolate_group()->class_table(); - ASSERT(class_table->HasValidClassAt(kPointerCid)); - const auto& pointer_class = - Class::ZoneHandle(H.zone(), class_table->At(kPointerCid)); - const auto& pointer_type_param = - TypeParameter::ZoneHandle(pointer_class.TypeParameterAt(0)); - - // But we type check it as a method on a generic class at runtime. - body += LoadLocal(arg_value); // value. - body += Constant(pointer_type_param); // dst_type. - // We pass the Pointer type argument as instantiator_type_args. - // - // Call sites to this recognized method are guaranteed to pass a - // Pointer> as RawParameterVariable(0). This function - // will takes a Pointer object - for which we inspect the - // reified type on the argument. - // - // The following is safe to do, as (1) we are guaranteed to have a - // Pointer> as argument, and (2) the bound on the pointer - // type parameter guarantees X is an interface type. - body += LoadLocal(arg_pointer); - body += CheckNullOptimized(String::ZoneHandle(Z, function.name())); - body += LoadNativeField( - Slot::GetTypeArgumentsSlotFor(thread_, pointer_class)); - body += NullConstant(); // function_type_args. - body += AssertAssignable(TokenPosition::kNoSource, Symbols::Empty()); - body += Drop(); - } - ASSERT_EQUAL(function.NumParameters(), 3); body += LoadLocal(arg_offset); body += CheckNullOptimized(String::ZoneHandle(Z, function.name())); @@ -1448,14 +1403,14 @@ FlowGraph* FlowGraphBuilder::BuildGraphOfRecognizedMethod( body += NullConstant(); } break; case MethodRecognizer::kFfiFromAddress: { - const auto class_table = thread_->isolate_group()->class_table(); - ASSERT(class_table->HasValidClassAt(kPointerCid)); const auto& pointer_class = - Class::ZoneHandle(H.zone(), class_table->At(kPointerCid)); + Class::ZoneHandle(Z, IG->object_store()->ffi_pointer_class()); + const auto& type_arguments = TypeArguments::ZoneHandle( + Z, IG->object_store()->type_argument_never()); ASSERT(function.NumTypeParameters() == 1); ASSERT_EQUAL(function.NumParameters(), 1); - body += LoadLocal(parsed_function_->RawTypeArgumentsVariable()); + body += Constant(type_arguments); body += AllocateObject(TokenPosition::kNoSource, pointer_class, 1); body += LoadLocal(MakeTemporary()); // Duplicate Pointer. body += LoadLocal(parsed_function_->RawParameterVariable(0)); // Address. @@ -4306,15 +4261,17 @@ Fragment FlowGraphBuilder::NativeReturn( return Fragment(instr).closed(); } -Fragment FlowGraphBuilder::FfiPointerFromAddress(const Type& result_type) { +Fragment FlowGraphBuilder::FfiPointerFromAddress() { LocalVariable* address = MakeTemporary(); LocalVariable* result = parsed_function_->expression_temp_var(); - Class& result_class = Class::ZoneHandle(Z, result_type.type_class()); + Class& result_class = + Class::ZoneHandle(Z, IG->object_store()->ffi_pointer_class()); // This class might only be instantiated as a return type of ffi calls. result_class.EnsureIsFinalized(thread_); - TypeArguments& args = TypeArguments::ZoneHandle(Z, result_type.arguments()); + TypeArguments& args = + TypeArguments::ZoneHandle(Z, IG->object_store()->type_argument_never()); // A kernel transform for FFI in the front-end ensures that type parameters // do not appear in the type arguments to a any Pointer classes in an FFI @@ -4656,8 +4613,7 @@ Fragment FlowGraphBuilder::FfiConvertPrimitiveToDart( Fragment body; if (marshaller.IsPointer(arg_index)) { body += Box(kUnboxedFfiIntPtr); - body += FfiPointerFromAddress( - Type::CheckedHandle(Z, marshaller.CType(arg_index))); + body += FfiPointerFromAddress(); } else if (marshaller.IsHandle(arg_index)) { body += UnwrapHandle(); } else if (marshaller.IsVoid(arg_index)) { diff --git a/runtime/vm/compiler/frontend/kernel_to_il.h b/runtime/vm/compiler/frontend/kernel_to_il.h index 445e0758e4a..53283c241b4 100644 --- a/runtime/vm/compiler/frontend/kernel_to_il.h +++ b/runtime/vm/compiler/frontend/kernel_to_il.h @@ -285,8 +285,8 @@ class FlowGraphBuilder : public BaseFlowGraphBuilder { // Converts 0 to false and the rest to true. Fragment IntToBool(); - // Creates an ffi.Pointer holding a given address (TOS). - Fragment FfiPointerFromAddress(const Type& result_type); + // Creates an ffi.Pointer holding a given address. + Fragment FfiPointerFromAddress(); // Pushes an (unboxed) bogus value returned when a native -> Dart callback // throws an exception. diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h index 9216e27adda..0f54f5fb4b3 100644 --- a/runtime/vm/compiler/runtime_offsets_extracted.h +++ b/runtime/vm/compiler/runtime_offsets_extracted.h @@ -234,25 +234,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -897,25 +897,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -1564,25 +1564,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -2227,25 +2227,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -2895,25 +2895,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -3562,25 +3562,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -4230,25 +4230,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -4896,25 +4896,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -5558,25 +5558,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -6213,25 +6213,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -6872,25 +6872,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -7527,25 +7527,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -8187,25 +8187,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -8846,25 +8846,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -9506,25 +9506,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 520; + ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 552; + ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 516; + ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 532; + ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 544; + ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 524; + ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 528; + ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 540; + ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 536; + ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word OneByteString_data_offset = 12; static constexpr dart::compiler::target::word PointerBase_data_offset = 4; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = 8; @@ -10164,25 +10164,25 @@ static constexpr dart::compiler::target::word ObjectStore_string_type_offset = static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 1040; + ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 1104; + ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 1032; + ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 1064; + ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 1088; + ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 1048; + ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 1056; + ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 1080; + ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 1072; + ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word OneByteString_data_offset = 16; static constexpr dart::compiler::target::word PointerBase_data_offset = 8; static constexpr dart::compiler::target::word Pointer_type_arguments_offset = @@ -10857,25 +10857,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 520; + AOT_ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 552; + AOT_ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 516; + AOT_ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 532; + AOT_ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 544; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 524; + AOT_ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 528; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 540; + AOT_ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 536; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 12; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 4; @@ -11593,25 +11593,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -12336,25 +12336,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -13077,25 +13077,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -13817,25 +13817,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -14557,25 +14557,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 520; + AOT_ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 552; + AOT_ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 516; + AOT_ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 532; + AOT_ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 544; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 524; + AOT_ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 528; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 540; + AOT_ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 536; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 12; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 4; @@ -15295,25 +15295,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -16028,25 +16028,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 520; + AOT_ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 552; + AOT_ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 516; + AOT_ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 532; + AOT_ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 544; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 524; + AOT_ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 528; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 540; + AOT_ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 536; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 12; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 4; @@ -16755,25 +16755,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -17489,25 +17489,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -18221,25 +18221,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -18952,25 +18952,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; @@ -19683,25 +19683,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 132; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 520; + AOT_ObjectStore_suspend_state_await_offset = 524; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 552; + AOT_ObjectStore_suspend_state_handle_exception_offset = 556; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 516; + AOT_ObjectStore_suspend_state_init_async_offset = 520; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 532; + AOT_ObjectStore_suspend_state_init_async_star_offset = 536; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 544; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 548; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 524; + AOT_ObjectStore_suspend_state_return_async_offset = 528; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 528; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 532; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 540; + AOT_ObjectStore_suspend_state_return_async_star_offset = 544; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 548; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 552; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 536; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 540; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 12; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 4; @@ -20412,25 +20412,25 @@ static constexpr dart::compiler::target::word static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 264; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 1040; + AOT_ObjectStore_suspend_state_await_offset = 1048; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 1104; + AOT_ObjectStore_suspend_state_handle_exception_offset = 1112; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 1032; + AOT_ObjectStore_suspend_state_init_async_offset = 1040; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 1064; + AOT_ObjectStore_suspend_state_init_async_star_offset = 1072; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 1088; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 1096; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 1048; + AOT_ObjectStore_suspend_state_return_async_offset = 1056; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1056; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 1064; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 1080; + AOT_ObjectStore_suspend_state_return_async_star_offset = 1088; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1096; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 1104; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 1072; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 1080; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 16; static constexpr dart::compiler::target::word AOT_PointerBase_data_offset = 8; diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index 4b9834b36ab..f333132c563 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -2330,6 +2330,10 @@ ErrorPtr Object::Init(IsolateGroup* isolate_group, type.SetIsFinalized(); type ^= type.Canonicalize(thread, nullptr); object_store->set_never_type(type); + type_args = TypeArguments::New(1); + type_args.SetTypeAt(0, type); + type_args = type_args.Canonicalize(thread, nullptr); + object_store->set_type_argument_never(type_args); // Create and cache commonly used type arguments , , // , and . @@ -25689,16 +25693,12 @@ const char* ExternalTypedData::ToCString() const { return cls.ScrubbedNameCString(); } -PointerPtr Pointer::New(const AbstractType& type_arg, - uword native_address, - Heap::Space space) { +PointerPtr Pointer::New(uword native_address, Heap::Space space) { Thread* thread = Thread::Current(); Zone* zone = thread->zone(); - TypeArguments& type_args = TypeArguments::Handle(zone); - type_args = TypeArguments::New(1); - type_args.SetTypeAt(Pointer::kNativeTypeArgPos, type_arg); - type_args = type_args.Canonicalize(thread, nullptr); + TypeArguments& type_args = TypeArguments::Handle( + zone, IsolateGroup::Current()->object_store()->type_argument_never()); const Class& cls = Class::Handle(IsolateGroup::Current()->class_table()->At(kPointerCid)); @@ -25714,10 +25714,8 @@ PointerPtr Pointer::New(const AbstractType& type_arg, } const char* Pointer::ToCString() const { - TypeArguments& type_args = TypeArguments::Handle(GetTypeArguments()); - String& type_args_name = String::Handle(type_args.UserVisibleName()); - return OS::SCreate(Thread::Current()->zone(), "Pointer%s: address=0x%" Px, - type_args_name.ToCString(), NativeAddress()); + return OS::SCreate(Thread::Current()->zone(), "Pointer: address=0x%" Px, + NativeAddress()); } DynamicLibraryPtr DynamicLibrary::New(void* handle, Heap::Space space) { diff --git a/runtime/vm/object.h b/runtime/vm/object.h index ce71884cb76..5d96ef5bcb3 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -11263,9 +11263,7 @@ class ByteBuffer : public AllStatic { class Pointer : public Instance { public: - static PointerPtr New(const AbstractType& type_arg, - uword native_address, - Heap::Space space = Heap::kNew); + static PointerPtr New(uword native_address, Heap::Space space = Heap::kNew); static intptr_t InstanceSize() { return RoundedAllocationSize(sizeof(UntaggedPointer)); diff --git a/runtime/vm/object_store.h b/runtime/vm/object_store.h index 9c2ceef4a3a..fc71c352ac6 100644 --- a/runtime/vm/object_store.h +++ b/runtime/vm/object_store.h @@ -103,6 +103,7 @@ class ObjectPointerVisitor; RW(TypeArguments, type_argument_int) \ RW(TypeArguments, type_argument_legacy_int) \ RW(TypeArguments, type_argument_double) \ + RW(TypeArguments, type_argument_never) \ RW(TypeArguments, type_argument_string) \ RW(TypeArguments, type_argument_legacy_string) \ RW(TypeArguments, type_argument_string_dynamic) \ diff --git a/runtime/vm/object_test.cc b/runtime/vm/object_test.cc index 2dfc12b744c..f1904cdbc96 100644 --- a/runtime/vm/object_test.cc +++ b/runtime/vm/object_test.cc @@ -5154,10 +5154,7 @@ static void NativeFinalizer_TwoEntriesCrossGen( queue_length_start = aq.queue()->Length(); } - ObjectStore* object_store = thread->isolate_group()->object_store(); - const auto& void_type = Type::Handle(object_store->never_type()); const auto& callback = Pointer::Handle(Pointer::New( - void_type, reinterpret_cast(&NativeFinalizer_TwoEntriesCrossGen_Finalizer), spaces[3])); @@ -5195,14 +5192,14 @@ static void NativeFinalizer_TwoEntriesCrossGen( auto& value1 = String::Handle(); auto& detach1 = String::Handle(); - const auto& token1 = Pointer::Handle(Pointer::New( - void_type, reinterpret_cast(&token1_memory), spaces[3])); + const auto& token1 = Pointer::Handle( + Pointer::New(reinterpret_cast(&token1_memory), spaces[3])); entry1.set_token(token1); auto& value2 = String::Handle(); auto& detach2 = String::Handle(); - const auto& token2 = Pointer::Handle(Pointer::New( - void_type, reinterpret_cast(&token2_memory), spaces[4])); + const auto& token2 = Pointer::Handle( + Pointer::New(reinterpret_cast(&token2_memory), spaces[4])); entry2.set_token(token2); entry2.set_detach(detach2); diff --git a/runtime/vm/raw_object.h b/runtime/vm/raw_object.h index 39509c3c8bf..27e976250e6 100644 --- a/runtime/vm/raw_object.h +++ b/runtime/vm/raw_object.h @@ -1400,9 +1400,12 @@ class UntaggedFfiTrampolineData : public UntaggedObject { private: RAW_HEAP_OBJECT_IMPLEMENTATION(FfiTrampolineData); + // Not traced. We don't need this info after precompilation, and FFI + // trampolines are not supported in JIT snapshots. + COMPRESSED_POINTER_FIELD(FunctionTypePtr, c_signature) + COMPRESSED_POINTER_FIELD(TypePtr, signature_type) VISIT_FROM(signature_type) - COMPRESSED_POINTER_FIELD(FunctionTypePtr, c_signature) // Target Dart method for callbacks, otherwise null. COMPRESSED_POINTER_FIELD(FunctionPtr, callback_target) diff --git a/tests/ffi/data_test.dart b/tests/ffi/data_test.dart index 4b619dd681c..47ddd4a3733 100644 --- a/tests/ffi/data_test.dart +++ b/tests/ffi/data_test.dart @@ -398,11 +398,10 @@ void testTypeTest() { void testToString() { Pointer p = calloc(); - Expect.stringEquals( - "Pointer: address=0x", p.toString().substring(0, 26)); + Expect.stringEquals("Pointer: address=0x", p.toString().substring(0, 19)); calloc.free(p); Pointer p2 = Pointer.fromAddress(0x123abc); - Expect.stringEquals("Pointer: address=0x123abc", p2.toString()); + Expect.stringEquals("Pointer: address=0x123abc", p2.toString()); } void testEquality() { diff --git a/tests/ffi/regress_37254_test.dart b/tests/ffi/regress_37254_test.dart index 0c2829a83d1..57cdca9ab9e 100644 --- a/tests/ffi/regress_37254_test.dart +++ b/tests/ffi/regress_37254_test.dart @@ -94,18 +94,15 @@ void store3() { final Pointer> a = calloc>(); final Pointer b = calloc().cast>(); - // Failing implicit downcast of argument at runtime. - // Should fail now at runtime, should statically be rejected when NNBD lands. - Expect.throws(() { - a.value = b as Pointer; - }); + // Type arguments are not reified. + a.value = b as Pointer; calloc.free(a); calloc.free(b); } void store4() { - // Reified as Pointer> at runtime. + // Type arguments are not reified. final Pointer> a = calloc>(); final Pointer b = calloc(); @@ -134,10 +131,8 @@ void store6() { final Pointer> a = calloc>(); final Pointer b = calloc().cast>(); - // Fails on type check of argument. - Expect.throws(() { - a.value = b; - }); + // Type arguments are not reified. + a.value = b; calloc.free(a); calloc.free(b); @@ -156,7 +151,7 @@ void store7() { void store8() { final Pointer> a = calloc>(); - // Reified as Pointer at runtime. + // Type arguments are not reified. final Pointer b = calloc(); a.value = b; @@ -219,11 +214,9 @@ void load4() { void load5() { final Pointer> a = calloc>(); - // Failing implicit downcast of return value at runtime. - // Should fail now at runtime, should statically be rejected when NNBD lands. - Expect.throws(() { - Pointer b = a.value as Pointer; - }); + // Type arguments are not reified. + // ignore: unused_local_variable + Pointer b = a.value as Pointer; calloc.free(a); } diff --git a/tests/ffi/variance_function_test.dart b/tests/ffi/variance_function_test.dart index 5293cdd00f9..bd3f0d1af8f 100644 --- a/tests/ffi/variance_function_test.dart +++ b/tests/ffi/variance_function_test.dart @@ -193,9 +193,8 @@ void callbackParamImplicitDowncast1() { final callback = ffiTestFunctions.lookupFunction(callbackParamOpName); final fp = Pointer.fromFunction(int64PointerParamOp); - Expect.throws(() { - callback(fp as Pointer>); - }); + // Pointer type arguments are not reified, any cast will succeed. + callback(fp as Pointer>); } void callbackParamSubtype1() { diff --git a/tests/ffi_2/data_test.dart b/tests/ffi_2/data_test.dart index 14be2c0d753..931edda2c68 100644 --- a/tests/ffi_2/data_test.dart +++ b/tests/ffi_2/data_test.dart @@ -400,11 +400,10 @@ void testTypeTest() { void testToString() { Pointer p = calloc(); - Expect.stringEquals( - "Pointer: address=0x", p.toString().substring(0, 26)); + Expect.stringEquals("Pointer: address=0x", p.toString().substring(0, 19)); calloc.free(p); Pointer p2 = Pointer.fromAddress(0x123abc); - Expect.stringEquals("Pointer: address=0x123abc", p2.toString()); + Expect.stringEquals("Pointer: address=0x123abc", p2.toString()); } void testEquality() { diff --git a/tests/ffi_2/regress_37254_test.dart b/tests/ffi_2/regress_37254_test.dart index 79afd96bb4b..f5a92ee8a61 100644 --- a/tests/ffi_2/regress_37254_test.dart +++ b/tests/ffi_2/regress_37254_test.dart @@ -96,18 +96,15 @@ void store3() { final Pointer> a = calloc>(); final Pointer b = calloc().cast>(); - // Failing implicit downcast of argument at runtime. - // Should fail now at runtime, should statically be rejected when NNBD lands. - Expect.throws(() { - a.value = b; - }); + // Type arguments are not reified. + a.value = b; calloc.free(a); calloc.free(b); } void store4() { - // Reified as Pointer> at runtime. + // Type arguments are not reified. final Pointer> a = calloc>(); final Pointer b = calloc(); @@ -119,11 +116,9 @@ void store4() { } void store5() { - // Reified as Pointer> at runtime. + // Type arguments are not reified. final Pointer> a = calloc>(); - - final Pointer b = - calloc(); // Reified as Pointer at runtime. + final Pointer b = calloc(); a.value = b; @@ -136,10 +131,8 @@ void store6() { final Pointer> a = calloc>(); final Pointer b = calloc().cast>(); - // Fails on type check of argument. - Expect.throws(() { - a.value = b; - }); + // Type arguments are not reified. + a.value = b; calloc.free(a); calloc.free(b); @@ -221,11 +214,8 @@ void load4() { void load5() { final Pointer> a = calloc>(); - // Failing implicit downcast of return value at runtime. - // Should fail now at runtime, should statically be rejected when NNBD lands. - Expect.throws(() { - Pointer b = a.value; - }); + // Type arguments are not reified. + Pointer b = a.value; calloc.free(a); } diff --git a/tests/ffi_2/variance_function_test.dart b/tests/ffi_2/variance_function_test.dart index 36b63ee55a1..27ebc93c95d 100644 --- a/tests/ffi_2/variance_function_test.dart +++ b/tests/ffi_2/variance_function_test.dart @@ -195,9 +195,8 @@ void callbackParamImplicitDowncast1() { final callback = ffiTestFunctions.lookupFunction(callbackParamOpName); final fp = Pointer.fromFunction(int64PointerParamOp); - Expect.throws(() { - callback(fp); - }); + // Pointer type arguments are not reified, any cast will succeed. + callback(fp); } void callbackParamSubtype1() {