diff --git a/pkg/dart2bytecode/lib/bytecode_generator.dart b/pkg/dart2bytecode/lib/bytecode_generator.dart
index 7d49d42f3df..7094ffacecc 100644
--- a/pkg/dart2bytecode/lib/bytecode_generator.dart
+++ b/pkg/dart2bytecode/lib/bytecode_generator.dart
@@ -1479,12 +1479,8 @@ class BytecodeGenerator extends RecursiveVisitor {
     }
     if (condition is EqualsNull) {
       _generateNode(condition.expression);
-      if (options.emitDebuggerStops &&
-          condition.fileOffset != TreeNode.noOffset) {
-        final savedSourcePosition = asm.currentSourcePosition;
-        _recordSourcePosition(condition.fileOffset);
-        asm.emitDebugCheck();
-        asm.currentSourcePosition = savedSourcePosition;
+      if (condition.fileOffset != TreeNode.noOffset) {
+        _emitLocalSourcePosition(condition.fileOffset);
       }
       if (value) {
         asm.emitJumpIfNull(dest);
@@ -1631,23 +1627,20 @@ class BytecodeGenerator extends RecursiveVisitor {
     savedAssemblers = null;
     currentLoopDepth = 0;
     savedMaxSourcePositions = <int>[];
-    maxSourcePosition = node.fileOffset;
+    if (node is Procedure) {
+      maxSourcePosition = node.fileStartOffset;
+    } else if (node is Constructor) {
+      maxSourcePosition = node.startFileOffset;
+    } else {
+      maxSourcePosition = node.fileOffset;
+    }
 
     locals = new LocalVariables(node, options, staticTypeContext);
     locals.enterScope(node);
 
-    int position;
-    if (node is Procedure) {
-      position = node.fileStartOffset;
-    } else if (node is Constructor) {
-      position = node.startFileOffset;
-    } else {
-      position = node.fileOffset;
-    }
-    _recordSourcePosition(position);
     _genPrologue(node, node.function);
     _setupInitialContext(node.function);
-    _emitFirstDebugCheck(node.function);
+    _emitFirstDebugCheck(node, node.function);
     _genEqualsOperatorNullHandling(node);
     if (node is Procedure && node.isInstanceMember) {
       _checkArguments(node.function);
@@ -1864,7 +1857,7 @@ class BytecodeGenerator extends RecursiveVisitor {
     return localVariables;
   }
 
-  void _genPrologue(Node node, FunctionNode? function) {
+  void _genPrologue(TreeNode node, FunctionNode? function) {
     if (locals.makesCopyOfParameters) {
       final int numOptionalPositional = function!.positionalParameters.length -
           function.requiredParameterCount;
@@ -1957,6 +1950,7 @@ class BytecodeGenerator extends RecursiveVisitor {
 
     // CheckStack must see a properly initialized context when stress-testing
     // stack trace collection.
+    _recordInitialSourcePositionForFunction(node, function);
     asm.emitCheckStack(0);
 
     if (locals.hasFunctionTypeArgsVar && isClosure) {
@@ -2047,25 +2041,31 @@ class BytecodeGenerator extends RecursiveVisitor {
     }
   }
 
-  void _emitFirstDebugCheck(FunctionNode? function) {
+  int _initialSourcePositionForFunction(TreeNode node, FunctionNode? function) {
+    // The debugger expects the initial source position to correspond to the
+    // declaration position of the last parameter, if any, or of the function.
+    if (function?.namedParameters.isNotEmpty ?? false) {
+      return function!.namedParameters.last.fileOffset;
+    } else if (function?.positionalParameters.isNotEmpty ?? false) {
+      return function!.positionalParameters.last.fileOffset;
+    } else if (function != null) {
+      return function.fileOffset;
+    } else {
+      return node.fileOffset;
+    }
+  }
+
+  void _recordInitialSourcePositionForFunction(
+      TreeNode node, FunctionNode? function) {
+    _recordSourcePosition(_initialSourcePositionForFunction(node, function));
+  }
+
+  void _emitFirstDebugCheck(TreeNode node, FunctionNode? function) {
     if (options.emitDebuggerStops) {
       // DebugCheck instruction should be emitted after parameter variables
       // are declared and copied into context.
-      // The debugger expects the source position to correspond to the
-      // declaration position of the last parameter, if any, or of the function.
       // The DebugCheck must be encountered each time an async op is reentered.
-      if (options.emitSourcePositions && function != null) {
-        var pos = TreeNode.noOffset;
-        if (function.namedParameters.isNotEmpty) {
-          pos = function.namedParameters.last.fileOffset;
-        } else if (function.positionalParameters.isNotEmpty) {
-          pos = function.positionalParameters.last.fileOffset;
-        }
-        if (pos == TreeNode.noOffset) {
-          pos = function.fileOffset;
-        }
-        _recordSourcePosition(pos);
-      }
+      _recordInitialSourcePositionForFunction(node, function);
       asm.emitDebugCheck();
     }
   }
@@ -2411,11 +2411,10 @@ class BytecodeGenerator extends RecursiveVisitor {
 
     final int closureFunctionIndex = cp.addClosureFunction(closureIndex);
 
-    _recordSourcePosition(function.fileOffset);
+    maxSourcePosition = math.max(maxSourcePosition, function.fileOffset);
     _genPrologue(node, function);
-
     _setupInitialContext(function);
-    _emitFirstDebugCheck(function);
+    _emitFirstDebugCheck(node, function);
     _checkArguments(function);
     _initSuspendableFunction(function);
 
@@ -2685,6 +2684,26 @@ class BytecodeGenerator extends RecursiveVisitor {
     continuation();
   }
 
+  // Emits a source position entry and/or debugger stop as appropriate.
+  void _emitSourcePosition() {
+    if (options.emitSourcePositions) {
+      asm.emitSourcePosition();
+    }
+    if (options.emitDebuggerStops) {
+      asm.emitDebugCheck();
+    }
+  }
+
+  // Records the given file offset as the current source position and
+  // emits a source position entry and/or debugger stop as appropriate,
+  // restoring the current source position afterwards.
+  void _emitLocalSourcePosition(int fileOffset) {
+    final savedSourcePosition = asm.currentSourcePosition;
+    _recordSourcePosition(fileOffset);
+    _emitSourcePosition();
+    asm.currentSourcePosition = savedSourcePosition;
+  }
+
   /// Generates non-local transfer from inner node [from] into the outer
   /// node, executing finally blocks on the way out. [to] can be null,
   /// in such case all enclosing finally blocks are executed.
@@ -2692,9 +2711,7 @@ class BytecodeGenerator extends RecursiveVisitor {
   /// the last finally block.
   void _generateNonLocalControlTransfer(
       TreeNode from, TreeNode to, GenerateContinuation continuation) {
-    if (options.emitDebuggerStops && from.fileOffset != TreeNode.noOffset) {
-      asm.emitDebugCheck(); // Before context is unwound.
-    }
+    _emitLocalSourcePosition(from.fileOffset);
     List<TryFinally> tryFinallyBlocks = _getEnclosingTryFinallyBlocks(from, to);
     _addFinallyBlocks(tryFinallyBlocks, continuation);
   }
@@ -3389,9 +3406,8 @@ class BytecodeGenerator extends RecursiveVisitor {
     }
     tryCatches![tryCatch]!.needsStackTrace = true;
 
-    if (options.emitDebuggerStops) {
-      asm.emitDebugCheck(); // Allow breakpoint on explicit rethrow statement.
-    }
+    // Allow breakpoint on explicit rethrow statement.
+    _emitSourcePosition();
     _genRethrow(tryCatch);
   }
 
@@ -3505,9 +3521,8 @@ class BytecodeGenerator extends RecursiveVisitor {
 
     final target = node.target;
     if (target is Field && !_needsSetter(target)) {
-      if (options.emitDebuggerStops &&
-          _variableSetNeedsDebugCheck(node.value)) {
-        asm.emitDebugCheck();
+      if (_variableSetNeedsDebugCheck(node.value)) {
+        _emitSourcePosition();
       }
       int cpIndex = cp.addStaticField(target);
       asm.emitStoreStaticTOS(cpIndex);
@@ -3562,9 +3577,7 @@ class BytecodeGenerator extends RecursiveVisitor {
   void visitThrow(Throw node) {
     _generateNode(node.expression);
 
-    if (options.emitDebuggerStops) {
-      asm.emitDebugCheck();
-    }
+    _emitSourcePosition();
     asm.emitThrow(0);
   }
 
@@ -3649,8 +3662,8 @@ class BytecodeGenerator extends RecursiveVisitor {
 
     _generateNode(node.value);
 
-    if (options.emitDebuggerStops && _variableSetNeedsDebugCheck(node.value)) {
-      asm.emitDebugCheck();
+    if (_variableSetNeedsDebugCheck(node.value)) {
+      _emitSourcePosition();
     }
 
     if (isLateFinal) {
@@ -3902,9 +3915,7 @@ class BytecodeGenerator extends RecursiveVisitor {
 
   @override
   void visitFunctionDeclaration(ast.FunctionDeclaration node) {
-    if (options.emitDebuggerStops) {
-      asm.emitDebugCheck();
-    }
+    _emitSourcePosition();
     _genPushContextIfCaptured(node.variable);
     _genClosure(node, node.variable.name!, node.function);
     _genStoreVar(node.variable);
@@ -4311,14 +4322,12 @@ class BytecodeGenerator extends RecursiveVisitor {
         }
       }
 
-      if (options.emitDebuggerStops &&
-          (initializer == null || _variableSetNeedsDebugCheck(initializer))) {
-        final savedSourcePosition = asm.currentSourcePosition;
-        if (node.fileEqualsOffset != TreeNode.noOffset) {
-          _recordSourcePosition(node.fileEqualsOffset);
-        }
-        asm.emitDebugCheck();
-        asm.currentSourcePosition = savedSourcePosition;
+      // Emit a source position only as part of a DebugCheck instruction or
+      // if there's a store instruction to be emitted for the current PC offset.
+      if ((initializer == null || _variableSetNeedsDebugCheck(initializer)) &&
+          (options.emitDebuggerStops || emitStore)) {
+        _recordSourcePosition(node.fileEqualsOffset);
+        _emitSourcePosition();
       }
 
       if (options.emitLocalVarInfo && !asm.isUnreachable && node.name != null) {
diff --git a/pkg/dart2bytecode/lib/source_positions.dart b/pkg/dart2bytecode/lib/source_positions.dart
index 623c14f4326..0303bccae64 100644
--- a/pkg/dart2bytecode/lib/source_positions.dart
+++ b/pkg/dart2bytecode/lib/source_positions.dart
@@ -24,10 +24,15 @@ class SourcePositions extends BytecodeDeclaration {
 
   SourcePositions();
 
+  // Maps the given PC to the given file offset.
   void add(int pc, int fileOffset) {
-    assert(pc > _lastPc);
     assert((fileOffset >= 0) || (fileOffset == syntheticCodeMarker));
     if (fileOffset != _lastOffset) {
+      if (pc <= _lastPc) {
+        throw ArgumentError(
+            '$pc <= $_lastPc for change in source position $fileOffset != $_lastOffset',
+            'pc');
+      }
       _positions.add(pc);
       _positions.add(fileOffset);
       _lastPc = pc;
diff --git a/pkg/vm_service/test/common/service_test_common.dart b/pkg/vm_service/test/common/service_test_common.dart
index 48e3491286e..c16f7d564ef 100644
--- a/pkg/vm_service/test/common/service_test_common.dart
+++ b/pkg/vm_service/test/common/service_test_common.dart
@@ -471,14 +471,22 @@ Future<String> _locationToString(
   IsolateRef isolateRef,
   Frame frame,
 ) async {
+  final buffer = StringBuffer();
   final location = frame.location!;
-  final Script script =
+  final script =
       await service.getObject(isolateRef.id!, location.script!.id!) as Script;
   final scriptName = p.basename(script.uri!);
+  buffer.write(scriptName);
   final tokenPos = location.tokenPos!;
   final line = script.getLineNumberFromTokenPos(tokenPos);
-  final column = script.getColumnNumberFromTokenPos(tokenPos);
-  return '$scriptName:$line:$column';
+  if (line != null) {
+    buffer.write(':$line');
+    final column = script.getColumnNumberFromTokenPos(tokenPos);
+    if (column != null) {
+      buffer.write(':$column');
+    }
+  }
+  return buffer.toString();
 }
 
 IsolateTest runStepThroughProgramRecordingStops(List<String> recordStops) {
diff --git a/runtime/vm/bytecode_reader.cc b/runtime/vm/bytecode_reader.cc
index 579aac0cd91..277472e60a5 100644
--- a/runtime/vm/bytecode_reader.cc
+++ b/runtime/vm/bytecode_reader.cc
@@ -35,9 +35,17 @@
 namespace dart {
 
 DEFINE_FLAG(bool, dump_kernel_bytecode, false, "Dump kernel bytecode");
+DEFINE_FLAG(charp,
+            dump_kernel_bytecode_filter,
+            nullptr,
+            "Dump only kernel bytecode of functions with matching names");
 
 namespace bytecode {
 
+static bool ShouldPrint(const Function& function) {
+  return function.NamePassesFilter(FLAG_dump_kernel_bytecode_filter);
+}
+
 class BytecodeOffsetsMapTraits {
  public:
   static const char* Name() { return "BytecodeOffsetsMapTraits"; }
@@ -256,7 +264,9 @@ void BytecodeReaderHelper::ReadCode(const Function& function,
   ReadLocalVariables(bytecode, has_local_variables);
 
   if (FLAG_dump_kernel_bytecode) {
-    KernelBytecodeDisassembler::Disassemble(function);
+    if (ShouldPrint(function)) {
+      KernelBytecodeDisassembler::Disassemble(function);
+    }
   }
 
   // Initialization of fields with null literal is elided from bytecode.
@@ -303,7 +313,9 @@ void BytecodeReaderHelper::ReadCode(const Function& function,
       ReadLocalVariables(closure_bytecode, has_local_variables);
 
       if (FLAG_dump_kernel_bytecode) {
-        KernelBytecodeDisassembler::Disassemble(closure);
+        if (ShouldPrint(closure)) {
+          KernelBytecodeDisassembler::Disassemble(closure);
+        }
       }
     }
   }
diff --git a/runtime/vm/code_patcher.cc b/runtime/vm/code_patcher.cc
index 2184ccd4f5f..54e044a9d26 100644
--- a/runtime/vm/code_patcher.cc
+++ b/runtime/vm/code_patcher.cc
@@ -87,24 +87,12 @@ void BytecodePatcher::RemoveBreakpointAt(uword return_address,
   });
 }
 
-KBCInstr* GetInstructionBefore(const Bytecode& bytecode, uword return_address) {
-  ASSERT(bytecode.ContainsInstructionAt(return_address));
-  ASSERT(return_address != bytecode.PayloadStart());
-  uword prev = bytecode.PayloadStart();
-  uword current = KernelBytecode::Next(prev);
-  while (current < return_address) {
-    prev = current;
-    current = KernelBytecode::Next(prev);
-  }
-  ASSERT_EQUAL(current, return_address);
-  return reinterpret_cast<KBCInstr*>(prev);
-}
-
 uint32_t BytecodePatcher::AddBreakpointAtWithMutatorsStopped(
     Thread* thread,
     uword return_address,
     const Bytecode& bytecode) {
-  auto* const instr = GetInstructionBefore(bytecode, return_address);
+  auto* const instr = reinterpret_cast<KBCInstr*>(
+      bytecode.GetInstructionBefore(return_address));
   uint32_t old_opcode = *instr;
   *instr = KernelBytecode::BreakpointOpcode(instr);
   return old_opcode;
@@ -115,7 +103,8 @@ void BytecodePatcher::RemoveBreakpointAtWithMutatorsStopped(
     uword return_address,
     const Bytecode& bytecode,
     uint32_t opcode) {
-  auto* const instr = GetInstructionBefore(bytecode, return_address);
+  auto* const instr = reinterpret_cast<KBCInstr*>(
+      bytecode.GetInstructionBefore(return_address));
   // Must be previously enabled and not yet removed.
   ASSERT(*instr == KernelBytecode::BreakpointOpcode(
                        static_cast<KernelBytecode::Opcode>(opcode)));
diff --git a/runtime/vm/compiler/api/print_filter.cc b/runtime/vm/compiler/api/print_filter.cc
index 010cae68837..40ab4694860 100644
--- a/runtime/vm/compiler/api/print_filter.cc
+++ b/runtime/vm/compiler/api/print_filter.cc
@@ -47,38 +47,7 @@ static bool PassesFilter(const char* filter,
   }
 #endif
 
-  char* save_ptr;  // Needed for strtok_r.
-  const char* scrubbed_name = function.QualifiedScrubbedNameCString();
-  const char* function_name = function.ToFullyQualifiedCString();
-  intptr_t function_name_len = strlen(function_name);
-
-  intptr_t len = strlen(filter) + 1;  // Length with \0.
-  char* filter_buffer = new char[len];
-  strncpy(filter_buffer, filter, len);  // strtok modifies arg 1.
-  char* token = strtok_r(filter_buffer, ",", &save_ptr);
-  bool found = false;
-  while (token != nullptr) {
-    if ((strstr(function_name, token) != nullptr) ||
-        (strstr(scrubbed_name, token) != nullptr)) {
-      found = true;
-      break;
-    }
-    const intptr_t token_len = strlen(token);
-    if (token[token_len - 1] == '%') {
-      if (function_name_len > token_len) {
-        const char* suffix =
-            function_name + (function_name_len - token_len + 1);
-        if (strncmp(suffix, token, token_len - 1) == 0) {
-          found = true;
-          break;
-        }
-      }
-    }
-    token = strtok_r(nullptr, ",", &save_ptr);
-  }
-  delete[] filter_buffer;
-
-  return found;
+  return function.NamePassesFilter(filter);
 }
 
 bool PrintFilter::ShouldPrint(const Function& function,
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index 35b58ec99d7..1c3c0d2b31f 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -321,9 +321,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x324;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x328;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x32c;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -341,7 +341,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x40c;
+    0x410;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -358,7 +358,7 @@ static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x454;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x410;
+    Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 0x458;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -377,7 +377,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x338;
+    0x33c;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -397,7 +397,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -405,10 +405,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x340;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2fc;
+    0x344;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x300;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x300;
+    0x304;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -418,9 +418,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x314;
+    Thread_old_marking_stack_block_offset = 0x318;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x318;
+    Thread_new_marking_stack_block_offset = 0x31c;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -469,11 +469,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x330;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x334;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x334;
+    Thread_saved_shadow_call_stack_offset = 0x338;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x33c;
+    0x340;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word Thread_single_step_offset = 0x43c;
@@ -483,9 +483,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x304;
+    0x308;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x308;
+    Thread_stack_overflow_flags_offset = 0x30c;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -495,36 +495,36 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x310;
+    0x314;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2d4;
+    Thread_suspend_state_await_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d8;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2d0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x2dc;
+    Thread_suspend_state_return_async_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e0;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x2e4;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e8;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x2ec;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f0;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2f4;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x2f8;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x30c;
+    Thread_top_exit_frame_info_offset = 0x310;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
     Thread_unboxed_runtime_arg_offset = 0x418;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x320;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x324;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
@@ -622,8 +622,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, 0x2c4, -1,
-        0x2c8, 0x2cc, -1,    -1,    -1,    -1, -1,    -1};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, 0x2c4, -1, 0x2c8, -1,
+        0x2cc, 0x2d0, -1,    -1,    -1,    -1, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -1039,9 +1039,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x660;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x668;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x670;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -1059,7 +1059,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x830;
+    0x838;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -1072,13 +1072,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x898;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x838;
+    Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a0;
+    Thread_service_extension_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -1095,7 +1095,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x688;
+    0x690;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -1115,7 +1115,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -1123,10 +1123,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x698;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x610;
+    0x6a0;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x618;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x618;
+    0x620;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -1136,9 +1136,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x640;
+    Thread_old_marking_stack_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x648;
+    Thread_new_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -1187,23 +1187,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x678;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x680;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x680;
+    Thread_saved_shadow_call_stack_offset = 0x688;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x690;
+    0x698;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x868;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x870;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x628;
+    Thread_stack_overflow_flags_offset = 0x630;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -1213,49 +1213,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x638;
+    0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5c0;
+    Thread_suspend_state_await_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5c8;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5b8;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x5d0;
+    Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5d8;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e0;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5e8;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f0;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x5f8;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x600;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x608;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x630;
+    Thread_top_exit_frame_info_offset = 0x638;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x840;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x658;
+    Thread_unboxed_runtime_arg_offset = 0x848;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x660;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x850;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x858;
+    0x858;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x860;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x860;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x878;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x880;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x870;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x868;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x880;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x888;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x878;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -1344,8 +1344,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, -1,    -1,    0x580, 0x588,
-        0x590, 0x598, 0x5a0, -1,    0x5a8, 0x5b0, -1,    -1};
+        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
+        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -1757,9 +1757,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x318;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x31c;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x320;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -1777,7 +1777,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x400;
+    0x404;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -1790,13 +1790,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x444;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x404;
+    Thread_double_truncate_round_supported_offset = 0x408;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x448;
+    Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -1813,7 +1813,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -1833,7 +1833,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x320;
+    0x324;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -1841,10 +1841,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x334;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2f0;
+    0x338;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2f4;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x2f4;
+    0x2f8;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -1854,9 +1854,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x308;
+    Thread_old_marking_stack_block_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x30c;
+    Thread_new_marking_stack_block_offset = 0x310;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -1905,23 +1905,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x324;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x328;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x328;
+    Thread_saved_shadow_call_stack_offset = 0x32c;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x330;
+    0x334;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x42c;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x434;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0xe4;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x2f8;
+    0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x2fc;
+    Thread_stack_overflow_flags_offset = 0x300;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -1931,49 +1931,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x304;
+    0x308;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2c8;
+    Thread_suspend_state_await_entry_point_offset = 0x2cc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2cc;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2c4;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x2d0;
+    Thread_suspend_state_return_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2d4;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x2d8;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2dc;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x2e0;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2e4;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2e8;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x2ec;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x300;
+    Thread_top_exit_frame_info_offset = 0x304;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x408;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x314;
+    Thread_unboxed_runtime_arg_offset = 0x410;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x318;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x28;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x418;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x420;
+    0x420;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x428;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x134;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x428;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x434;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x438;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x430;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x430;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x43c;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x440;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x438;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -2058,7 +2058,7 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, -1, -1, -1, 0x2c0};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, -1, -1, 0x2c4};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -2474,9 +2474,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x6a8;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6b0;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6b8;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -2494,7 +2494,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -2507,13 +2507,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x880;
+    Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8e8;
+    Thread_service_extension_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -2530,7 +2530,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6d0;
+    0x6d8;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -2550,7 +2550,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6b8;
+    0x6c0;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -2558,10 +2558,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6e0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x658;
+    0x6e8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x660;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x660;
+    0x668;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -2571,9 +2571,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x688;
+    Thread_old_marking_stack_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x690;
+    Thread_new_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -2622,23 +2622,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c0;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c8;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6c8;
+    Thread_saved_shadow_call_stack_offset = 0x6d0;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6d8;
+    0x6e0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8b0;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8b8;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x670;
+    Thread_stack_overflow_flags_offset = 0x678;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -2648,49 +2648,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x680;
+    0x688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x608;
+    Thread_suspend_state_await_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x610;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x600;
+    Thread_suspend_state_init_async_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x618;
+    Thread_suspend_state_return_async_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x620;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x628;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x630;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x638;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x640;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x648;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x650;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x678;
+    Thread_top_exit_frame_info_offset = 0x680;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x888;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a0;
+    Thread_unboxed_runtime_arg_offset = 0x890;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x898;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x8a0;
+    0x8a0;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8a8;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c0;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8c8;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b0;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c8;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -2779,10 +2779,10 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598,
-        0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, -1,
-        -1,    -1,    -1,    0x5d8, 0x5e0, -1,    -1,    0x5e8,
-        0x5f0, 0x5f8, -1,    -1,    -1,    -1,    -1,    -1};
+        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
+        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
+        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
+        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -3196,9 +3196,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x668;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x670;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x678;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -3216,7 +3216,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x838;
+    0x840;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -3229,13 +3229,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x840;
+    Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a8;
+    Thread_service_extension_stream_offset = 0x8b0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -3252,7 +3252,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x690;
+    0x698;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -3272,7 +3272,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x678;
+    0x680;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -3280,10 +3280,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6a0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x618;
+    0x6a8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x620;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x78;
 static constexpr dart::compiler::target::word
@@ -3293,9 +3293,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x648;
+    Thread_old_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x650;
+    Thread_new_marking_stack_block_offset = 0x658;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -3344,23 +3344,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a8;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x680;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x688;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x688;
+    Thread_saved_shadow_call_stack_offset = 0x690;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x698;
+    0x6a0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x80;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x870;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x878;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x628;
+    0x630;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x630;
+    Thread_stack_overflow_flags_offset = 0x638;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -3370,50 +3370,50 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x640;
+    0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5c8;
+    Thread_suspend_state_await_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
+    Thread_suspend_state_return_async_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x608;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x638;
+    Thread_top_exit_frame_info_offset = 0x640;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x848;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x660;
+    Thread_unboxed_runtime_arg_offset = 0x850;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x668;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x858;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x860;
+    0x860;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x868;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x270;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x868;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x880;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x888;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x878;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x870;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x888;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x890;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x880;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -3500,8 +3500,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
-        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
+        0x570, 0x578, 0x580, 0x588, -1,    -1,    0x590, 0x598,
+        0x5a0, 0x5a8, 0x5b0, -1,    0x5b8, 0x5c0, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x20;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x10;
@@ -3915,9 +3915,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x6b0;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6b8;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6c0;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -3935,7 +3935,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x880;
+    0x888;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -3948,13 +3948,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x888;
+    Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f0;
+    Thread_service_extension_stream_offset = 0x8f8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -3971,7 +3971,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6d8;
+    0x6e0;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -3991,7 +3991,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -3999,10 +3999,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6e8;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x660;
+    0x6f0;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x668;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x78;
 static constexpr dart::compiler::target::word
@@ -4012,9 +4012,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x690;
+    Thread_old_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x698;
+    Thread_new_marking_stack_block_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -4063,23 +4063,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a8;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c8;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6d0;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6d0;
+    Thread_saved_shadow_call_stack_offset = 0x6d8;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6e0;
+    0x6e8;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x80;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8c0;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x678;
+    Thread_stack_overflow_flags_offset = 0x680;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -4089,50 +4089,50 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x688;
+    0x690;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x610;
+    Thread_suspend_state_await_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x608;
+    Thread_suspend_state_init_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x620;
+    Thread_suspend_state_return_async_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x650;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x660;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x680;
+    Thread_top_exit_frame_info_offset = 0x688;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x890;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a8;
+    Thread_unboxed_runtime_arg_offset = 0x898;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x8a0;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x8a8;
+    0x8a8;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x8b0;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x270;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b0;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c8;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d0;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c0;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d8;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c8;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -4219,10 +4219,10 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
-        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
-        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
-        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
+        0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0, 0x5a8,
+        0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, 0x5e0, -1,
+        -1,    -1,    -1,    0x5e8, 0x5f0, -1,    -1,    0x5f8,
+        0x600, 0x608, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x20;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x10;
@@ -4634,9 +4634,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x34c;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x350;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x354;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -4654,7 +4654,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x434;
+    0x438;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -4671,7 +4671,7 @@ static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x47c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x438;
+    Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 0x480;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -4690,7 +4690,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x360;
+    0x364;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -4710,7 +4710,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x354;
+    0x358;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -4718,10 +4718,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x368;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x324;
+    0x36c;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x328;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x328;
+    0x32c;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -4731,9 +4731,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x33c;
+    Thread_old_marking_stack_block_offset = 0x340;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x340;
+    Thread_new_marking_stack_block_offset = 0x344;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -4782,11 +4782,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x358;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x35c;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x35c;
+    Thread_saved_shadow_call_stack_offset = 0x360;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x364;
+    0x368;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word Thread_single_step_offset = 0x464;
@@ -4796,9 +4796,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x330;
+    Thread_stack_overflow_flags_offset = 0x334;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -4808,36 +4808,36 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x338;
+    0x33c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2fc;
+    Thread_suspend_state_await_entry_point_offset = 0x300;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x300;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x304;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2f8;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x304;
+    Thread_suspend_state_return_async_entry_point_offset = 0x308;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x308;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x30c;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x310;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x310;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x314;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x314;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x318;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x318;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x31c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x31c;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x320;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x320;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x324;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x334;
+    Thread_top_exit_frame_info_offset = 0x338;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
     Thread_unboxed_runtime_arg_offset = 0x440;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x348;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x34c;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
@@ -4935,9 +4935,9 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x2b0, 0x2b4, 0x2b8, -1,    -1,    0x2bc,
-        0x2c0, 0x2c4, -1, -1, -1, 0x2c8, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc,
-        0x2e0, 0x2e4, -1, -1, -1, -1,    0x2e8, 0x2ec, 0x2f0, 0x2f4};
+        -1,    -1,    -1, -1, -1, 0x2b4, 0x2b8, 0x2bc, -1,    -1,    0x2c0,
+        0x2c4, 0x2c8, -1, -1, -1, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc, 0x2e0,
+        0x2e4, 0x2e8, -1, -1, -1, -1,    0x2ec, 0x2f0, 0x2f4, 0x2f8};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -5353,9 +5353,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x698;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6a0;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6a8;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -5373,7 +5373,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -5386,13 +5386,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x870;
+    Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8d8;
+    Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -5409,7 +5409,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -5429,7 +5429,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6a8;
+    0x6b0;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -5437,10 +5437,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6d0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x648;
+    0x6d8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x650;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x650;
+    0x658;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -5450,9 +5450,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x678;
+    Thread_old_marking_stack_block_offset = 0x680;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x680;
+    Thread_new_marking_stack_block_offset = 0x688;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -5501,23 +5501,23 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6b0;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6b8;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6b8;
+    Thread_saved_shadow_call_stack_offset = 0x6c0;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6c8;
+    0x6d0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
-static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_single_step_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x658;
+    0x660;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x660;
+    Thread_stack_overflow_flags_offset = 0x668;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -5527,49 +5527,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5f8;
+    Thread_suspend_state_await_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x600;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5f0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x608;
+    Thread_suspend_state_return_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x610;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x618;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x620;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x628;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x630;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x638;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x640;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x668;
+    Thread_top_exit_frame_info_offset = 0x670;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x878;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x690;
+    Thread_unboxed_runtime_arg_offset = 0x880;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x698;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x888;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x890;
+    0x890;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x898;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x898;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8b0;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8b8;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8a8;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8c0;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8b0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -5658,9 +5658,9 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x560, 0x568, 0x570, -1,    -1,    0x578,
-        0x580, 0x588, -1, -1, -1, 0x590, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8,
-        0x5c0, 0x5c8, -1, -1, -1, -1,    0x5d0, 0x5d8, 0x5e0, 0x5e8};
+        -1,    -1,    -1, -1, -1, 0x568, 0x570, 0x578, -1,    -1,    0x580,
+        0x588, 0x590, -1, -1, -1, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0,
+        0x5c8, 0x5d0, -1, -1, -1, -1,    0x5d8, 0x5e0, 0x5e8, 0x5f0};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -6065,9 +6065,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x324;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x328;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x32c;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -6085,7 +6085,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x40c;
+    0x410;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -6102,7 +6102,7 @@ static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x454;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x410;
+    Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 0x458;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -6121,7 +6121,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x338;
+    0x33c;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -6141,7 +6141,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -6149,10 +6149,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x340;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2fc;
+    0x344;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x300;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x300;
+    0x304;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -6162,9 +6162,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x314;
+    Thread_old_marking_stack_block_offset = 0x318;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x318;
+    Thread_new_marking_stack_block_offset = 0x31c;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -6213,11 +6213,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x330;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x334;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x334;
+    Thread_saved_shadow_call_stack_offset = 0x338;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x33c;
+    0x340;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word
@@ -6226,9 +6226,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x304;
+    0x308;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x308;
+    Thread_stack_overflow_flags_offset = 0x30c;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -6238,36 +6238,36 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x310;
+    0x314;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2d4;
+    Thread_suspend_state_await_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d8;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2d0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x2dc;
+    Thread_suspend_state_return_async_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e0;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x2e4;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e8;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x2ec;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f0;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2f4;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x2f8;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x30c;
+    Thread_top_exit_frame_info_offset = 0x310;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
     Thread_unboxed_runtime_arg_offset = 0x418;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x320;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x324;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
@@ -6365,8 +6365,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, 0x2c4, -1,
-        0x2c8, 0x2cc, -1,    -1,    -1,    -1, -1,    -1};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, 0x2c4, -1, 0x2c8, -1,
+        0x2cc, 0x2d0, -1,    -1,    -1,    -1, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -6775,9 +6775,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x660;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x668;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x670;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -6795,7 +6795,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x830;
+    0x838;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -6808,13 +6808,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x898;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x838;
+    Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a0;
+    Thread_service_extension_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -6831,7 +6831,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x688;
+    0x690;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -6851,7 +6851,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -6859,10 +6859,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x698;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x610;
+    0x6a0;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x618;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x618;
+    0x620;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -6872,9 +6872,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x640;
+    Thread_old_marking_stack_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x648;
+    Thread_new_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -6923,11 +6923,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x678;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x680;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x680;
+    Thread_saved_shadow_call_stack_offset = 0x688;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x690;
+    0x698;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -6936,9 +6936,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x628;
+    Thread_stack_overflow_flags_offset = 0x630;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -6948,49 +6948,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x638;
+    0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5c0;
+    Thread_suspend_state_await_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5c8;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5b8;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x5d0;
+    Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5d8;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e0;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5e8;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f0;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x5f8;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x600;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x608;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x630;
+    Thread_top_exit_frame_info_offset = 0x638;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x840;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x658;
+    Thread_unboxed_runtime_arg_offset = 0x848;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x660;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x850;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x858;
+    0x858;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x860;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x860;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x878;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x880;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x870;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x868;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x880;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x888;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x878;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -7079,8 +7079,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, -1,    -1,    0x580, 0x588,
-        0x590, 0x598, 0x5a0, -1,    0x5a8, 0x5b0, -1,    -1};
+        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
+        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -7485,9 +7485,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x318;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x31c;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x320;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -7505,7 +7505,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x400;
+    0x404;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -7518,13 +7518,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x444;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x404;
+    Thread_double_truncate_round_supported_offset = 0x408;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x448;
+    Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -7541,7 +7541,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -7561,7 +7561,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x320;
+    0x324;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -7569,10 +7569,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x334;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2f0;
+    0x338;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x2f4;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x2f4;
+    0x2f8;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -7582,9 +7582,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x308;
+    Thread_old_marking_stack_block_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x30c;
+    Thread_new_marking_stack_block_offset = 0x310;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -7633,11 +7633,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x324;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x328;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x328;
+    Thread_saved_shadow_call_stack_offset = 0x32c;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x330;
+    0x334;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word
@@ -7646,9 +7646,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x2f8;
+    0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x2fc;
+    Thread_stack_overflow_flags_offset = 0x300;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -7658,49 +7658,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x304;
+    0x308;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2c8;
+    Thread_suspend_state_await_entry_point_offset = 0x2cc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2cc;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2c4;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x2d0;
+    Thread_suspend_state_return_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2d4;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x2d8;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2dc;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x2e0;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2e4;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2e8;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x2ec;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x300;
+    Thread_top_exit_frame_info_offset = 0x304;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x408;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x314;
+    Thread_unboxed_runtime_arg_offset = 0x410;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x318;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x28;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x418;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x420;
+    0x420;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x428;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x134;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x428;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x434;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x438;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x430;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x430;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x43c;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x440;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x438;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -7785,7 +7785,7 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, -1, -1, -1, 0x2c0};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, -1, -1, 0x2c4};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -8194,9 +8194,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x6a8;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6b0;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6b8;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -8214,7 +8214,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -8227,13 +8227,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x880;
+    Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8e8;
+    Thread_service_extension_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -8250,7 +8250,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6d0;
+    0x6d8;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -8270,7 +8270,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6b8;
+    0x6c0;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -8278,10 +8278,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6e0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x658;
+    0x6e8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x660;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x660;
+    0x668;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -8291,9 +8291,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x688;
+    Thread_old_marking_stack_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x690;
+    Thread_new_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -8342,11 +8342,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c0;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c8;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6c8;
+    Thread_saved_shadow_call_stack_offset = 0x6d0;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6d8;
+    0x6e0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -8355,9 +8355,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x670;
+    Thread_stack_overflow_flags_offset = 0x678;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -8367,49 +8367,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x680;
+    0x688;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x608;
+    Thread_suspend_state_await_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x610;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x600;
+    Thread_suspend_state_init_async_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x618;
+    Thread_suspend_state_return_async_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x620;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x628;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x630;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x638;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x640;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x648;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x650;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x678;
+    Thread_top_exit_frame_info_offset = 0x680;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x888;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a0;
+    Thread_unboxed_runtime_arg_offset = 0x890;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x898;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x8a0;
+    0x8a0;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8a8;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c0;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8c8;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b0;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c8;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -8498,10 +8498,10 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598,
-        0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, -1,
-        -1,    -1,    -1,    0x5d8, 0x5e0, -1,    -1,    0x5e8,
-        0x5f0, 0x5f8, -1,    -1,    -1,    -1,    -1,    -1};
+        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
+        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
+        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
+        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -8908,9 +8908,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x668;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x670;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x678;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -8928,7 +8928,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x838;
+    0x840;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -8941,13 +8941,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x840;
+    Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a8;
+    Thread_service_extension_stream_offset = 0x8b0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -8964,7 +8964,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x690;
+    0x698;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -8984,7 +8984,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x678;
+    0x680;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -8992,10 +8992,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6a0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x618;
+    0x6a8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x620;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x78;
 static constexpr dart::compiler::target::word
@@ -9005,9 +9005,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x648;
+    Thread_old_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x650;
+    Thread_new_marking_stack_block_offset = 0x658;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -9056,11 +9056,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a8;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x680;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x688;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x688;
+    Thread_saved_shadow_call_stack_offset = 0x690;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x698;
+    0x6a0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word
@@ -9069,9 +9069,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x628;
+    0x630;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x630;
+    Thread_stack_overflow_flags_offset = 0x638;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -9081,50 +9081,50 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x640;
+    0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5c8;
+    Thread_suspend_state_await_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
+    Thread_suspend_state_return_async_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x608;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x638;
+    Thread_top_exit_frame_info_offset = 0x640;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x848;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x660;
+    Thread_unboxed_runtime_arg_offset = 0x850;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x668;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x858;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x860;
+    0x860;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x868;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x270;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x868;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x880;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x888;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x878;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x870;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x888;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x890;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x880;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -9211,8 +9211,8 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
-        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
+        0x570, 0x578, 0x580, 0x588, -1,    -1,    0x590, 0x598,
+        0x5a0, 0x5a8, 0x5b0, -1,    0x5b8, 0x5c0, -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x20;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x10;
@@ -9619,9 +9619,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x6b0;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6b8;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6c0;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -9639,7 +9639,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x880;
+    0x888;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -9652,13 +9652,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x888;
+    Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f0;
+    Thread_service_extension_stream_offset = 0x8f8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -9675,7 +9675,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6d8;
+    0x6e0;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -9695,7 +9695,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -9703,10 +9703,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6e8;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x660;
+    0x6f0;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x668;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x78;
 static constexpr dart::compiler::target::word
@@ -9716,9 +9716,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x690;
+    Thread_old_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x698;
+    Thread_new_marking_stack_block_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -9767,11 +9767,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a8;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6c8;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6d0;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6d0;
+    Thread_saved_shadow_call_stack_offset = 0x6d8;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6e0;
+    0x6e8;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word
@@ -9780,9 +9780,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x678;
+    Thread_stack_overflow_flags_offset = 0x680;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -9792,50 +9792,50 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x688;
+    0x690;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x610;
+    Thread_suspend_state_await_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x608;
+    Thread_suspend_state_init_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x620;
+    Thread_suspend_state_return_async_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x650;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x660;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x680;
+    Thread_top_exit_frame_info_offset = 0x688;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x890;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6a8;
+    Thread_unboxed_runtime_arg_offset = 0x898;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_heap_base_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x8a0;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x8a8;
+    0x8a8;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x8b0;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x270;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b0;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8c8;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d0;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c0;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8d8;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8c8;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -9922,10 +9922,10 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
-        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
-        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
-        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
+        0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0, 0x5a8,
+        0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, 0x5e0, -1,
+        -1,    -1,    -1,    0x5e8, 0x5f0, -1,    -1,    0x5f8,
+        0x600, 0x608, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x20;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x10;
@@ -10330,9 +10330,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x34c;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x350;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x354;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -10350,7 +10350,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x434;
+    0x438;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -10367,7 +10367,7 @@ static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x47c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x438;
+    Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
     Thread_service_extension_stream_offset = 0x480;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -10386,7 +10386,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x360;
+    0x364;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -10406,7 +10406,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x354;
+    0x358;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -10414,10 +10414,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x368;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x324;
+    0x36c;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x328;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x328;
+    0x32c;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x38;
 static constexpr dart::compiler::target::word
@@ -10427,9 +10427,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x33c;
+    Thread_old_marking_stack_block_offset = 0x340;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x340;
+    Thread_new_marking_stack_block_offset = 0x344;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -10478,11 +10478,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x150;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x358;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x35c;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x35c;
+    Thread_saved_shadow_call_stack_offset = 0x360;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x364;
+    0x368;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word
@@ -10491,9 +10491,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x138;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x24;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x32c;
+    0x330;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x330;
+    Thread_stack_overflow_flags_offset = 0x334;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -10503,36 +10503,36 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x338;
+    0x33c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x2fc;
+    Thread_suspend_state_await_entry_point_offset = 0x300;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x300;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x304;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x2f8;
+    Thread_suspend_state_init_async_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x304;
+    Thread_suspend_state_return_async_entry_point_offset = 0x308;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x308;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x30c;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x310;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x310;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x314;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x314;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x318;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x318;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x31c;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x31c;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x320;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x320;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x324;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x334;
+    Thread_top_exit_frame_info_offset = 0x338;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x10;
 static constexpr dart::compiler::target::word
     Thread_unboxed_runtime_arg_offset = 0x440;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x348;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x34c;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
@@ -10630,9 +10630,9 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x2b0, 0x2b4, 0x2b8, -1,    -1,    0x2bc,
-        0x2c0, 0x2c4, -1, -1, -1, 0x2c8, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc,
-        0x2e0, 0x2e4, -1, -1, -1, -1,    0x2e8, 0x2ec, 0x2f0, 0x2f4};
+        -1,    -1,    -1, -1, -1, 0x2b4, 0x2b8, 0x2bc, -1,    -1,    0x2c0,
+        0x2c4, 0x2c8, -1, -1, -1, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc, 0x2e0,
+        0x2e4, 0x2e8, -1, -1, -1, -1,    0x2ec, 0x2f0, 0x2f4, 0x2f8};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x14;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x8;
 static constexpr dart::compiler::target::word Array_header_size = 0xc;
@@ -11041,9 +11041,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    0x698;
-static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
     0x6a0;
+static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
+    0x6a8;
 static constexpr dart::compiler::target::word
     Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -11061,7 +11061,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word
     Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -11074,13 +11074,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 0x870;
+    Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8d8;
+    Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -11097,7 +11097,7 @@ static constexpr dart::compiler::target::word Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
     Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -11117,7 +11117,7 @@ static constexpr dart::compiler::target::word Thread_float_not_address_offset =
 static constexpr dart::compiler::target::word
     Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    0x6a8;
+    0x6b0;
 static constexpr dart::compiler::target::word
     Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -11125,10 +11125,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    0x6d0;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 0x648;
+    0x6d8;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 0x650;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    0x650;
+    0x658;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
     0x70;
 static constexpr dart::compiler::target::word
@@ -11138,9 +11138,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    Thread_old_marking_stack_block_offset = 0x678;
+    Thread_old_marking_stack_block_offset = 0x680;
 static constexpr dart::compiler::target::word
-    Thread_new_marking_stack_block_offset = 0x680;
+    Thread_new_marking_stack_block_offset = 0x688;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -11189,11 +11189,11 @@ static constexpr dart::compiler::target::word
     Thread_predefined_symbols_address_offset = 0x2a0;
 static constexpr dart::compiler::target::word
     Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6b0;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 0x6b8;
 static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 0x6b8;
+    Thread_saved_shadow_call_stack_offset = 0x6c0;
 static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
-    0x6c8;
+    0x6d0;
 static constexpr dart::compiler::target::word
     Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -11202,9 +11202,9 @@ static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word Thread_stack_limit_offset = 0x48;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    0x658;
+    0x660;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 0x660;
+    Thread_stack_overflow_flags_offset = 0x668;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -11214,49 +11214,49 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    0x670;
+    0x678;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_entry_point_offset = 0x5f8;
+    Thread_suspend_state_await_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x600;
+    Thread_suspend_state_await_with_type_check_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_entry_point_offset = 0x5f0;
+    Thread_suspend_state_init_async_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_entry_point_offset = 0x608;
+    Thread_suspend_state_return_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x610;
+    Thread_suspend_state_return_async_not_future_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_async_star_entry_point_offset = 0x618;
+    Thread_suspend_state_init_async_star_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_yield_async_star_entry_point_offset = 0x620;
+    Thread_suspend_state_yield_async_star_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_return_async_star_entry_point_offset = 0x628;
+    Thread_suspend_state_return_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_init_sync_star_entry_point_offset = 0x630;
+    Thread_suspend_state_init_sync_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x638;
+    Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    Thread_suspend_state_handle_exception_entry_point_offset = 0x640;
+    Thread_suspend_state_handle_exception_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 0x668;
+    Thread_top_exit_frame_info_offset = 0x670;
 static constexpr dart::compiler::target::word Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word Thread_top_resource_offset = 0x20;
 static constexpr dart::compiler::target::word
-    Thread_unboxed_runtime_arg_offset = 0x878;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x690;
+    Thread_unboxed_runtime_arg_offset = 0x880;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 0x698;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
     0x50;
 static constexpr dart::compiler::target::word Thread_next_task_id_offset =
-    0x888;
-static constexpr dart::compiler::target::word Thread_random_offset = 0x890;
+    0x890;
+static constexpr dart::compiler::target::word Thread_random_offset = 0x898;
 static constexpr dart::compiler::target::word
     Thread_jump_to_frame_entry_point_offset = 0x268;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x898;
-static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8b0;
-static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8b8;
-static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8a8;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_current_tag_offset = 0x8b8;
+static constexpr dart::compiler::target::word Thread_default_tag_offset = 0x8c0;
+static constexpr dart::compiler::target::word Thread_user_tag_offset = 0x8b0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
     0x0;
 static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -11345,9 +11345,9 @@ static constexpr dart::compiler::target::word Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x560, 0x568, 0x570, -1,    -1,    0x578,
-        0x580, 0x588, -1, -1, -1, 0x590, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8,
-        0x5c0, 0x5c8, -1, -1, -1, -1,    0x5d0, 0x5d8, 0x5e0, 0x5e8};
+        -1,    -1,    -1, -1, -1, 0x568, 0x570, 0x578, -1,    -1,    0x580,
+        0x588, 0x590, -1, -1, -1, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0,
+        0x5c8, 0x5d0, -1, -1, -1, -1,    0x5d8, 0x5e0, 0x5e8, 0x5f0};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 0x28;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 0x10;
 static constexpr dart::compiler::target::word Array_header_size = 0x18;
@@ -11787,9 +11787,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x324;
+    AOT_Thread_active_exception_offset = 0x328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x328;
+    AOT_Thread_active_stacktrace_offset = 0x32c;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -11807,7 +11807,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x40c;
+    0x410;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -11827,7 +11827,7 @@ static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x410;
+    AOT_Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 0x458;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -11846,7 +11846,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x338;
+    AOT_Thread_execution_state_offset = 0x33c;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -11866,7 +11866,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x32c;
+    AOT_Thread_global_object_pool_offset = 0x330;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -11874,10 +11874,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x340;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x2fc;
+    AOT_Thread_exit_through_ffi_offset = 0x344;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x300;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x300;
+    0x304;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x38;
 static constexpr dart::compiler::target::word
@@ -11887,9 +11887,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x314;
+    AOT_Thread_old_marking_stack_block_offset = 0x318;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x318;
+    AOT_Thread_new_marking_stack_block_offset = 0x31c;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -11943,11 +11943,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x330;
+    0x334;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x334;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x338;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x33c;
+    AOT_Thread_safepoint_state_offset = 0x340;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
@@ -11959,9 +11959,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x24;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x304;
+    AOT_Thread_saved_stack_limit_offset = 0x308;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x308;
+    AOT_Thread_stack_overflow_flags_offset = 0x30c;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -11972,38 +11972,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x310;
+    AOT_Thread_store_buffer_block_offset = 0x314;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x2d4;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d8;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2d0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x2dc;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e0;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x2e4;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e8;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x2ec;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f0;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f4;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x2f4;
+        0x2f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x2f8;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x30c;
+    AOT_Thread_top_exit_frame_info_offset = 0x310;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x10;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_runtime_arg_offset = 0x418;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x320;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x324;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word
@@ -12120,8 +12120,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, 0x2c4, -1,
-        0x2c8, 0x2cc, -1,    -1,    -1,    -1, -1,    -1};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, 0x2c4, -1, 0x2c8, -1,
+        0x2cc, 0x2d0, -1,    -1,    -1,    -1, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x14;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x8;
@@ -12583,9 +12583,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x660;
+    AOT_Thread_active_exception_offset = 0x668;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x668;
+    AOT_Thread_active_stacktrace_offset = 0x670;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -12603,7 +12603,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x830;
+    0x838;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -12619,13 +12619,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x898;
+    0x8a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x838;
+    AOT_Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a0;
+    AOT_Thread_service_extension_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -12642,7 +12642,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x688;
+    AOT_Thread_execution_state_offset = 0x690;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -12662,7 +12662,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x670;
+    AOT_Thread_global_object_pool_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -12670,10 +12670,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x698;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x610;
+    AOT_Thread_exit_through_ffi_offset = 0x6a0;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x618;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x618;
+    0x620;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -12683,9 +12683,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x640;
+    AOT_Thread_old_marking_stack_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x648;
+    AOT_Thread_new_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -12739,15 +12739,15 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x678;
+    0x680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x680;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x690;
+    AOT_Thread_safepoint_state_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
@@ -12755,9 +12755,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x620;
+    AOT_Thread_saved_stack_limit_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x628;
+    AOT_Thread_stack_overflow_flags_offset = 0x630;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -12768,55 +12768,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x638;
+    AOT_Thread_store_buffer_block_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c0;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5c8;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5b8;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d0;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5d8;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e0;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5e8;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x600;
+        0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x630;
+    AOT_Thread_top_exit_frame_info_offset = 0x638;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x840;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x658;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x848;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x660;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x850;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x858;
+    0x858;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x860;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x860;
+    0x868;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x878;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x880;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x888;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x870;
+    0x878;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -12916,8 +12916,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, -1,    -1,    0x580, 0x588,
-        0x590, 0x598, 0x5a0, -1,    0x5a8, 0x5b0, -1,    -1};
+        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
+        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -13386,9 +13386,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x6a8;
+    AOT_Thread_active_exception_offset = 0x6b0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6b0;
+    AOT_Thread_active_stacktrace_offset = 0x6b8;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -13406,7 +13406,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -13422,13 +13422,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e0;
+    0x8e8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x880;
+    AOT_Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8e8;
+    AOT_Thread_service_extension_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -13445,7 +13445,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6d0;
+    AOT_Thread_execution_state_offset = 0x6d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -13465,7 +13465,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6b8;
+    AOT_Thread_global_object_pool_offset = 0x6c0;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -13473,10 +13473,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6e0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x658;
+    AOT_Thread_exit_through_ffi_offset = 0x6e8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x660;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x660;
+    0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -13486,9 +13486,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x688;
+    AOT_Thread_old_marking_stack_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x690;
+    AOT_Thread_new_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -13542,15 +13542,15 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6c8;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6d8;
+    AOT_Thread_safepoint_state_offset = 0x6e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
-    0x8b0;
+    0x8b8;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
@@ -13558,9 +13558,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x668;
+    AOT_Thread_saved_stack_limit_offset = 0x670;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x670;
+    AOT_Thread_stack_overflow_flags_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -13571,55 +13571,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x680;
+    AOT_Thread_store_buffer_block_offset = 0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x638;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x648;
+        0x650;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x650;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x678;
+    AOT_Thread_top_exit_frame_info_offset = 0x680;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x888;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a0;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x890;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x898;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a0;
+    0x8a0;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x8a8;
+    0x8b0;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8c0;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8c8;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8d0;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8b8;
+    0x8c0;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -13719,10 +13719,10 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598,
-        0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, -1,
-        -1,    -1,    -1,    0x5d8, 0x5e0, -1,    -1,    0x5e8,
-        0x5f0, 0x5f8, -1,    -1,    -1,    -1,    -1,    -1};
+        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
+        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
+        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
+        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -14185,9 +14185,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x668;
+    AOT_Thread_active_exception_offset = 0x670;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x670;
+    AOT_Thread_active_stacktrace_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -14205,7 +14205,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x838;
+    0x840;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -14221,13 +14221,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a0;
+    0x8a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x840;
+    AOT_Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a8;
+    AOT_Thread_service_extension_stream_offset = 0x8b0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -14244,7 +14244,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x690;
+    AOT_Thread_execution_state_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -14264,7 +14264,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x678;
+    AOT_Thread_global_object_pool_offset = 0x680;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -14272,10 +14272,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6a0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x618;
+    AOT_Thread_exit_through_ffi_offset = 0x6a8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x620;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -14285,9 +14285,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x648;
+    AOT_Thread_old_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x650;
+    AOT_Thread_new_marking_stack_block_offset = 0x658;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -14341,15 +14341,15 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x680;
+    0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x688;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x698;
+    AOT_Thread_safepoint_state_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
-    0x870;
+    0x878;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
@@ -14357,9 +14357,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x628;
+    AOT_Thread_saved_stack_limit_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x630;
+    AOT_Thread_stack_overflow_flags_offset = 0x638;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -14370,38 +14370,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x640;
+    AOT_Thread_store_buffer_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c8;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x608;
+        0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x638;
+    AOT_Thread_top_exit_frame_info_offset = 0x640;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x848;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x660;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x850;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -14409,18 +14409,18 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset =
     0x58;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x858;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x860;
+    0x860;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x868;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x880;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x888;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x890;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -14520,8 +14520,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
-        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
+        0x570, 0x578, 0x580, 0x588, -1,    -1,    0x590, 0x598,
+        0x5a0, 0x5a8, 0x5b0, -1,    0x5b8, 0x5c0, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x20;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -14984,9 +14984,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x6b0;
+    AOT_Thread_active_exception_offset = 0x6b8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6b8;
+    AOT_Thread_active_stacktrace_offset = 0x6c0;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -15004,7 +15004,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x880;
+    0x888;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -15020,13 +15020,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e8;
+    0x8f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x888;
+    AOT_Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f0;
+    AOT_Thread_service_extension_stream_offset = 0x8f8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -15043,7 +15043,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6d8;
+    AOT_Thread_execution_state_offset = 0x6e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -15063,7 +15063,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6c0;
+    AOT_Thread_global_object_pool_offset = 0x6c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -15071,10 +15071,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6e8;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x660;
+    AOT_Thread_exit_through_ffi_offset = 0x6f0;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x668;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -15084,9 +15084,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x690;
+    AOT_Thread_old_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x698;
+    AOT_Thread_new_marking_stack_block_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -15140,15 +15140,15 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6c8;
+    0x6d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6d0;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6e0;
+    AOT_Thread_safepoint_state_offset = 0x6e8;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
-    0x8b8;
+    0x8c0;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
@@ -15156,9 +15156,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x670;
+    AOT_Thread_saved_stack_limit_offset = 0x678;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x678;
+    AOT_Thread_stack_overflow_flags_offset = 0x680;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -15169,38 +15169,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x688;
+    AOT_Thread_store_buffer_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x650;
+        0x658;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x660;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x680;
+    AOT_Thread_top_exit_frame_info_offset = 0x688;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x890;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a8;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x898;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -15208,18 +15208,18 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset =
     0x58;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x8a0;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a8;
+    0x8a8;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x8b0;
+    0x8b8;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8c8;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8d0;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8d8;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8c0;
+    0x8c8;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -15319,10 +15319,10 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
-        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
-        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
-        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
+        0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0, 0x5a8,
+        0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, 0x5e0, -1,
+        -1,    -1,    -1,    0x5e8, 0x5f0, -1,    -1,    0x5f8,
+        0x600, 0x608, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x20;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -15785,9 +15785,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x34c;
+    AOT_Thread_active_exception_offset = 0x350;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x350;
+    AOT_Thread_active_stacktrace_offset = 0x354;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -15805,7 +15805,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x434;
+    0x438;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -15825,7 +15825,7 @@ static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x438;
+    AOT_Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 0x480;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -15844,7 +15844,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x360;
+    AOT_Thread_execution_state_offset = 0x364;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -15864,7 +15864,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x354;
+    AOT_Thread_global_object_pool_offset = 0x358;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -15872,10 +15872,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x368;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x324;
+    AOT_Thread_exit_through_ffi_offset = 0x36c;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x328;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x328;
+    0x32c;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x38;
 static constexpr dart::compiler::target::word
@@ -15885,9 +15885,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x33c;
+    AOT_Thread_old_marking_stack_block_offset = 0x340;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x340;
+    AOT_Thread_new_marking_stack_block_offset = 0x344;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -15941,11 +15941,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x358;
+    0x35c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x35c;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x364;
+    AOT_Thread_safepoint_state_offset = 0x368;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
@@ -15957,9 +15957,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x24;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x32c;
+    AOT_Thread_saved_stack_limit_offset = 0x330;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x330;
+    AOT_Thread_stack_overflow_flags_offset = 0x334;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -15970,38 +15970,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x338;
+    AOT_Thread_store_buffer_block_offset = 0x33c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x2fc;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x300;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x300;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2f8;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x304;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x308;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x308;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x30c;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x310;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x310;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x314;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x314;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x318;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x318;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x31c;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x31c;
+        0x320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x320;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x324;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x334;
+    AOT_Thread_top_exit_frame_info_offset = 0x338;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x10;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_runtime_arg_offset = 0x440;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x348;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x34c;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word
@@ -16118,9 +16118,9 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x2b0, 0x2b4, 0x2b8, -1,    -1,    0x2bc,
-        0x2c0, 0x2c4, -1, -1, -1, 0x2c8, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc,
-        0x2e0, 0x2e4, -1, -1, -1, -1,    0x2e8, 0x2ec, 0x2f0, 0x2f4};
+        -1,    -1,    -1, -1, -1, 0x2b4, 0x2b8, 0x2bc, -1,    -1,    0x2c0,
+        0x2c4, 0x2c8, -1, -1, -1, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc, 0x2e0,
+        0x2e4, 0x2e8, -1, -1, -1, -1,    0x2ec, 0x2f0, 0x2f4, 0x2f8};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x14;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x8;
@@ -16582,9 +16582,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x698;
+    AOT_Thread_active_exception_offset = 0x6a0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6a0;
+    AOT_Thread_active_stacktrace_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -16602,7 +16602,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -16618,13 +16618,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8d0;
+    0x8d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x870;
+    AOT_Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8d8;
+    AOT_Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -16641,7 +16641,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6c0;
+    AOT_Thread_execution_state_offset = 0x6c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -16661,7 +16661,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6a8;
+    AOT_Thread_global_object_pool_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -16669,10 +16669,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6d0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x648;
+    AOT_Thread_exit_through_ffi_offset = 0x6d8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x650;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x650;
+    0x658;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -16682,9 +16682,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x678;
+    AOT_Thread_old_marking_stack_block_offset = 0x680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x680;
+    AOT_Thread_new_marking_stack_block_offset = 0x688;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -16738,15 +16738,15 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6b0;
+    0x6b8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6b8;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6c0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6c8;
+    AOT_Thread_safepoint_state_offset = 0x6d0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word AOT_Thread_single_step_offset =
-    0x8a0;
+    0x8a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_stub_offset = 0x1c8;
 static constexpr dart::compiler::target::word
@@ -16754,9 +16754,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x658;
+    AOT_Thread_saved_stack_limit_offset = 0x660;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x660;
+    AOT_Thread_stack_overflow_flags_offset = 0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -16767,55 +16767,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x670;
+    AOT_Thread_store_buffer_block_offset = 0x678;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x638;
+        0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x668;
+    AOT_Thread_top_exit_frame_info_offset = 0x670;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x878;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x690;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x880;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x888;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x890;
+    0x890;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x898;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x898;
+    0x8a0;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8b0;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8b8;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8c0;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8a8;
+    0x8b0;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -16915,9 +16915,9 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x560, 0x568, 0x570, -1,    -1,    0x578,
-        0x580, 0x588, -1, -1, -1, 0x590, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8,
-        0x5c0, 0x5c8, -1, -1, -1, -1,    0x5d0, 0x5d8, 0x5e0, 0x5e8};
+        -1,    -1,    -1, -1, -1, 0x568, 0x570, 0x578, -1,    -1,    0x580,
+        0x588, 0x590, -1, -1, -1, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0,
+        0x5c8, 0x5d0, -1, -1, -1, -1,    0x5d8, 0x5e0, 0x5e8, 0x5f0};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -17373,9 +17373,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x324;
+    AOT_Thread_active_exception_offset = 0x328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x328;
+    AOT_Thread_active_stacktrace_offset = 0x32c;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -17393,7 +17393,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x40c;
+    0x410;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -17413,7 +17413,7 @@ static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x410;
+    AOT_Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 0x458;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -17432,7 +17432,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x338;
+    AOT_Thread_execution_state_offset = 0x33c;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -17452,7 +17452,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x32c;
+    AOT_Thread_global_object_pool_offset = 0x330;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -17460,10 +17460,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x340;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x2fc;
+    AOT_Thread_exit_through_ffi_offset = 0x344;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x300;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x300;
+    0x304;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x38;
 static constexpr dart::compiler::target::word
@@ -17473,9 +17473,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x314;
+    AOT_Thread_old_marking_stack_block_offset = 0x318;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x318;
+    AOT_Thread_new_marking_stack_block_offset = 0x31c;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -17529,11 +17529,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x330;
+    0x334;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x334;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x338;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x33c;
+    AOT_Thread_safepoint_state_offset = 0x340;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word
@@ -17543,9 +17543,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x24;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x304;
+    AOT_Thread_saved_stack_limit_offset = 0x308;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x308;
+    AOT_Thread_stack_overflow_flags_offset = 0x30c;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -17556,38 +17556,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x310;
+    AOT_Thread_store_buffer_block_offset = 0x314;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x2d4;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2d8;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x2dc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2d0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2d4;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x2dc;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e0;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x2e4;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x2e4;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x2e8;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x2ec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x2ec;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x2f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f0;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x2f4;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x2f4;
+        0x2f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x2f8;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x30c;
+    AOT_Thread_top_exit_frame_info_offset = 0x310;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x10;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_runtime_arg_offset = 0x418;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x320;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x324;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word
@@ -17704,8 +17704,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x2b0, 0x2b4, 0x2b8, 0x2bc, 0x2c0, -1, 0x2c4, -1,
-        0x2c8, 0x2cc, -1,    -1,    -1,    -1, -1,    -1};
+        0x2b4, 0x2b8, 0x2bc, 0x2c0, 0x2c4, -1, 0x2c8, -1,
+        0x2cc, 0x2d0, -1,    -1,    -1,    -1, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x14;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x8;
@@ -18160,9 +18160,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x660;
+    AOT_Thread_active_exception_offset = 0x668;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x668;
+    AOT_Thread_active_stacktrace_offset = 0x670;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -18180,7 +18180,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x830;
+    0x838;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -18196,13 +18196,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x898;
+    0x8a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x838;
+    AOT_Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a0;
+    AOT_Thread_service_extension_stream_offset = 0x8a8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -18219,7 +18219,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x688;
+    AOT_Thread_execution_state_offset = 0x690;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -18239,7 +18239,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x670;
+    AOT_Thread_global_object_pool_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -18247,10 +18247,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x698;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x610;
+    AOT_Thread_exit_through_ffi_offset = 0x6a0;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x618;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x618;
+    0x620;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -18260,9 +18260,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x640;
+    AOT_Thread_old_marking_stack_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x648;
+    AOT_Thread_new_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -18316,11 +18316,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x678;
+    0x680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x680;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x690;
+    AOT_Thread_safepoint_state_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -18330,9 +18330,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x620;
+    AOT_Thread_saved_stack_limit_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x628;
+    AOT_Thread_stack_overflow_flags_offset = 0x630;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -18343,55 +18343,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x638;
+    AOT_Thread_store_buffer_block_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c0;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5c8;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5b8;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d0;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5d8;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e0;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5e8;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x600;
+        0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x630;
+    AOT_Thread_top_exit_frame_info_offset = 0x638;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x840;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x658;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x848;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x660;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x850;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x858;
+    0x858;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x860;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x860;
+    0x868;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x878;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x880;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x888;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x870;
+    0x878;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -18491,8 +18491,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, -1,    -1,    0x580, 0x588,
-        0x590, 0x598, 0x5a0, -1,    0x5a8, 0x5b0, -1,    -1};
+        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
+        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -18954,9 +18954,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x6a8;
+    AOT_Thread_active_exception_offset = 0x6b0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6b0;
+    AOT_Thread_active_stacktrace_offset = 0x6b8;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -18974,7 +18974,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -18990,13 +18990,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e0;
+    0x8e8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x880;
+    AOT_Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8e8;
+    AOT_Thread_service_extension_stream_offset = 0x8f0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19013,7 +19013,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6d0;
+    AOT_Thread_execution_state_offset = 0x6d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -19033,7 +19033,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6b8;
+    AOT_Thread_global_object_pool_offset = 0x6c0;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -19041,10 +19041,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6e0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x658;
+    AOT_Thread_exit_through_ffi_offset = 0x6e8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x660;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x660;
+    0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -19054,9 +19054,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x688;
+    AOT_Thread_old_marking_stack_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x690;
+    AOT_Thread_new_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -19110,11 +19110,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6c0;
+    0x6c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6c8;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6d8;
+    AOT_Thread_safepoint_state_offset = 0x6e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -19124,9 +19124,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x668;
+    AOT_Thread_saved_stack_limit_offset = 0x670;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x670;
+    AOT_Thread_stack_overflow_flags_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -19137,55 +19137,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x680;
+    AOT_Thread_store_buffer_block_offset = 0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x638;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x648;
+        0x650;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x650;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x678;
+    AOT_Thread_top_exit_frame_info_offset = 0x680;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x888;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a0;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x890;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x898;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a0;
+    0x8a0;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x8a8;
+    0x8b0;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8c0;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8c8;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8d0;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8b8;
+    0x8c0;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -19285,10 +19285,10 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x560, 0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598,
-        0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, -1,
-        -1,    -1,    -1,    0x5d8, 0x5e0, -1,    -1,    0x5e8,
-        0x5f0, 0x5f8, -1,    -1,    -1,    -1,    -1,    -1};
+        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
+        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
+        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
+        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -19744,9 +19744,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x668;
+    AOT_Thread_active_exception_offset = 0x670;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x670;
+    AOT_Thread_active_stacktrace_offset = 0x678;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -19764,7 +19764,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x838;
+    0x840;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -19780,13 +19780,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a0;
+    0x8a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x840;
+    AOT_Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a8;
+    AOT_Thread_service_extension_stream_offset = 0x8b0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19803,7 +19803,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x690;
+    AOT_Thread_execution_state_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -19823,7 +19823,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x678;
+    AOT_Thread_global_object_pool_offset = 0x680;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -19831,10 +19831,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6a0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x618;
+    AOT_Thread_exit_through_ffi_offset = 0x6a8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x620;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x620;
+    0x628;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -19844,9 +19844,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x648;
+    AOT_Thread_old_marking_stack_block_offset = 0x650;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x650;
+    AOT_Thread_new_marking_stack_block_offset = 0x658;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -19900,11 +19900,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x680;
+    0x688;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x688;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x698;
+    AOT_Thread_safepoint_state_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word
@@ -19914,9 +19914,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x628;
+    AOT_Thread_saved_stack_limit_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x630;
+    AOT_Thread_stack_overflow_flags_offset = 0x638;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -19927,38 +19927,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x640;
+    AOT_Thread_store_buffer_block_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5c8;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x5d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d0;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x5d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5c8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5d8;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x5e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e0;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x5e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5e8;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x5f0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x608;
+        0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x638;
+    AOT_Thread_top_exit_frame_info_offset = 0x640;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x848;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x660;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x850;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -19966,18 +19966,18 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset =
     0x58;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x858;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x860;
