Revert "[vm/ffi] Throw on returning `Error` in `Handle`"

This reverts commit d9c442bce8d13bb4db977e738d795b753ce84168.

Reason for revert: https://github.com/flutter/flutter/issues/112726

Original change's description:
> [vm/ffi] Throw on returning `Error` in `Handle`
>
> Makes `Dart_Handle` FFI returns behave as the following snippet:
>
> ```
> Dart_Handle ExampleSnippet() {
>   Dart_Handle result;
>   if (Dart_IsError(result)) {
>     Dart_PropagateError(result);
>   }
>   return result;
> }
> ```
>
> Also makes FFI consistent with Dart_NativeFunctions, which will
> automatically throw upon return if Dart_SetReturnValue set the result
> to an error.
>
> `UnhandledExceptions` cannot flow out into Dart generated code. So,
> the implementation needs to be in `FfiCallInstr::EmitNativeCode`.
>
> Using `Dart_IsError` is slow compared to a machine code class id
> check. So, we should do the handle unwrapping and class id check in
> machine code.
>
> Unwrapping Handles in machine code is only safe when the GC is
> guaranteed to not run: Either (1) in `kThreadInGenerated`, or (2) in
> `kThreadInNative`, but only when transitioned into safepoint. So, the
> handle cannot be unwrapped immediately after the FFI call in machine code. We first need to transition back to generated.
>
> This means we need to transition again to native to do the actual
> `Dart_PropagateError` call. We can do so without the stub in JIT
> because we never return with normal control flow.
>
> Performance impact of this change is within benchmark noise in both
> JIT and AOT.
> Size impact is 42 bytes on x64, which is 10% in AOT and 12% in JIT.
>
> For more numbers see: go/dart-ffi-handle-error
>
> TEST=runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
> TEST=tests/ffi/vmspecific_handle_test.dart
>
> Closes: https://github.com/dart-lang/sdk/issues/49936
> Change-Id: Ie8fabeb6d53bc80689541bc4470cb37ee2200581
> Cq-Include-Trybots: luci.dart.try:vm-canary-linux-debug-try,vm-ffi-android-debug-arm64c-try,vm-ffi-android-debug-arm-try,vm-kernel-gcc-linux-try,vm-kernel-linux-debug-x64-try,vm-kernel-linux-debug-x64c-try,vm-kernel-msvc-windows-try,vm-kernel-optcounter-threshold-linux-release-x64-try,vm-kernel-precomp-asan-linux-release-x64-try,vm-kernel-precomp-linux-debug-x64-try,vm-kernel-reload-linux-debug-x64-try,vm-kernel-reload-rollback-linux-debug-x64-try,vm-kernel-tsan-linux-release-x64-try,vm-kernel-win-debug-x64-try,vm-kernel-win-debug-ia32-try,vm-precomp-ffi-qemu-linux-release-arm-try,vm-precomp-ffi-qemu-linux-release-riscv64-try,vm-kernel-linux-debug-ia32-try,vm-kernel-mac-release-arm64-try,vm-kernel-precomp-win-debug-x64c-try
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/261603
> Reviewed-by: Ryan Macnak <rmacnak@google.com>
> Reviewed-by: Martin Kustermann <kustermann@google.com>
> Commit-Queue: Daco Harkes <dacoharkes@google.com>

TBR=kustermann@google.com,rmacnak@google.com,dacoharkes@google.com,dart-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I94cc63de16b54db2b0a4f92759c39a1e569b8e63
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Cq-Include-Trybots: luci.dart.try:vm-canary-linux-debug-try,vm-ffi-android-debug-arm64c-try,vm-ffi-android-debug-arm-try,vm-kernel-gcc-linux-try,vm-kernel-linux-debug-x64-try,vm-kernel-linux-debug-x64c-try,vm-kernel-msvc-windows-try,vm-kernel-optcounter-threshold-linux-release-x64-try,vm-kernel-precomp-asan-linux-release-x64-try,vm-kernel-precomp-linux-debug-x64-try,vm-kernel-reload-linux-debug-x64-try,vm-kernel-reload-rollback-linux-debug-x64-try,vm-kernel-tsan-linux-release-x64-try,vm-kernel-win-debug-x64-try,vm-kernel-win-debug-ia32-try,vm-precomp-ffi-qemu-linux-release-arm-try,vm-precomp-ffi-qemu-linux-release-riscv64-try,vm-kernel-linux-debug-ia32-try,vm-kernel-mac-release-arm64-try,vm-kernel-precomp-win-debug-x64c-try
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/262270
Reviewed-by: Zach Anderson <zra@google.com>
Reviewed-by: Liam Appelbe <liama@google.com>
Commit-Queue: Zach Anderson <zra@google.com>
diff --git a/benchmarks/FfiCall/dart/FfiCall.dart b/benchmarks/FfiCall/dart/FfiCall.dart
index 517329a..e6c922e 100644
--- a/benchmarks/FfiCall/dart/FfiCall.dart
+++ b/benchmarks/FfiCall/dart/FfiCall.dart
@@ -1290,7 +1290,8 @@
 //
 // Main driver.
 //
-void main(List<String> args) {
+
+void main() {
   final benchmarks = [
     () => Uint8x01(),
     () => Uint8x01(isLeaf: true),
@@ -1337,12 +1338,7 @@
     () => Handlex10(),
     () => Handlex20(),
   ];
-  final filter = args.length == 1 ? args[0] : null;
   for (final benchmark in benchmarks) {
-    final b = benchmark();
-    final run = (filter != null) ? b.name.contains(filter) : true;
-    if (run) {
-      b.report();
-    }
+    benchmark().report();
   }
 }
diff --git a/benchmarks/FfiCall/dart2/FfiCall.dart b/benchmarks/FfiCall/dart2/FfiCall.dart
index a1ada52..1fd1b02 100644
--- a/benchmarks/FfiCall/dart2/FfiCall.dart
+++ b/benchmarks/FfiCall/dart2/FfiCall.dart
@@ -1279,7 +1279,8 @@
 //
 // Main driver.
 //
-void main(List<String> args) {
+
+void main() {
   final benchmarks = [
     () => Uint8x01(),
     () => Uint8x01(isLeaf: true),
@@ -1326,12 +1327,7 @@
     () => Handlex10(),
     () => Handlex20(),
   ];
-  final filter = args.length == 1 ? args[0] : null;
   for (final benchmark in benchmarks) {
-    final b = benchmark();
-    final run = (filter != null) ? b.name.contains(filter) : true;
-    if (run) {
-      b.report();
-    }
+    benchmark().report();
   }
 }
diff --git a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
index 83e442d..0b1972c 100644
--- a/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
+++ b/runtime/bin/ffi_test/ffi_test_functions_vmspecific.cc
@@ -1065,13 +1065,6 @@
   return 0;
 }
 
-DART_EXPORT Dart_Handle ThrowOnReturnOfError(Dart_Handle (*callback)()) {
-  Dart_Handle result = callback();
-  const bool is_error = Dart_IsError(result);
-  printf("ThrowOnReturnOfError is_error %s\n", is_error ? "true" : "false");
-  return result;
-}
-
 DART_EXPORT Dart_Handle TrueHandle() {
   return Dart_True();
 }
diff --git a/runtime/vm/class_id.h b/runtime/vm/class_id.h
index 84a230c..22001ad 100644
--- a/runtime/vm/class_id.h
+++ b/runtime/vm/class_id.h
@@ -304,20 +304,15 @@
   return index <= kLastInternalOnlyCid;
 }
 
