From dc445e4eec57f83c92ad3d2d5cda745e3103c8d4 Mon Sep 17 00:00:00 2001 From: Ryan Macnak Date: Mon, 18 Sep 2023 22:14:58 +0000 Subject: [PATCH] [vm, compiler] Fix incorrect reduction of identical(num, num?) to pointer equality. TEST=ci Change-Id: Ifd75fa074581cc9c5a67bcc035f0d594b2692158 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/326722 Reviewed-by: Alexander Markov Commit-Queue: Ryan Macnak --- .../vm/dart/identical_nullable_num_test.dart | 16 + runtime/vm/compiler/backend/il.cc | 3 +- .../vm/compiler/runtime_offsets_extracted.h | 960 +++++++++--------- runtime/vm/object.cc | 6 + runtime/vm/object.h | 3 + runtime/vm/object_store.h | 1 + 6 files changed, 508 insertions(+), 481 deletions(-) create mode 100644 runtime/tests/vm/dart/identical_nullable_num_test.dart diff --git a/runtime/tests/vm/dart/identical_nullable_num_test.dart b/runtime/tests/vm/dart/identical_nullable_num_test.dart new file mode 100644 index 00000000000..0eb74d182ab --- /dev/null +++ b/runtime/tests/vm/dart/identical_nullable_num_test.dart @@ -0,0 +1,16 @@ +// Copyright (c) 2023, the Dart project authors. Please see the AUTHORS file +// 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. + +// VMOptions= +// VMOptions=--optimization_level=3 + +@pragma("vm:never-inline") +void check(num a, num? b) { + if (!identical(a, b)) throw "bad"; +} + +main() { + // same value, different object, but `identical` is equal for numbers + check(0.0, double.parse("0.0")); +} diff --git a/runtime/vm/compiler/backend/il.cc b/runtime/vm/compiler/backend/il.cc index 21b7fa727c0..d2895956913 100644 --- a/runtime/vm/compiler/backend/il.cc +++ b/runtime/vm/compiler/backend/il.cc @@ -3367,7 +3367,8 @@ static bool MayBeNumber(CompileType* type) { // Note that type 'Number' is a subtype of itself. return unwrapped_type.IsTopTypeForSubtyping() || unwrapped_type.IsObjectType() || unwrapped_type.IsTypeParameter() || - unwrapped_type.IsSubtypeOf(Type::Handle(Type::Number()), Heap::kOld); + unwrapped_type.IsSubtypeOf(Type::Handle(Type::NullableNumber()), + Heap::kOld); } // Returns a replacement for a strict comparison and signals if the result has diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h index c93f0755590..11d0b54ae55 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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -966,39 +966,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -1681,39 +1681,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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -2395,39 +2395,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -3114,39 +3114,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -3830,39 +3830,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -4546,39 +4546,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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -5262,39 +5262,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -5970,39 +5970,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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -6677,39 +6677,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -7384,39 +7384,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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -8090,39 +8090,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -8801,39 +8801,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -9509,39 +9509,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -10217,39 +10217,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 = - 0xc0; + 0xc4; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x1fc; + ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0xd4; + 0xd8; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x278; + ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x224; + ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x248; + ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x220; + ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x234; + ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x240; + ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x22c; + ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x23c; + ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x238; + ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x4; @@ -10925,39 +10925,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 = - 0x180; + 0x188; static constexpr dart::compiler::target::word ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - ObjectStore_record_field_names_offset = 0x3f8; + ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word ObjectStore_string_type_offset = - 0x1a8; + 0x1b0; static constexpr dart::compiler::target::word ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - ObjectStore_ffi_callback_code_offset = 0x4f0; + ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_offset = 0x448; + ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_handle_exception_offset = 0x490; + ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_offset = 0x440; + ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_async_star_offset = 0x468; + ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_init_sync_star_offset = 0x480; + ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_offset = 0x458; + ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_return_async_star_offset = 0x478; + ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - ObjectStore_suspend_state_yield_async_star_offset = 0x470; + ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word PersistentHandle_ptr_offset = 0x0; static constexpr dart::compiler::target::word PointerBase_data_offset = 0x8; @@ -11666,39 +11666,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 = 0xc0; + AOT_ObjectStore_double_type_offset = 0xc4; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x1fc; + AOT_ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd4; + AOT_ObjectStore_string_type_offset = 0xd8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x278; + AOT_ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x224; + AOT_ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x220; + AOT_ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; + AOT_ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -12457,39 +12457,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -13255,39 +13255,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -14049,39 +14049,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -14843,39 +14843,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -15639,39 +15639,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 = 0xc0; + AOT_ObjectStore_double_type_offset = 0xc4; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x1fc; + AOT_ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd4; + AOT_ObjectStore_string_type_offset = 0xd8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x278; + AOT_ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x224; + AOT_ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x220; + AOT_ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; + AOT_ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -16431,39 +16431,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -17215,39 +17215,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 = 0xc0; + AOT_ObjectStore_double_type_offset = 0xc4; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x1fc; + AOT_ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd4; + AOT_ObjectStore_string_type_offset = 0xd8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x278; + AOT_ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x224; + AOT_ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x220; + AOT_ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; + AOT_ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -17997,39 +17997,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -18786,39 +18786,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -19571,39 +19571,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -20356,39 +20356,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -21143,39 +21143,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 = 0xc0; + AOT_ObjectStore_double_type_offset = 0xc4; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x94; + 0x98; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x1fc; + AOT_ObjectStore_record_field_names_offset = 0x200; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0xd4; + AOT_ObjectStore_string_type_offset = 0xd8; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x84; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x278; + AOT_ObjectStore_ffi_callback_code_offset = 0x27c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x224; + AOT_ObjectStore_suspend_state_await_offset = 0x228; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x228; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x22c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x248; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x24c; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x220; + AOT_ObjectStore_suspend_state_init_async_offset = 0x224; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x234; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x238; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x240; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x244; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x22c; + AOT_ObjectStore_suspend_state_return_async_offset = 0x230; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x230; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x234; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x23c; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x240; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x244; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x248; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x238; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x23c; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0xc; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = @@ -21926,39 +21926,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 = 0x180; + AOT_ObjectStore_double_type_offset = 0x188; static constexpr dart::compiler::target::word AOT_ObjectStore_int_type_offset = - 0x128; + 0x130; static constexpr dart::compiler::target::word - AOT_ObjectStore_record_field_names_offset = 0x3f8; + AOT_ObjectStore_record_field_names_offset = 0x400; static constexpr dart::compiler::target::word - AOT_ObjectStore_string_type_offset = 0x1a8; + AOT_ObjectStore_string_type_offset = 0x1b0; static constexpr dart::compiler::target::word AOT_ObjectStore_type_type_offset = 0x108; static constexpr dart::compiler::target::word - AOT_ObjectStore_ffi_callback_code_offset = 0x4f0; + AOT_ObjectStore_ffi_callback_code_offset = 0x4f8; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_offset = 0x448; + AOT_ObjectStore_suspend_state_await_offset = 0x450; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x450; + AOT_ObjectStore_suspend_state_await_with_type_check_offset = 0x458; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_handle_exception_offset = 0x490; + AOT_ObjectStore_suspend_state_handle_exception_offset = 0x498; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_offset = 0x440; + AOT_ObjectStore_suspend_state_init_async_offset = 0x448; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_async_star_offset = 0x468; + AOT_ObjectStore_suspend_state_init_async_star_offset = 0x470; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x480; + AOT_ObjectStore_suspend_state_init_sync_star_offset = 0x488; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_offset = 0x458; + AOT_ObjectStore_suspend_state_return_async_offset = 0x460; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x460; + AOT_ObjectStore_suspend_state_return_async_not_future_offset = 0x468; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_return_async_star_offset = 0x478; + AOT_ObjectStore_suspend_state_return_async_star_offset = 0x480; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x488; + AOT_ObjectStore_suspend_state_suspend_sync_star_at_start_offset = 0x490; static constexpr dart::compiler::target::word - AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x470; + AOT_ObjectStore_suspend_state_yield_async_star_offset = 0x478; static constexpr dart::compiler::target::word AOT_OneByteString_data_offset = 0x10; static constexpr dart::compiler::target::word AOT_PersistentHandle_ptr_offset = diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc index f883767cb3b..cd6b63796f4 100644 --- a/runtime/vm/object.cc +++ b/runtime/vm/object.cc @@ -2289,6 +2289,8 @@ ErrorPtr Object::Init(IsolateGroup* isolate_group, pending_classes.Add(cls); type = Type::NewNonParameterizedType(cls); object_store->set_number_type(type); + type = type.ToNullability(Nullability::kNullable, Heap::kOld); + object_store->set_nullable_number_type(type); cls = Class::New(kIllegalCid, isolate_group, /*register_class=*/true, @@ -21813,6 +21815,10 @@ TypePtr Type::Number() { return IsolateGroup::Current()->object_store()->number_type(); } +TypePtr Type::NullableNumber() { + return IsolateGroup::Current()->object_store()->nullable_number_type(); +} + TypePtr Type::StringType() { return IsolateGroup::Current()->object_store()->string_type(); } diff --git a/runtime/vm/object.h b/runtime/vm/object.h index 188d7ec8a9e..5a4ab9a8a3d 100644 --- a/runtime/vm/object.h +++ b/runtime/vm/object.h @@ -9349,6 +9349,9 @@ class Type : public AbstractType { // The 'num' type. static TypePtr Number(); + // The 'num?' type. + static TypePtr NullableNumber(); + // The 'String' type. static TypePtr StringType(); diff --git a/runtime/vm/object_store.h b/runtime/vm/object_store.h index a448f540d9b..510e0ff9b92 100644 --- a/runtime/vm/object_store.h +++ b/runtime/vm/object_store.h @@ -82,6 +82,7 @@ class ObjectPointerVisitor; RW(Class, closure_class) \ RW(Class, record_class) \ RW(Type, number_type) \ + RW(Type, nullable_number_type) \ RW(Type, int_type) \ RW(Type, legacy_int_type) \ RW(Type, non_nullable_int_type) \