+    0x860;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x868;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x880;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x888;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x890;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x878;
+    0x880;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -20077,8 +20077,8 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, -1,    -1,    0x588, 0x590,
-        0x598, 0x5a0, 0x5a8, -1,    0x5b0, 0x5b8, -1,    -1};
+        0x570, 0x578, 0x580, 0x588, -1,    -1,    0x590, 0x598,
+        0x5a0, 0x5a8, 0x5b0, -1,    0x5b8, 0x5c0, -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x20;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -20534,9 +20534,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x6b0;
+    AOT_Thread_active_exception_offset = 0x6b8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6b8;
+    AOT_Thread_active_stacktrace_offset = 0x6c0;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
@@ -20554,7 +20554,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x230;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x880;
+    0x888;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x160;
 static constexpr dart::compiler::target::word
@@ -20570,13 +20570,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e8;
+    0x8f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x888;
+    AOT_Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f0;
+    AOT_Thread_service_extension_stream_offset = 0x8f8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -20593,7 +20593,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6d8;
+    AOT_Thread_execution_state_offset = 0x6e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e8;
 static constexpr dart::compiler::target::word
@@ -20613,7 +20613,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6c0;
+    AOT_Thread_global_object_pool_offset = 0x6c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x2a0;
 static constexpr dart::compiler::target::word