-  // Make sure this function is updated when new Error types are added.
-static const ClassId kFirstErrorCid = kErrorCid;
-static const ClassId kLastErrorCid = kUnwindErrorCid;
-COMPILE_ASSERT(kFirstErrorCid == kErrorCid &&
-               kApiErrorCid == kFirstErrorCid + 1 &&
-               kLanguageErrorCid == kFirstErrorCid + 2 &&
-               kUnhandledExceptionCid == kFirstErrorCid + 3 &&
-               kUnwindErrorCid == kFirstErrorCid + 4 &&
-               kLastErrorCid == kUnwindErrorCid &&
-               // Change if needed for detecting a new error added at the end.
-               kLastInternalOnlyCid == kLastErrorCid);
-
 inline bool IsErrorClassId(intptr_t index) {
-  return (index >= kFirstErrorCid && index <= kLastErrorCid);
+  // Make sure this function is updated when new Error types are added.
+  COMPILE_ASSERT(kApiErrorCid == kErrorCid + 1 &&
+                 kLanguageErrorCid == kErrorCid + 2 &&
+                 kUnhandledExceptionCid == kErrorCid + 3 &&
+                 kUnwindErrorCid == kErrorCid + 4 &&
+                 // Change if needed for detecting a new error added at the end.
+                 kLastInternalOnlyCid == kUnwindErrorCid);
+  return (index >= kErrorCid && index <= kUnwindErrorCid);
 }
 
 inline bool IsNumberClassId(intptr_t index) {
diff --git a/runtime/vm/compiler/assembler/assembler_arm64_test.cc b/runtime/vm/compiler/assembler/assembler_arm64_test.cc
index df7c4a1..7f410d7 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_arm64_test.cc
@@ -7581,7 +7581,7 @@
 static void RangeCheck(Assembler* assembler, Register value, Register temp) {
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ LoadImmediate(return_reg, Immediate(0));
   __ Ret();
@@ -7631,7 +7631,7 @@
   const Register temp = CallingConventions::ArgumentRegisters[1];
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ Bind(&in_range);
   __ mov(return_reg, value);
diff --git a/runtime/vm/compiler/assembler/assembler_arm_test.cc b/runtime/vm/compiler/assembler/assembler_arm_test.cc
index f81ff1a..347ddac 100644
--- a/runtime/vm/compiler/assembler/assembler_arm_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_arm_test.cc
@@ -3852,7 +3852,7 @@
 static void RangeCheck(Assembler* assembler, Register value, Register temp) {
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ LoadImmediate(return_reg, Immediate(0));
   __ Ret();
@@ -3902,7 +3902,7 @@
   const Register temp = CallingConventions::ArgumentRegisters[1];
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ Bind(&in_range);
   __ mov(return_reg, Operand(value));
diff --git a/runtime/vm/compiler/assembler/assembler_ia32_test.cc b/runtime/vm/compiler/assembler/assembler_ia32_test.cc
index 8547eeb..df51fdd 100644
--- a/runtime/vm/compiler/assembler/assembler_ia32_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_ia32_test.cc
@@ -5010,7 +5010,7 @@
 static void RangeCheck(Assembler* assembler, Register value, Register temp) {
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ movl(return_reg, Immediate(0));
   __ ret();
@@ -5063,7 +5063,7 @@
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
   __ movl(value, compiler::Address(ESP, 4));
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ Bind(&in_range);
   __ movl(return_reg, value);
diff --git a/runtime/vm/compiler/assembler/assembler_riscv_test.cc b/runtime/vm/compiler/assembler/assembler_riscv_test.cc
index b5ebb70..a283b0a 100644
--- a/runtime/vm/compiler/assembler/assembler_riscv_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_riscv_test.cc
@@ -6648,7 +6648,7 @@
 static void RangeCheck(Assembler* assembler, Register value, Register temp) {
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ LoadImmediate(return_reg, 0);
   __ Ret();
@@ -6698,7 +6698,7 @@
   const Register temp = CallingConventions::ArgumentRegisters[1];
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ Bind(&in_range);
   __ MoveRegister(return_reg, value);
diff --git a/runtime/vm/compiler/assembler/assembler_x64_test.cc b/runtime/vm/compiler/assembler/assembler_x64_test.cc
index 155f432..33553dd 100644
--- a/runtime/vm/compiler/assembler/assembler_x64_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_x64_test.cc
@@ -6318,7 +6318,7 @@
 static void RangeCheck(Assembler* assembler, Register value, Register temp) {
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ movq(return_reg, Immediate(0));
   __ ret();
@@ -6368,7 +6368,7 @@
   const Register temp = CallingConventions::kArg2Reg;
   const Register return_reg = CallingConventions::kReturnReg;
   Label in_range;
-  __ RangeCheck(value, temp, kFirstErrorCid, kLastErrorCid,
+  __ RangeCheck(value, temp, kErrorCid, kUnwindErrorCid,
                 AssemblerBase::kIfInRange, &in_range);
   __ Bind(&in_range);
   __ movq(return_reg, value);
diff --git a/runtime/vm/compiler/backend/il_arm.cc b/runtime/vm/compiler/backend/il_arm.cc
index 556fca7..87597ee 100644
--- a/runtime/vm/compiler/backend/il_arm.cc
+++ b/runtime/vm/compiler/backend/il_arm.cc
@@ -1528,37 +1528,6 @@
       __ blx(temp1);
     }
 
-    if (marshaller_.IsHandle(compiler::ffi::kResultIndex)) {
-      __ Comment("Check Dart_Handle for Error.");
-      compiler::Label not_error;
-      ASSERT(temp1 != CallingConventions::kReturnReg);
-      ASSERT(saved_fp_or_sp != CallingConventions::kReturnReg);
-      __ ldr(temp1,
-             compiler::Address(CallingConventions::kReturnReg,
-                               compiler::target::LocalHandle::ptr_offset()));
-      __ LoadClassId(temp1, temp1);
-      __ RangeCheck(temp1, saved_fp_or_sp, kFirstErrorCid, kLastErrorCid,
-                    compiler::AssemblerBase::kIfNotInRange, &not_error);
-
-      // Slow path, use the stub to propagate error, to save on code-size.
-      __ Comment("Slow path: call Dart_PropagateError through stub.");
-      ASSERT(CallingConventions::ArgumentRegisters[0] ==
-             CallingConventions::kReturnReg);
-      __ ldr(temp1,
-             compiler::Address(
-                 THR, compiler::target::Thread::
-                          call_native_through_safepoint_entry_point_offset()));
-      __ ldr(branch, compiler::Address(
-                         THR, kPropagateErrorRuntimeEntry.OffsetFromThread()));
-      __ blx(temp1);
-#if defined(DEBUG)
-      // We should never return with normal controlflow from this.
-      __ bkpt(0);
-#endif
-
-      __ Bind(&not_error);
-    }
-
     // Restore the global object pool after returning from runtime (old space is
     // moving, so the GOP could have been relocated).
     if (FLAG_precompiled_mode) {
diff --git a/runtime/vm/compiler/backend/il_arm64.cc b/runtime/vm/compiler/backend/il_arm64.cc
index 73a174b..418ddc7 100644
--- a/runtime/vm/compiler/backend/il_arm64.cc
+++ b/runtime/vm/compiler/backend/il_arm64.cc
@@ -1405,35 +1405,6 @@
       __ blr(temp1);
     }
 
-    if (marshaller_.IsHandle(compiler::ffi::kResultIndex)) {
-      __ Comment("Check Dart_Handle for Error.");
-      compiler::Label not_error;
-      __ ldr(temp1,
-             compiler::Address(CallingConventions::kReturnReg,
-                               compiler::target::LocalHandle::ptr_offset()));
-      __ LoadClassId(temp1, temp1);
-      __ RangeCheck(temp1, temp2, kFirstErrorCid, kLastErrorCid,
-                    compiler::AssemblerBase::kIfNotInRange, &not_error);
-
-      // Slow path, use the stub to propagate error, to save on code-size.
-      __ Comment("Slow path: call Dart_PropagateError through stub.");
-      ASSERT(CallingConventions::ArgumentRegisters[0] ==
-             CallingConventions::kReturnReg);
-      __ ldr(temp1,
-             compiler::Address(
-                 THR, compiler::target::Thread::
-                          call_native_through_safepoint_entry_point_offset()));
-      __ ldr(branch, compiler::Address(
-                         THR, kPropagateErrorRuntimeEntry.OffsetFromThread()));
-      __ blr(temp1);
-#if defined(DEBUG)
-      // We should never return with normal controlflow from this.
-      __ brk(0);
-#endif
-
-      __ Bind(&not_error);
-    }
-
     // Refresh pinned registers values (inc. write barrier mask and null
     // object).
     __ RestorePinnedRegisters();
@@ -3693,8 +3664,8 @@
       object_store->allocate_mint_without_fpu_regs_stub()
           ->untag()
           ->InVMIsolateHeap();
-  const bool shared_slow_path_call =
-      SlowPathSharingSupported(opt) && !stubs_in_vm_isolate;
+  const bool shared_slow_path_call = SlowPathSharingSupported(opt) &&
+                                     !stubs_in_vm_isolate;
   LocationSummary* summary = new (zone) LocationSummary(
       zone, kNumInputs, kNumTemps,
       ValueFitsSmi()          ? LocationSummary::kNoCall
diff --git a/runtime/vm/compiler/backend/il_ia32.cc b/runtime/vm/compiler/backend/il_ia32.cc
index 8b7132a..16266db 100644
--- a/runtime/vm/compiler/backend/il_ia32.cc
+++ b/runtime/vm/compiler/backend/il_ia32.cc
@@ -1117,34 +1117,6 @@
     // Calls EAX within a safepoint and clobbers EBX.
     ASSERT(branch == EAX);
     __ call(temp);
-
-    if (marshaller_.IsHandle(compiler::ffi::kResultIndex)) {
-      __ Comment("Check Dart_Handle for Error.");
-      compiler::Label not_error;
-      __ movl(temp,
-              compiler::Address(CallingConventions::kReturnReg,
-                                compiler::target::LocalHandle::ptr_offset()));
-      __ LoadClassId(temp, temp);
-      __ RangeCheck(temp, kNoRegister, kFirstErrorCid, kLastErrorCid,
-                    compiler::AssemblerBase::kIfNotInRange, &not_error);
-
-      // Slow path, use the stub to propagate error, to save on code-size.
-      __ Comment("Slow path: call Dart_PropagateError through stub.");
-      __ movl(temp,
-              compiler::Address(
-                  THR, compiler::target::Thread::
-                           call_native_through_safepoint_entry_point_offset()));
-      __ pushl(CallingConventions::kReturnReg);
-      __ movl(EAX, compiler::Address(
-                       THR, kPropagateErrorRuntimeEntry.OffsetFromThread()));
-      __ call(temp);
-#if defined(DEBUG)
-      // We should never return with normal controlflow from this.
-      __ int3();
-#endif
-
-      __ Bind(&not_error);
-    }
   }
 
   // Restore the stack when a struct by value is returned into memory pointed
diff --git a/runtime/vm/compiler/backend/il_riscv.cc b/runtime/vm/compiler/backend/il_riscv.cc
index 72b31c0..2028c10 100644
--- a/runtime/vm/compiler/backend/il_riscv.cc
+++ b/runtime/vm/compiler/backend/il_riscv.cc
@@ -1629,38 +1629,6 @@
       __ jalr(temp1);
     }
 
-    if (marshaller_.IsHandle(compiler::ffi::kResultIndex)) {
-      __ Comment("Check Dart_Handle for Error.");
-      ASSERT(temp1 != CallingConventions::kReturnReg);
-      ASSERT(temp2 != CallingConventions::kReturnReg);
-      compiler::Label not_error;
-      __ LoadFromOffset(
-          temp1,
-          compiler::Address(CallingConventions::kReturnReg,
-                            compiler::target::LocalHandle::ptr_offset()));
-      __ LoadClassId(temp1, temp1);
-      __ RangeCheck(temp1, temp2, kFirstErrorCid, kLastErrorCid,
-                    compiler::AssemblerBase::kIfNotInRange, &not_error);
-
-      // Slow path, use the stub to propagate error, to save on code-size.
-      __ Comment("Slow path: call Dart_PropagateError through stub.");
-      ASSERT(CallingConventions::ArgumentRegisters[0] ==
-             CallingConventions::kReturnReg);
-      __ lx(temp1,
-            compiler::Address(
-                THR, compiler::target::Thread::
-                         call_native_through_safepoint_entry_point_offset()));
-      __ lx(target, compiler::Address(
-                        THR, kPropagateErrorRuntimeEntry.OffsetFromThread()));
-      __ jalr(temp1);
-#if defined(DEBUG)
-      // We should never return with normal controlflow from this.
-      __ ebreak();
-#endif
-
-      __ Bind(&not_error);
-    }
-
     // Refresh pinned registers values (inc. write barrier mask and null
     // object).
     __ RestorePinnedRegisters();
diff --git a/runtime/vm/compiler/backend/il_x64.cc b/runtime/vm/compiler/backend/il_x64.cc
index ea22fca..d17f765 100644
--- a/runtime/vm/compiler/backend/il_x64.cc
+++ b/runtime/vm/compiler/backend/il_x64.cc
@@ -1331,34 +1331,6 @@
       __ movq(RBX, target_address);
       __ call(temp);
     }
-
-    if (marshaller_.IsHandle(compiler::ffi::kResultIndex)) {
-      __ Comment("Check Dart_Handle for Error.");
-      compiler::Label not_error;
-      __ movq(temp,
-              compiler::Address(CallingConventions::kReturnReg,
-                                compiler::target::LocalHandle::ptr_offset()));
-      __ LoadClassId(temp, temp);
-      __ RangeCheck(temp, kNoRegister, kFirstErrorCid, kLastErrorCid,
-                    compiler::AssemblerBase::kIfNotInRange, &not_error);
-
-      // Slow path, use the stub to propagate error, to save on code-size.
-      __ Comment("Slow path: call Dart_PropagateError through stub.");
-      __ movq(temp,
-              compiler::Address(
-                  THR, compiler::target::Thread::
-                           call_native_through_safepoint_entry_point_offset()));
-      __ movq(RBX, compiler::Address(
-                       THR, kPropagateErrorRuntimeEntry.OffsetFromThread()));
-      __ movq(CallingConventions::kArg1Reg, CallingConventions::kReturnReg);
-      __ call(temp);
-#if defined(DEBUG)
-      // We should never return with normal controlflow from this.
-      __ int3();
-#endif
-
-      __ Bind(&not_error);
-    }
   }
 
   // Pass the `saved_fp` reg. as a temp to clobber since we're done with it.
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index 0dcb431..6935a83 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -287,9 +287,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    864;
+    860;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    868;
+    864;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -312,7 +312,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 904;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 900;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -329,7 +329,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 908;
+    Thread_double_truncate_round_supported_offset = 904;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 940;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -347,7 +347,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    884;
+    880;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -369,11 +369,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    872;
+    868;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    900;
+    896;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 944;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -428,11 +428,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 876;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 872;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 880;
+    Thread_saved_shadow_call_stack_offset = 876;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    888;
+    884;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -453,25 +453,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 828;
+    Thread_suspend_state_await_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 824;
+    Thread_suspend_state_init_async_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 832;
+    Thread_suspend_state_return_async_entry_point_offset = 828;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 836;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 832;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 840;
+    Thread_suspend_state_init_async_star_entry_point_offset = 836;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 844;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 840;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 848;
+    Thread_suspend_state_return_async_star_entry_point_offset = 844;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 852;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 848;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 856;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 852;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 860;
+    Thread_suspend_state_handle_exception_entry_point_offset = 856;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -484,9 +484,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 892;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 888;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 896;
+    Thread_callback_stack_return_offset = 892;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 912;
 static constexpr dart::compiler::target::word Thread_random_offset = 920;
 static constexpr dart::compiler::target::word
@@ -576,7 +576,7 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        792, 796, 800, 804, 808, -1, 812, -1, 816, 820, -1, -1, -1, -1, -1, -1};
+        788, 792, 796, 800, 804, -1, 808, -1, 812, 816, -1, -1, -1, -1, -1, -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 16;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
 static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -949,9 +949,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1728;
+    1720;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1736;
+    1728;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -975,7 +975,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -988,13 +988,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1816;
+    Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1864;
+    Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -1010,7 +1010,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1768;
+    1760;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -1032,14 +1032,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1744;
+    1736;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -1092,11 +1092,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1752;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1760;
+    Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1776;
+    1768;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -1117,25 +1117,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1656;
+    Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1648;
+    Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1664;
+    Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1712;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -1149,14 +1149,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+    Thread_callback_stack_return_offset = 1784;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1816;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -1243,8 +1243,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -1614,9 +1614,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    832;
+    828;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    836;
+    832;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -1639,7 +1639,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 872;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 868;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -1656,7 +1656,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 876;
+    Thread_double_truncate_round_supported_offset = 872;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 908;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -1674,7 +1674,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    852;
+    848;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -1696,11 +1696,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    840;
+    836;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    868;
+    864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 912;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -1755,11 +1755,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 844;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 840;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 848;
+    Thread_saved_shadow_call_stack_offset = 844;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    856;
+    852;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -1780,25 +1780,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 796;
+    Thread_suspend_state_await_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 792;
+    Thread_suspend_state_init_async_entry_point_offset = 788;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 800;
+    Thread_suspend_state_return_async_entry_point_offset = 796;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 804;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 800;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 808;
+    Thread_suspend_state_init_async_star_entry_point_offset = 804;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 812;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 808;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 816;
+    Thread_suspend_state_return_async_star_entry_point_offset = 812;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 820;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 816;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 824;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 828;
+    Thread_suspend_state_handle_exception_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -1811,9 +1811,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 860;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 856;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 864;
+    Thread_callback_stack_return_offset = 860;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 880;
 static constexpr dart::compiler::target::word Thread_random_offset = 888;
 static constexpr dart::compiler::target::word
@@ -2273,9 +2273,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -2299,7 +2299,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -2312,13 +2312,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1928;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1920;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1888;
+    Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1936;
+    Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -2334,7 +2334,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -2356,14 +2356,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1816;
+    1808;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -2416,11 +2416,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1824;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1816;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1832;
+    Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1848;
+    1840;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -2441,25 +2441,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1728;
+    Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1720;
+    Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1736;
+    Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1784;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1776;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -2473,14 +2473,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1864;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1896;
-static constexpr dart::compiler::target::word Thread_random_offset = 1904;
+    Thread_callback_stack_return_offset = 1856;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1888;
+static constexpr dart::compiler::target::word Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1912;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1904;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -2567,9 +2567,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -2940,9 +2940,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1728;
+    1720;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1736;
+    1728;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -2966,7 +2966,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -2979,13 +2979,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1816;
+    Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1864;
+    Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -3001,7 +3001,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1768;
+    1760;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -3023,14 +3023,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1744;
+    1736;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -3083,11 +3083,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1752;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1760;
+    Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1776;
+    1768;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -3108,25 +3108,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1656;
+    Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1648;
+    Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1664;
+    Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1712;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -3140,14 +3140,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+    Thread_callback_stack_return_offset = 1784;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1816;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -3234,8 +3234,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -3606,9 +3606,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -3632,7 +3632,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -3645,13 +3645,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1928;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1920;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1888;
+    Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1936;
+    Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -3667,7 +3667,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -3689,14 +3689,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1816;
+    1808;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -3749,11 +3749,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1824;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1816;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1832;
+    Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1848;
+    1840;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -3774,25 +3774,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1728;
+    Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1720;
+    Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1736;
+    Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1784;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1776;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -3806,14 +3806,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1864;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1896;
-static constexpr dart::compiler::target::word Thread_random_offset = 1904;
+    Thread_callback_stack_return_offset = 1856;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1888;
+static constexpr dart::compiler::target::word Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1912;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1904;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -3900,9 +3900,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -4272,9 +4272,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    904;
+    900;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    908;
+    904;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -4297,7 +4297,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 944;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 940;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -4314,7 +4314,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 948;
+    Thread_double_truncate_round_supported_offset = 944;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 980;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -4332,7 +4332,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    924;
+    920;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -4354,11 +4354,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    912;
+    908;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    940;
+    936;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 984;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -4413,11 +4413,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 916;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 912;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 920;
+    Thread_saved_shadow_call_stack_offset = 916;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    928;
+    924;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -4438,25 +4438,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 868;
+    Thread_suspend_state_await_entry_point_offset = 864;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 864;
+    Thread_suspend_state_init_async_entry_point_offset = 860;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 872;
+    Thread_suspend_state_return_async_entry_point_offset = 868;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 876;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 872;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 880;
+    Thread_suspend_state_init_async_star_entry_point_offset = 876;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 884;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 880;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 888;
+    Thread_suspend_state_return_async_star_entry_point_offset = 884;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 892;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 888;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 896;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 892;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 900;
+    Thread_suspend_state_handle_exception_entry_point_offset = 896;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -4469,9 +4469,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 932;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 928;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 936;
+    Thread_callback_stack_return_offset = 932;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 952;
 static constexpr dart::compiler::target::word Thread_random_offset = 960;
 static constexpr dart::compiler::target::word
@@ -4561,9 +4561,9 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,  -1,  -1, -1, -1, 792, 796, 800, -1,  -1,  804,
-        808, 812, -1, -1, -1, 816, 820, 824, 828, 832, 836,
-        840, 844, -1, -1, -1, -1,  848, 852, 856, 860};
+        -1,  -1,  -1, -1, -1, 788, 792, 796, -1,  -1,  800,
+        804, 808, -1, -1, -1, 812, 816, 820, 824, 828, 832,
+        836, 840, -1, -1, -1, -1,  844, 848, 852, 856};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 16;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
 static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -4936,9 +4936,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1792;