@@ -20621,10 +20621,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6e8;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x660;
+    AOT_Thread_exit_through_ffi_offset = 0x6f0;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x668;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x668;
+    0x670;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -20634,9 +20634,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x690;
+    AOT_Thread_old_marking_stack_block_offset = 0x698;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x698;
+    AOT_Thread_new_marking_stack_block_offset = 0x6a0;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x248;
 static constexpr dart::compiler::target::word
@@ -20690,11 +20690,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x280;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6c8;
+    0x6d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6d0;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6e0;
+    AOT_Thread_safepoint_state_offset = 0x6e8;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x80;
 static constexpr dart::compiler::target::word
@@ -20704,9 +20704,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x670;
+    AOT_Thread_saved_stack_limit_offset = 0x678;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x678;
+    AOT_Thread_stack_overflow_flags_offset = 0x680;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -20717,38 +20717,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x188;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x688;
+    AOT_Thread_store_buffer_block_offset = 0x690;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x638;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x648;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x650;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x650;
+        0x658;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x658;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x660;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x680;
+    AOT_Thread_top_exit_frame_info_offset = 0x688;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x60;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x890;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6a8;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x898;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -20756,18 +20756,18 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset =
     0x58;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x8a0;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8a8;
+    0x8a8;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x8b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x270;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x8b0;
+    0x8b8;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8c8;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8d0;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8d8;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8c0;
+    0x8c8;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -20867,10 +20867,10 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        0x568, 0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0,
-        0x5a8, 0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, -1,
-        -1,    -1,    -1,    0x5e0, 0x5e8, -1,    -1,    0x5f0,
-        0x5f8, 0x600, -1,    -1,    -1,    -1,    -1,    -1};
+        0x570, 0x578, 0x580, 0x588, 0x590, 0x598, 0x5a0, 0x5a8,
+        0x5b0, 0x5b8, 0x5c0, 0x5c8, 0x5d0, 0x5d8, 0x5e0, -1,
+        -1,    -1,    -1,    0x5e8, 0x5f0, -1,    -1,    0x5f8,
+        0x600, 0x608, -1,    -1,    -1,    -1,    -1,    -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x20;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
@@ -21326,9 +21326,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x170;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x34c;
+    AOT_Thread_active_exception_offset = 0x350;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x350;
+    AOT_Thread_active_stacktrace_offset = 0x354;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0xfc;
 static constexpr dart::compiler::target::word