+    1784;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -4962,7 +4962,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1864;
+    1856;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -4975,13 +4975,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1912;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1904;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1872;
+    Thread_double_truncate_round_supported_offset = 1864;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1920;
+    Thread_service_extension_stream_offset = 1912;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -4997,7 +4997,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -5019,14 +5019,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -5079,11 +5079,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1808;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1800;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1816;
+    Thread_saved_shadow_call_stack_offset = 1808;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1832;
+    1824;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -5104,25 +5104,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1712;
+    Thread_suspend_state_await_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1704;
+    Thread_suspend_state_init_async_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1720;
+    Thread_suspend_state_return_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1728;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1736;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1744;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1760;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1768;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1776;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -5136,14 +5136,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1848;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1880;
-static constexpr dart::compiler::target::word Thread_random_offset = 1888;
+    Thread_callback_stack_return_offset = 1840;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1872;
+static constexpr dart::compiler::target::word Thread_random_offset = 1880;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1896;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1888;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -5230,9 +5230,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,   -1,   -1, -1, -1, 1560, 1568, 1576, -1,   -1,   1584,
-        1592, 1600, -1, -1, -1, 1608, 1616, 1624, 1632, 1640, 1648,
-        1656, 1664, -1, -1, -1, -1,   1672, 1680, 1688, 1696};
+        -1,   -1,   -1, -1, -1, 1552, 1560, 1568, -1,   -1,   1576,
+        1584, 1592, -1, -1, -1, 1600, 1608, 1616, 1624, 1632, 1640,
+        1648, 1656, -1, -1, -1, -1,   1664, 1672, 1680, 1688};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -5596,9 +5596,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    864;
+    860;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    868;
+    864;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -5621,7 +5621,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 904;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 900;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -5638,7 +5638,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 908;
+    Thread_double_truncate_round_supported_offset = 904;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 940;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -5656,7 +5656,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    884;
+    880;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -5678,11 +5678,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    872;
+    868;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    900;
+    896;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 944;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -5737,11 +5737,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 876;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 872;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 880;
+    Thread_saved_shadow_call_stack_offset = 876;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    888;
+    884;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -5762,25 +5762,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 828;
+    Thread_suspend_state_await_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 824;
+    Thread_suspend_state_init_async_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 832;
+    Thread_suspend_state_return_async_entry_point_offset = 828;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 836;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 832;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 840;
+    Thread_suspend_state_init_async_star_entry_point_offset = 836;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 844;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 840;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 848;
+    Thread_suspend_state_return_async_star_entry_point_offset = 844;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 852;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 848;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 856;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 852;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 860;
+    Thread_suspend_state_handle_exception_entry_point_offset = 856;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -5793,9 +5793,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 892;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 888;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 896;
+    Thread_callback_stack_return_offset = 892;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 912;
 static constexpr dart::compiler::target::word Thread_random_offset = 920;
 static constexpr dart::compiler::target::word