@@ -21346,7 +21346,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x114;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x434;
+    0x438;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0xac;
 static constexpr dart::compiler::target::word
@@ -21366,7 +21366,7 @@ static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x438;
+    AOT_Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
     AOT_Thread_service_extension_stream_offset = 0x480;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -21385,7 +21385,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x30;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0xec;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x360;
+    AOT_Thread_execution_state_offset = 0x364;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0xf0;
 static constexpr dart::compiler::target::word
@@ -21405,7 +21405,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x16c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x354;
+    AOT_Thread_global_object_pool_offset = 0x358;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x14c;
 static constexpr dart::compiler::target::word
@@ -21413,10 +21413,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0x60;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x368;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x324;
+    AOT_Thread_exit_through_ffi_offset = 0x36c;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x328;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x328;
+    0x32c;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x38;
 static constexpr dart::compiler::target::word
@@ -21426,9 +21426,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0xe8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x33c;
+    AOT_Thread_old_marking_stack_block_offset = 0x340;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x340;
+    AOT_Thread_new_marking_stack_block_offset = 0x344;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x120;
 static constexpr dart::compiler::target::word
@@ -21482,11 +21482,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x13c;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x358;
+    0x35c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x35c;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x364;
+    AOT_Thread_safepoint_state_offset = 0x368;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x3c;
 static constexpr dart::compiler::target::word
@@ -21496,9 +21496,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x24;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x32c;
+    AOT_Thread_saved_stack_limit_offset = 0x330;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x330;
+    AOT_Thread_stack_overflow_flags_offset = 0x334;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x11c;
 static constexpr dart::compiler::target::word
@@ -21509,38 +21509,38 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x338;
+    AOT_Thread_store_buffer_block_offset = 0x33c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x2fc;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x300;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x300;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2f8;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x2fc;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x304;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x308;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x308;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x30c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x30c;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x310;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x310;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x314;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x314;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x318;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x318;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x31c;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x31c;
+        0x320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x320;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x324;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x334;
+    AOT_Thread_top_exit_frame_info_offset = 0x338;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x2c;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x10;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_runtime_arg_offset = 0x440;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x348;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x34c;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0xf8;
 static constexpr dart::compiler::target::word
@@ -21657,9 +21657,9 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x4, 0xc, 0x8, 0x10};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x2b0, 0x2b4, 0x2b8, -1,    -1,    0x2bc,
-        0x2c0, 0x2c4, -1, -1, -1, 0x2c8, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc,
-        0x2e0, 0x2e4, -1, -1, -1, -1,    0x2e8, 0x2ec, 0x2f0, 0x2f4};
+        -1,    -1,    -1, -1, -1, 0x2b4, 0x2b8, 0x2bc, -1,    -1,    0x2c0,
+        0x2c4, 0x2c8, -1, -1, -1, 0x2cc, 0x2d0, 0x2d4, 0x2d8, 0x2dc, 0x2e0,
+        0x2e4, 0x2e8, -1, -1, -1, -1,    0x2ec, 0x2f0, 0x2f4, 0x2f8};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x14;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x8;
@@ -22114,9 +22114,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_AllocateArray_entry_point_offset = 0x2e0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 0x698;
+    AOT_Thread_active_exception_offset = 0x6a0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 0x6a0;
+    AOT_Thread_active_stacktrace_offset = 0x6a8;
 static constexpr dart::compiler::target::word
     AOT_Thread_array_write_barrier_entry_point_offset = 0x1f8;
 static constexpr dart::compiler::target::word