@@ -5885,7 +5885,7 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        792, 796, 800, 804, 808, -1, 812, -1, 816, 820, -1, -1, -1, -1, -1, -1};
+        788, 792, 796, 800, 804, -1, 808, -1, 812, 816, -1, -1, -1, -1, -1, -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 16;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
 static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -6250,9 +6250,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1728;
+    1720;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1736;
+    1728;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -6276,7 +6276,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -6289,13 +6289,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1816;
+    Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1864;
+    Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -6311,7 +6311,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1768;
+    1760;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -6333,14 +6333,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1744;
+    1736;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -6393,11 +6393,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1752;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1760;
+    Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1776;
+    1768;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -6418,25 +6418,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1656;
+    Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1648;
+    Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1664;
+    Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1712;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -6450,14 +6450,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+    Thread_callback_stack_return_offset = 1784;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1816;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -6544,8 +6544,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -6907,9 +6907,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    832;
+    828;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    836;
+    832;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -6932,7 +6932,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 872;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 868;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -6949,7 +6949,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 876;
+    Thread_double_truncate_round_supported_offset = 872;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 908;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -6967,7 +6967,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    852;
+    848;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -6989,11 +6989,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    840;
+    836;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    868;
+    864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 912;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -7048,11 +7048,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 844;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 840;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 848;
+    Thread_saved_shadow_call_stack_offset = 844;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    856;
+    852;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -7073,25 +7073,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 796;
+    Thread_suspend_state_await_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 792;
+    Thread_suspend_state_init_async_entry_point_offset = 788;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 800;
+    Thread_suspend_state_return_async_entry_point_offset = 796;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 804;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 800;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 808;
+    Thread_suspend_state_init_async_star_entry_point_offset = 804;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 812;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 808;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 816;
+    Thread_suspend_state_return_async_star_entry_point_offset = 812;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 820;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 816;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 824;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 828;
+    Thread_suspend_state_handle_exception_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -7104,9 +7104,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 860;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 856;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 864;
+    Thread_callback_stack_return_offset = 860;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 880;
 static constexpr dart::compiler::target::word Thread_random_offset = 888;
 static constexpr dart::compiler::target::word
@@ -7558,9 +7558,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -7584,7 +7584,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -7597,13 +7597,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1928;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1920;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1888;
+    Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1936;
+    Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -7619,7 +7619,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -7641,14 +7641,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1816;
+    1808;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -7701,11 +7701,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1824;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1816;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1832;
+    Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1848;
+    1840;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -7726,25 +7726,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1728;
+    Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1720;
+    Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1736;
+    Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1784;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1776;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -7758,14 +7758,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1864;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1896;
-static constexpr dart::compiler::target::word Thread_random_offset = 1904;
+    Thread_callback_stack_return_offset = 1856;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1888;
+static constexpr dart::compiler::target::word Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1912;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1904;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -7852,9 +7852,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -8217,9 +8217,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1728;
+    1720;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1736;
+    1728;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -8243,7 +8243,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -8256,13 +8256,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1816;
+    Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1864;
+    Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -8278,7 +8278,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1768;
+    1760;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -8300,14 +8300,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1744;
+    1736;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -8360,11 +8360,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1752;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1760;
+    Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1776;
+    1768;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -8385,25 +8385,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1656;
+    Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1648;
+    Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1664;
+    Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1712;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -8417,14 +8417,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+    Thread_callback_stack_return_offset = 1784;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1816;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -8511,8 +8511,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -8875,9 +8875,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -8901,7 +8901,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -8914,13 +8914,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1928;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1920;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1888;
+    Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1936;
+    Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -8936,7 +8936,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -8958,14 +8958,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1816;
+    1808;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -9018,11 +9018,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1824;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1816;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1832;
+    Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1848;
+    1840;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -9043,25 +9043,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1728;
+    Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1720;
+    Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1736;
+    Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1784;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1776;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -9075,14 +9075,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1864;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1896;
-static constexpr dart::compiler::target::word Thread_random_offset = 1904;
+    Thread_callback_stack_return_offset = 1856;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1888;
+static constexpr dart::compiler::target::word Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1912;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1904;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -9169,9 +9169,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -9533,9 +9533,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    904;
+    900;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    908;
+    904;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -9558,7 +9558,7 @@
     Thread_allocate_object_slow_entry_point_offset = 324;
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 208;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 944;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 940;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -9575,7 +9575,7 @@
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 948;
+    Thread_double_truncate_round_supported_offset = 944;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 980;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -9593,7 +9593,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    924;
+    920;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -9615,11 +9615,11 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    912;
+    908;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    940;
+    936;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 984;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
@@ -9674,11 +9674,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 112;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 916;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 912;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 920;
+    Thread_saved_shadow_call_stack_offset = 916;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    928;
+    924;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -9699,25 +9699,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     76;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 868;
+    Thread_suspend_state_await_entry_point_offset = 864;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 864;
+    Thread_suspend_state_init_async_entry_point_offset = 860;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 872;
+    Thread_suspend_state_return_async_entry_point_offset = 868;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 876;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 872;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 880;
+    Thread_suspend_state_init_async_star_entry_point_offset = 876;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 884;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 880;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 888;
+    Thread_suspend_state_return_async_star_entry_point_offset = 884;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 892;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 888;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 896;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 892;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 900;
+    Thread_suspend_state_handle_exception_entry_point_offset = 896;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word Thread_top_offset = 48;
@@ -9730,9 +9730,9 @@
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     32;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 932;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 928;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 936;
+    Thread_callback_stack_return_offset = 932;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset = 952;
 static constexpr dart::compiler::target::word Thread_random_offset = 960;
 static constexpr dart::compiler::target::word
@@ -9822,9 +9822,9 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,  -1,  -1, -1, -1, 792, 796, 800, -1,  -1,  804,
-        808, 812, -1, -1, -1, 816, 820, 824, 828, 832, 836,
-        840, 844, -1, -1, -1, -1,  848, 852, 856, 860};
+        -1,  -1,  -1, -1, -1, 788, 792, 796, -1,  -1,  800,
+        804, 808, -1, -1, -1, 812, 816, 820, 824, 828, 832,
+        836, 840, -1, -1, -1, -1,  844, 848, 852, 856};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 16;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
 static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -10189,9 +10189,9 @@
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1792;
+    1784;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -10215,7 +10215,7 @@
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1864;
+    1856;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -10228,13 +10228,13 @@
     Thread_call_to_runtime_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1912;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1904;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1872;
+    Thread_double_truncate_round_supported_offset = 1864;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 1920;
+    Thread_service_extension_stream_offset = 1912;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 488;
@@ -10250,7 +10250,7 @@
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -10272,14 +10272,14 @@
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1800;
+    1792;
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     128;
 static constexpr dart::compiler::target::word
@@ -10332,11 +10332,11 @@
 static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
 static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1808;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1800;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1816;
+    Thread_saved_shadow_call_stack_offset = 1808;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    1832;
+    1824;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -10357,25 +10357,25 @@
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
     152;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 1712;
+    Thread_suspend_state_await_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 1704;
+    Thread_suspend_state_init_async_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 1720;
+    Thread_suspend_state_return_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 1728;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 1736;
+    Thread_suspend_state_init_async_star_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 1744;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 1752;
+    Thread_suspend_state_return_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 1760;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1768;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 1776;
+    Thread_suspend_state_handle_exception_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word Thread_top_offset = 96;
@@ -10389,14 +10389,14 @@
     64;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1848;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1880;
-static constexpr dart::compiler::target::word Thread_random_offset = 1888;
+    Thread_callback_stack_return_offset = 1840;
+static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1872;
+static constexpr dart::compiler::target::word Thread_random_offset = 1880;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 688;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1896;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1888;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -10483,9 +10483,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,   -1,   -1, -1, -1, 1560, 1568, 1576, -1,   -1,   1584,
-        1592, 1600, -1, -1, -1, 1608, 1616, 1624, 1632, 1640, 1648,
-        1656, 1664, -1, -1, -1, -1,   1672, 1680, 1688, 1696};
+        -1,   -1,   -1, -1, -1, 1552, 1560, 1568, -1,   -1,   1576,
+        1584, 1592, -1, -1, -1, 1600, 1608, 1616, 1624, 1632, 1640,
+        1648, 1656, -1, -1, -1, -1,   1664, 1672, 1680, 1688};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 32;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -10884,9 +10884,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 864;
+    AOT_Thread_active_exception_offset = 860;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 868;
+    AOT_Thread_active_stacktrace_offset = 864;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -10910,7 +10910,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 208;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    904;
+    900;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -10929,7 +10929,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 908;
+    AOT_Thread_double_truncate_round_supported_offset = 904;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 940;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -10948,7 +10948,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 884;
+    AOT_Thread_execution_state_offset = 880;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -10970,11 +10970,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 872;
+    AOT_Thread_global_object_pool_offset = 868;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 900;
+    AOT_Thread_exit_through_ffi_offset = 896;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     944;
@@ -11033,11 +11033,11 @@
     112;
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 876;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 872;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 880;
+    AOT_Thread_saved_shadow_call_stack_offset = 876;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 888;
+    AOT_Thread_safepoint_state_offset = 884;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -11059,26 +11059,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 828;
+    AOT_Thread_suspend_state_await_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 824;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 832;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 828;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 836;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 832;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 840;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 836;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 844;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 848;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 844;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 852;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 848;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        856;
+        852;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 860;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 856;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
@@ -11093,9 +11093,9 @@
     AOT_Thread_write_barrier_mask_offset = 32;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    892;