@@ -22134,7 +22134,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_allocate_object_slow_entry_point_offset = 0x228;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    0x868;
+    0x870;
 static constexpr dart::compiler::target::word
     AOT_Thread_async_exception_handler_stub_offset = 0x158;
 static constexpr dart::compiler::target::word
@@ -22150,13 +22150,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8d0;
+    0x8d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 0x870;
+    AOT_Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8d8;
+    AOT_Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -22173,7 +22173,7 @@ static constexpr dart::compiler::target::word AOT_Thread_end_offset = 0x60;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 0x1d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 0x6c0;
+    AOT_Thread_execution_state_offset = 0x6c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_safepoint_stub_offset = 0x1e0;
 static constexpr dart::compiler::target::word
@@ -22193,7 +22193,7 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_float_zerow_address_offset = 0x2d8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 0x6a8;
+    AOT_Thread_global_object_pool_offset = 0x6b0;
 static constexpr dart::compiler::target::word
     AOT_Thread_interpret_call_entry_point_offset = 0x298;
 static constexpr dart::compiler::target::word
@@ -22201,10 +22201,10 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_invoke_dart_code_stub_offset = 0xc0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 0x6d0;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x648;
+    AOT_Thread_exit_through_ffi_offset = 0x6d8;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 0x650;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    0x650;
+    0x658;
 static constexpr dart::compiler::target::word
     AOT_Thread_field_table_values_offset = 0x70;
 static constexpr dart::compiler::target::word
@@ -22214,9 +22214,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 0x1d0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_old_marking_stack_block_offset = 0x678;
+    AOT_Thread_old_marking_stack_block_offset = 0x680;
 static constexpr dart::compiler::target::word
-    AOT_Thread_new_marking_stack_block_offset = 0x680;
+    AOT_Thread_new_marking_stack_block_offset = 0x688;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 0x240;
 static constexpr dart::compiler::target::word
@@ -22270,11 +22270,11 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_resume_interpreter_adjusted_entry_point_offset = 0x278;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    0x6b0;
+    0x6b8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 0x6b8;
+    AOT_Thread_saved_shadow_call_stack_offset = 0x6c0;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 0x6c8;
+    AOT_Thread_safepoint_state_offset = 0x6d0;
 static constexpr dart::compiler::target::word
     AOT_Thread_shared_field_table_values_offset = 0x78;
 static constexpr dart::compiler::target::word
@@ -22284,9 +22284,9 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
     0x48;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 0x658;
+    AOT_Thread_saved_stack_limit_offset = 0x660;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 0x660;
+    AOT_Thread_stack_overflow_flags_offset = 0x668;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 0x238;
 static constexpr dart::compiler::target::word
@@ -22297,55 +22297,55 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 0x180;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 0x670;
+    AOT_Thread_store_buffer_block_offset = 0x678;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_entry_point_offset = 0x5f8;
+    AOT_Thread_suspend_state_await_entry_point_offset = 0x600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x600;
+    AOT_Thread_suspend_state_await_with_type_check_entry_point_offset = 0x608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5f0;
+    AOT_Thread_suspend_state_init_async_entry_point_offset = 0x5f8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x608;
+    AOT_Thread_suspend_state_return_async_entry_point_offset = 0x610;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x610;
+    AOT_Thread_suspend_state_return_async_not_future_entry_point_offset = 0x618;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x618;
+    AOT_Thread_suspend_state_init_async_star_entry_point_offset = 0x620;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x620;
+    AOT_Thread_suspend_state_yield_async_star_entry_point_offset = 0x628;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x628;
+    AOT_Thread_suspend_state_return_async_star_entry_point_offset = 0x630;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x630;
+    AOT_Thread_suspend_state_init_sync_star_entry_point_offset = 0x638;
 static constexpr dart::compiler::target::word
     AOT_Thread_suspend_state_suspend_sync_star_at_start_entry_point_offset =
-        0x638;
+        0x640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x640;
+    AOT_Thread_suspend_state_handle_exception_entry_point_offset = 0x648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 0x668;
+    AOT_Thread_top_exit_frame_info_offset = 0x670;
 static constexpr dart::compiler::target::word AOT_Thread_top_offset = 0x58;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
     0x20;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_runtime_arg_offset = 0x878;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x690;
+    AOT_Thread_unboxed_runtime_arg_offset = 0x880;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 0x698;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 0x1f0;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_mask_offset = 0x50;
 static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
-    0x888;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x890;
+    0x890;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 0x898;
 static constexpr dart::compiler::target::word
     AOT_Thread_jump_to_frame_entry_point_offset = 0x268;
 static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
-    0x898;
+    0x8a0;
 static constexpr dart::compiler::target::word AOT_Thread_current_tag_offset =
-    0x8b0;
-static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
     0x8b8;
+static constexpr dart::compiler::target::word AOT_Thread_default_tag_offset =
+    0x8c0;
 static constexpr dart::compiler::target::word AOT_Thread_user_tag_offset =
-    0x8a8;
+    0x8b0;
 static constexpr dart::compiler::target::word
     AOT_TsanUtils_setjmp_function_offset = 0x0;
 static constexpr dart::compiler::target::word
@@ -22445,9 +22445,9 @@ static constexpr dart::compiler::target::word AOT_Code_entry_point_offset[] = {
     0x8, 0x18, 0x10, 0x20};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        -1,    -1,    -1, -1, -1, 0x560, 0x568, 0x570, -1,    -1,    0x578,
-        0x580, 0x588, -1, -1, -1, 0x590, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8,
-        0x5c0, 0x5c8, -1, -1, -1, -1,    0x5d0, 0x5d8, 0x5e0, 0x5e8};
+        -1,    -1,    -1, -1, -1, 0x568, 0x570, 0x578, -1,    -1,    0x580,
+        0x588, 0x590, -1, -1, -1, 0x598, 0x5a0, 0x5a8, 0x5b0, 0x5b8, 0x5c0,
+        0x5c8, 0x5d0, -1, -1, -1, -1,    0x5d8, 0x5e0, 0x5e8, 0x5f0};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     0x28;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 0x10;
diff --git a/runtime/vm/constants_kbc.h b/runtime/vm/constants_kbc.h
index 17b26ebdecc..8d775d53b0b 100644
--- a/runtime/vm/constants_kbc.h
+++ b/runtime/vm/constants_kbc.h
@@ -427,71 +427,22 @@ class KernelBytecode {
     return DecodeOpcode(instr) == KernelBytecode::kSetFrame;
   }
 