+    888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 896;
+    AOT_Thread_callback_stack_return_offset = 892;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
     912;
 static constexpr dart::compiler::target::word AOT_Thread_random_offset = 920;
@@ -11205,7 +11205,7 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        792, 796, 800, 804, 808, -1, 812, -1, 816, 820, -1, -1, -1, -1, -1, -1};
+        788, 792, 796, 800, 804, -1, 808, -1, 812, 816, -1, -1, -1, -1, -1, -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     16;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -11619,9 +11619,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1728;
+    AOT_Thread_active_exception_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1736;
+    AOT_Thread_active_stacktrace_offset = 1728;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -11645,7 +11645,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -11660,13 +11660,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1816;
+    AOT_Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1864;
+    AOT_Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -11683,7 +11683,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1768;
+    AOT_Thread_execution_state_offset = 1760;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -11705,14 +11705,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1744;
+    AOT_Thread_global_object_pool_offset = 1736;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1800;
+    AOT_Thread_exit_through_ffi_offset = 1792;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -11769,11 +11769,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1752;
+    1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1760;
+    AOT_Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1776;
+    AOT_Thread_safepoint_state_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -11795,26 +11795,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1656;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1648;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1664;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1712;
+        1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -11829,16 +11829,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1792;
+    AOT_Thread_callback_stack_return_offset = 1784;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+    1816;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -11942,8 +11942,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -12360,9 +12360,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1800;
+    AOT_Thread_active_exception_offset = 1792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1808;
+    AOT_Thread_active_stacktrace_offset = 1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -12386,7 +12386,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -12401,13 +12401,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1888;
+    AOT_Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1936;
+    AOT_Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -12424,7 +12424,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1840;
+    AOT_Thread_execution_state_offset = 1832;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -12446,14 +12446,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1816;
+    AOT_Thread_global_object_pool_offset = 1808;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1872;
+    AOT_Thread_exit_through_ffi_offset = 1864;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -12510,11 +12510,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1832;
+    AOT_Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1848;
+    AOT_Thread_safepoint_state_offset = 1840;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -12536,26 +12536,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1784;
+        1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -12570,16 +12570,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1864;
+    AOT_Thread_callback_stack_return_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1896;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1904;
+    1888;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -12683,9 +12683,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -13099,9 +13099,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1728;
+    AOT_Thread_active_exception_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1736;
+    AOT_Thread_active_stacktrace_offset = 1728;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -13125,7 +13125,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -13140,13 +13140,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1816;
+    AOT_Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1864;
+    AOT_Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -13163,7 +13163,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1768;
+    AOT_Thread_execution_state_offset = 1760;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -13185,14 +13185,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1744;
+    AOT_Thread_global_object_pool_offset = 1736;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1800;
+    AOT_Thread_exit_through_ffi_offset = 1792;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -13249,11 +13249,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1752;
+    1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1760;
+    AOT_Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1776;
+    AOT_Thread_safepoint_state_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -13275,26 +13275,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1656;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1648;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1664;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1712;
+        1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -13309,16 +13309,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1792;
+    AOT_Thread_callback_stack_return_offset = 1784;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+    1816;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -13422,8 +13422,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -13837,9 +13837,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1800;
+    AOT_Thread_active_exception_offset = 1792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1808;
+    AOT_Thread_active_stacktrace_offset = 1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -13863,7 +13863,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -13878,13 +13878,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1888;
+    AOT_Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1936;
+    AOT_Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -13901,7 +13901,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1840;
+    AOT_Thread_execution_state_offset = 1832;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -13923,14 +13923,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1816;
+    AOT_Thread_global_object_pool_offset = 1808;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1872;
+    AOT_Thread_exit_through_ffi_offset = 1864;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -13987,11 +13987,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1832;
+    AOT_Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1848;
+    AOT_Thread_safepoint_state_offset = 1840;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -14013,26 +14013,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1784;
+        1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -14047,16 +14047,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1864;
+    AOT_Thread_callback_stack_return_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1896;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1904;
+    1888;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -14160,9 +14160,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -14574,9 +14574,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 904;
+    AOT_Thread_active_exception_offset = 900;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 908;
+    AOT_Thread_active_stacktrace_offset = 904;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -14600,7 +14600,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 208;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    944;
+    940;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -14619,7 +14619,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 948;
+    AOT_Thread_double_truncate_round_supported_offset = 944;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 980;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -14638,7 +14638,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 924;
+    AOT_Thread_execution_state_offset = 920;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -14660,11 +14660,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 912;
+    AOT_Thread_global_object_pool_offset = 908;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 940;
+    AOT_Thread_exit_through_ffi_offset = 936;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     984;
@@ -14723,11 +14723,11 @@
     112;
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 916;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 912;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 920;
+    AOT_Thread_saved_shadow_call_stack_offset = 916;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 928;
+    AOT_Thread_safepoint_state_offset = 924;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -14749,26 +14749,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 868;
+    AOT_Thread_suspend_state_await_entry_point_offset = 864;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 864;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 860;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 872;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 868;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 876;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 872;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 880;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 876;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 884;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 888;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 884;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 892;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 888;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        896;
+        892;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 900;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 896;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
@@ -14783,9 +14783,9 @@
     AOT_Thread_write_barrier_mask_offset = 32;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    932;
+    928;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 936;
+    AOT_Thread_callback_stack_return_offset = 932;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
     952;
 static constexpr dart::compiler::target::word AOT_Thread_random_offset = 960;
@@ -14895,9 +14895,9 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,  -1,  -1, -1, -1, 792, 796, 800, -1,  -1,  804,
-        808, 812, -1, -1, -1, 816, 820, 824, 828, 832, 836,
-        840, 844, -1, -1, -1, -1,  848, 852, 856, 860};
+        -1,  -1,  -1, -1, -1, 788, 792, 796, -1,  -1,  800,
+        804, 808, -1, -1, -1, 812, 816, 820, 824, 828, 832,
+        836, 840, -1, -1, -1, -1,  844, 848, 852, 856};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     16;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -15311,9 +15311,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1784;
+    AOT_Thread_active_exception_offset = 1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1792;
+    AOT_Thread_active_stacktrace_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -15337,7 +15337,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1864;
+    1856;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -15352,13 +15352,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1872;
+    AOT_Thread_double_truncate_round_supported_offset = 1864;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1920;
+    AOT_Thread_service_extension_stream_offset = 1912;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -15375,7 +15375,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1824;
+    AOT_Thread_execution_state_offset = 1816;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -15397,14 +15397,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1800;
+    AOT_Thread_global_object_pool_offset = 1792;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1856;
+    AOT_Thread_exit_through_ffi_offset = 1848;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -15461,11 +15461,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1816;
+    AOT_Thread_saved_shadow_call_stack_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1832;
+    AOT_Thread_safepoint_state_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -15487,26 +15487,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1712;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1768;
+        1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -15521,16 +15521,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1848;
+    AOT_Thread_callback_stack_return_offset = 1840;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1880;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1888;
+    1872;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1880;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1896;
+    1888;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -15634,9 +15634,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,   -1,   -1, -1, -1, 1560, 1568, 1576, -1,   -1,   1584,
-        1592, 1600, -1, -1, -1, 1608, 1616, 1624, 1632, 1640, 1648,
-        1656, 1664, -1, -1, -1, -1,   1672, 1680, 1688, 1696};
+        -1,   -1,   -1, -1, -1, 1552, 1560, 1568, -1,   -1,   1576,
+        1584, 1592, -1, -1, -1, 1600, 1608, 1616, 1624, 1632, 1640,
+        1648, 1656, -1, -1, -1, -1,   1664, 1672, 1680, 1688};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -16041,9 +16041,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 864;
+    AOT_Thread_active_exception_offset = 860;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 868;
+    AOT_Thread_active_stacktrace_offset = 864;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -16067,7 +16067,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 208;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    904;
+    900;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -16086,7 +16086,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 908;
+    AOT_Thread_double_truncate_round_supported_offset = 904;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 940;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -16105,7 +16105,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 884;
+    AOT_Thread_execution_state_offset = 880;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -16127,11 +16127,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 872;
+    AOT_Thread_global_object_pool_offset = 868;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 900;
+    AOT_Thread_exit_through_ffi_offset = 896;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     944;
@@ -16190,11 +16190,11 @@
     112;
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 876;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 872;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 880;
+    AOT_Thread_saved_shadow_call_stack_offset = 876;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 888;
+    AOT_Thread_safepoint_state_offset = 884;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -16216,26 +16216,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 828;
+    AOT_Thread_suspend_state_await_entry_point_offset = 824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 824;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 820;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 832;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 828;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 836;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 832;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 840;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 836;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 844;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 848;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 844;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 852;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 848;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        856;
+        852;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 860;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 856;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
@@ -16250,9 +16250,9 @@
     AOT_Thread_write_barrier_mask_offset = 32;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    892;
+    888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 896;
+    AOT_Thread_callback_stack_return_offset = 892;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
     912;
 static constexpr dart::compiler::target::word AOT_Thread_random_offset = 920;
@@ -16362,7 +16362,7 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        792, 796, 800, 804, 808, -1, 812, -1, 816, 820, -1, -1, -1, -1, -1, -1};
+        788, 792, 796, 800, 804, -1, 808, -1, 812, 816, -1, -1, -1, -1, -1, -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     16;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -16767,9 +16767,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1728;
+    AOT_Thread_active_exception_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1736;
+    AOT_Thread_active_stacktrace_offset = 1728;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -16793,7 +16793,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -16808,13 +16808,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1816;
+    AOT_Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1864;
+    AOT_Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -16831,7 +16831,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1768;
+    AOT_Thread_execution_state_offset = 1760;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -16853,14 +16853,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1744;
+    AOT_Thread_global_object_pool_offset = 1736;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1800;
+    AOT_Thread_exit_through_ffi_offset = 1792;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -16917,11 +16917,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1752;
+    1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1760;
+    AOT_Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1776;
+    AOT_Thread_safepoint_state_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -16943,26 +16943,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1656;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1648;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1664;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1712;
+        1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -16977,16 +16977,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1792;
+    AOT_Thread_callback_stack_return_offset = 1784;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+    1816;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -17090,8 +17090,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -17499,9 +17499,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1800;
+    AOT_Thread_active_exception_offset = 1792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1808;
+    AOT_Thread_active_stacktrace_offset = 1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -17525,7 +17525,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -17540,13 +17540,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1888;
+    AOT_Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1936;
+    AOT_Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -17563,7 +17563,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1840;
+    AOT_Thread_execution_state_offset = 1832;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -17585,14 +17585,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1816;
+    AOT_Thread_global_object_pool_offset = 1808;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1872;
+    AOT_Thread_exit_through_ffi_offset = 1864;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -17649,11 +17649,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1832;
+    AOT_Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1848;
+    AOT_Thread_safepoint_state_offset = 1840;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -17675,26 +17675,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1784;
+        1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -17709,16 +17709,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1864;
+    AOT_Thread_callback_stack_return_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1896;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1904;
+    1888;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -17822,9 +17822,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -18229,9 +18229,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1728;
+    AOT_Thread_active_exception_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1736;
+    AOT_Thread_active_stacktrace_offset = 1728;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -18255,7 +18255,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -18270,13 +18270,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1816;
+    AOT_Thread_double_truncate_round_supported_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1864;
+    AOT_Thread_service_extension_stream_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -18293,7 +18293,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1768;
+    AOT_Thread_execution_state_offset = 1760;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -18315,14 +18315,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1744;
+    AOT_Thread_global_object_pool_offset = 1736;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1800;
+    AOT_Thread_exit_through_ffi_offset = 1792;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1872;
+    1864;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -18379,11 +18379,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1752;
+    1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1760;
+    AOT_Thread_saved_shadow_call_stack_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1776;
+    AOT_Thread_safepoint_state_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -18405,26 +18405,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1656;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1648;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1664;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1656;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1672;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1680;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1672;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1688;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1696;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1712;
+        1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -18439,16 +18439,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1784;
+    1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1792;
+    AOT_Thread_callback_stack_return_offset = 1784;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+    1816;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -18552,8 +18552,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, -1,   -1,   1592, 1600,
-        1608, 1616, 1624, -1,   1632, 1640, -1,   -1};
+        1552, 1560, 1568, 1576, -1,   -1,   1584, 1592,
+        1600, 1608, 1616, -1,   1624, 1632, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -18958,9 +18958,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1800;
+    AOT_Thread_active_exception_offset = 1792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1808;
+    AOT_Thread_active_stacktrace_offset = 1800;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -18984,7 +18984,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1880;
+    1872;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -18999,13 +18999,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1888;
+    AOT_Thread_double_truncate_round_supported_offset = 1880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1936;
+    AOT_Thread_service_extension_stream_offset = 1928;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19022,7 +19022,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1840;
+    AOT_Thread_execution_state_offset = 1832;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -19044,14 +19044,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1816;
+    AOT_Thread_global_object_pool_offset = 1808;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1872;
+    AOT_Thread_exit_through_ffi_offset = 1864;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1944;
+    1936;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -19108,11 +19108,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1824;
+    1816;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1832;
+    AOT_Thread_saved_shadow_call_stack_offset = 1824;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1848;
+    AOT_Thread_safepoint_state_offset = 1840;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -19134,26 +19134,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1768;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1784;
+        1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1792;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -19168,16 +19168,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1856;
+    1848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1864;
+    AOT_Thread_callback_stack_return_offset = 1856;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1896;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1904;
+    1888;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1896;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -19281,9 +19281,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632, 1640,
-        1648, 1656, 1664, 1672, -1,   -1,   -1,   -1,   1680, 1688, -1,
-        -1,   1696, 1704, 1712, -1,   -1,   -1,   -1,   -1,   -1};
+        1552, 1560, 1568, 1576, 1584, 1592, 1600, 1608, 1616, 1624, 1632,
+        1640, 1648, 1656, 1664, -1,   -1,   -1,   -1,   1672, 1680, -1,
+        -1,   1688, 1696, 1704, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -19686,9 +19686,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 904;
+    AOT_Thread_active_exception_offset = 900;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 908;
+    AOT_Thread_active_stacktrace_offset = 904;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 300;
 static constexpr dart::compiler::target::word
@@ -19712,7 +19712,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 208;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    944;
+    940;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 212;
 static constexpr dart::compiler::target::word
@@ -19731,7 +19731,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 948;
+    AOT_Thread_double_truncate_round_supported_offset = 944;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 980;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -19750,7 +19750,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 280;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 924;
+    AOT_Thread_execution_state_offset = 920;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 284;
 static constexpr dart::compiler::target::word
@@ -19772,11 +19772,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 404;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 912;
+    AOT_Thread_global_object_pool_offset = 908;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 136;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 940;
+    AOT_Thread_exit_through_ffi_offset = 936;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     984;
@@ -19835,11 +19835,11 @@
     112;
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 376;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 916;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 912;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 920;
+    AOT_Thread_saved_shadow_call_stack_offset = 916;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 928;
+    AOT_Thread_safepoint_state_offset = 924;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 272;
 static constexpr dart::compiler::target::word