-  DART_FORCE_INLINE static bool IsDebugCheckOpcode(const KBCInstr* instr) {
-    return DecodeOpcode(instr) == KernelBytecode::kDebugCheck;
-  }
-
-  // The interpreter, the bytecode generator, the bytecode compiler, and this
-  // function must agree on this list of opcodes.
-  // For each instruction with listed opcode:
-  // - The interpreter checks for a debug break.
-  // - The bytecode generator emits a source position.
-  // - The bytecode compiler may emit a DebugStepCheck call.
-  DART_FORCE_INLINE static bool IsDebugCheckedOpcode(const KBCInstr* instr) {
-    return IsDebugCheckedOpcode(DecodeOpcode(instr));
-  }
-
-  DART_FORCE_INLINE static bool IsDebugCheckedOpcode(Opcode op) {
-    switch (op) {
-      case KernelBytecode::kDebugCheck:
+  DART_FORCE_INLINE static bool IsDirectCallOpcode(const KBCInstr* instr) {
+    switch (DecodeOpcode(instr)) {
       case KernelBytecode::kDirectCall:
       case KernelBytecode::kDirectCall_Wide:
       case KernelBytecode::kUncheckedDirectCall:
       case KernelBytecode::kUncheckedDirectCall_Wide:
-      case KernelBytecode::kInterfaceCall:
-      case KernelBytecode::kInterfaceCall_Wide:
-      case KernelBytecode::kInstantiatedInterfaceCall:
-      case KernelBytecode::kInstantiatedInterfaceCall_Wide:
-      case KernelBytecode::kUncheckedClosureCall:
-      case KernelBytecode::kUncheckedClosureCall_Wide:
-      case KernelBytecode::kUncheckedInterfaceCall:
-      case KernelBytecode::kUncheckedInterfaceCall_Wide:
-      case KernelBytecode::kDynamicCall:
-      case KernelBytecode::kDynamicCall_Wide:
-      case KernelBytecode::kReturnTOS:
-      case KernelBytecode::kEqualsNull:
-      case KernelBytecode::kNegateInt:
-      case KernelBytecode::kNegateDouble:
-      case KernelBytecode::kAddInt:
-      case KernelBytecode::kSubInt:
-      case KernelBytecode::kMulInt:
-      case KernelBytecode::kTruncDivInt:
-      case KernelBytecode::kModInt:
-      case KernelBytecode::kBitAndInt:
-      case KernelBytecode::kBitOrInt:
-      case KernelBytecode::kBitXorInt:
-      case KernelBytecode::kShlInt:
-      case KernelBytecode::kShrInt:
-      case KernelBytecode::kCompareIntEq:
-      case KernelBytecode::kCompareIntGt:
-      case KernelBytecode::kCompareIntLt:
-      case KernelBytecode::kCompareIntGe:
-      case KernelBytecode::kCompareIntLe:
-      case KernelBytecode::kAddDouble:
-      case KernelBytecode::kSubDouble:
-      case KernelBytecode::kMulDouble:
-      case KernelBytecode::kDivDouble:
-      case KernelBytecode::kCompareDoubleEq:
-      case KernelBytecode::kCompareDoubleGt:
-      case KernelBytecode::kCompareDoubleLt:
-      case KernelBytecode::kCompareDoubleGe:
-      case KernelBytecode::kCompareDoubleLe:
         return true;
       default:
         return false;
     }
   }
 
+  DART_FORCE_INLINE static bool IsReturnOpcode(const KBCInstr* instr) {
+    return DecodeOpcode(instr) == KernelBytecode::kReturnTOS;
+  }
+
   DART_FORCE_INLINE static uint8_t DecodeArgc(const KBCInstr* ret_addr) {
     // All call instructions have DF encoding, with argc being the last byte
     // regardless of whether the wide variant is used or not.
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc
index b07f39ef778..f40be9c4494 100644
--- a/runtime/vm/debugger.cc
+++ b/runtime/vm/debugger.cc
@@ -535,24 +535,24 @@ void ActivationFrame::GetPcDescriptors() {
 // if not IsInterpreted(), also compute deopt_id_.
 TokenPosition ActivationFrame::TokenPos() {
   if (!token_pos_initialized_) {
-    token_pos_initialized_ = true;
+    token_pos_ = TokenPosition::kNoSource;
     if (IsInterpreted()) {
       token_pos_ = bytecode().GetTokenIndexOfPC(pc_);
       try_index_ = bytecode().GetTryIndexAtPc(pc_);
-      return token_pos_;
-    }
-    token_pos_ = TokenPosition::kNoSource;
-    GetPcDescriptors();
-    PcDescriptors::Iterator iter(pc_desc_, UntaggedPcDescriptors::kAnyKind);
-    const uword pc_offset = pc_ - code().PayloadStart();
-    while (iter.MoveNext()) {
-      if (iter.PcOffset() == pc_offset) {
-        try_index_ = iter.TryIndex();
-        token_pos_ = iter.TokenPos();
-        deopt_id_ = iter.DeoptId();
-        break;
+    } else {
+      GetPcDescriptors();
+      PcDescriptors::Iterator iter(pc_desc_, UntaggedPcDescriptors::kAnyKind);
+      const uword pc_offset = pc_ - code().PayloadStart();
+      while (iter.MoveNext()) {
+        if (iter.PcOffset() == pc_offset) {
+          try_index_ = iter.TryIndex();
+          token_pos_ = iter.TokenPos();
+          deopt_id_ = iter.DeoptId();
+          break;
+        }
       }
     }
+    token_pos_initialized_ = true;
   }
   return token_pos_;
 }
@@ -2257,21 +2257,18 @@ static TokenPosition ResolveBreakpointPos(const Function& func,
 
   if (func.HasBytecode()) {
 #if defined(DART_DYNAMIC_MODULES)
+    // Only compiled code has synthetic token positions.
+    ASSERT(!requested_token_pos.IsSynthetic());
     bytecode::BytecodeSourcePositionsIterator iter(zone, bytecode);
     while (iter.MoveNext()) {
       const TokenPosition& pos = iter.TokenPos();
-      if (pos.IsSynthetic() && pos == requested_token_pos) {
-        // if there's a safepoint for a synthetic function start and the start
-        // was requested, we're done.
-        return pos;
-      }
       if (!pos.IsWithin(requested_token_pos, last_token_pos)) {
         // Token is not in the target range.
         continue;
       }
       TokenPosition next_closest_token_position = TokenPosition::kMaxSource;
       if (requested_column >= 0) {
-        // Find next closest safepoint
+        // Find next closest emitted source position.
         bytecode::BytecodeSourcePositionsIterator iter2(zone, bytecode);
         while (iter2.MoveNext()) {
           const TokenPosition& next = iter2.TokenPos();
@@ -2352,11 +2349,6 @@ static TokenPosition ResolveBreakpointPos(const Function& func,
           // Token is not on same line as best fit.
           continue;
         }
-        // To match the PCDescriptors version, adjust the offset to be
-        // the "return address" (e.g., the next instuction).
-        auto* const pc = reinterpret_cast<const KBCInstr*>(
-            pc_offset + bytecode.PayloadStart());
-        pc_offset += KernelBytecode::kInstructionSize[*pc];
         // Prefer the lowest pc offset.
         if (pc_offset < lowest_pc_offset) {
           lowest_pc_offset = pc_offset;
@@ -2457,12 +2449,11 @@ void GroupDebugger::MakeCodeBreakpointAtUnsafe(Thread* thread,
     bytecode::BytecodeSourcePositionsIterator iter(zone, bytecode);
     while (iter.MoveNext()) {
       if (iter.TokenPos() == loc->token_pos_) {
-        // To match the PCDescriptors version, adjust the offset to be
-        // the "return address" (e.g., the next instuction).
-        uword pc_offset = iter.PcOffset();
-        auto* const pc = reinterpret_cast<const KBCInstr*>(
-            pc_offset + bytecode.PayloadStart());
-        pc_offset += KernelBytecode::kInstructionSize[*pc];
+        // Breakpoints are set and located using the address of the instruction
+        // following the breakpoint instruction, since frames contain
+        // return addresses.
+        const uword pc_offset =
+            KernelBytecode::Next(start + iter.PcOffset()) - start;
         if (pc_offset < lowest_pc_offset) {
           lowest_pc_offset = pc_offset;
         }
@@ -3844,27 +3835,107 @@ void Debugger::SignalPausedEvent(ActivationFrame* top_frame, Breakpoint* bpt) {
 }
 
 static bool IsAtAsyncJump(ActivationFrame* top_frame) {
-  Zone* zone = Thread::Current()->zone();
+  Thread* const thread = Thread::Current();
+  Zone* const zone = thread->zone();
   if (!top_frame->function().IsAsyncFunction() &&
       !top_frame->function().IsAsyncGenerator()) {
     return false;
   }
-  const auto& pc_descriptors =
-      PcDescriptors::Handle(zone, top_frame->code().pc_descriptors());
-  if (pc_descriptors.IsNull()) {
-    return false;
-  }
-  const TokenPosition looking_for = top_frame->TokenPos();
-  PcDescriptors::Iterator it(pc_descriptors, UntaggedPcDescriptors::kOther);
-  while (it.MoveNext()) {
-    if (it.TokenPos() == looking_for &&
-        it.YieldIndex() != UntaggedPcDescriptors::kInvalidYieldIndex) {
-      return true;
+  if (top_frame->IsInterpreted()) {
+#if defined(DART_DYNAMIC_MODULES)
+    const auto& bytecode = top_frame->bytecode();
+    const uword prev = bytecode.GetInstructionBefore(top_frame->pc());
+    if (prev == 0) {
+      // Async awaiter frames have an PC offset of 0 or 1.
+      ASSERT(top_frame->pc() == bytecode.PayloadStart() ||
+             top_frame->pc() == bytecode.PayloadStart() +
+                                    StackTraceUtils::kFutureListenerPcOffset);
+      return false;
+    }
+    auto* const instr = reinterpret_cast<const KBCInstr*>(prev);
+    // Async jumps in bytecode are implemented via direct calls to the
+    // appropriate Dart method.
+    if (!KernelBytecode::IsDirectCallOpcode(instr)) {
+      return false;
+    }
+    const auto& object_pool = ObjectPool::Handle(zone, bytecode.object_pool());
+    auto const index = KernelBytecode::DecodeD(instr);
+    const auto& obj = Object::Handle(zone, object_pool.ObjectAt(index));
+    if (obj.IsNull() || !obj.IsFunction()) {
+      return false;
+    }
+    const auto& target = Function::Cast(obj);
+    auto* const object_store = thread->isolate_group()->object_store();
+    return target.ptr() == object_store->suspend_state_await() ||
+           target.ptr() ==
+               object_store->suspend_state_await_with_type_check() ||
+           target.ptr() == object_store->suspend_state_yield_async_star() ||
+           target.ptr() ==
+               object_store->suspend_state_suspend_sync_star_at_start();
+#else
+    UNREACHABLE();
+#endif
+  } else {
+    const TokenPosition looking_for = top_frame->TokenPos();
+    const auto& pc_descriptors =
+        PcDescriptors::Handle(zone, top_frame->code().pc_descriptors());
+    if (!pc_descriptors.IsNull()) {
+      PcDescriptors::Iterator it(pc_descriptors, UntaggedPcDescriptors::kOther);
+      while (it.MoveNext()) {
+        if (it.TokenPos() == looking_for &&
+            it.YieldIndex() != UntaggedPcDescriptors::kInvalidYieldIndex) {
+          return true;
+        }
+      }
     }
   }
   return false;
 }
 
+static bool IsAtBytecodeAsyncReturn(ActivationFrame* top_frame) {
+#if defined(DART_DYNAMIC_MODULES)
+  if (!top_frame->IsInterpreted()) return false;
+
+  Thread* const thread = Thread::Current();
+  Zone* const zone = thread->zone();
+  const auto& bytecode = top_frame->bytecode();
+  uword prev = bytecode.GetInstructionBefore(top_frame->pc());
+  if (prev == 0) {
+    // Async awaiter frames have an PC offset of 0 or 1.
+    ASSERT(top_frame->pc() == bytecode.PayloadStart() ||
+           top_frame->pc() == bytecode.PayloadStart() +
+                                  StackTraceUtils::kFutureListenerPcOffset);
+    return false;
+  }
+  auto* instr = reinterpret_cast<const KBCInstr*>(prev);
+  // Async returns in bytecode are implemented via direct calls to
+  // the appropriate Dart async return method followed by a return
+  // instruction.
+  if (KernelBytecode::IsReturnOpcode(instr)) {
+    prev = bytecode.GetInstructionBefore(prev);
+    ASSERT(prev != 0);
+    instr = reinterpret_cast<const KBCInstr*>(prev);
+  }
+  if (!KernelBytecode::IsDirectCallOpcode(instr)) {
+    return false;
+  }
+  const auto& object_pool = ObjectPool::Handle(zone, bytecode.object_pool());
+  auto const index = KernelBytecode::DecodeD(instr);
+  const auto& obj = Object::Handle(zone, object_pool.ObjectAt(index));
+  if (obj.IsNull() || !obj.IsFunction()) {
+    return false;
+  }
+  const auto& target = Function::Cast(obj);
+  auto* const object_store = thread->isolate_group()->object_store();
+  return target.ptr() == object_store->suspend_state_return_async() ||
+         target.ptr() ==
+             object_store->suspend_state_return_async_not_future() ||
+         target.ptr() == object_store->suspend_state_return_async_star();
+#else
+  return false;
+#endif
+}
+
 #if defined(DART_DYNAMIC_MODULES)
 static ActivationFrame::Relation CompareTopDartFrameTo(uword other_fp,
                                                        bool is_interpreted) {
@@ -3876,7 +3947,15 @@ static ActivationFrame::Relation CompareTopDartFrameTo(uword other_fp,
     if (frame->IsDartFrame() && (frame->is_interpreted() == is_interpreted)) {
       // The current frame's FP can be directly compared to the provided FP to
       // provide an answer, since they're using the same stack.
-      return ActivationFrame::CompareTo(is_interpreted, frame->fp(), other_fp);
+      //
+      // Since this function is only called if the top Dart frame is interpreted
+      // but the stepping frame is not or vice versa, the current frame is not
+      // the top Dart frame, so a result of kSelf means the top Dart frame
+      // is a callee.
+      return ActivationFrame::CompareTo(is_interpreted, frame->fp(),
+                                        other_fp) == ActivationFrame::kCaller
+                 ? ActivationFrame::kCaller
+                 : ActivationFrame::kCallee;
     }
   }
   // If there were no frames of the same type on the stack, this must have been
@@ -3949,7 +4028,10 @@ ErrorPtr Debugger::PauseStepping() {
   // with regular function wrt the first stop in the function prologue.
   if ((frame->function().IsAsyncFunction() ||
        frame->function().IsAsyncGenerator()) &&
-      frame->GetSuspendStateVar() == Object::null()) {
+      frame->GetSuspendStateVar() == Object::null() &&
+      // The bytecode generator sets the suspend state var to null prior
+      // to returning.
+      !IsAtBytecodeAsyncReturn(frame)) {
     return Error::null();
   }
 
diff --git a/runtime/vm/interpreter.cc b/runtime/vm/interpreter.cc
index 84fceea249e..4c4451a020e 100644
--- a/runtime/vm/interpreter.cc
+++ b/runtime/vm/interpreter.cc
@@ -848,8 +848,30 @@ DART_FORCE_INLINE bool Interpreter::InstanceCall(Thread* thread,
     WriteInstructionToTrace(pc);                                               \
   }                                                                            \
   icount_++;
+#define BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION                                  \
+  do {                                                                         \
+    if (IsTracingExecution()) {                                                \
+      /* Use the original instruction count. */                                \
+      auto const icount = icount_ - 1;                                         \
+      auto const instr_size = KernelBytecode::kInstructionSize[op];            \
+      THR_Print("%" Pu64 " ", icount);                                         \
+      THR_Print("dispatching to original instruction\n");                      \
+      THR_Print("%" Pu64 " ", icount);                                         \
+      if (FLAG_support_disassembler) {                                         \
+        KBCInstr temp[6];                                                      \
+        *temp = op;                                                            \
+        memmove(temp + 1, pc + 1, instr_size - 1);                             \
+        KernelBytecodeDisassembler::Disassemble(                               \
+            reinterpret_cast<uword>(temp),                                     \
+            reinterpret_cast<uword>(temp + instr_size));                       \
+      } else {                                                                 \
+        THR_Print("Disassembler not supported in this mode.\n");               \
+      }                                                                        \
+    }                                                                          \
+  } while (0)
 #else
 #define TRACE_INSTRUCTION
+#define BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION
 #endif  // defined(DEBUG)
 
 #if !defined(PRODUCT)
@@ -865,13 +887,27 @@ DART_FORCE_INLINE bool Interpreter::InstanceCall(Thread* thread,
 
 // Decode opcode and A part of the given value and dispatch to the
 // corresponding bytecode handler.
-#ifdef DART_HAS_COMPUTED_GOTO
+#if defined(DART_HAS_COMPUTED_GOTO)
 #define DISPATCH_OP(val)                                                       \
   do {                                                                         \
     op = (val);                                                                \
     TRACE_INSTRUCTION                                                          \
     goto* dispatch[ADJUST_FOR_SINGLE_STEPPING(op)];                            \
   } while (0)
+#if !defined(PRODUCT)
+// The breakpoint should dispatch to the single step handler, if any, in case
+// the breakpoint was set on a call that should then be stepped into or over
+// appropriately. Note that op has already been set to the original opcode
+// that had been replaced with the breakpoint opcode during patching.
+#define BREAKPOINT_DISPATCH                                                    \
+  do {                                                                         \
+    BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION;                                     \
+    goto* dispatch[ADJUST_FOR_SINGLE_STEPPING(op)];                            \
+  } while (0)
+// The dispatch from a single step check back to the original instruction
+// implementation should ignore single_stepping_offset.
+#define DISPATCH_ORIGINAL_OPCODE goto* dispatch[op]
+#endif  // !defined(PRODUCT)
 #else
 #define DISPATCH_OP(val)                                                       \
   do {                                                                         \
@@ -879,6 +915,20 @@ DART_FORCE_INLINE bool Interpreter::InstanceCall(Thread* thread,
     TRACE_INSTRUCTION                                                          \
     goto SwitchDispatch;                                                       \
   } while (0)
+#if !defined(PRODUCT)
+// The breakpoint should dispatch to the single step handler, if any, in case
+// the breakpoint was set on a call that should then be stepped into or over
+// appropriately. Note that op has already been set to the original opcode
+// that had been replaced with the breakpoint opcode during patching.
+#define BREAKPOINT_DISPATCH                                                    \
+  do {                                                                         \
+    BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION;                                     \
+    goto SwitchDispatch;                                                       \
+  } while (0)
+// The dispatch from a single step check back to the original instruction
+// implementation should ignore single_stepping_offset.
+#define DISPATCH_ORIGINAL_OPCODE goto SwitchDispatchNoSingleStep
+#endif  // !defined(PRODUCT)
 #endif  // defined(DART_HAS_COMPUTED_GOTO)
 
 // Fetch next operation from PC and dispatch.
@@ -1800,6 +1850,16 @@ ObjectPtr Interpreter::Resume(Thread* thread,
   pp_ = bytecode->untag()->object_pool();
   fp_ = FP;
 
+#if !defined(PRODUCT)
+  if (auto* const isolate = thread->isolate()) {
+    if (isolate->has_resumption_breakpoints()) {
+      Exit(thread, FP, SP + 1, pc_);
+      InvokeRuntime(thread, this, DRT_ResumptionBreakpointHandler,
+                    NativeArguments(thread, 0, nullptr, nullptr));
+    }
+  }
+#endif
+
   return Run(thread, SP, rethrow_exception);
 }
 
@@ -1849,7 +1909,7 @@ ObjectPtr Interpreter::Run(Thread* thread,
     goto RethrowException;
   }
 
-#ifdef DART_HAS_COMPUTED_GOTO
+#if defined(DART_HAS_COMPUTED_GOTO)
   static const void* dispatch[] = {
 #define TARGET(name, fmt, kind, fmta, fmtb, fmtc) &&bc##name,
       KERNEL_BYTECODES_LIST(TARGET)
@@ -1880,7 +1940,19 @@ SwitchDispatch:
     default:
       FATAL1("Undefined opcode: %d\n", op);
   }
-#endif
+#if !defined(PRODUCT)
+SwitchDispatchNoSingleStep:
+  switch (op & 0xFF) {
+#define TARGET(name, fmt, kind, fmta, fmtb, fmtc)                              \
+  case KernelBytecode::k##name:                                                \
+    goto bc##name;
+    KERNEL_BYTECODES_LIST(TARGET)
+#undef TARGET
+    default:
+      FATAL1("Undefined opcode: %d\n", op);
+  }
+#endif  // !defined(PRODUCT)
+#endif  // defined(DART_HAS_COMPUTED_GOTO)
 
   // KernelBytecode handlers (see constants_kbc.h for bytecode descriptions).
   {
@@ -4074,80 +4146,6 @@ SwitchDispatch:
     DISPATCH();
   }
 
-#if !defined(PRODUCT)
-#if defined(DEBUG)
-#define BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION                                  \
-  do {                                                                         \
-    if (IsTracingExecution()) {                                                \
-      /* Use the original instruction count. */                                \
-      auto const icount = icount_ - 1;                                         \
-      auto const instr_size = KernelBytecode::kInstructionSize[op];            \
-      THR_Print("%" Pu64 " ", icount);                                         \
-      THR_Print("dispatching to original instruction\n");                      \
-      THR_Print("%" Pu64 " ", icount);                                         \
-      if (FLAG_support_disassembler) {                                         \
-        KBCInstr temp[6];                                                      \
-        *temp = op;                                                            \
-        memmove(temp + 1, pc + 1, instr_size - 1);                             \
-        KernelBytecodeDisassembler::Disassemble(                               \
-            reinterpret_cast<uword>(temp),                                     \
-            reinterpret_cast<uword>(temp + instr_size));                       \
-      } else {                                                                 \
-        THR_Print("Disassembler not supported in this mode.\n");               \
-      }                                                                        \
-    }                                                                          \
-  } while (0)
-#else
-#define BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION
-#endif
-
-// The dispatch from a single step check or a breakpoint back to the original
-// patched instruction should ignore single_stepping_offset.
-#if defined(DART_HAS_COMPUTED_GOTO)
-#define DISPATCH_ORIGINAL_OPCODE goto* dispatch[op]
-#else
-#define DISPATCH_ORIGINAL_OPCODE goto SwitchDispatchNoSingleStep
-  {
-  SwitchDispatchNoSingleStep:
-    switch (op & 0xFF) {
-#define TARGET(name, fmt, kind, fmta, fmtb, fmtc)                              \
-  case KernelBytecode::k##name:                                                \
-    goto bc##name;
-      KERNEL_BYTECODES_LIST(TARGET)
-#undef TARGET
-      default:
-        FATAL1("Undefined opcode: %d\n", op);
-    }
-  }
-#endif
-
-#define DEFINE_BREAKPOINT(Format)                                              \
-  {                                                                            \
-    BYTECODE(VMInternal_Breakpoint_##Format, Format)                           \
-    SP[1] = 0; /* Smi containing the original opcode. */                       \
-    Exit(thread, FP, SP + 2, pc);                                              \
-    INVOKE_RUNTIME(DRT_BreakpointRuntimeHandler,                               \
-                   NativeArguments(thread, 0, nullptr, SP + 1));               \
-    uint32_t old_op = RawSmiValue(Smi::RawCast(SP[1]));                        \
-    ASSERT_EQUAL(KernelBytecode::BreakpointOpcode(                             \
-                     static_cast<KernelBytecode::Opcode>(old_op)),             \
-                 op);                                                          \
-    op = old_op;                                                               \
-    /* The pc is moved to the next instruction during the dispatch to  */      \
-    /* the original instruction's implementation, so re-adjust it to   */      \
-    /* before the breakpoint/original instruction prior to dispatch.   */      \
-    pc -= KernelBytecode::kInstructionSize[op];                                \
-    BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION;                                     \
-    DISPATCH_ORIGINAL_OPCODE;                                                  \
-  }
-  DEFINE_BREAKPOINT(0)      // size 1
-  DEFINE_BREAKPOINT(D)      // size 2 and 5
-  DEFINE_BREAKPOINT(A_E)    // size 3 and 6
-  DEFINE_BREAKPOINT(A_B_C)  // size 4
-#undef DEFINE_BREAKPOINT
-#undef BREAKPOINT_TRACE_ORIGINAL_INSTRUCTION
-#endif  // !defined(PRODUCT)
-
   {
   TailCallSP1:
     FunctionPtr function = Function::RawCast(SP[1]);
@@ -4329,6 +4327,30 @@ SwitchDispatch:
   }
 
 #if !defined(PRODUCT)
+#define DEFINE_BREAKPOINT(Format)                                              \
+  {                                                                            \
+    BYTECODE(VMInternal_Breakpoint_##Format, Format)                           \
+    SP[1] = 0; /* Smi containing the original opcode. */                       \
+    Exit(thread, FP, SP + 2, pc);                                              \
+    INVOKE_RUNTIME(DRT_BreakpointRuntimeHandler,                               \
+                   NativeArguments(thread, 0, nullptr, SP + 1));               \
+    uint32_t old_op = RawSmiValue(Smi::RawCast(SP[1]));                        \
+    ASSERT_EQUAL(KernelBytecode::BreakpointOpcode(                             \
+                     static_cast<KernelBytecode::Opcode>(old_op)),             \
+                 op);                                                          \
+    op = old_op;                                                               \
+    /* The pc is moved to the next instruction during the dispatch to  */      \
+    /* the original instruction's implementation, so re-adjust it to   */      \
+    /* before the breakpoint/original instruction prior to dispatch.   */      \
+    pc -= KernelBytecode::kInstructionSize[op];                                \
+    BREAKPOINT_DISPATCH;                                                       \
+  }
+  DEFINE_BREAKPOINT(0)      // size 1
+  DEFINE_BREAKPOINT(D)      // size 2 and 5
+  DEFINE_BREAKPOINT(A_E)    // size 3 and 6
+  DEFINE_BREAKPOINT(A_B_C)  // size 4
+#undef DEFINE_BREAKPOINT
+
   {
 #define SINGLE_STEP_HANDLER_ENTRY(Name, __, ___, ____, _____, ______)          \
   bc##Name##_SingleStep:
@@ -4343,8 +4365,9 @@ SwitchDispatch:
     }
 #endif
 
-    /* The frame should include the PC of the to-be-executed instruction. */
-    Exit(thread, FP, SP + 1, pc);
+    // The debugger expects return addresses in the frames when retrieving
+    // source positions, so use the next instruction's address.
+    Exit(thread, FP, SP + 1, KernelBytecode::Next(pc));
     INVOKE_RUNTIME(DRT_SingleStepHandler,
                    NativeArguments(thread, 0, nullptr, nullptr));
     DISPATCH_ORIGINAL_OPCODE;
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index 55449c509cc..85403725c00 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -11657,6 +11657,43 @@ void Function::PrintName(const NameFormattingParams& params,
   FunctionPrintNameHelper(fun, params, printer);
 }
 
+bool Function::NamePassesFilter(const char* name_filter) const {
+  if (name_filter == nullptr) return true;
+
+  char* save_ptr;  // Needed for strtok_r.
+  const char* scrubbed_name = QualifiedScrubbedNameCString();
+  const char* function_name = ToFullyQualifiedCString();
+  intptr_t function_name_len = strlen(function_name);
+
+  intptr_t len = strlen(name_filter) + 1;  // Length with \0.
+  char* filter_buffer = new char[len];
+  strncpy(filter_buffer, name_filter, len);  // strtok modifies arg 1.
+  char* token = strtok_r(filter_buffer, ",", &save_ptr);
+  bool found = false;
+  while (token != nullptr) {
+    if ((strstr(function_name, token) != nullptr) ||
+        (strstr(scrubbed_name, token) != nullptr)) {
+      found = true;
+      break;
+    }
+    const intptr_t token_len = strlen(token);
+    if (token[token_len - 1] == '%') {
+      if (function_name_len > token_len) {
+        const char* suffix =
+            function_name + (function_name_len - token_len + 1);
+        if (strncmp(suffix, token, token_len - 1) == 0) {
+          found = true;
+          break;
+        }
+      }
+    }
+    token = strtok_r(nullptr, ",", &save_ptr);
+  }
+  delete[] filter_buffer;
+
+  return found;
+}
+
 StringPtr Function::GetSource() const {
   if (IsImplicitConstructor() || is_synthetic()) {
     // We may need to handle more cases when the restrictions on mixins are
@@ -19312,40 +19349,25 @@ intptr_t Bytecode::GetTryIndexAtPc(uword return_address) const {
 #endif
 }
 
-uword Bytecode::GetFirstDebugCheckOpcodePc() const {
+uword Bytecode::GetInstructionBefore(uword return_address) const {
 #if defined(DART_DYNAMIC_MODULES)
-  uword pc = PayloadStart();
-  const uword end_pc = pc + Size();
-  while (pc < end_pc) {
-    if (KernelBytecode::IsDebugCheckOpcode(
-            reinterpret_cast<const KBCInstr*>(pc))) {
-      return pc;
-    }
-    pc = KernelBytecode::Next(pc);
+  const uword start = PayloadStart();
+  // return_address could be the end of the bytecode instructions
+  // if the last instruction is Throw.
+  if (return_address <= start || return_address > start + Size()) {
+    return 0;
   }
-  return 0;
+  uword prev = start;
+  uword current = KernelBytecode::Next(start);
+  while (current < return_address) {
+    prev = current;
+    current = KernelBytecode::Next(prev);
+  }
+  // Any valid return address should be on an instruction boundary.
+  return current == return_address ? prev : 0;
 #else
   UNREACHABLE();
-#endif
-}
-
-uword Bytecode::GetDebugCheckedOpcodeReturnAddress(uword from_offset,
-                                                   uword to_offset) const {
-#if defined(DART_DYNAMIC_MODULES)
-  uword pc = PayloadStart() + from_offset;
-  const uword end_pc = pc + (to_offset - from_offset);
-  while (pc < end_pc) {
-    uword next_pc = KernelBytecode::Next(pc);
-    if (KernelBytecode::IsDebugCheckedOpcode(
-            reinterpret_cast<const KBCInstr*>(pc))) {
-      // Return the pc after the opcode, i.e. its 'return address'.
-      return next_pc;
-    }
-    pc = next_pc;
-  }
   return 0;
-#else
-  UNREACHABLE();
 #endif
 }
 
diff --git a/runtime/vm/object.h b/runtime/vm/object.h
index 7aa7c20ac17..255f891eb5b 100644
--- a/runtime/vm/object.h
+++ b/runtime/vm/object.h
@@ -3049,6 +3049,10 @@ class Function : public Object {
 
   virtual StringPtr DictionaryName() const { return name(); }
 
+  // Returns whether either the fully qualified name or qualified scrubbed name
+  // matches the given name filter, or true if the filter is nullptr.
+  bool NamePassesFilter(const char* name_filter) const;
+
   StringPtr GetSource() const;
 
   // Set the "C signature" for an FFI trampoline.
@@ -7564,14 +7568,9 @@ class Bytecode : public Object {
   TokenPosition GetTokenIndexOfPC(uword return_address) const;
   intptr_t GetTryIndexAtPc(uword return_address) const;
 
-  // Return the pc of the first 'DebugCheck' opcode of the bytecode.
-  // Return 0 if none is found.
-  uword GetFirstDebugCheckOpcodePc() const;
-
-  // Return the pc after the first 'debug checked' opcode in the range.
-  // Return 0 if none is found.
-  uword GetDebugCheckedOpcodeReturnAddress(uword from_offset,
-                                           uword to_offset) const;
+  // Returns the address of the previous instruction when given
+  // a valid return address for the given bytecode or 0 otherwise.
+  uword GetInstructionBefore(uword return_address) const;
 
   intptr_t instructions_binary_offset() const {
     return untag()->instructions_binary_offset_;
@@ -7617,7 +7616,6 @@ class Bytecode : public Object {
   // Will compute local var descriptors if necessary.
   LocalVarDescriptorsPtr GetLocalVarDescriptors() const;
 #endif  // !defined(PRODUCT) && !defined(DART_PRECOMPILED_RUNTIME)
-
   const char* Name() const;
   const char* QualifiedName() const;
   const char* FullyQualifiedName() const;
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index 036e4b72759..1d037ed26b5 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -2178,6 +2178,14 @@ DEFINE_RUNTIME_ENTRY(SingleStepHandler, 0) {
 #endif
 }
 
+DEFINE_RUNTIME_ENTRY(ResumptionBreakpointHandler, 0) {
+#if defined(DART_DYNAMIC_MODULES) && !defined(PRODUCT)
+  isolate->debugger()->ResumptionBreakpoint();
+#else
+  UNREACHABLE();
+#endif
+}
+
 // An instance call of the form o.f(...) could not be resolved.  Check if
 // there is a getter with the same name.  If so, invoke it.  If the value is
 // a closure, invoke it with the given arguments.  If the value is a
diff --git a/runtime/vm/runtime_entry_list.h b/runtime/vm/runtime_entry_list.h
index 72c5e6cb4c6..c8753a2674e 100644
--- a/runtime/vm/runtime_entry_list.h
+++ b/runtime/vm/runtime_entry_list.h
@@ -26,6 +26,7 @@ namespace dart {
   V(BoxFloat64x2)                                                              \
   V(BreakpointRuntimeHandler)                                                  \
   V(SingleStepHandler)                                                         \
+  V(ResumptionBreakpointHandler)                                               \
   V(CloneContext)                                                              \
   V(CloneSuspendState)                                                         \
   V(DoubleToInteger)                                                           \