@@ -19861,26 +19861,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 868;
+    AOT_Thread_suspend_state_await_entry_point_offset = 864;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 864;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 860;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 872;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 868;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 876;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 872;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 880;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 876;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 884;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 880;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 888;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 884;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 892;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 888;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        896;
+        892;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 900;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 896;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
@@ -19895,9 +19895,9 @@
     AOT_Thread_write_barrier_mask_offset = 32;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    932;
+    928;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 936;
+    AOT_Thread_callback_stack_return_offset = 932;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
     952;
 static constexpr dart::compiler::target::word AOT_Thread_random_offset = 960;
@@ -20007,9 +20007,9 @@
     4, 12, 8, 16};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,  -1,  -1, -1, -1, 792, 796, 800, -1,  -1,  804,
-        808, 812, -1, -1, -1, 816, 820, 824, 828, 832, 836,
-        840, 844, -1, -1, -1, -1,  848, 852, 856, 860};
+        -1,  -1,  -1, -1, -1, 788, 792, 796, -1,  -1,  800,
+        804, 808, -1, -1, -1, 812, 816, 820, 824, 828, 832,
+        836, 840, -1, -1, -1, -1,  844, 848, 852, 856};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     16;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -20414,9 +20414,9 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 792;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1784;
+    AOT_Thread_active_exception_offset = 1776;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1792;
+    AOT_Thread_active_stacktrace_offset = 1784;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
@@ -20440,7 +20440,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_stub_offset = 392;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1864;
+    1856;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 400;
 static constexpr dart::compiler::target::word
@@ -20455,13 +20455,13 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 256;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    1912;
+    1904;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1872;
+    AOT_Thread_double_truncate_round_supported_offset = 1864;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 1920;
+    AOT_Thread_service_extension_stream_offset = 1912;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     664;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -20478,7 +20478,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1824;
+    AOT_Thread_execution_state_offset = 1816;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 544;
 static constexpr dart::compiler::target::word
@@ -20500,14 +20500,14 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 784;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1800;
+    AOT_Thread_global_object_pool_offset = 1792;
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 248;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1856;
+    AOT_Thread_exit_through_ffi_offset = 1848;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1928;
+    1920;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
@@ -20564,11 +20564,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_predefined_symbols_address_offset = 728;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1808;
+    1800;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1816;
+    AOT_Thread_saved_shadow_call_stack_offset = 1808;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1832;
+    AOT_Thread_safepoint_state_offset = 1824;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 520;
 static constexpr dart::compiler::target::word
@@ -20590,26 +20590,26 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 1712;
+    AOT_Thread_suspend_state_await_entry_point_offset = 1704;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 1704;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 1696;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 1720;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 1712;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1728;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 1720;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1736;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 1728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1744;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 1736;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1752;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 1744;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1760;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 1752;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        1768;
+        1760;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1776;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 1768;
 static constexpr dart::compiler::target::word
     AOT_Thread_top_exit_frame_info_offset = 144;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
@@ -20624,16 +20624,16 @@
     AOT_Thread_write_barrier_mask_offset = 64;
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1840;
+    1832;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1848;
+    AOT_Thread_callback_stack_return_offset = 1840;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    1880;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1888;
+    1872;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1880;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 688;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    1896;
+    1888;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0;
 static constexpr dart::compiler::target::word
@@ -20737,9 +20737,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,   -1,   -1, -1, -1, 1560, 1568, 1576, -1,   -1,   1584,
-        1592, 1600, -1, -1, -1, 1608, 1616, 1624, 1632, 1640, 1648,
-        1656, 1664, -1, -1, -1, -1,   1672, 1680, 1688, 1696};
+        -1,   -1,   -1, -1, -1, 1552, 1560, 1568, -1,   -1,   1576,
+        1584, 1592, -1, -1, -1, 1600, 1608, 1616, 1624, 1632, 1640,
+        1648, 1656, -1, -1, -1, -1,   1664, 1672, 1680, 1688};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     32;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index dfd073d..b9b3909 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -3902,32 +3902,6 @@
     false /* is_float */,
     reinterpret_cast<RuntimeFunction>(&DLRT_AllocateHandle));
 
-// Enables reusing `Dart_PropagateError` from `FfiCallInstr`.
-// `Dart_PropagateError` requires the native state and transitions into the VM.
-// So the flow is:
-// - FfiCallInstr (slow path)
-// - TransitionGeneratedToNative
-// - DLRT_PropagateError (this)
-// - Dart_PropagateError
-// - TransitionNativeToVM
-// - Throw
-extern "C" void DLRT_PropagateError(Dart_Handle handle) {
-  CHECK_STACK_ALIGNMENT;
-  TRACE_RUNTIME_CALL("PropagateError %p", handle);
-  ASSERT(Thread::Current()->execution_state() == Thread::kThreadInNative);
-  ASSERT(Dart_IsError(handle));
-  Dart_PropagateError(handle);
-  // We should never exit through normal control flow.
-  UNREACHABLE();
-}
-
-// Not a leaf-function, throws error.
-DEFINE_RAW_LEAF_RUNTIME_ENTRY(
-    PropagateError,
-    1,
-    false /* is_float */,
-    reinterpret_cast<RuntimeFunction>(&DLRT_PropagateError));
-
 #if defined(USING_MEMORY_SANITIZER)
 #define MSAN_UNPOISON_RANGE reinterpret_cast<RuntimeFunction>(&__msan_unpoison)
 #define MSAN_UNPOISON_PARAM                                                    \
diff --git a/runtime/vm/runtime_entry_list.h b/runtime/vm/runtime_entry_list.h
index f7c437e..5f94bf8 100644
--- a/runtime/vm/runtime_entry_list.h
+++ b/runtime/vm/runtime_entry_list.h
@@ -107,7 +107,6 @@
   V(ApiLocalScope*, EnterHandleScope, Thread*)                                 \
   V(void, ExitHandleScope, Thread*)                                            \
   V(LocalHandle*, AllocateHandle, ApiLocalScope*)                              \
-  V(void, PropagateError, Dart_Handle)                                         \
   V(void, MsanUnpoison, void*, size_t)                                         \
   V(void, MsanUnpoisonParam, size_t)                                           \
   V(void, TsanLoadAcquire, void*)                                              \
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index 3d8e493..6a07342 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -446,10 +446,10 @@
   enum {
     // Always true in generated state.
     kDidNotExit = 0,
-    // The VM exited the generated state through FFI.
+    // The VM did exit the generated state through FFI.
     // This can be true in both native and VM state.
     kExitThroughFfi = 1,
-    // The VM exited the generated state through a runtime call.
+    // The VM exited the generated state through FFI.
     // This can be true in both native and VM state.
     kExitThroughRuntimeCall = 2,
   };
diff --git a/tests/ffi/vmspecific_handle_test.dart b/tests/ffi/vmspecific_handle_test.dart
index 9bbf0bc..00ec530 100644
--- a/tests/ffi/vmspecific_handle_test.dart
+++ b/tests/ffi/vmspecific_handle_test.dart
@@ -23,7 +23,6 @@
   testNull();
   testDeepRecursive();
   testNoHandlePropagateError();
-  testThrowOnReturnOfError();
 }
 
 void testHandle() {
@@ -225,21 +224,6 @@
   bool throws = false;
   try {
     final result = propagateErrorWithoutHandle(exceptionHandleCallbackPointer);
-    print(result.runtimeType);
-    print(result);
-  } catch (e) {
-    throws = true;
-    print("caught ($e, ${e.runtimeType})");
-    Expect.isTrue(identical(someException, e));
-  }
-  Expect.isTrue(throws);
-}
-
-void testThrowOnReturnOfError() {
-  bool throws = false;
-  try {
-    final result = autoPropagateErrorInHandle(exceptionHandleCallbackPointer);
-    print(result.runtimeType);
     print(result);
   } catch (e) {
     throws = true;
@@ -281,8 +265,3 @@
         Int64 Function(Pointer<NativeFunction<Handle Function()>>),
         int Function(Pointer<NativeFunction<Handle Function()>>)>(
     "PropagateErrorWithoutHandle");
-
-final autoPropagateErrorInHandle = testLibrary.lookupFunction<
-    Handle Function(Pointer<NativeFunction<Handle Function()>>),
-    Object Function(
-        Pointer<NativeFunction<Handle Function()>>)>("ThrowOnReturnOfError");