diff --git a/BUILD.gn b/BUILD.gn
index c409ffd..ad09ed8 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -124,8 +124,8 @@
 }
 
 if (is_fuchsia) {
-  import("third_party/fuchsia/sdk/linux/build/component.gni")
-  import("third_party/fuchsia/sdk/linux/build/package.gni")
+  import("third_party/fuchsia/sdk/${host_os}/build/component.gni")
+  import("third_party/fuchsia/sdk/${host_os}/build/package.gni")
 
   template("dart_fuchsia_test_package") {
     fuchsia_package(target_name) {
diff --git a/DEPS b/DEPS
index 6c75f52..90ee138 100644
--- a/DEPS
+++ b/DEPS
@@ -604,6 +604,16 @@
   },
 
   # Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/gn
+  Var("dart_root") + "/third_party/fuchsia/sdk/mac": {
+    "packages": [
+      {
+      "package": "fuchsia/sdk/gn/mac-amd64",
+      "version": "git_revision:190502a955c482431c2edd0525e128423728b662"
+      }
+    ],
+    "condition": 'host_os == "mac" and host_cpu == "x64"',
+    "dep_type": "cipd",
+  },
   Var("dart_root") + "/third_party/fuchsia/sdk/linux": {
     "packages": [
       {
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 4afcb19..3889bb4 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -260,8 +260,8 @@
 }
 if (is_fuchsia) {
   _native_compiler_configs += [
-    "//third_party/fuchsia/sdk/linux/build/config:compiler",
-    "//third_party/fuchsia/sdk/linux/build/config:runtime_library",
+    "//third_party/fuchsia/sdk/${host_os}/build/config:compiler",
+    "//third_party/fuchsia/sdk/${host_os}/build/config:runtime_library",
   ]
 }
 
@@ -405,10 +405,16 @@
   host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
   set_default_toolchain("//build/toolchain/mac:clang_$current_cpu")
 } else if (is_fuchsia) {
-  assert(host_os == "linux")
   assert(host_cpu == "x64")
-  host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
-  set_default_toolchain("//build/toolchain/fuchsia")
+  if (host_os == "linux") {
+    host_toolchain = "//build/toolchain/linux:clang_$host_cpu"
+    set_default_toolchain("//build/toolchain/fuchsia")
+  } else if (host_os == "mac") {
+    host_toolchain = "//build/toolchain/mac:clang_$host_cpu"
+    set_default_toolchain("//build/toolchain/fuchsia")
+  } else {
+    assert(false, "Unknown host for fuchsia cross compile")
+  }
 }
 
 # ==============================================================================
diff --git a/build/fuchsia/config/clang/clang.gni b/build/fuchsia/config/clang/clang.gni
index 8617aa5..80f8095 100644
--- a/build/fuchsia/config/clang/clang.gni
+++ b/build/fuchsia/config/clang/clang.gni
@@ -3,5 +3,5 @@
 # found in the LICENSE file.
 
 declare_args() {
-  clang_base_path = "//buildtools/linux-x64/clang"
+  clang_base_path = "//buildtools/${host_os}-x64/clang"
 }
diff --git a/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart b/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart
index 70eb2fa..7c2429b 100644
--- a/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/dependency/node.dart
@@ -46,11 +46,11 @@
 
 /// The dependencies of the API or implementation portion of a node.
 class Dependencies {
-  static final none = Dependencies([], [], [], [], [], []);
+  static final none = Dependencies(Uint8List(0), [], [], [], [], []);
 
   /// The token signature of this portion of the node. It depends on all
   /// tokens that might affect the node API or implementation resolution.
-  final List<int> tokenSignature;
+  final Uint8List tokenSignature;
 
   /// The names that appear unprefixed in this portion of the node, and are
   /// not defined locally in the node. Locally defined names themselves
@@ -87,7 +87,7 @@
   /// The transitive signature of this portion of the node, computed using
   /// the [tokenSignature] of this node, and API signatures of the
   /// [referencedNodes].
-  List<int>? transitiveSignature;
+  Uint8List? transitiveSignature;
 
   Dependencies(
       this.tokenSignature,
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index 630a495..3540b01 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -1281,7 +1281,7 @@
 
     // If we don't need the fully resolved unit, check for the cached result.
     if (!withUnit) {
-      List<int>? bytes = _byteStore.get(key);
+      var bytes = _byteStore.get(key);
       if (bytes != null) {
         return _getAnalysisResultFromBytes(file, signature, bytes);
       }
@@ -1314,7 +1314,7 @@
             testingData: testingData);
         Map<FileState, UnitAnalysisResult> results = analyzer.analyze();
 
-        late List<int> bytes;
+        late Uint8List bytes;
         late CompilationUnit resolvedUnit;
         for (FileState unitFile in results.keys) {
           UnitAnalysisResult unitResult = results[unitFile]!;
@@ -1576,7 +1576,7 @@
   /// Load the [AnalysisResult] for the given [file] from the [bytes]. Set
   /// optional [content] and [resolvedUnit].
   AnalysisResult _getAnalysisResultFromBytes(
-      FileState file, String signature, List<int> bytes,
+      FileState file, String signature, Uint8List bytes,
       {String? content, CompilationUnit? resolvedUnit}) {
     var unit = AnalysisDriverResolvedUnit.fromBuffer(bytes);
     List<AnalysisError> errors = _getErrorsFromSerialized(file, unit.errors);
diff --git a/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart b/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart
index 58f154e..99140ad 100644
--- a/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/file_byte_store.dart
@@ -181,7 +181,7 @@
 
     _writeInProgress[key] = bytes;
 
-    final List<int> wrappedBytes = _validator.wrapData(bytes);
+    final wrappedBytes = _validator.wrapData(bytes);
 
     // We don't wait for the write and rename to complete.
     _pool.execute(() async {
diff --git a/pkg/analyzer/lib/src/dart/analysis/file_content_cache.dart b/pkg/analyzer/lib/src/dart/analysis/file_content_cache.dart
index 4e1e989..f87ee8e 100644
--- a/pkg/analyzer/lib/src/dart/analysis/file_content_cache.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/file_content_cache.dart
@@ -42,7 +42,7 @@
   void invalidateAll() {}
 
   FileContent _read(String path) {
-    List<int> contentBytes;
+    Uint8List contentBytes;
     String content;
     bool exists;
     try {
diff --git a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
index 0608b1f..62ea343 100644
--- a/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/hint_codes.g.dart
@@ -30,7 +30,7 @@
   // to have either a single parameter of type `Object` or two parameters of
   // type `Object` and `StackTrace`.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the closure being
   // passed to `catchError` doesn't take any parameters, but the function is
@@ -109,7 +109,7 @@
   // The analyzer produces this diagnostic when code is found that won't be
   // executed because execution will never reach the code.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the invocation of
   // `print` occurs after the function has returned:
@@ -173,7 +173,7 @@
   // the thrown object is selected, and both of those forms will match any
   // object, so no `catch` clauses that follow them will be selected.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -235,7 +235,7 @@
   // matches anything matchable by the highlighted clause, so the highlighted
   // clause will never be selected.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -343,7 +343,7 @@
   // The analyzer produces this diagnostic when a deprecated library or class
   // member is used in a different package.
   //
-  // #### Examples
+  // #### Example
   //
   // If the method `m` in the class `C` is annotated with `@deprecated`, then
   // the following code produces this diagnostic:
@@ -375,7 +375,7 @@
   // The analyzer produces this diagnostic when a deprecated library member or
   // class member is used in the same package in which it's declared.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is deprecated:
   //
@@ -505,7 +505,7 @@
   // because it's already included in the same `ignore` comment or because it
   // appears in an `ignore-in-file` comment.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the diagnostic named
   // `unused_local_variable` is already being ignored for the whole file so it
@@ -559,7 +559,7 @@
   // that is the same as an import before it in the file. The second import
   // doesn’t add value and should be removed.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -1415,7 +1415,7 @@
   // The analyzer produces this diagnostic when either the `@visibleForTemplate`
   // or `@visibleForTesting` annotation is applied to a non-public declaration.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -1503,7 +1503,7 @@
   // named parameter that is annotated as being required is invoked without
   // providing a value for the parameter.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the named parameter `x`
   // is required:
@@ -1564,7 +1564,7 @@
   // throw implicitly returns `null`. This is rarely the desired behavior. The
   // analyzer produces this diagnostic when it finds an implicit return.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` doesn't end with a
   // return:
@@ -1604,7 +1604,7 @@
   // Classes that are sealed can't be extended, implemented, mixed in, or used
   // as a superclass constraint.
   //
-  // #### Examples
+  // #### Example
   //
   // If the package `p` defines a sealed class:
   //
@@ -1649,7 +1649,7 @@
   // marked as being immutable using the annotation `@immutable` or if it's a
   // subclass of an immutable class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the field `x` isn't
   // final:
@@ -1708,7 +1708,7 @@
   // that is annotated as `@mustCallSuper` doesn't invoke the overridden method
   // as required.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the method `m` in `B`
   // doesn't invoke the overridden method `m` in `A`:
@@ -1767,7 +1767,7 @@
   // that the constructor should be used to create a constant value whenever
   // possible.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -1980,7 +1980,7 @@
   // the `@override` annotation, but the member isn’t declared in any of the
   // supertypes of the class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` isn't declared in
   // any of the supertypes of `C`:
@@ -2086,7 +2086,7 @@
   // `catchError` attempts to return the value from the callback as the result
   // of the future, which results in another exception being thrown.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `future` is declared to
   // return an `int` while `callback` is declared to return a `String`, and
@@ -2157,7 +2157,7 @@
   // earlier versions, these classes weren't defined in `dart:core`, so the
   // import was necessary.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.1.0:
@@ -2212,7 +2212,7 @@
   // [constant context][] wasn't supported in earlier versions, so this code
   // won't be able to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.3.2:
@@ -2268,7 +2268,7 @@
   // versions, so this code won't be able to run against earlier versions of the
   // SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.3.2:
@@ -2384,7 +2384,7 @@
   // in a [constant context][] wasn't supported in earlier versions, so this
   // code won't be able to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.3.2:
@@ -2445,7 +2445,7 @@
   // versions, so this code won't be able to run against earlier versions of the
   // SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.6.0:
@@ -2504,7 +2504,7 @@
   // operator wasn't supported in earlier versions, so this code won't be able
   // to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.14.0:
@@ -2564,7 +2564,7 @@
   // [constant context][] wasn't supported in earlier versions, so this code
   // won't be able to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.3.2:
@@ -2619,7 +2619,7 @@
   // 2.12.0. This class wasn't defined in earlier versions, so this code won't
   // be able to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.12.0:
@@ -2671,7 +2671,7 @@
   // literals weren't supported in earlier versions, so this code won't be able
   // to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.2.0:
@@ -2723,7 +2723,7 @@
   // versions, so this code won't be able to run against earlier versions of the
   // SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.3.0:
@@ -2783,7 +2783,7 @@
   // [constant context][] wasn't supported in earlier versions, so this code
   // won't be able to run against earlier versions of the SDK.
   //
-  // #### Examples
+  // #### Example
   //
   // Here's an example of a pubspec that defines an SDK constraint with a lower
   // bound of less than 2.5.0:
@@ -2914,7 +2914,7 @@
   // is `Null`, so the code is both more readable and more performant when it
   // tests for `null` explicitly.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the code is testing to
   // see whether the value of `s` is `null` by using a type check:
@@ -2981,7 +2981,7 @@
   // The analyzer produces this diagnostic when a hide combinator includes a
   // name that isn't defined by the library being imported.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `dart:math` doesn't
   // define the name `String`:
@@ -3059,7 +3059,7 @@
   // The analyzer produces this diagnostic when a show combinator includes a
   // name that isn't defined by the library being imported.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `dart:math` doesn't
   // define the name `String`:
@@ -3106,7 +3106,7 @@
   // The analyzer produces this diagnostic when the value being cast is already
   // known to be of the type that it's being cast to.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `n` is already known to
   // be an `int` as a result of the `is` test:
@@ -3265,7 +3265,7 @@
   // can't be `null`. Such comparisons are always either `true` or `false`, so
   // they serve no purpose.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `x` can never be
   // `null`, so the comparison always evaluates to `true`:
@@ -3424,7 +3424,7 @@
   // neither the exception parameter nor the optional stack trace parameter are
   // used in the `catch` block.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `e` isn't referenced:
   //
@@ -3467,7 +3467,7 @@
   // The analyzer produces this diagnostic when the stack trace parameter in a
   // `catch` clause isn't referenced within the body of the `catch` block.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `stackTrace` isn't
   // referenced:
@@ -3518,7 +3518,7 @@
   // - Optional parameters of private functions for which a value is never
   //   passed, even when the parameter doesn't have a private name
   //
-  // #### Examples
+  // #### Example
   //
   // Assuming that no code in the library references `_C`, the following code
   // produces this diagnostic:
@@ -3580,7 +3580,7 @@
   // The analyzer produces this diagnostic when a private field is declared but
   // never read, even if it's written in one or more places.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the field
   // `_originalValue` isn't read anywhere in the library:
@@ -3622,7 +3622,7 @@
   // none of the names that are imported are referenced within the importing
   // library.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because nothing defined in
   // `dart:async` is referenced in the library:
@@ -3655,7 +3655,7 @@
   // The analyzer produces this diagnostic when a label that isn't used is
   // found.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the label `loop` isn't
   // referenced anywhere in the method:
@@ -3708,7 +3708,7 @@
   // The analyzer produces this diagnostic when a local variable is declared but
   // never read, even if it's written in one or more places.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the value of `count` is
   // never read:
@@ -3837,7 +3837,7 @@
   // name that isn't used within the library. Because it isn't referenced, the
   // name can be removed.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the function `max`
   // isn't used:
diff --git a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
index a855fe1..0bec5ea 100644
--- a/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
+++ b/pkg/analyzer/lib/src/dart/error/syntactic_errors.g.dart
@@ -552,7 +552,7 @@
   // The analyzer produces this diagnostic when an abstract declaration is
   // declared in an extension. Extensions can declare only concrete members.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the method `a` doesn't
   // have a body:
@@ -584,7 +584,7 @@
   // extensions aren't classes, and it isn't possible to create an instance of
   // an extension.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because there is a constructor
   // declaration in `E`:
@@ -614,7 +614,7 @@
   // found in an extension. It isn't valid to define an instance field because
   // extensions can only add behavior, not state.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `s` is an instance
   // field:
@@ -996,7 +996,7 @@
   // Extensions aren't classes and don't have subclasses, so the keyword serves
   // no purpose.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `i` is marked as being
   // covariant:
diff --git a/pkg/analyzer/lib/src/dart/micro/library_graph.dart b/pkg/analyzer/lib/src/dart/micro/library_graph.dart
index 9e6cb1c..2626139 100644
--- a/pkg/analyzer/lib/src/dart/micro/library_graph.dart
+++ b/pkg/analyzer/lib/src/dart/micro/library_graph.dart
@@ -170,9 +170,9 @@
     this._packageLanguageVersion,
   );
 
-  List<int> get apiSignature => unlinked.unit.apiSignature;
+  Uint8List get apiSignature => unlinked.unit.apiSignature;
 
-  List<int> get digest => _digest;
+  Uint8List get digest => _digest;
 
   bool get exists => _exists;
 
diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
index 22dec30..f9d2a42 100644
--- a/pkg/analyzer/lib/src/error/codes.g.dart
+++ b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -23,7 +23,7 @@
   // The analyzer produces this diagnostic when a field that has the `abstract`
   // modifier also has an initializer.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `f` is marked as
   // `abstract` and has an initializer:
@@ -95,7 +95,7 @@
   // referenced using `super`, but there is no concrete implementation of the
   // member in the superclass chain. Abstract members can't be invoked.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `B` doesn't inherit a
   // concrete implementation of `a`:
@@ -202,7 +202,7 @@
   // extended type that's more specific than the extended types of all of the
   // other extensions, making the reference to the member ambiguous.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because there's no way to
   // choose between the member in `E1` and the member in `E2`:
@@ -261,7 +261,7 @@
   // The analyzer produces this diagnostic when a name is referenced that is
   // declared in two or more imported libraries.
   //
-  // #### Examples
+  // #### Example
   //
   // Given a library (`a.dart`) that defines a class (`C` in this example):
   //
@@ -346,7 +346,7 @@
   // element is neither of these, making it impossible for the analyzer to
   // determine whether you are writing a map literal or a set literal.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -404,7 +404,7 @@
   // a type that allows the analyzer to decide whether you were writing a map
   // literal or a set literal.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -477,7 +477,7 @@
   // The analyzer produces this diagnostic when the static type of an argument
   // can't be assigned to the static type of the corresponding parameter.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because a `num` can't be
   // assigned to a `String`:
@@ -650,7 +650,7 @@
   // setter, but there's no setter because the field with the same name was
   // declared to be `final` or `const`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `v` is final:
   //
@@ -694,7 +694,7 @@
   // The analyzer produces this diagnostic when a local variable that was
   // declared to be final is assigned after it was initialized.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is final, so it
   // can't have a value assigned to it after it was initialized:
@@ -736,7 +736,7 @@
   // found; there is no setter defined for the type; but there is a getter
   // defined with the same name.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because there is no setter
   // named `x` in `C`, but there is a getter named `x`:
@@ -850,7 +850,7 @@
   // The analyzer produces this diagnostic when the target of an assignment is a
   // method.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` can't be assigned a
   // value because it's a method:
@@ -1049,7 +1049,7 @@
   // return type that's [potentially non-nullable][] but would implicitly return
   // `null` if control reached the end of the function.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the method `m` has an
   // implicit return of `null` inserted at the end of the method, but the method
@@ -1235,7 +1235,7 @@
   // The analyzer produces this diagnostic when a built-in identifier is used
   // where a type name is expected.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `import` can't be used
   // as a type because it's a built-in identifier:
@@ -1307,7 +1307,7 @@
   // block isn't one of the required terminators: `break`, `continue`,
   // `rethrow`, `return`, or `throw`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the `case` block ends
   // with an assignment:
@@ -1519,7 +1519,7 @@
   // The analyzer produces this diagnostic when the name following the `as` in a
   // cast expression is defined to be something other than a type.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is a variable, not
   // a type:
@@ -1595,7 +1595,7 @@
   // found that doesn't have a concrete implementation. Concrete classes aren't
   // allowed to contain abstract members.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` is an abstract
   // method but `C` isn't an abstract class:
@@ -1644,7 +1644,7 @@
   // the name of the class, so having the same name makes the reference
   // ambiguous.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the static field `foo`
   // and the named constructor `foo` have the same name:
@@ -2206,7 +2206,7 @@
   // const constructor, but the constructor is defined in a class that has at
   // least one non-final instance field (either directly or by inheritance).
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the field `x` isn't
   // final:
@@ -2402,7 +2402,7 @@
   // known to be a constant is assigned to a variable that's declared to be a
   // `const` variable.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` isn't declared to
   // be `const`:
@@ -2498,7 +2498,7 @@
   // The analyzer produces this diagnostic when an instance field is marked as
   // being const.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is an instance
   // field:
@@ -2605,7 +2605,7 @@
   // The analyzer produces this diagnostic when a variable that is declared to
   // be a constant doesn't have an initializer.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `c` isn't initialized:
   //
@@ -2698,7 +2698,7 @@
   // operator in a constant list or set evaluates to something other than a list
   // or a set.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the value of `list1` is
   // `null`, which is neither a list nor a set:
@@ -2734,7 +2734,7 @@
   // The analyzer produces this diagnostic when the expression of a spread
   // operator in a constant map evaluates to something other than a map.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the value of `map1` is
   // `null`, which isn't a map:
@@ -2769,7 +2769,7 @@
   // The analyzer produces this diagnostic when the keyword `const` is used to
   // invoke a constructor that isn't marked with `const`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the constructor in `A`
   // isn't a const constructor:
@@ -2820,7 +2820,7 @@
   // The analyzer produces this diagnostic when a const constructor is invoked
   // with an argument that isn't a constant expression.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `i` isn't a constant:
   //
@@ -3109,7 +3109,7 @@
   // a value for the parameter is always provided at the call sites, so the
   // default value can never be used.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code generates this diagnostic:
   //
@@ -3383,7 +3383,7 @@
   // The analyzer produces this diagnostic when a name is declared, and there is
   // a previous declaration with the same name in the same scope.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `x` is
   // declared twice:
@@ -3460,7 +3460,7 @@
   // The analyzer produces this diagnostic when an invocation has two or more
   // named arguments that have the same name.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because there are two arguments
   // with the name `a`:
@@ -3573,7 +3573,7 @@
   // literal have the same value. The set can only contain each value once,
   // which means that one of the values is unnecessary.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the string `'a'` is
   // specified twice:
@@ -3611,7 +3611,7 @@
   // second value would overwrite the first value, which makes having both pairs
   // pointless.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the key `1` is used
   // twice:
@@ -3878,7 +3878,7 @@
   // The analyzer produces this diagnostic when the analyzer finds an
   // expression, rather than a map entry, in what appears to be a map literal.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -3967,7 +3967,7 @@
   // are all restricted in this way, to allow for more efficient
   // implementations.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `String` is used in an
   // `extends` clause:
@@ -4030,7 +4030,7 @@
   // The analyzer produces this diagnostic when an `extends` clause contains a
   // name that is declared to be something other than a class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is declared to be a
   // function:
@@ -4123,7 +4123,7 @@
   // representing the type of the class. Extensions, on the other hand, don't
   // define a type and can't be used as a type literal.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `E` is an extension:
   //
@@ -4168,7 +4168,7 @@
   // because it's unclear which member is being referenced by an unqualified use
   // of the name within the body of the extension.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `a` is being
   // used for two different members:
@@ -4209,7 +4209,7 @@
   // `Object`. Such a member can never be used because the member in `Object` is
   // always found first.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `toString` is defined
   // by `Object`:
@@ -4248,7 +4248,7 @@
   // classes, the static members of an extension should be accessed using the
   // name of the extension, not an extension override.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` is static:
   //
@@ -4293,7 +4293,7 @@
   // The analyzer produces this diagnostic when the argument to an extension
   // override isn't assignable to the type being extended by the extension.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `3` isn't a `String`:
   //
@@ -4342,7 +4342,7 @@
   // extension override syntax doesn't have any runtime semantics; it only
   // controls which member is selected at compile time.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `E(i)` isn't an
   // expression:
@@ -4401,7 +4401,7 @@
   // `e..m` is the value of the receiver `e`, but extension overrides aren't
   // expressions and don't have a value.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `E(3)` isn't an
   // expression:
@@ -4472,7 +4472,7 @@
   // The analyzer produces this diagnostic when a method or function invocation
   // has more positional arguments than the method or function allows.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` defines 2
   // parameters but is invoked with 3 arguments:
@@ -4513,7 +4513,7 @@
   // has more positional arguments than the method or function allows, but the
   // method or function defines named parameters.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` defines 2
   // positional parameters but has a named parameter that could be used for the
@@ -4833,7 +4833,7 @@
   // that has the field hasn't been created at the point at which it should be
   // initialized.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the constructor
   // `C.zero`, which redirects to the constructor `C`, has a field formal
@@ -5030,7 +5030,7 @@
   // The analyzer produces this diagnostic when a final field or variable isn't
   // initialized.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` doesn't have an
   // initializer:
@@ -5087,7 +5087,7 @@
   // initialized when the instance is created, either by the field's initializer
   // or by the constructor.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -5264,7 +5264,7 @@
   // The analyzer produces this diagnostic when the expression following `in` in
   // a for-in loop has a type that isn't a subclass of `Iterable`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` is a `Map`, and
   // `Map` isn't a subclass of `Iterable`:
@@ -5663,7 +5663,7 @@
   // clause of a class or mixin declaration is defined to be something other
   // than a class or mixin.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is a variable
   // rather than a class or mixin:
@@ -5703,7 +5703,7 @@
   // The analyzer produces this diagnostic when a single class is specified more
   // than once in an `implements` clause.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `A` is in the list
   // twice:
@@ -5797,7 +5797,7 @@
   // The analyzer produces this diagnostic when it finds a reference to an
   // instance member in a constructor's initializer list.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `defaultX` is an
   // instance member:
@@ -6009,7 +6009,7 @@
   // Constructors can't initialize fields that aren't declared and fields that
   // are inherited from superclasses.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the initializer is
   // initializing `x`, but `x` isn't a field in the class:
@@ -6133,7 +6133,7 @@
   // initialized. Constructors can't initialize fields that aren't declared and
   // fields that are inherited from superclasses.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the field `x` isn't
   // defined:
@@ -6216,7 +6216,7 @@
   // The analyzer produces this diagnostic when an access operator is used to
   // access a static member through an instance of the class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `zero` is a static
   // field, but it’s being accessed as if it were an instance field:
@@ -6265,7 +6265,7 @@
   // factory constructor, the instance isn't created before executing the body,
   // so `this` can't be used to reference it.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` isn't in scope in
   // the factory constructor:
@@ -6309,7 +6309,7 @@
   // The analyzer produces this diagnostic when a static method contains an
   // unqualified reference to an instance member.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the instance field `x`
   // is being referenced in a static method:
@@ -6373,7 +6373,7 @@
   // though you can't create an instance of an abstract class, abstract classes
   // can declare constructors that can be invoked by subclasses.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `C` is an abstract
   // class:
@@ -6573,7 +6573,7 @@
   //
   // Getters can't be used as annotations.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the variable `v` isn't
   // a `const` variable:
@@ -6761,7 +6761,7 @@
   // that is assigned to a variable isn't assignable to the type of the
   // variable.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the type of the
   // initializer (`int`) isn't assignable to the type of the variable
@@ -6974,7 +6974,7 @@
   // The analyzer produces this diagnostic when the name of a factory
   // constructor isn't the same as the name of the surrounding class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name of the factory
   // constructor (`A`) isn't the same as the surrounding class (`C`):
@@ -7280,7 +7280,7 @@
   // * The return type of the override is assignable to the return type of the
   //   overridden member.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the type of the
   // parameter `s` (`String`) isn't assignable to the type of the parameter `i`
@@ -7339,7 +7339,7 @@
   // only defined in the context of an instance method or a generative
   // constructor.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `v` is a top-level
   // variable:
@@ -7423,7 +7423,7 @@
   // This isn't allowed because the value of the type parameter (the actual type
   // that will be used at runtime) can't be known at compile time.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the type parameter `T`
   // is being used as a type argument when creating a constant list:
@@ -7508,7 +7508,7 @@
   // The analyzer produces this diagnostic when a URI in a directive doesn't
   // conform to the syntax of a valid URI.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `'#'` isn't a valid
   // URI:
@@ -7582,7 +7582,7 @@
   // The analyzer produces this diagnostic when an extension override is used to
   // invoke a function but the extension doesn't declare a `call` method.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the extension `E`
   // doesn't define a `call` method:
@@ -7631,7 +7631,7 @@
   // but the name of the function being invoked is defined to be something other
   // than a function.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `Binary` is the name of
   // a function type, not a function:
@@ -7957,7 +7957,7 @@
   // The analyzer produces this diagnostic when the type of an element in a list
   // literal isn't assignable to the element type of the list.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `2.5` is a double, and
   // the list can hold only integers:
@@ -8159,7 +8159,7 @@
   // The analyzer produces this diagnostic when a map entry (a key/value pair)
   // is found in a set literal.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the literal has a map
   // entry even though it's a set literal:
@@ -8206,7 +8206,7 @@
   // The analyzer produces this diagnostic when a key of a key-value pair in a
   // map literal has a type that isn't assignable to the key type of the map.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `2` is an `int`, but
   // the keys of the map are required to be `String`s:
@@ -8247,7 +8247,7 @@
   // map literal has a type that isn't assignable to the the value type of the
   // map.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `2` is an `int`, but/
   // the values of the map are required to be `String`s:
@@ -8338,7 +8338,7 @@
   // parameter doesn't allow the parameter to have a value of `null`, then the
   // implicit default value isn't valid.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `x` can't be `null`,
   // and no non-`null` default value is specified:
@@ -8884,7 +8884,7 @@
   // The analyzer produces this diagnostic when a name in a `with` clause is
   // defined to be something other than a mixin or a class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `F` is defined to be a
   // function type:
@@ -8965,7 +8965,7 @@
   // The analyzer produces this diagnostic when a type following the `on`
   // keyword in a mixin declaration is neither a class nor a mixin.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `F` is neither a class
   // nor a mixin:
@@ -9187,7 +9187,7 @@
   // invoked on a class that defines named constructors but the class doesn’t
   // have an unnamed constructor.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `A` doesn't define an
   // unnamed constructor:
@@ -9278,7 +9278,7 @@
   // more abstract members, and doesn't provide or inherit an implementation for
   // at least one of those abstract members.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the class `B` doesn't
   // have a concrete implementation of `m`:
@@ -9380,7 +9380,7 @@
   // The analyzer produces this diagnostic when a condition, such as an `if` or
   // `while` loop, doesn't have the static type `bool`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` has the static type
   // `int`:
@@ -9419,7 +9419,7 @@
   // The analyzer produces this diagnostic when the first expression in an
   // assert has a type other than `bool`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the type of `p` is
   // `int`, but a `bool` is required:
@@ -9454,7 +9454,7 @@
   // The analyzer produces this diagnostic when the operand of the unary
   // negation operator (`!`) doesn't have the type `bool`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is an `int` when it
   // must be a `bool`:
@@ -9489,7 +9489,7 @@
   // The analyzer produces this diagnostic when one of the operands of either
   // the `&&` or `||` operator doesn't have the type `bool`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `a` isn't a Boolean
   // value:
@@ -9569,7 +9569,7 @@
   // The analyzer produces this diagnostic when the expression in a `case`
   // clause isn't a constant expression.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `j` isn't a constant:
   //
@@ -9702,7 +9702,7 @@
   // named or positional, has a default value that isn't a compile-time
   // constant.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -9809,7 +9809,7 @@
   // explicitly (because it's prefixed by the `const` keyword) or implicitly
   // (because it appears in a [constant context][]).
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` isn't a constant,
   // even though it appears in an implicitly constant list literal:
@@ -9977,7 +9977,7 @@
   // The analyzer produces this diagnostic when a key in a constant map literal
   // isn't a constant value.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic beause `a` isn't a constant:
   //
@@ -10030,7 +10030,7 @@
   // The analyzer produces this diagnostic when a value in a constant map
   // literal isn't a constant value.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `a` isn't a constant:
   //
@@ -10084,7 +10084,7 @@
   // The analyzer produces this diagnostic when a constant set literal contains
   // an element that isn't a compile-time constant.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `i` isn't a constant:
   //
@@ -10265,7 +10265,7 @@
   // The analyzer produces this diagnostic when an identifier that isn't a type
   // is used as a type argument.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is a variable, not
   // a type:
@@ -10302,7 +10302,7 @@
   // The analyzer produces this diagnostic when the identifier following the
   // `on` in a `catch` clause is defined to be something other than a type.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is a function, not
   // a type:
@@ -10427,7 +10427,7 @@
   // - The analyzer can't prove that the local variable will be assigned before
   //   the reference based on the specification of [definite assignment][].
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `x` can't have a value
   // of `null`, but is referenced before a value was assigned to it:
@@ -10545,7 +10545,7 @@
   // The analyzer produces this diagnostic when a name is used as a type but
   // declared to be something other than a type.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is a function:
   //
@@ -10606,7 +10606,7 @@
   // has fewer positional arguments than the number of required positional
   // parameters.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` declares two
   // required parameters, but only one argument is provided:
@@ -10648,7 +10648,7 @@
   // - Doesn't have an initializer
   // - Isn't marked as `late`
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `x` is implicitly
   // initialized to `null` when it isn't allowed to be `null`:
@@ -10743,7 +10743,7 @@
   // initialized to `null`, but the type of the field or variable doesn't allow
   // it to be set to `null`, so an explicit initializer must be provided.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the field `f` can't be
   // initialized to `null`:
@@ -10814,7 +10814,7 @@
   // expression of a spread element that appears in either a list literal or a
   // set literal doesn't implement the type `Iterable`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic:
   //
@@ -10847,7 +10847,7 @@
   // expression of a spread element that appears in a map literal doesn't
   // implement the type `Map`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `l` isn't a `Map`:
   //
@@ -10890,7 +10890,7 @@
   // variable. To create an instance of the class, the identifier must be
   // followed by an argument list.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `C` is a class, and a
   // class can't be used as an annotation without invoking a `const` constructor
@@ -11356,7 +11356,7 @@
   // The analyzer produces this diagnostic when a part directive is found and
   // the referenced file doesn't have a part-of directive.
   //
-  // #### Examples
+  // #### Example
   //
   // Given a file (`a.dart`) containing:
   //
@@ -11710,7 +11710,7 @@
   // The analyzer produces this diagnostic when a constructor redirects to
   // itself, either directly or indirectly, creating an infinite loop.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the generative
   // constructors `C.a` and `C.b` each redirect to the other:
@@ -12113,7 +12113,7 @@
   // to a constructor whose return type isn't a subtype of the type that the
   // factory constructor is declared to produce.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `A` isn't a subclass
   // of `C`, which means that the value returned by the constructor `A()`
@@ -12188,7 +12188,7 @@
   // produces this diagnostic when the redirect is to something other than a
   // constructor.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is a function:
   //
@@ -12334,7 +12334,7 @@
   // The analyzer also produces a context message that indicates where the
   // declaration is located.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `i` is used before it
   // is declared:
@@ -12501,7 +12501,7 @@
   // statement to return a value or implicitly returns a value because of using
   // `=>`. In any of these cases, they should use `yield` instead of `return`.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the method `f` is a
   // generator and is using `return` to return a value:
@@ -12566,7 +12566,7 @@
   // expression isn't assignable to the return type that the closure is required
   // to have.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` is defined to be a
   // function that returns a `String`, but the closure assigned to it returns an
@@ -12616,7 +12616,7 @@
   // The analyzer produces this diagnostic when a method or function returns a
   // value whose type isn't assignable to the declared return type.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` has a return type
   // of `String` but is returning an `int`:
@@ -12669,7 +12669,7 @@
   // The analyzer produces this diagnostic when it finds a `return` statement
   // without an expression in a function that declares a return type.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the function `f` is
   // expected to return an `int`, but no value is being returned:
@@ -12815,7 +12815,7 @@
   // an instance field. Instance fields don't exist on a class; they exist only
   // on an instance of the class.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `x` is an instance
   // field:
@@ -12887,7 +12887,7 @@
   // extension uses the `super` keyword . Extensions aren't classes and don't
   // have superclasses, so the `super` keyword serves no purpose.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `super` can't be used
   // in an extension:
@@ -12921,7 +12921,7 @@
   // The analyzer produces this diagnostic when the keyword `super` is used
   // outside of a instance method.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `super` is used in a
   // top-level function:
@@ -13277,7 +13277,7 @@
   // The analyzer produces this diagnostic when a type argument isn't the same
   // as or a subclass of the bounds of the corresponding type parameter.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `String` isn't a
   // subclass of `num`:
@@ -13369,7 +13369,7 @@
   // as itself or a subtype of itself or a subtype of itself isn't helpful
   // because it will always be the same as itself.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because the bound of `T` is
   // `T`:
@@ -13474,7 +13474,7 @@
   // The analyzer produces this diagnostic when the name following the `is` in a
   // type test expression isn't defined.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `Srting` isn't
   // defined:
@@ -13648,7 +13648,7 @@
   // The analyzer produces this diagnostic when a name that isn't defined is
   // used as an annotation.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `undefined`
   // isn't defined:
@@ -13697,7 +13697,7 @@
   // appears to be the name of a class but either isn't defined or isn't visible
   // in the scope in which it's being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `Piont` isn't defined:
   //
@@ -13844,7 +13844,7 @@
   // appears to be the name of an enum constant, and the name either isn't
   // defined or isn't visible in the scope in which it's being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `E` doesn't define a
   // constant named `c`:
@@ -14254,7 +14254,7 @@
   // appears to be the name of a function but either isn't defined or isn't
   // visible in the scope in which it's being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `emty` isn't
   // defined:
@@ -14303,7 +14303,7 @@
   // appears to be the name of a getter but either isn't defined or isn't
   // visible in the scope in which it's being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `String` has no member
   // named `len`:
@@ -14354,7 +14354,7 @@
   // either isn't defined or isn't visible in the scope in which it's being
   // referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the name `rihgt` isn't
   // defined:
@@ -14431,7 +14431,7 @@
   // appears to be the name of a method but either isn't defined or isn't
   // visible in the scope in which it's being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the identifier
   // `removeMiddle` isn't defined:
@@ -14482,7 +14482,7 @@
   // has a named argument, but the method or function being invoked doesn't
   // define a parameter with the same name.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` doesn't declare a
   // named parameter named `a`:
@@ -14563,7 +14563,7 @@
   // The analyzer produces this diagnostic when a user-definable operator is
   // invoked on an object for which the operator isn't defined.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the class `C` doesn't
   // define the operator `+`:
@@ -14601,7 +14601,7 @@
   // where the prefix is valid, but the identifier isn't declared in any of the
   // libraries imported using that prefix.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `dart:core` doesn't
   // define anything named `a`:
@@ -14641,7 +14641,7 @@
   // appears to be the name of a setter but either isn't defined or isn't
   // visible in the scope in which the identifier is being referenced.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because there isn't a setter
   // named `z`:
@@ -14853,7 +14853,7 @@
   // the name is the same as a static member of the extended type or one of its
   // superclasses.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `m` is a static member
   // of the extended type `C`:
@@ -14921,7 +14921,7 @@
   // The analyzer produces this diagnostic when an import, export, or part
   // directive is found where the URI refers to a file that doesn't exist.
   //
-  // #### Examples
+  // #### Example
   //
   // If the file `lib.dart` doesn't exist, the following code produces this
   // diagnostic:
@@ -14960,7 +14960,7 @@
   // - `.pbjson.dart`
   // - `.template.dart`
   //
-  // #### Examples
+  // #### Example
   //
   // If the file `lib.g.dart` doesn't exist, the following code produces this
   // diagnostic:
@@ -15062,7 +15062,7 @@
   // expected, such as before a member access or on the right-hand side of an
   // assignment.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because `f` doesn't produce an
   // object on which `toString` can be invoked:
@@ -15097,7 +15097,7 @@
   // The analyzer produces this diagnostic when the evaluation of a constant
   // expression would result in a `CastException`.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the value of `x` is an
   // `int`, which can't be assigned to `y` because an `int` isn't a `String`:
@@ -15172,7 +15172,7 @@
   // The analyzer produces this diagnostic when a declaration of an operator has
   // the wrong number of parameters.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the operator `+` must
   // have a single parameter corresponding to the right operand:
@@ -15559,7 +15559,7 @@
   // appears in a function whose body isn't marked with one of the `async*` or
   // `sync*` modifiers.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `yield` is being used
   // in a function whose body doesn't have a modifier:
@@ -15802,7 +15802,7 @@
   // left-hand side has the value `null`, and because the left-hand side can't
   // be `null`, the right-hand side is never evaluated.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `x` can't be `null`:
   //
@@ -15879,7 +15879,7 @@
   // `?..`, `?[`, `?..[`, or `...?`) is used on a receiver that's known to be
   // non-nullable.
   //
-  // #### Example
+  // #### Examples
   //
   // The following code produces this diagnostic because `s` can't be `null`:
   //
@@ -16003,7 +16003,7 @@
   // Note that `null` is always a possible value for an enum and therefore also
   // must be handled.
   //
-  // #### Examples
+  // #### Example
   //
   // The following code produces this diagnostic because the enum constant `e2`
   // isn't handled:
diff --git a/pkg/analyzer/lib/src/summary/summary_file_builder.dart b/pkg/analyzer/lib/src/summary/summary_file_builder.dart
index 6f9c3ed..521f24b 100644
--- a/pkg/analyzer/lib/src/summary/summary_file_builder.dart
+++ b/pkg/analyzer/lib/src/summary/summary_file_builder.dart
@@ -5,6 +5,8 @@
 @Deprecated('Use package:analyzer/dart/sdk/build_sdk_summary.dart instead')
 library summary_file_builder;
 
+import 'dart:typed_data';
+
 import 'package:analyzer/dart/sdk/build_sdk_summary.dart' as api;
 import 'package:analyzer/file_system/file_system.dart';
 
@@ -12,7 +14,7 @@
 ///
 /// If [embedderYamlPath] is provided, then libraries from this file are
 /// appended to the libraries of the specified SDK.
-List<int> buildSdkSummary({
+Uint8List buildSdkSummary({
   required ResourceProvider resourceProvider,
   required String sdkPath,
   String? embedderYamlPath,
diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
index cf4a160..ef1c2be 100644
--- a/pkg/analyzer/messages.yaml
+++ b/pkg/analyzer/messages.yaml
@@ -171,7 +171,7 @@
       The analyzer produces this diagnostic when a field that has the `abstract`
       modifier also has an initializer.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `f` is marked as
       `abstract` and has an initializer:
@@ -229,7 +229,7 @@
       referenced using `super`, but there is no concrete implementation of the
       member in the superclass chain. Abstract members can't be invoked.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `B` doesn't inherit a
       concrete implementation of `a`:
@@ -329,7 +329,7 @@
       extended type that's more specific than the extended types of all of the
       other extensions, making the reference to the member ambiguous.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because there's no way to
       choose between the member in `E1` and the member in `E2`:
@@ -383,7 +383,7 @@
       The analyzer produces this diagnostic when a name is referenced that is
       declared in two or more imported libraries.
 
-      #### Examples
+      #### Example
 
       Given a library (`a.dart`) that defines a class (`C` in this example):
 
@@ -463,7 +463,7 @@
       element is neither of these, making it impossible for the analyzer to
       determine whether you are writing a map literal or a set literal.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -515,7 +515,7 @@
       a type that allows the analyzer to decide whether you were writing a map
       literal or a set literal.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -582,7 +582,7 @@
       The analyzer produces this diagnostic when the static type of an argument
       can't be assigned to the static type of the corresponding parameter.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because a `num` can't be
       assigned to a `String`:
@@ -742,7 +742,7 @@
       setter, but there's no setter because the field with the same name was
       declared to be `final` or `const`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `v` is final:
 
@@ -781,7 +781,7 @@
       The analyzer produces this diagnostic when a local variable that was
       declared to be final is assigned after it was initialized.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is final, so it
       can't have a value assigned to it after it was initialized:
@@ -818,7 +818,7 @@
       found; there is no setter defined for the type; but there is a getter
       defined with the same name.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because there is no setter
       named `x` in `C`, but there is a getter named `x`:
@@ -920,7 +920,7 @@
       The analyzer produces this diagnostic when the target of an assignment is a
       method.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` can't be assigned a
       value because it's a method:
@@ -1094,7 +1094,7 @@
       return type that's [potentially non-nullable][] but would implicitly return
       `null` if control reached the end of the function.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the method `m` has an
       implicit return of `null` inserted at the end of the method, but the method
@@ -1225,7 +1225,7 @@
       The analyzer produces this diagnostic when a built-in identifier is used
       where a type name is expected.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `import` can't be used
       as a type because it's a built-in identifier:
@@ -1313,7 +1313,7 @@
       block isn't one of the required terminators: `break`, `continue`,
       `rethrow`, `return`, or `throw`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the `case` block ends
       with an assignment:
@@ -1511,7 +1511,7 @@
       The analyzer produces this diagnostic when the name following the `as` in a
       cast expression is defined to be something other than a type.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is a variable, not
       a type:
@@ -1646,7 +1646,7 @@
       found that doesn't have a concrete implementation. Concrete classes aren't
       allowed to contain abstract members.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` is an abstract
       method but `C` isn't an abstract class:
@@ -1692,7 +1692,7 @@
       the name of the class, so having the same name makes the reference
       ambiguous.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the static field `foo`
       and the named constructor `foo` have the same name:
@@ -2144,7 +2144,7 @@
       const constructor, but the constructor is defined in a class that has at
       least one non-final instance field (either directly or by inheritance).
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the field `x` isn't
       final:
@@ -2280,7 +2280,7 @@
       known to be a constant is assigned to a variable that's declared to be a
       `const` variable.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` isn't declared to
       be `const`:
@@ -2363,7 +2363,7 @@
       The analyzer produces this diagnostic when an instance field is marked as
       being const.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is an instance
       field:
@@ -2461,7 +2461,7 @@
       The analyzer produces this diagnostic when a variable that is declared to
       be a constant doesn't have an initializer.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `c` isn't initialized:
 
@@ -2543,7 +2543,7 @@
       operator in a constant list or set evaluates to something other than a list
       or a set.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the value of `list1` is
       `null`, which is neither a list nor a set:
@@ -2574,7 +2574,7 @@
       The analyzer produces this diagnostic when the expression of a spread
       operator in a constant map evaluates to something other than a map.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the value of `map1` is
       `null`, which isn't a map:
@@ -2605,7 +2605,7 @@
       The analyzer produces this diagnostic when the keyword `const` is used to
       invoke a constructor that isn't marked with `const`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the constructor in `A`
       isn't a const constructor:
@@ -2652,7 +2652,7 @@
       The analyzer produces this diagnostic when a const constructor is invoked
       with an argument that isn't a constant expression.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `i` isn't a constant:
 
@@ -2933,7 +2933,7 @@
       a value for the parameter is always provided at the call sites, so the
       default value can never be used.
 
-      #### Examples
+      #### Example
 
       The following code generates this diagnostic:
 
@@ -3174,7 +3174,7 @@
       The analyzer produces this diagnostic when a name is declared, and there is
       a previous declaration with the same name in the same scope.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `x` is
       declared twice:
@@ -3243,7 +3243,7 @@
       The analyzer produces this diagnostic when an invocation has two or more
       named arguments that have the same name.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because there are two arguments
       with the name `a`:
@@ -3342,7 +3342,7 @@
       literal have the same value. The set can only contain each value once,
       which means that one of the values is unnecessary.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the string `'a'` is
       specified twice:
@@ -3375,7 +3375,7 @@
       second value would overwrite the first value, which makes having both pairs
       pointless.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the key `1` is used
       twice:
@@ -3613,7 +3613,7 @@
       The analyzer produces this diagnostic when the analyzer finds an
       expression, rather than a map entry, in what appears to be a map literal.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -3644,7 +3644,7 @@
       The analyzer produces this diagnostic when an `extends` clause contains a
       name that is declared to be something other than a class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is declared to be a
       function:
@@ -3692,7 +3692,7 @@
       representing the type of the class. Extensions, on the other hand, don't
       define a type and can't be used as a type literal.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `E` is an extension:
 
@@ -3733,7 +3733,7 @@
       because it's unclear which member is being referenced by an unqualified use
       of the name within the body of the extension.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `a` is being
       used for two different members:
@@ -3768,7 +3768,7 @@
       `Object`. Such a member can never be used because the member in `Object` is
       always found first.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `toString` is defined
       by `Object`:
@@ -3802,7 +3802,7 @@
       classes, the static members of an extension should be accessed using the
       name of the extension, not an extension override.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` is static:
 
@@ -3842,7 +3842,7 @@
       The analyzer produces this diagnostic when the argument to an extension
       override isn't assignable to the type being extended by the extension.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `3` isn't a `String`:
 
@@ -3887,7 +3887,7 @@
       extension override syntax doesn't have any runtime semantics; it only
       controls which member is selected at compile time.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `E(i)` isn't an
       expression:
@@ -3941,7 +3941,7 @@
       `e..m` is the value of the receiver `e`, but extension overrides aren't
       expressions and don't have a value.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `E(3)` isn't an
       expression:
@@ -3993,7 +3993,7 @@
       The analyzer produces this diagnostic when a method or function invocation
       has more positional arguments than the method or function allows.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` defines 2
       parameters but is invoked with 3 arguments:
@@ -4030,7 +4030,7 @@
       has more positional arguments than the method or function allows, but the
       method or function defines named parameters.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` defines 2
       positional parameters but has a named parameter that could be used for the
@@ -4325,7 +4325,7 @@
       that has the field hasn't been created at the point at which it should be
       initialized.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the constructor
       `C.zero`, which redirects to the constructor `C`, has a field formal
@@ -4508,7 +4508,7 @@
       The analyzer produces this diagnostic when a final field or variable isn't
       initialized.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` doesn't have an
       initializer:
@@ -4562,7 +4562,7 @@
       initialized when the instance is created, either by the field's initializer
       or by the constructor.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -4719,7 +4719,7 @@
       The analyzer produces this diagnostic when the expression following `in` in
       a for-in loop has a type that isn't a subclass of `Iterable`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` is a `Map`, and
       `Map` isn't a subclass of `Iterable`:
@@ -5033,7 +5033,7 @@
       clause of a class or mixin declaration is defined to be something other
       than a class or mixin.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is a variable
       rather than a class or mixin:
@@ -5069,7 +5069,7 @@
       The analyzer produces this diagnostic when a single class is specified more
       than once in an `implements` clause.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `A` is in the list
       twice:
@@ -5144,7 +5144,7 @@
       The analyzer produces this diagnostic when it finds a reference to an
       instance member in a constructor's initializer list.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `defaultX` is an
       instance member:
@@ -5321,7 +5321,7 @@
       Constructors can't initialize fields that aren't declared and fields that
       are inherited from superclasses.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the initializer is
       initializing `x`, but `x` isn't a field in the class:
@@ -5436,7 +5436,7 @@
       initialized. Constructors can't initialize fields that aren't declared and
       fields that are inherited from superclasses.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the field `x` isn't
       defined:
@@ -5514,7 +5514,7 @@
       The analyzer produces this diagnostic when an access operator is used to
       access a static member through an instance of the class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `zero` is a static
       field, but it’s being accessed as if it were an instance field:
@@ -5558,7 +5558,7 @@
       factory constructor, the instance isn't created before executing the body,
       so `this` can't be used to reference it.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` isn't in scope in
       the factory constructor:
@@ -5597,7 +5597,7 @@
       The analyzer produces this diagnostic when a static method contains an
       unqualified reference to an instance member.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the instance field `x`
       is being referenced in a static method:
@@ -5655,7 +5655,7 @@
       though you can't create an instance of an abstract class, abstract classes
       can declare constructors that can be invoked by subclasses.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `C` is an abstract
       class:
@@ -5829,7 +5829,7 @@
 
       Getters can't be used as annotations.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the variable `v` isn't
       a `const` variable:
@@ -6002,7 +6002,7 @@
       that is assigned to a variable isn't assignable to the type of the
       variable.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the type of the
       initializer (`int`) isn't assignable to the type of the variable
@@ -6157,7 +6157,7 @@
       The analyzer produces this diagnostic when the name of a factory
       constructor isn't the same as the name of the surrounding class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name of the factory
       constructor (`A`) isn't the same as the surrounding class (`C`):
@@ -6441,7 +6441,7 @@
       * The return type of the override is assignable to the return type of the
         overridden member.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the type of the
       parameter `s` (`String`) isn't assignable to the type of the parameter `i`
@@ -6496,7 +6496,7 @@
       only defined in the context of an instance method or a generative
       constructor.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `v` is a top-level
       variable:
@@ -6573,7 +6573,7 @@
       This isn't allowed because the value of the type parameter (the actual type
       that will be used at runtime) can't be known at compile time.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the type parameter `T`
       is being used as a type argument when creating a constant list:
@@ -6639,7 +6639,7 @@
       The analyzer produces this diagnostic when a URI in a directive doesn't
       conform to the syntax of a valid URI.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `'#'` isn't a valid
       URI:
@@ -6699,7 +6699,7 @@
       The analyzer produces this diagnostic when an extension override is used to
       invoke a function but the extension doesn't declare a `call` method.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the extension `E`
       doesn't define a `call` method:
@@ -6745,7 +6745,7 @@
       but the name of the function being invoked is defined to be something other
       than a function.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `Binary` is the name of
       a function type, not a function:
@@ -7041,7 +7041,7 @@
       The analyzer produces this diagnostic when the type of an element in a list
       literal isn't assignable to the element type of the list.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `2.5` is a double, and
       the list can hold only integers:
@@ -7218,7 +7218,7 @@
       The analyzer produces this diagnostic when a map entry (a key/value pair)
       is found in a set literal.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the literal has a map
       entry even though it's a set literal:
@@ -7260,7 +7260,7 @@
       The analyzer produces this diagnostic when a key of a key-value pair in a
       map literal has a type that isn't assignable to the key type of the map.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `2` is an `int`, but
       the keys of the map are required to be `String`s:
@@ -7297,7 +7297,7 @@
       map literal has a type that isn't assignable to the the value type of the
       map.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `2` is an `int`, but/
       the values of the map are required to be `String`s:
@@ -7362,7 +7362,7 @@
       parameter doesn't allow the parameter to have a value of `null`, then the
       implicit default value isn't valid.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `x` can't be `null`,
       and no non-`null` default value is specified:
@@ -7826,7 +7826,7 @@
       The analyzer produces this diagnostic when a name in a `with` clause is
       defined to be something other than a mixin or a class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `F` is defined to be a
       function type:
@@ -7861,7 +7861,7 @@
       The analyzer produces this diagnostic when a type following the `on`
       keyword in a mixin declaration is neither a class nor a mixin.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `F` is neither a class
       nor a mixin:
@@ -8005,7 +8005,7 @@
       invoked on a class that defines named constructors but the class doesn’t
       have an unnamed constructor.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `A` doesn't define an
       unnamed constructor:
@@ -8079,7 +8079,7 @@
       more abstract members, and doesn't provide or inherit an implementation for
       at least one of those abstract members.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the class `B` doesn't
       have a concrete implementation of `m`:
@@ -8162,7 +8162,7 @@
       The analyzer produces this diagnostic when a condition, such as an `if` or
       `while` loop, doesn't have the static type `bool`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` has the static type
       `int`:
@@ -8197,7 +8197,7 @@
       The analyzer produces this diagnostic when the first expression in an
       assert has a type other than `bool`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the type of `p` is
       `int`, but a `bool` is required:
@@ -8228,7 +8228,7 @@
       The analyzer produces this diagnostic when the operand of the unary
       negation operator (`!`) doesn't have the type `bool`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is an `int` when it
       must be a `bool`:
@@ -8258,7 +8258,7 @@
       The analyzer produces this diagnostic when one of the operands of either
       the `&&` or `||` operator doesn't have the type `bool`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `a` isn't a Boolean
       value:
@@ -8329,7 +8329,7 @@
       The analyzer produces this diagnostic when the expression in a `case`
       clause isn't a constant expression.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `j` isn't a constant:
 
@@ -8451,7 +8451,7 @@
       named or positional, has a default value that isn't a compile-time
       constant.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -8548,7 +8548,7 @@
       explicitly (because it's prefixed by the `const` keyword) or implicitly
       (because it appears in a [constant context][]).
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` isn't a constant,
       even though it appears in an implicitly constant list literal:
@@ -8636,7 +8636,7 @@
       The analyzer produces this diagnostic when a key in a constant map literal
       isn't a constant value.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic beause `a` isn't a constant:
 
@@ -8672,7 +8672,7 @@
       The analyzer produces this diagnostic when a value in a constant map
       literal isn't a constant value.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `a` isn't a constant:
 
@@ -8708,7 +8708,7 @@
       The analyzer produces this diagnostic when a constant set literal contains
       an element that isn't a compile-time constant.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `i` isn't a constant:
 
@@ -8866,7 +8866,7 @@
       The analyzer produces this diagnostic when an identifier that isn't a type
       is used as a type argument.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is a variable, not
       a type:
@@ -8897,7 +8897,7 @@
       The analyzer produces this diagnostic when the identifier following the
       `on` in a `catch` clause is defined to be something other than a type.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is a function, not
       a type:
@@ -9007,7 +9007,7 @@
       - The analyzer can't prove that the local variable will be assigned before
         the reference based on the specification of [definite assignment][].
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `x` can't have a value
       of `null`, but is referenced before a value was assigned to it:
@@ -9119,7 +9119,7 @@
       The analyzer produces this diagnostic when a name is used as a type but
       declared to be something other than a type.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is a function:
 
@@ -9174,7 +9174,7 @@
       has fewer positional arguments than the number of required positional
       parameters.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` declares two
       required parameters, but only one argument is provided:
@@ -9212,7 +9212,7 @@
       - Doesn't have an initializer
       - Isn't marked as `late`
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `x` is implicitly
       initialized to `null` when it isn't allowed to be `null`:
@@ -9295,7 +9295,7 @@
       initialized to `null`, but the type of the field or variable doesn't allow
       it to be set to `null`, so an explicit initializer must be provided.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the field `f` can't be
       initialized to `null`:
@@ -9354,7 +9354,7 @@
       expression of a spread element that appears in either a list literal or a
       set literal doesn't implement the type `Iterable`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -9383,7 +9383,7 @@
       expression of a spread element that appears in a map literal doesn't
       implement the type `Map`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `l` isn't a `Map`:
 
@@ -9417,7 +9417,7 @@
       variable. To create an instance of the class, the identifier must be
       followed by an argument list.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `C` is a class, and a
       class can't be used as an annotation without invoking a `const` constructor
@@ -9817,7 +9817,7 @@
       The analyzer produces this diagnostic when a part directive is found and
       the referenced file doesn't have a part-of directive.
 
-      #### Examples
+      #### Example
 
       Given a file (`a.dart`) containing:
 
@@ -10125,7 +10125,7 @@
       The analyzer produces this diagnostic when a constructor redirects to
       itself, either directly or indirectly, creating an infinite loop.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the generative
       constructors `C.a` and `C.b` each redirect to the other:
@@ -10472,7 +10472,7 @@
       to a constructor whose return type isn't a subtype of the type that the
       factory constructor is declared to produce.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `A` isn't a subclass
       of `C`, which means that the value returned by the constructor `A()`
@@ -10537,7 +10537,7 @@
       produces this diagnostic when the redirect is to something other than a
       constructor.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is a function:
 
@@ -10668,7 +10668,7 @@
       The analyzer also produces a context message that indicates where the
       declaration is located.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `i` is used before it
       is declared:
@@ -10817,7 +10817,7 @@
       statement to return a value or implicitly returns a value because of using
       `=>`. In any of these cases, they should use `yield` instead of `return`.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the method `f` is a
       generator and is using `return` to return a value:
@@ -10887,7 +10887,7 @@
       The analyzer produces this diagnostic when a method or function returns a
       value whose type isn't assignable to the declared return type.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` has a return type
       of `String` but is returning an `int`:
@@ -10933,7 +10933,7 @@
       expression isn't assignable to the return type that the closure is required
       to have.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` is defined to be a
       function that returns a `String`, but the closure assigned to it returns an
@@ -10961,7 +10961,7 @@
       The analyzer produces this diagnostic when it finds a `return` statement
       without an expression in a function that declares a return type.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the function `f` is
       expected to return an `int`, but no value is being returned:
@@ -11078,7 +11078,7 @@
       an instance field. Instance fields don't exist on a class; they exist only
       on an instance of the class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is an instance
       field:
@@ -11198,7 +11198,7 @@
       are all restricted in this way, to allow for more efficient
       implementations.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `String` is used in an
       `extends` clause:
@@ -11333,7 +11333,7 @@
       extension uses the `super` keyword . Extensions aren't classes and don't
       have superclasses, so the `super` keyword serves no purpose.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `super` can't be used
       in an extension:
@@ -11363,7 +11363,7 @@
       The analyzer produces this diagnostic when the keyword `super` is used
       outside of a instance method.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `super` is used in a
       top-level function:
@@ -11677,7 +11677,7 @@
       The analyzer produces this diagnostic when a type argument isn't the same
       as or a subclass of the bounds of the corresponding type parameter.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `String` isn't a
       subclass of `num`:
@@ -11759,7 +11759,7 @@
       as itself or a subtype of itself or a subtype of itself isn't helpful
       because it will always be the same as itself.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the bound of `T` is
       `T`:
@@ -11853,7 +11853,7 @@
       The analyzer produces this diagnostic when the name following the `is` in a
       type test expression isn't defined.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `Srting` isn't
       defined:
@@ -11985,7 +11985,7 @@
       The analyzer produces this diagnostic when a name that isn't defined is
       used as an annotation.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `undefined`
       isn't defined:
@@ -12030,7 +12030,7 @@
       appears to be the name of a class but either isn't defined or isn't visible
       in the scope in which it's being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `Piont` isn't defined:
 
@@ -12156,7 +12156,7 @@
       appears to be the name of an enum constant, and the name either isn't
       defined or isn't visible in the scope in which it's being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `E` doesn't define a
       constant named `c`:
@@ -12543,7 +12543,7 @@
       appears to be the name of a function but either isn't defined or isn't
       visible in the scope in which it's being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `emty` isn't
       defined:
@@ -12587,7 +12587,7 @@
       appears to be the name of a getter but either isn't defined or isn't
       visible in the scope in which it's being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `String` has no member
       named `len`:
@@ -12629,7 +12629,7 @@
       either isn't defined or isn't visible in the scope in which it's being
       referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the name `rihgt` isn't
       defined:
@@ -12695,7 +12695,7 @@
       appears to be the name of a method but either isn't defined or isn't
       visible in the scope in which it's being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the identifier
       `removeMiddle` isn't defined:
@@ -12736,7 +12736,7 @@
       has a named argument, but the method or function being invoked doesn't
       define a parameter with the same name.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` doesn't declare a
       named parameter named `a`:
@@ -12812,7 +12812,7 @@
       The analyzer produces this diagnostic when a user-definable operator is
       invoked on an object for which the operator isn't defined.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the class `C` doesn't
       define the operator `+`:
@@ -12846,7 +12846,7 @@
       where the prefix is valid, but the identifier isn't declared in any of the
       libraries imported using that prefix.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `dart:core` doesn't
       define anything named `a`:
@@ -12881,7 +12881,7 @@
       appears to be the name of a setter but either isn't defined or isn't
       visible in the scope in which the identifier is being referenced.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because there isn't a setter
       named `z`:
@@ -13057,7 +13057,7 @@
       the name is the same as a static member of the extended type or one of its
       superclasses.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` is a static member
       of the extended type `C`:
@@ -13120,7 +13120,7 @@
       The analyzer produces this diagnostic when an import, export, or part
       directive is found where the URI refers to a file that doesn't exist.
 
-      #### Examples
+      #### Example
 
       If the file `lib.dart` doesn't exist, the following code produces this
       diagnostic:
@@ -13155,7 +13155,7 @@
       - `.pbjson.dart`
       - `.template.dart`
 
-      #### Examples
+      #### Example
 
       If the file `lib.g.dart` doesn't exist, the following code produces this
       diagnostic:
@@ -13241,7 +13241,7 @@
       expected, such as before a member access or on the right-hand side of an
       assignment.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` doesn't produce an
       object on which `toString` can be invoked:
@@ -13272,7 +13272,7 @@
       The analyzer produces this diagnostic when the evaluation of a constant
       expression would result in a `CastException`.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the value of `x` is an
       `int`, which can't be assigned to `y` because an `int` isn't a `String`:
@@ -13335,7 +13335,7 @@
       The analyzer produces this diagnostic when a declaration of an operator has
       the wrong number of parameters.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the operator `+` must
       have a single parameter corresponding to the right operand:
@@ -13668,7 +13668,7 @@
       appears in a function whose body isn't marked with one of the `async*` or
       `sync*` modifiers.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `yield` is being used
       in a function whose body doesn't have a modifier:
@@ -13987,7 +13987,7 @@
       to have either a single parameter of type `Object` or two parameters of
       type `Object` and `StackTrace`.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the closure being
       passed to `catchError` doesn't take any parameters, but the function is
@@ -14054,7 +14054,7 @@
       The analyzer produces this diagnostic when code is found that won't be
       executed because execution will never reach the code.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the invocation of
       `print` occurs after the function has returned:
@@ -14114,7 +14114,7 @@
       the thrown object is selected, and both of those forms will match any
       object, so no `catch` clauses that follow them will be selected.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -14172,7 +14172,7 @@
       matches anything matchable by the highlighted clause, so the highlighted
       clause will never be selected.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -14225,7 +14225,7 @@
       The analyzer produces this diagnostic when a deprecated library or class
       member is used in a different package.
 
-      #### Examples
+      #### Example
 
       If the method `m` in the class `C` is annotated with `@deprecated`, then
       the following code produces this diagnostic:
@@ -14262,7 +14262,7 @@
       The analyzer produces this diagnostic when a deprecated library member or
       class member is used in the same package in which it's declared.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `x` is deprecated:
 
@@ -14389,7 +14389,7 @@
       because it's already included in the same `ignore` comment or because it
       appears in an `ignore-in-file` comment.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the diagnostic named
       `unused_local_variable` is already being ignored for the whole file so it
@@ -14439,7 +14439,7 @@
       that is the same as an import before it in the file. The second import
       doesn’t add value and should be removed.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -15027,7 +15027,7 @@
       `catchError` attempts to return the value from the callback as the result
       of the future, which results in another exception being thrown.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `future` is declared to
       return an `int` while `callback` is declared to return a `String`, and
@@ -15171,7 +15171,7 @@
       The analyzer produces this diagnostic when either the `@visibleForTemplate`
       or `@visibleForTesting` annotation is applied to a non-public declaration.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -15252,7 +15252,7 @@
       named parameter that is annotated as being required is invoked without
       providing a value for the parameter.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the named parameter `x`
       is required:
@@ -15307,7 +15307,7 @@
       throw implicitly returns `null`. This is rarely the desired behavior. The
       analyzer produces this diagnostic when it finds an implicit return.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `f` doesn't end with a
       return:
@@ -15343,7 +15343,7 @@
       Classes that are sealed can't be extended, implemented, mixed in, or used
       as a superclass constraint.
 
-      #### Examples
+      #### Example
 
       If the package `p` defines a sealed class:
 
@@ -15383,7 +15383,7 @@
       marked as being immutable using the annotation `@immutable` or if it's a
       subclass of an immutable class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the field `x` isn't
       final:
@@ -15439,7 +15439,7 @@
       that is annotated as `@mustCallSuper` doesn't invoke the overridden method
       as required.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the method `m` in `B`
       doesn't invoke the overridden method `m` in `A`:
@@ -15507,7 +15507,7 @@
       that the constructor should be used to create a constant value whenever
       possible.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic:
 
@@ -15668,7 +15668,7 @@
       the `@override` annotation, but the member isn’t declared in any of the
       supertypes of the class.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `m` isn't declared in
       any of the supertypes of `C`:
@@ -15748,7 +15748,7 @@
       earlier versions, these classes weren't defined in `dart:core`, so the
       import was necessary.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.1.0:
@@ -15798,7 +15798,7 @@
       [constant context][] wasn't supported in earlier versions, so this code
       won't be able to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.3.2:
@@ -15850,7 +15850,7 @@
       versions, so this code won't be able to run against earlier versions of the
       SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.3.2:
@@ -15958,7 +15958,7 @@
       in a [constant context][] wasn't supported in earlier versions, so this
       code won't be able to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.3.2:
@@ -16015,7 +16015,7 @@
       versions, so this code won't be able to run against earlier versions of the
       SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.6.0:
@@ -16070,7 +16070,7 @@
       operator wasn't supported in earlier versions, so this code won't be able
       to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.14.0:
@@ -16126,7 +16126,7 @@
       [constant context][] wasn't supported in earlier versions, so this code
       won't be able to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.3.2:
@@ -16177,7 +16177,7 @@
       2.12.0. This class wasn't defined in earlier versions, so this code won't
       be able to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.12.0:
@@ -16225,7 +16225,7 @@
       literals weren't supported in earlier versions, so this code won't be able
       to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.2.0:
@@ -16273,7 +16273,7 @@
       versions, so this code won't be able to run against earlier versions of the
       SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.3.0:
@@ -16329,7 +16329,7 @@
       [constant context][] wasn't supported in earlier versions, so this code
       won't be able to run against earlier versions of the SDK.
 
-      #### Examples
+      #### Example
 
       Here's an example of a pubspec that defines an SDK constraint with a lower
       bound of less than 2.5.0:
@@ -16449,7 +16449,7 @@
       is `Null`, so the code is both more readable and more performant when it
       tests for `null` explicitly.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because the code is testing to
       see whether the value of `s` is `null` by using a type check:
@@ -16507,7 +16507,7 @@
       The analyzer produces this diagnostic when a hide combinator includes a
       name that isn't defined by the library being imported.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `dart:math` doesn't
       define the name `String`:
@@ -16579,7 +16579,7 @@
       The analyzer produces this diagnostic when a show combinator includes a
       name that isn't defined by the library being imported.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `dart:math` doesn't
       define the name `String`:
@@ -16617,7 +16617,7 @@
       The analyzer produces this diagnostic when the value being cast is already
       known to be of the type that it's being cast to.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `n` is already known to
       be an `int` as a result of the `is` test:
@@ -16761,7 +16761,7 @@
       can't be `null`. Such comparisons are always either `true` or `false`, so
       they serve no purpose.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `x` can never be
       `null`, so the comparison always evaluates to `true`:
@@ -16896,7 +16896,7 @@
       neither the exception parameter nor the optional stack trace parameter are
       used in the `catch` block.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `e` isn't referenced:
 
@@ -16936,7 +16936,7 @@
       The analyzer produces this diagnostic when the stack trace parameter in a
       `catch` clause isn't referenced within the body of the `catch` block.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because `stackTrace` isn't
       referenced:
@@ -16984,7 +16984,7 @@
       - Optional parameters of private functions for which a value is never
         passed, even when the parameter doesn't have a private name
 
-      #### Examples
+      #### Example
 
       Assuming that no code in the library references `_C`, the following code
       produces this diagnostic:
@@ -17039,7 +17039,7 @@
       The analyzer produces this diagnostic when a private field is declared but
       never read, even if it's written in one or more places.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the field
       `_originalValue` isn't read anywhere in the library:
@@ -17078,7 +17078,7 @@
       none of the names that are imported are referenced within the importing
       library.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because nothing defined in
       `dart:async` is referenced in the library:
@@ -17108,7 +17108,7 @@
       The analyzer produces this diagnostic when a label that isn't used is
       found.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the label `loop` isn't
       referenced anywhere in the method:
@@ -17157,7 +17157,7 @@
       The analyzer produces this diagnostic when a local variable is declared but
       never read, even if it's written in one or more places.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the value of `count` is
       never read:
@@ -17274,7 +17274,7 @@
       name that isn't used within the library. Because it isn't referenced, the
       name can be removed.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the function `max`
       isn't used:
@@ -18188,7 +18188,7 @@
       left-hand side has the value `null`, and because the left-hand side can't
       be `null`, the right-hand side is never evaluated.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `x` can't be `null`:
 
@@ -18262,7 +18262,7 @@
       `?..`, `?[`, `?..[`, or `...?`) is used on a receiver that's known to be
       non-nullable.
 
-      #### Example
+      #### Examples
 
       The following code produces this diagnostic because `s` can't be `null`:
 
@@ -18367,7 +18367,7 @@
       Note that `null` is always a possible value for an enum and therefore also
       must be handled.
 
-      #### Examples
+      #### Example
 
       The following code produces this diagnostic because the enum constant `e2`
       isn't handled:
diff --git a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
index f5e1dd3..cec815e 100644
--- a/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/ast_rewrite_test.dart
@@ -189,7 +189,8 @@
 }
 ''', [
       error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 50,
-          5),
+          5,
+          messageContains: "The constructor 'A.named'"),
     ]);
 
     var importFind = findElement.importFind('package:test/a.dart');
@@ -212,6 +213,44 @@
     _assertArgumentList(creation.argumentList, ['0']);
   }
 
+  test_targetPrefixedIdentifier_prefix_class_constructor_typeArguments_new() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+class A<T> {
+  A.new(int a);
+}
+''');
+
+    await assertErrorsInCode(r'''
+import 'a.dart' as prefix;
+
+f() {
+  prefix.A.new<int>(0);
+}
+''', [
+      error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 48,
+          5,
+          messageContains: "The constructor 'A.'"),
+    ]);
+
+    var importFind = findElement.importFind('package:test/a.dart');
+
+    var creation = findNode.instanceCreation('new<int>(0);');
+    assertInstanceCreation(
+      creation,
+      importFind.class_('A'),
+      'A<int>',
+      expectedPrefix: importFind.prefix,
+      expectedConstructorMember: true,
+      expectedSubstitution: {'T': 'int'},
+    );
+    _assertTypeArgumentList(
+      creation.constructorName.type2.typeArguments,
+      ['int'],
+    );
+    expect((creation as InstanceCreationExpressionImpl).typeArguments, isNull);
+    _assertArgumentList(creation.argumentList, ['0']);
+  }
+
   test_targetPrefixedIdentifier_prefix_getter_method() async {
     newFile('$testPackageLibPath/a.dart', content: r'''
 A get foo => A();
@@ -304,7 +343,8 @@
 }
 ''', [
       error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 52,
-          13),
+          13,
+          messageContains: "The constructor 'A.named'"),
     ]);
 
     var creation = findNode.instanceCreation('named<int, String>(0);');
@@ -330,6 +370,43 @@
     _assertArgumentList(creation.argumentList, ['0']);
   }
 
+  test_targetSimpleIdentifier_class_constructor_typeArguments_new() async {
+    await assertErrorsInCode(r'''
+class A<T, U> {
+  A.new(int a);
+}
+
+f() {
+  A.new<int, String>(0);
+}
+''', [
+      error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 48,
+          13,
+          messageContains: "The constructor 'A.'"),
+    ]);
+
+    var creation = findNode.instanceCreation('new<int, String>(0);');
+    assertInstanceCreation(
+      creation,
+      findElement.class_('A'),
+      // TODO(scheglov) Move type arguments
+      'A<dynamic, dynamic>',
+//      'A<int, String>',
+      expectedConstructorMember: true,
+      // TODO(scheglov) Move type arguments
+      expectedSubstitution: {'T': 'dynamic', 'U': 'dynamic'},
+//      expectedSubstitution: {'T': 'int', 'U': 'String'},
+    );
+    // TODO(scheglov) Move type arguments
+//    _assertTypeArgumentList(
+//      creation.constructorName.type.typeArguments,
+//      ['int', 'String'],
+//    );
+    // TODO(scheglov) Fix and uncomment.
+//    expect((creation as InstanceCreationExpressionImpl).typeArguments, isNull);
+    _assertArgumentList(creation.argumentList, ['0']);
+  }
+
   test_targetSimpleIdentifier_class_staticMethod() async {
     await assertNoErrorsInCode(r'''
 class A {
diff --git a/pkg/analyzer/test/src/dart/resolution/constructor_reference_test.dart b/pkg/analyzer/test/src/dart/resolution/constructor_reference_test.dart
index 46d6e0d..eac6bb7 100644
--- a/pkg/analyzer/test/src/dart/resolution/constructor_reference_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/constructor_reference_test.dart
@@ -245,7 +245,8 @@
 }
 ''', [
       error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 52,
-          5),
+          5,
+          messageContains: "The constructor 'A.foo'"),
     ]);
 
     var classElement = findElement.class_('A');
@@ -258,6 +259,31 @@
     );
   }
 
+  test_class_generic_new_typeArgs() async {
+    await assertErrorsInCode('''
+class A<T> {
+  A.new();
+}
+
+void bar() {
+  A<int>.new<int>;
+}
+''', [
+      error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 52,
+          5,
+          messageContains: "The constructor 'A.new'"),
+    ]);
+
+    var classElement = findElement.class_('A');
+    assertConstructorReference(
+      findNode.constructorReference('A<int>.new<int>;'),
+      elementMatcher(classElement.unnamedConstructor!,
+          substitution: {'T': 'int'}),
+      classElement,
+      'A<int> Function()',
+    );
+  }
+
   test_class_generic_nonConstructor() async {
     await assertErrorsInCode('''
 class A<T> {
diff --git a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
index 2f6fbd0..c8245ec 100644
--- a/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
+++ b/pkg/analyzer/test/src/dart/resolution/instance_creation_test.dart
@@ -174,7 +174,8 @@
 }
 ''', [
       error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 53,
-          5),
+          5,
+          messageContains: "The constructor 'Foo.bar'"),
     ]);
 
     var creation = findNode.instanceCreation('Foo.bar<int>');
@@ -188,6 +189,31 @@
     );
   }
 
+  test_error_wrongNumberOfTypeArgumentsConstructor_explicitNew_new() async {
+    await assertErrorsInCode(r'''
+class Foo<X> {
+  Foo.new();
+}
+
+main() {
+  new Foo.new<int>();
+}
+''', [
+      error(CompileTimeErrorCode.WRONG_NUMBER_OF_TYPE_ARGUMENTS_CONSTRUCTOR, 53,
+          5,
+          messageContains: "The constructor 'Foo.new'"),
+    ]);
+
+    var creation = findNode.instanceCreation('Foo.new<int>');
+    assertInstanceCreation(
+      creation,
+      findElement.class_('Foo'),
+      'Foo<dynamic>',
+      expectedConstructorMember: true,
+      expectedSubstitution: {'X': 'dynamic'},
+    );
+  }
+
   test_error_wrongNumberOfTypeArgumentsConstructor_explicitNew_prefix() async {
     newFile('$testPackageLibPath/a.dart', content: '''
 class Foo<X> {
diff --git a/pkg/analyzer/tool/diagnostics/diagnostics.md b/pkg/analyzer/tool/diagnostics/diagnostics.md
index fc014beb..1878547 100644
--- a/pkg/analyzer/tool/diagnostics/diagnostics.md
+++ b/pkg/analyzer/tool/diagnostics/diagnostics.md
@@ -279,7 +279,7 @@
 The analyzer produces this diagnostic when a field that has the `abstract`
 modifier also has an initializer.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `f` is marked as
 `abstract` and has an initializer:
@@ -329,7 +329,7 @@
 referenced using `super`, but there is no concrete implementation of the
 member in the superclass chain. Abstract members can't be invoked.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `B` doesn't inherit a
 concrete implementation of `a`:
@@ -415,7 +415,7 @@
 extended type that's more specific than the extended types of all of the
 other extensions, making the reference to the member ambiguous.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because there's no way to
 choose between the member in `E1` and the member in `E2`:
@@ -464,7 +464,7 @@
 The analyzer produces this diagnostic when a name is referenced that is
 declared in two or more imported libraries.
 
-#### Examples
+#### Example
 
 Given a library (`a.dart`) that defines a class (`C` in this example):
 
@@ -542,7 +542,7 @@
 element is neither of these, making it impossible for the analyzer to
 determine whether you are writing a map literal or a set literal.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -594,7 +594,7 @@
 a type that allows the analyzer to decide whether you were writing a map
 literal or a set literal.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -658,7 +658,7 @@
 The analyzer produces this diagnostic when the static type of an argument
 can't be assigned to the static type of the corresponding parameter.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because a `num` can't be
 assigned to a `String`:
@@ -718,7 +718,7 @@
 to have either a single parameter of type `Object` or two parameters of
 type `Object` and `StackTrace`.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the closure being
 passed to `catchError` doesn't take any parameters, but the function is
@@ -990,7 +990,7 @@
 setter, but there's no setter because the field with the same name was
 declared to be `final` or `const`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `v` is final:
 
@@ -1028,7 +1028,7 @@
 The analyzer produces this diagnostic when a local variable that was
 declared to be final is assigned after it was initialized.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is final, so it
 can't have a value assigned to it after it was initialized:
@@ -1064,7 +1064,7 @@
 found; there is no setter defined for the type; but there is a getter
 defined with the same name.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because there is no setter
 named `x` in `C`, but there is a getter named `x`:
@@ -1166,7 +1166,7 @@
 The analyzer produces this diagnostic when the target of an assignment is a
 method.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` can't be assigned a
 value because it's a method:
@@ -1331,7 +1331,7 @@
 return type that's [potentially non-nullable][] but would implicitly return
 `null` if control reached the end of the function.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the method `m` has an
 implicit return of `null` inserted at the end of the method, but the method
@@ -1459,7 +1459,7 @@
 The analyzer produces this diagnostic when a built-in identifier is used
 where a type name is expected.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `import` can't be used
 as a type because it's a built-in identifier:
@@ -1519,7 +1519,7 @@
 block isn't one of the required terminators: `break`, `continue`,
 `rethrow`, `return`, or `throw`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the `case` block ends
 with an assignment:
@@ -1710,7 +1710,7 @@
 The analyzer produces this diagnostic when the name following the `as` in a
 cast expression is defined to be something other than a type.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is a variable, not
 a type:
@@ -1809,7 +1809,7 @@
 found that doesn't have a concrete implementation. Concrete classes aren't
 allowed to contain abstract members.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` is an abstract
 method but `C` isn't an abstract class:
@@ -1861,7 +1861,7 @@
 the name of the class, so having the same name makes the reference
 ambiguous.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the static field `foo`
 and the named constructor `foo` have the same name:
@@ -2168,7 +2168,7 @@
 const constructor, but the constructor is defined in a class that has at
 least one non-final instance field (either directly or by inheritance).
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the field `x` isn't
 final:
@@ -2259,7 +2259,7 @@
 known to be a constant is assigned to a variable that's declared to be a
 `const` variable.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` isn't declared to
 be `const`:
@@ -2341,7 +2341,7 @@
 The analyzer produces this diagnostic when an instance field is marked as
 being const.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is an instance
 field:
@@ -2434,7 +2434,7 @@
 The analyzer produces this diagnostic when a variable that is declared to
 be a constant doesn't have an initializer.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `c` isn't initialized:
 
@@ -2514,7 +2514,7 @@
 operator in a constant list or set evaluates to something other than a list
 or a set.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the value of `list1` is
 `null`, which is neither a list nor a set:
@@ -2543,7 +2543,7 @@
 The analyzer produces this diagnostic when the expression of a spread
 operator in a constant map evaluates to something other than a map.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the value of `map1` is
 `null`, which isn't a map:
@@ -2571,7 +2571,7 @@
 The analyzer produces this diagnostic when the keyword `const` is used to
 invoke a constructor that isn't marked with `const`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the constructor in `A`
 isn't a const constructor:
@@ -2617,7 +2617,7 @@
 The analyzer produces this diagnostic when a const constructor is invoked
 with an argument that isn't a constant expression.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `i` isn't a constant:
 
@@ -2749,7 +2749,7 @@
 The analyzer produces this diagnostic when code is found that won't be
 executed because execution will never reach the code.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the invocation of
 `print` occurs after the function has returned:
@@ -2805,7 +2805,7 @@
 the thrown object is selected, and both of those forms will match any
 object, so no `catch` clauses that follow them will be selected.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -2856,7 +2856,7 @@
 matches anything matchable by the highlighted clause, so the highlighted
 clause will never be selected.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -2911,7 +2911,7 @@
 left-hand side has the value `null`, and because the left-hand side can't
 be `null`, the right-hand side is never evaluated.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `x` can't be `null`:
 
@@ -3107,7 +3107,7 @@
 a value for the parameter is always provided at the call sites, so the
 default value can never be used.
 
-#### Examples
+#### Example
 
 The following code generates this diagnostic:
 
@@ -3310,7 +3310,7 @@
 The analyzer produces this diagnostic when a deprecated library or class
 member is used in a different package.
 
-#### Examples
+#### Example
 
 If the method `m` in the class `C` is annotated with `@deprecated`, then
 the following code produces this diagnostic:
@@ -3337,7 +3337,7 @@
 The analyzer produces this diagnostic when a deprecated library member or
 class member is used in the same package in which it's declared.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is deprecated:
 
@@ -3473,7 +3473,7 @@
 The analyzer produces this diagnostic when a name is declared, and there is
 a previous declaration with the same name in the same scope.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `x` is
 declared twice:
@@ -3580,7 +3580,7 @@
 because it's already included in the same `ignore` comment or because it
 appears in an `ignore-in-file` comment.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the diagnostic named
 `unused_local_variable` is already being ignored for the whole file so it
@@ -3626,7 +3626,7 @@
 that is the same as an import before it in the file. The second import
 doesn’t add value and should be removed.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -3656,7 +3656,7 @@
 The analyzer produces this diagnostic when an invocation has two or more
 named arguments that have the same name.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because there are two arguments
 with the name `a`:
@@ -3784,7 +3784,7 @@
 literal have the same value. The set can only contain each value once,
 which means that one of the values is unnecessary.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the string `'a'` is
 specified twice:
@@ -3861,7 +3861,7 @@
 second value would overwrite the first value, which makes having both pairs
 pointless.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the key `1` is used
 twice:
@@ -4124,7 +4124,7 @@
 The analyzer produces this diagnostic when the analyzer finds an
 expression, rather than a map entry, in what appears to be a map literal.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -4151,7 +4151,7 @@
 The analyzer produces this diagnostic when an `extends` clause contains a
 name that is declared to be something other than a class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is declared to be a
 function:
@@ -4196,7 +4196,7 @@
 representing the type of the class. Extensions, on the other hand, don't
 define a type and can't be used as a type literal.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `E` is an extension:
 
@@ -4234,7 +4234,7 @@
 because it's unclear which member is being referenced by an unqualified use
 of the name within the body of the extension.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `a` is being
 used for two different members:
@@ -4266,7 +4266,7 @@
 The analyzer produces this diagnostic when an abstract declaration is
 declared in an extension. Extensions can declare only concrete members.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the method `a` doesn't
 have a body:
@@ -4292,7 +4292,7 @@
 extensions aren't classes, and it isn't possible to create an instance of
 an extension.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because there is a constructor
 declaration in `E`:
@@ -4317,7 +4317,7 @@
 found in an extension. It isn't valid to define an instance field because
 extensions can only add behavior, not state.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `s` is an instance
 field:
@@ -4345,7 +4345,7 @@
 `Object`. Such a member can never be used because the member in `Object` is
 always found first.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `toString` is defined
 by `Object`:
@@ -4379,7 +4379,7 @@
 classes, the static members of an extension should be accessed using the
 name of the extension, not an extension override.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` is static:
 
@@ -4417,7 +4417,7 @@
 The analyzer produces this diagnostic when the argument to an extension
 override isn't assignable to the type being extended by the extension.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `3` isn't a `String`:
 
@@ -4461,7 +4461,7 @@
 extension override syntax doesn't have any runtime semantics; it only
 controls which member is selected at compile time.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `E(i)` isn't an
 expression:
@@ -4515,7 +4515,7 @@
 `e..m` is the value of the receiver `e`, but extension overrides aren't
 expressions and don't have a value.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `E(3)` isn't an
 expression:
@@ -4554,7 +4554,7 @@
 The analyzer produces this diagnostic when a method or function invocation
 has more positional arguments than the method or function allows.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` defines 2
 parameters but is invoked with 3 arguments:
@@ -4587,7 +4587,7 @@
 has more positional arguments than the method or function allows, but the
 method or function defines named parameters.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` defines 2
 positional parameters but has a named parameter that could be used for the
@@ -4857,7 +4857,7 @@
 that has the field hasn't been created at the point at which it should be
 initialized.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the constructor
 `C.zero`, which redirects to the constructor `C`, has a field formal
@@ -5031,7 +5031,7 @@
 The analyzer produces this diagnostic when a final field or variable isn't
 initialized.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` doesn't have an
 initializer:
@@ -5086,7 +5086,7 @@
 initialized when the instance is created, either by the field's initializer
 or by the constructor.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -5255,7 +5255,7 @@
 The analyzer produces this diagnostic when the expression following `in` in
 a for-in loop has a type that isn't a subclass of `Iterable`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` is a `Map`, and
 `Map` isn't a subclass of `Iterable`:
@@ -5535,7 +5535,7 @@
 clause of a class or mixin declaration is defined to be something other
 than a class or mixin.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is a variable
 rather than a class or mixin:
@@ -5568,7 +5568,7 @@
 The analyzer produces this diagnostic when a single class is specified more
 than once in an `implements` clause.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `A` is in the list
 twice:
@@ -5636,7 +5636,7 @@
 The analyzer produces this diagnostic when it finds a reference to an
 instance member in a constructor's initializer list.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `defaultX` is an
 instance member:
@@ -5834,7 +5834,7 @@
 Constructors can't initialize fields that aren't declared and fields that
 are inherited from superclasses.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the initializer is
 initializing `x`, but `x` isn't a field in the class:
@@ -5939,7 +5939,7 @@
 initialized. Constructors can't initialize fields that aren't declared and
 fields that are inherited from superclasses.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the field `x` isn't
 defined:
@@ -6007,7 +6007,7 @@
 The analyzer produces this diagnostic when an access operator is used to
 access a static member through an instance of the class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `zero` is a static
 field, but it’s being accessed as if it were an instance field:
@@ -6050,7 +6050,7 @@
 factory constructor, the instance isn't created before executing the body,
 so `this` can't be used to reference it.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` isn't in scope in
 the factory constructor:
@@ -6088,7 +6088,7 @@
 The analyzer produces this diagnostic when a static method contains an
 unqualified reference to an instance member.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the instance field `x`
 is being referenced in a static method:
@@ -6142,7 +6142,7 @@
 though you can't create an instance of an abstract class, abstract classes
 can declare constructors that can be invoked by subclasses.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `C` is an abstract
 class:
@@ -6312,7 +6312,7 @@
 
 Getters can't be used as annotations.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the variable `v` isn't
 a `const` variable:
@@ -6479,7 +6479,7 @@
 that is assigned to a variable isn't assignable to the type of the
 variable.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the type of the
 initializer (`int`) isn't assignable to the type of the variable
@@ -6622,7 +6622,7 @@
 The analyzer produces this diagnostic when the name of a factory
 constructor isn't the same as the name of the surrounding class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name of the factory
 constructor (`A`) isn't the same as the surrounding class (`C`):
@@ -6937,7 +6937,7 @@
 `?..`, `?[`, `?..[`, or `...?`) is used on a receiver that's known to be
 non-nullable.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `s` can't be `null`:
 
@@ -7017,7 +7017,7 @@
 * The return type of the override is assignable to the return type of the
   overridden member.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the type of the
 parameter `s` (`String`) isn't assignable to the type of the parameter `i`
@@ -7072,7 +7072,7 @@
 only defined in the context of an instance method or a generative
 constructor.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `v` is a top-level
 variable:
@@ -7110,7 +7110,7 @@
 `catchError` attempts to return the value from the callback as the result
 of the future, which results in another exception being thrown.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `future` is declared to
 return an `int` while `callback` is declared to return a `String`, and
@@ -7210,7 +7210,7 @@
 This isn't allowed because the value of the type parameter (the actual type
 that will be used at runtime) can't be known at compile time.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the type parameter `T`
 is being used as a type argument when creating a constant list:
@@ -7258,7 +7258,7 @@
 The analyzer produces this diagnostic when a URI in a directive doesn't
 conform to the syntax of a valid URI.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `'#'` isn't a valid
 URI:
@@ -7282,7 +7282,7 @@
 Extensions aren't classes and don't have subclasses, so the keyword serves
 no purpose.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `i` is marked as being
 covariant:
@@ -7385,7 +7385,7 @@
 The analyzer produces this diagnostic when either the `@visibleForTemplate`
 or `@visibleForTesting` annotation is applied to a non-public declaration.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -7462,7 +7462,7 @@
 The analyzer produces this diagnostic when an extension override is used to
 invoke a function but the extension doesn't declare a `call` method.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the extension `E`
 doesn't define a `call` method:
@@ -7505,7 +7505,7 @@
 but the name of the function being invoked is defined to be something other
 than a function.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `Binary` is the name of
 a function type, not a function:
@@ -7791,7 +7791,7 @@
 The analyzer produces this diagnostic when the type of an element in a list
 literal isn't assignable to the element type of the list.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `2.5` is a double, and
 the list can hold only integers:
@@ -7964,7 +7964,7 @@
 The analyzer produces this diagnostic when a map entry (a key/value pair)
 is found in a set literal.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the literal has a map
 entry even though it's a set literal:
@@ -8003,7 +8003,7 @@
 The analyzer produces this diagnostic when a key of a key-value pair in a
 map literal has a type that isn't assignable to the key type of the map.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `2` is an `int`, but
 the keys of the map are required to be `String`s:
@@ -8037,7 +8037,7 @@
 map literal has a type that isn't assignable to the the value type of the
 map.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `2` is an `int`, but/
 the values of the map are required to be `String`s:
@@ -8089,7 +8089,7 @@
 parameter doesn't allow the parameter to have a value of `null`, then the
 implicit default value isn't valid.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `x` can't be `null`,
 and no non-`null` default value is specified:
@@ -8140,7 +8140,7 @@
 Note that `null` is always a possible value for an enum and therefore also
 must be handled.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the enum constant `e2`
 isn't handled:
@@ -8263,7 +8263,7 @@
 named parameter that is annotated as being required is invoked without
 providing a value for the parameter.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the named parameter `x`
 is required:
@@ -8303,7 +8303,7 @@
 throw implicitly returns `null`. This is rarely the desired behavior. The
 analyzer produces this diagnostic when it finds an implicit return.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` doesn't end with a
 return:
@@ -8679,7 +8679,7 @@
 The analyzer produces this diagnostic when a name in a `with` clause is
 defined to be something other than a mixin or a class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `F` is defined to be a
 function type:
@@ -8713,7 +8713,7 @@
 Classes that are sealed can't be extended, implemented, mixed in, or used
 as a superclass constraint.
 
-#### Examples
+#### Example
 
 If the package `p` defines a sealed class:
 
@@ -8748,7 +8748,7 @@
 The analyzer produces this diagnostic when a type following the `on`
 keyword in a mixin declaration is neither a class nor a mixin.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `F` is neither a class
 nor a mixin:
@@ -8864,7 +8864,7 @@
 marked as being immutable using the annotation `@immutable` or if it's a
 subclass of an immutable class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the field `x` isn't
 final:
@@ -8919,7 +8919,7 @@
 that is annotated as `@mustCallSuper` doesn't invoke the overridden method
 as required.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the method `m` in `B`
 doesn't invoke the overridden method `m` in `A`:
@@ -8995,7 +8995,7 @@
 invoked on a class that defines named constructors but the class doesn’t
 have an unnamed constructor.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `A` doesn't define an
 unnamed constructor:
@@ -9050,7 +9050,7 @@
 more abstract members, and doesn't provide or inherit an implementation for
 at least one of those abstract members.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the class `B` doesn't
 have a concrete implementation of `m`:
@@ -9113,7 +9113,7 @@
 The analyzer produces this diagnostic when a condition, such as an `if` or
 `while` loop, doesn't have the static type `bool`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` has the static type
 `int`:
@@ -9147,7 +9147,7 @@
 The analyzer produces this diagnostic when the first expression in an
 assert has a type other than `bool`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the type of `p` is
 `int`, but a `bool` is required:
@@ -9177,7 +9177,7 @@
 The analyzer produces this diagnostic when the operand of the unary
 negation operator (`!`) doesn't have the type `bool`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is an `int` when it
 must be a `bool`:
@@ -9205,7 +9205,7 @@
 The analyzer produces this diagnostic when one of the operands of either
 the `&&` or `||` operator doesn't have the type `bool`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `a` isn't a Boolean
 value:
@@ -9276,7 +9276,7 @@
 The analyzer produces this diagnostic when the expression in a `case`
 clause isn't a constant expression.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `j` isn't a constant:
 
@@ -9396,7 +9396,7 @@
 named or positional, has a default value that isn't a compile-time
 constant.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -9488,7 +9488,7 @@
 explicitly (because it's prefixed by the `const` keyword) or implicitly
 (because it appears in a [constant context][]).
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` isn't a constant,
 even though it appears in an implicitly constant list literal:
@@ -9574,7 +9574,7 @@
 The analyzer produces this diagnostic when a key in a constant map literal
 isn't a constant value.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic beause `a` isn't a constant:
 
@@ -9609,7 +9609,7 @@
 The analyzer produces this diagnostic when a value in a constant map
 literal isn't a constant value.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `a` isn't a constant:
 
@@ -9644,7 +9644,7 @@
 The analyzer produces this diagnostic when a constant set literal contains
 an element that isn't a compile-time constant.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `i` isn't a constant:
 
@@ -9685,7 +9685,7 @@
 that the constructor should be used to create a constant value whenever
 possible.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -9820,7 +9820,7 @@
 The analyzer produces this diagnostic when an identifier that isn't a type
 is used as a type argument.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is a variable, not
 a type:
@@ -9848,7 +9848,7 @@
 The analyzer produces this diagnostic when the identifier following the
 `on` in a `catch` clause is defined to be something other than a type.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is a function, not
 a type:
@@ -9951,7 +9951,7 @@
 - The analyzer can't prove that the local variable will be assigned before
   the reference based on the specification of [definite assignment][].
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `x` can't have a value
 of `null`, but is referenced before a value was assigned to it:
@@ -10060,7 +10060,7 @@
 The analyzer produces this diagnostic when a name is used as a type but
 declared to be something other than a type.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is a function:
 
@@ -10109,7 +10109,7 @@
 has fewer positional arguments than the number of required positional
 parameters.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` declares two
 required parameters, but only one argument is provided:
@@ -10144,7 +10144,7 @@
 - Doesn't have an initializer
 - Isn't marked as `late`
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `x` is implicitly
 initialized to `null` when it isn't allowed to be `null`:
@@ -10216,7 +10216,7 @@
 initialized to `null`, but the type of the field or variable doesn't allow
 it to be set to `null`, so an explicit initializer must be provided.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the field `f` can't be
 initialized to `null`:
@@ -10271,7 +10271,7 @@
 expression of a spread element that appears in either a list literal or a
 set literal doesn't implement the type `Iterable`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic:
 
@@ -10300,7 +10300,7 @@
 expression of a spread element that appears in a map literal doesn't
 implement the type `Map`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `l` isn't a `Map`:
 
@@ -10330,7 +10330,7 @@
 variable. To create an instance of the class, the identifier must be
 followed by an argument list.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `C` is a class, and a
 class can't be used as an annotation without invoking a `const` constructor
@@ -10723,7 +10723,7 @@
 the `@override` annotation, but the member isn’t declared in any of the
 supertypes of the class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` isn't declared in
 any of the supertypes of `C`:
@@ -10796,7 +10796,7 @@
 The analyzer produces this diagnostic when a part directive is found and
 the referenced file doesn't have a part-of directive.
 
-#### Examples
+#### Example
 
 Given a file (`a.dart`) containing:
 
@@ -11149,7 +11149,7 @@
 The analyzer produces this diagnostic when a constructor redirects to
 itself, either directly or indirectly, creating an infinite loop.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the generative
 constructors `C.a` and `C.b` each redirect to the other:
@@ -11424,7 +11424,7 @@
 to a constructor whose return type isn't a subtype of the type that the
 factory constructor is declared to produce.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `A` isn't a subclass
 of `C`, which means that the value returned by the constructor `A()`
@@ -11480,7 +11480,7 @@
 produces this diagnostic when the redirect is to something other than a
 constructor.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is a function:
 
@@ -11610,7 +11610,7 @@
 The analyzer also produces a context message that indicates where the
 declaration is located.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `i` is used before it
 is declared:
@@ -11754,7 +11754,7 @@
 statement to return a value or implicitly returns a value because of using
 `=>`. In any of these cases, they should use `yield` instead of `return`.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the method `f` is a
 generator and is using `return` to return a value:
@@ -11817,7 +11817,7 @@
 The analyzer produces this diagnostic when a method or function returns a
 value whose type isn't assignable to the declared return type.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` has a return type
 of `String` but is returning an `int`:
@@ -11851,7 +11851,7 @@
 expression isn't assignable to the return type that the closure is required
 to have.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` is defined to be a
 function that returns a `String`, but the closure assigned to it returns an
@@ -11879,7 +11879,7 @@
 The analyzer produces this diagnostic when it finds a `return` statement
 without an expression in a function that declares a return type.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the function `f` is
 expected to return an `int`, but no value is being returned:
@@ -11913,7 +11913,7 @@
 earlier versions, these classes weren't defined in `dart:core`, so the
 import was necessary.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.1.0:
@@ -11962,7 +11962,7 @@
 [constant context][] wasn't supported in earlier versions, so this code
 won't be able to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.3.2:
@@ -12013,7 +12013,7 @@
 versions, so this code won't be able to run against earlier versions of the
 SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.3.2:
@@ -12111,7 +12111,7 @@
 in a [constant context][] wasn't supported in earlier versions, so this
 code won't be able to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.3.2:
@@ -12165,7 +12165,7 @@
 versions, so this code won't be able to run against earlier versions of the
 SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.6.0:
@@ -12219,7 +12219,7 @@
 operator wasn't supported in earlier versions, so this code won't be able
 to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.14.0:
@@ -12274,7 +12274,7 @@
 [constant context][] wasn't supported in earlier versions, so this code
 won't be able to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.3.2:
@@ -12324,7 +12324,7 @@
 2.12.0. This class wasn't defined in earlier versions, so this code won't
 be able to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.12.0:
@@ -12370,7 +12370,7 @@
 literals weren't supported in earlier versions, so this code won't be able
 to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.2.0:
@@ -12417,7 +12417,7 @@
 versions, so this code won't be able to run against earlier versions of the
 SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.3.0:
@@ -12472,7 +12472,7 @@
 [constant context][] wasn't supported in earlier versions, so this code
 won't be able to run against earlier versions of the SDK.
 
-#### Examples
+#### Example
 
 Here's an example of a pubspec that defines an SDK constraint with a lower
 bound of less than 2.5.0:
@@ -12603,7 +12603,7 @@
 an instance field. Instance fields don't exist on a class; they exist only
 on an instance of the class.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `x` is an instance
 field:
@@ -12711,7 +12711,7 @@
 are all restricted in this way, to allow for more efficient
 implementations.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `String` is used in an
 `extends` clause:
@@ -12857,7 +12857,7 @@
 extension uses the `super` keyword . Extensions aren't classes and don't
 have superclasses, so the `super` keyword serves no purpose.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `super` can't be used
 in an extension:
@@ -12887,7 +12887,7 @@
 The analyzer produces this diagnostic when the keyword `super` is used
 outside of a instance method.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `super` is used in a
 top-level function:
@@ -13172,7 +13172,7 @@
 The analyzer produces this diagnostic when a type argument isn't the same
 as or a subclass of the bounds of the corresponding type parameter.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `String` isn't a
 subclass of `num`:
@@ -13206,7 +13206,7 @@
 is `Null`, so the code is both more readable and more performant when it
 tests for `null` explicitly.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the code is testing to
 see whether the value of `s` is `null` by using a type check:
@@ -13299,7 +13299,7 @@
 as itself or a subtype of itself or a subtype of itself isn't helpful
 because it will always be the same as itself.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because the bound of `T` is
 `T`:
@@ -13391,7 +13391,7 @@
 The analyzer produces this diagnostic when the name following the `is` in a
 type test expression isn't defined.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `Srting` isn't
 defined:
@@ -13502,7 +13502,7 @@
 The analyzer produces this diagnostic when a name that isn't defined is
 used as an annotation.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `undefined`
 isn't defined:
@@ -13543,7 +13543,7 @@
 appears to be the name of a class but either isn't defined or isn't visible
 in the scope in which it's being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `Piont` isn't defined:
 
@@ -13643,7 +13643,7 @@
 appears to be the name of an enum constant, and the name either isn't
 defined or isn't visible in the scope in which it's being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `E` doesn't define a
 constant named `c`:
@@ -14010,7 +14010,7 @@
 appears to be the name of a function but either isn't defined or isn't
 visible in the scope in which it's being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `emty` isn't
 defined:
@@ -14052,7 +14052,7 @@
 appears to be the name of a getter but either isn't defined or isn't
 visible in the scope in which it's being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `String` has no member
 named `len`:
@@ -14080,7 +14080,7 @@
 The analyzer produces this diagnostic when a hide combinator includes a
 name that isn't defined by the library being imported.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `dart:math` doesn't
 define the name `String`:
@@ -14112,7 +14112,7 @@
 either isn't defined or isn't visible in the scope in which it's being
 referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the name `rihgt` isn't
 defined:
@@ -14175,7 +14175,7 @@
 appears to be the name of a method but either isn't defined or isn't
 visible in the scope in which it's being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the identifier
 `removeMiddle` isn't defined:
@@ -14204,7 +14204,7 @@
 has a named argument, but the method or function being invoked doesn't
 define a parameter with the same name.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` doesn't declare a
 named parameter named `a`:
@@ -14272,7 +14272,7 @@
 The analyzer produces this diagnostic when a user-definable operator is
 invoked on an object for which the operator isn't defined.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the class `C` doesn't
 define the operator `+`:
@@ -14306,7 +14306,7 @@
 where the prefix is valid, but the identifier isn't declared in any of the
 libraries imported using that prefix.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `dart:core` doesn't
 define anything named `a`:
@@ -14373,7 +14373,7 @@
 appears to be the name of a setter but either isn't defined or isn't
 visible in the scope in which the identifier is being referenced.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because there isn't a setter
 named `z`:
@@ -14411,7 +14411,7 @@
 The analyzer produces this diagnostic when a show combinator includes a
 name that isn't defined by the library being imported.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `dart:math` doesn't
 define the name `String`:
@@ -14493,7 +14493,7 @@
 The analyzer produces this diagnostic when the value being cast is already
 known to be of the type that it's being cast to.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `n` is already known to
 be an `int` as a result of the `is` test:
@@ -14690,7 +14690,7 @@
 can't be `null`. Such comparisons are always either `true` or `false`, so
 they serve no purpose.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `x` can never be
 `null`, so the comparison always evaluates to `true`:
@@ -14851,7 +14851,7 @@
 the name is the same as a static member of the extended type or one of its
 superclasses.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `m` is a static member
 of the extended type `C`:
@@ -14912,7 +14912,7 @@
 neither the exception parameter nor the optional stack trace parameter are
 used in the `catch` block.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `e` isn't referenced:
 
@@ -14949,7 +14949,7 @@
 The analyzer produces this diagnostic when the stack trace parameter in a
 `catch` clause isn't referenced within the body of the `catch` block.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `stackTrace` isn't
 referenced:
@@ -14996,7 +14996,7 @@
 - Optional parameters of private functions for which a value is never
   passed, even when the parameter doesn't have a private name
 
-#### Examples
+#### Example
 
 Assuming that no code in the library references `_C`, the following code
 produces this diagnostic:
@@ -15039,7 +15039,7 @@
 The analyzer produces this diagnostic when a private field is declared but
 never read, even if it's written in one or more places.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the field
 `_originalValue` isn't read anywhere in the library:
@@ -15075,7 +15075,7 @@
 none of the names that are imported are referenced within the importing
 library.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because nothing defined in
 `dart:async` is referenced in the library:
@@ -15102,7 +15102,7 @@
 The analyzer produces this diagnostic when a label that isn't used is
 found.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the label `loop` isn't
 referenced anywhere in the method:
@@ -15147,7 +15147,7 @@
 The analyzer produces this diagnostic when a local variable is declared but
 never read, even if it's written in one or more places.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the value of `count` is
 never read:
@@ -15247,7 +15247,7 @@
 name that isn't used within the library. Because it isn't referenced, the
 name can be removed.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the function `max`
 isn't used:
@@ -15277,7 +15277,7 @@
 The analyzer produces this diagnostic when an import, export, or part
 directive is found where the URI refers to a file that doesn't exist.
 
-#### Examples
+#### Example
 
 If the file `lib.dart` doesn't exist, the following code produces this
 diagnostic:
@@ -15309,7 +15309,7 @@
 - `.pbjson.dart`
 - `.template.dart`
 
-#### Examples
+#### Example
 
 If the file `lib.g.dart` doesn't exist, the following code produces this
 diagnostic:
@@ -15393,7 +15393,7 @@
 expected, such as before a member access or on the right-hand side of an
 assignment.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because `f` doesn't produce an
 object on which `toString` can be invoked:
@@ -15420,7 +15420,7 @@
 The analyzer produces this diagnostic when the evaluation of a constant
 expression would result in a `CastException`.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the value of `x` is an
 `int`, which can't be assigned to `y` because an `int` isn't a `String`:
@@ -15459,7 +15459,7 @@
 The analyzer produces this diagnostic when a declaration of an operator has
 the wrong number of parameters.
 
-#### Examples
+#### Example
 
 The following code produces this diagnostic because the operator `+` must
 have a single parameter corresponding to the right operand:
@@ -15719,7 +15719,7 @@
 appears in a function whose body isn't marked with one of the `async*` or
 `sync*` modifiers.
 
-#### Example
+#### Examples
 
 The following code produces this diagnostic because `yield` is being used
 in a function whose body doesn't have a modifier:
diff --git a/pkg/front_end/messages.yaml b/pkg/front_end/messages.yaml
index c792862..3ab4a3e 100644
--- a/pkg/front_end/messages.yaml
+++ b/pkg/front_end/messages.yaml
@@ -991,7 +991,7 @@
     Extensions aren't classes and don't have subclasses, so the keyword serves
     no purpose.
 
-    #### Examples
+    #### Example
 
     The following code produces this diagnostic because `i` is marked as being
     covariant:
@@ -2236,7 +2236,7 @@
     The analyzer produces this diagnostic when an abstract declaration is
     declared in an extension. Extensions can declare only concrete members.
 
-    #### Examples
+    #### Example
 
     The following code produces this diagnostic because the method `a` doesn't
     have a body:
@@ -2266,7 +2266,7 @@
     extensions aren't classes, and it isn't possible to create an instance of
     an extension.
 
-    #### Examples
+    #### Example
 
     The following code produces this diagnostic because there is a constructor
     declaration in `E`:
@@ -2295,7 +2295,7 @@
     found in an extension. It isn't valid to define an instance field because
     extensions can only add behavior, not state.
 
-    #### Examples
+    #### Example
 
     The following code produces this diagnostic because `s` is an instance
     field:
diff --git a/runtime/bin/BUILD.gn b/runtime/bin/BUILD.gn
index 167ad39..727ccb9 100644
--- a/runtime/bin/BUILD.gn
+++ b/runtime/bin/BUILD.gn
@@ -721,18 +721,6 @@
     } else {
       configs += [ "..:dart_maybe_product_config" ]
     }
-    if (target_os != current_os && target_os == "fuchsia") {
-      # We already have these in the standalone build, but Fuchsia doesn't
-      # have them. They are needed for running Fuchsia binaries built for the
-      # host.
-      if (is_linux) {
-        # TODO(liama): Commenting this line out because it causes problems for
-        # --os=fuchsia. If no one complains, remove it.
-        # configs += [ "../../build/config/gcc:executable_ldconfig" ]
-      } else if (is_mac) {
-        configs += [ "../../build/config/mac:mac_dynamic_flags" ]
-      }
-    }
 
     deps = [
       ":crashpad",
diff --git a/runtime/observatory/lib/src/elements/vm_view.dart b/runtime/observatory/lib/src/elements/vm_view.dart
index 80c2910..b787fdc 100644
--- a/runtime/observatory/lib/src/elements/vm_view.dart
+++ b/runtime/observatory/lib/src/elements/vm_view.dart
@@ -263,6 +263,16 @@
               ..children = <Element>[
                 new DivElement()
                   ..classes = ['memberName']
+                  ..text = 'features',
+                new DivElement()
+                  ..classes = ['memberValue']
+                  ..text = _vm.features
+              ],
+            new DivElement()
+              ..classes = ['memberItem']
+              ..children = <Element>[
+                new DivElement()
+                  ..classes = ['memberName']
                   ..text = 'embedder',
                 new DivElement()
                   ..classes = ['memberValue']
diff --git a/runtime/observatory/lib/src/models/objects/vm.dart b/runtime/observatory/lib/src/models/objects/vm.dart
index 523f2a2..994b1e3 100644
--- a/runtime/observatory/lib/src/models/objects/vm.dart
+++ b/runtime/observatory/lib/src/models/objects/vm.dart
@@ -26,6 +26,8 @@
   /// The Dart VM version string.
   String get version;
 
+  String get features;
+
   String get embedder;
 
   /// The amount of memory currently allocated by native code in zones.
diff --git a/runtime/observatory/lib/src/service/object.dart b/runtime/observatory/lib/src/service/object.dart
index 703be40..f449b78 100644
--- a/runtime/observatory/lib/src/service/object.dart
+++ b/runtime/observatory/lib/src/service/object.dart
@@ -672,6 +672,7 @@
   final List<Service> services = <Service>[];
 
   String version = 'unknown';
+  String features = 'unknown';
   String hostCPU = 'unknown';
   String targetCPU = 'unknown';
   String embedder = 'unknown';
@@ -1030,6 +1031,7 @@
 
     _loaded = true;
     version = map['version'];
+    features = map['_features'] ?? 'unknown';
     hostCPU = map['hostCPU'];
     targetCPU = map['targetCPU'];
     architectureBits = map['architectureBits'];
diff --git a/runtime/vm/benchmark_test.cc b/runtime/vm/benchmark_test.cc
index 3c2345e..db27125 100644
--- a/runtime/vm/benchmark_test.cc
+++ b/runtime/vm/benchmark_test.cc
@@ -48,7 +48,6 @@
   bin::Builtin::SetNativeResolver(bin::Builtin::kCLILibrary);
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   Timer timer;
   timer.Start();
   const Error& error =
@@ -413,7 +412,6 @@
 
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
 
   Api::CheckAndFinalizePendingClasses(thread);
 
@@ -451,7 +449,6 @@
 
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
 
   Api::CheckAndFinalizePendingClasses(thread);
 
@@ -496,7 +493,6 @@
   {
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Api::CheckAndFinalizePendingClasses(thread);
   }
   Dart_Isolate isolate = Dart_CurrentIsolate();
@@ -514,7 +510,6 @@
 BENCHMARK(SerializeNull) {
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   const Object& null_object = Object::Handle();
   const intptr_t kLoopCount = 1000000;
   Timer timer;
@@ -536,7 +531,6 @@
 BENCHMARK(SerializeSmi) {
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   const Integer& smi_object = Integer::Handle(Smi::New(42));
   const intptr_t kLoopCount = 1000000;
   Timer timer;
@@ -558,7 +552,6 @@
 BENCHMARK(SimpleMessage) {
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   const Array& array_object = Array::Handle(Array::New(2));
   array_object.SetAt(0, Integer::Handle(Smi::New(42)));
   array_object.SetAt(1, Object::Handle());
@@ -592,7 +585,6 @@
   EXPECT_VALID(h_result);
   TransitionNativeToVM transition(thread);
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   Instance& map = Instance::Handle();
   map ^= Api::UnwrapHandle(h_result);
   const intptr_t kLoopCount = 100;
diff --git a/runtime/vm/class_finalizer.cc b/runtime/vm/class_finalizer.cc
index 1ea4076..377964b 100644
--- a/runtime/vm/class_finalizer.cc
+++ b/runtime/vm/class_finalizer.cc
@@ -1731,7 +1731,6 @@
   auto const isolate_group = thread->isolate_group();
   SafepointWriteRwLocker ml(thread, isolate_group->program_lock());
   StackZone stack_zone(thread);
-  HANDLESCOPE(thread);
   auto const zone = thread->zone();
 
   class ClearCodeVisitor : public FunctionVisitor {
diff --git a/runtime/vm/compiler/aot/precompiler.cc b/runtime/vm/compiler/aot/precompiler.cc
index 9ca03f4..6c373a5 100644
--- a/runtime/vm/compiler/aot/precompiler.cc
+++ b/runtime/vm/compiler/aot/precompiler.cc
@@ -3028,7 +3028,6 @@
   // otherwise unreachable constants of dropped classes, which would
   // cause assertion failures during GC after classes are dropped.
   StackZone stack_zone(thread());
-  HANDLESCOPE(thread());
 
   error_ = Library::FinalizeAllClasses();
   if (!error_.IsNull()) {
diff --git a/runtime/vm/compiler/jit/compiler.cc b/runtime/vm/compiler/jit/compiler.cc
index 7c89806..b750d2d 100644
--- a/runtime/vm/compiler/jit/compiler.cc
+++ b/runtime/vm/compiler/jit/compiler.cc
@@ -1133,7 +1133,6 @@
       Thread* thread = Thread::Current();
       StackZone stack_zone(thread);
       Zone* zone = stack_zone.GetZone();
-      HANDLESCOPE(thread);
       Function& function = Function::Handle(zone);
       {
         SafepointMonitorLocker ml(&queue_monitor_);
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index bc544f7..8a16d29 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -288,7 +288,7 @@
     Thread_call_to_runtime_stub_offset = 144;
 static constexpr dart::compiler::target::word Thread_dart_stream_offset = 800;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 48;
+    Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 792;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -302,7 +302,7 @@
     356;
 static constexpr dart::compiler::target::word
     Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word Thread_end_offset = 56;
+static constexpr dart::compiler::target::word Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
@@ -331,10 +331,10 @@
     Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
     784;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 804;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    68;
+    64;
 static constexpr dart::compiler::target::word
     Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -342,7 +342,7 @@
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 84;
+    Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -383,11 +383,11 @@
     Thread_slow_type_test_stub_offset = 248;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 328;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 32;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 28;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    60;
+    56;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 64;
+    Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -397,23 +397,23 @@
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    80;
+    76;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word Thread_top_offset = 52;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 20;
+    Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word Thread_top_offset = 48;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 16;
 static constexpr dart::compiler::target::word
     Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
     124;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    36;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
+    32;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word Thread_callback_code_offset = 776;
 static constexpr dart::compiler::target::word
     Thread_callback_stack_return_offset = 780;
@@ -800,180 +800,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1504;
+    1496;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1512;
+    1504;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1600;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1592;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1592;
+    Thread_double_truncate_round_supported_offset = 1584;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1536;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1512;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1568;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1600;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1520;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1528;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1544;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1520;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1576;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1528;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1536;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1552;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1560;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1568;
+    Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -1036,8 +1036,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -1397,7 +1397,7 @@
     Thread_call_to_runtime_stub_offset = 144;
 static constexpr dart::compiler::target::word Thread_dart_stream_offset = 768;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 48;
+    Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 760;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -1411,7 +1411,7 @@
     356;
 static constexpr dart::compiler::target::word
     Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word Thread_end_offset = 56;
+static constexpr dart::compiler::target::word Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
@@ -1440,10 +1440,10 @@
     Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
     752;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 772;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    68;
+    64;
 static constexpr dart::compiler::target::word
     Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -1451,7 +1451,7 @@
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 84;
+    Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -1492,11 +1492,11 @@
     Thread_slow_type_test_stub_offset = 248;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 328;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 32;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 28;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    60;
+    56;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 64;
+    Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -1506,23 +1506,23 @@
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    80;
+    76;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word Thread_top_offset = 52;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 20;
+    Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word Thread_top_offset = 48;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 16;
 static constexpr dart::compiler::target::word
     Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
     124;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    36;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
+    32;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word Thread_callback_code_offset = 744;
 static constexpr dart::compiler::target::word
     Thread_callback_stack_return_offset = 748;
@@ -1906,180 +1906,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1568;
+    1560;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1576;
+    1568;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1664;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1656;
+    Thread_double_truncate_round_supported_offset = 1648;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1600;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1632;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1664;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1584;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1592;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1608;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1584;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1640;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1592;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1600;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1616;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1624;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1632;
+    Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -2142,9 +2142,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -2464,180 +2464,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1504;
+    1496;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1512;
+    1504;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1600;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1592;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1592;
+    Thread_double_truncate_round_supported_offset = 1584;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1536;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1512;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1568;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1600;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1520;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1528;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1544;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1520;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1576;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1528;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1536;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1552;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1560;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1568;
+    Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -2700,8 +2700,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -3021,180 +3021,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1568;
+    1560;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1576;
+    1568;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1664;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1656;
+    Thread_double_truncate_round_supported_offset = 1648;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1600;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1632;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1664;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1584;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1592;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1608;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1584;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1640;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1592;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1600;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1616;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1624;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1632;
+    Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -3257,9 +3257,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -3615,7 +3615,7 @@
     Thread_call_to_runtime_stub_offset = 144;
 static constexpr dart::compiler::target::word Thread_dart_stream_offset = 800;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 48;
+    Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 792;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -3629,7 +3629,7 @@
     356;
 static constexpr dart::compiler::target::word
     Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word Thread_end_offset = 56;
+static constexpr dart::compiler::target::word Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
@@ -3658,10 +3658,10 @@
     Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
     784;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 804;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    68;
+    64;
 static constexpr dart::compiler::target::word
     Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -3669,7 +3669,7 @@
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 84;
+    Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -3710,11 +3710,11 @@
     Thread_slow_type_test_stub_offset = 248;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 328;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 32;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 28;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    60;
+    56;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 64;
+    Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -3724,23 +3724,23 @@
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    80;
+    76;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word Thread_top_offset = 52;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 20;
+    Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word Thread_top_offset = 48;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 16;
 static constexpr dart::compiler::target::word
     Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
     124;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    36;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
+    32;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word Thread_callback_code_offset = 776;
 static constexpr dart::compiler::target::word
     Thread_callback_stack_return_offset = 780;
@@ -4121,180 +4121,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1504;
+    1496;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1512;
+    1504;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1600;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1592;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1592;
+    Thread_double_truncate_round_supported_offset = 1584;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1536;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1512;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1568;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1600;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1520;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1528;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1544;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1520;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1576;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1528;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1536;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1552;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1560;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1568;
+    Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -4357,8 +4357,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -4712,7 +4712,7 @@
     Thread_call_to_runtime_stub_offset = 144;
 static constexpr dart::compiler::target::word Thread_dart_stream_offset = 768;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 48;
+    Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 760;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -4726,7 +4726,7 @@
     356;
 static constexpr dart::compiler::target::word
     Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word Thread_end_offset = 56;
+static constexpr dart::compiler::target::word Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word Thread_execution_state_offset =
@@ -4755,10 +4755,10 @@
     Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
     752;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word Thread_isolate_group_offset = 772;
 static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    68;
+    64;
 static constexpr dart::compiler::target::word
     Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -4766,7 +4766,7 @@
 static constexpr dart::compiler::target::word
     Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 84;
+    Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -4807,11 +4807,11 @@
     Thread_slow_type_test_stub_offset = 248;
 static constexpr dart::compiler::target::word
     Thread_slow_type_test_entry_point_offset = 328;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 32;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 28;
 static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    60;
+    56;
 static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 64;
+    Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -4821,23 +4821,23 @@
 static constexpr dart::compiler::target::word
     Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    80;
+    76;
 static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word Thread_top_offset = 52;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 20;
+    Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word Thread_top_offset = 48;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 16;
 static constexpr dart::compiler::target::word
     Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
     124;
 static constexpr dart::compiler::target::word
     Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    36;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
+    32;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word Thread_callback_code_offset = 744;
 static constexpr dart::compiler::target::word
     Thread_callback_stack_return_offset = 748;
@@ -5215,180 +5215,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1568;
+    1560;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1576;
+    1568;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1664;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1656;
+    Thread_double_truncate_round_supported_offset = 1648;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1600;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1632;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1664;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1584;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1592;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1608;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1584;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1640;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1592;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1600;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1616;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1624;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1632;
+    Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -5451,9 +5451,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -5767,180 +5767,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1504;
+    1496;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1512;
+    1504;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1600;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1592;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1592;
+    Thread_double_truncate_round_supported_offset = 1584;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1536;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1512;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1568;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1600;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1520;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1528;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1544;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1520;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1576;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1528;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1536;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1552;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1560;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1568;
+    Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -6003,8 +6003,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -6318,180 +6318,180 @@
 static constexpr dart::compiler::target::word String_length_offset = 8;
 static constexpr dart::compiler::target::word SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    Thread_AllocateArray_entry_point_offset = 736;
+    Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word Thread_active_exception_offset =
-    1568;
+    1560;
 static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
-    1576;
+    1568;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_code_offset = 240;
+    Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    Thread_array_write_barrier_entry_point_offset = 528;
+    Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_entry_point_offset = 560;
+    Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_stub_offset = 376;
+    Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_entry_point_offset = 568;
+    Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_parameterized_stub_offset = 384;
+    Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_entry_point_offset = 576;
+    Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    Thread_allocate_object_slow_stub_offset = 392;
+    Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    Thread_auto_scope_native_wrapper_entry_point_offset = 664;
-static constexpr dart::compiler::target::word Thread_bool_false_offset = 224;
-static constexpr dart::compiler::target::word Thread_bool_true_offset = 216;
+    Thread_auto_scope_native_wrapper_entry_point_offset = 656;
+static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
+static constexpr dart::compiler::target::word Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_entry_point_offset = 536;
+    Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    Thread_call_to_runtime_stub_offset = 272;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1664;
+    Thread_call_to_runtime_stub_offset = 264;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1656;
 static constexpr dart::compiler::target::word
-    Thread_dispatch_table_array_offset = 96;
+    Thread_dispatch_table_array_offset = 88;
 static constexpr dart::compiler::target::word
-    Thread_double_truncate_round_supported_offset = 1656;
+    Thread_double_truncate_round_supported_offset = 1648;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 448;
+    608;
+static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 440;
 static constexpr dart::compiler::target::word Thread_deoptimize_entry_offset =
-    624;
+    616;
 static constexpr dart::compiler::target::word Thread_deoptimize_stub_offset =
-    456;
+    448;
 static constexpr dart::compiler::target::word Thread_double_abs_address_offset =
+    688;
+static constexpr dart::compiler::target::word
+    Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    1600;
+static constexpr dart::compiler::target::word
+    Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word Thread_float_not_address_offset =
     696;
 static constexpr dart::compiler::target::word
-    Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word Thread_end_offset = 112;
+    Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
+    1576;
 static constexpr dart::compiler::target::word
-    Thread_enter_safepoint_stub_offset = 496;
-static constexpr dart::compiler::target::word Thread_execution_state_offset =
+    Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
+    1632;
+static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset =
+    1664;
+static constexpr dart::compiler::target::word Thread_field_table_values_offset =
+    128;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_return_stub_offset = 456;
+static constexpr dart::compiler::target::word
+    Thread_lazy_deopt_from_throw_stub_offset = 464;
+static constexpr dart::compiler::target::word
+    Thread_lazy_specialize_type_test_stub_offset = 480;
+static constexpr dart::compiler::target::word
+    Thread_marking_stack_block_offset = 160;
+static constexpr dart::compiler::target::word
+    Thread_megamorphic_call_checked_entry_offset = 592;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_entry_offset = 600;
+static constexpr dart::compiler::target::word
+    Thread_switchable_call_miss_stub_offset = 408;
+static constexpr dart::compiler::target::word
+    Thread_no_scope_native_wrapper_entry_point_offset = 648;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
+static constexpr dart::compiler::target::word
+    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 272;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
+static constexpr dart::compiler::target::word
+    Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
+static constexpr dart::compiler::target::word
+    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
+static constexpr dart::compiler::target::word
+    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
+static constexpr dart::compiler::target::word
+    Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
+static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
+static constexpr dart::compiler::target::word
+    Thread_predefined_symbols_address_offset = 664;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1584;
+static constexpr dart::compiler::target::word
+    Thread_saved_shadow_call_stack_offset = 1592;
+static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
     1608;
 static constexpr dart::compiler::target::word
-    Thread_exit_safepoint_stub_offset = 504;
+    Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_stub_offset = 512;
+    Thread_slow_type_test_entry_point_offset = 632;
+static constexpr dart::compiler::target::word Thread_stack_limit_offset = 56;
+static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
+    112;
 static constexpr dart::compiler::target::word
-    Thread_call_native_through_safepoint_entry_point_offset = 632;
+    Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    Thread_fix_allocation_stub_code_offset = 256;
+    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    Thread_fix_callers_target_code_offset = 248;
+    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    Thread_float_absolute_address_offset = 720;
+    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word Thread_float_not_address_offset =
-    704;
+    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
+static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
+    152;
 static constexpr dart::compiler::target::word
-    Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
-    1584;
+    Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word Thread_top_offset = 96;
+static constexpr dart::compiler::target::word Thread_top_resource_offset = 32;
 static constexpr dart::compiler::target::word
-    Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
-    1640;
-static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word Thread_field_table_values_offset =
-    136;
+    Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_return_stub_offset = 464;
+    Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word Thread_vm_tag_offset = 176;
+static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
+    224;
 static constexpr dart::compiler::target::word
-    Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
-static constexpr dart::compiler::target::word
-    Thread_late_initialization_error_shared_without_fpu_regs_stub_offset = 280;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
-static constexpr dart::compiler::target::word
-    Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
-static constexpr dart::compiler::target::word
-    Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
-static constexpr dart::compiler::target::word
-    Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
-static constexpr dart::compiler::target::word
-    Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
-static constexpr dart::compiler::target::word Thread_object_null_offset = 208;
-static constexpr dart::compiler::target::word
-    Thread_predefined_symbols_address_offset = 672;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1592;
-static constexpr dart::compiler::target::word
-    Thread_saved_shadow_call_stack_offset = 1600;
-static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
+    Thread_write_barrier_entry_point_offset = 512;
+static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
+    64;
+static constexpr dart::compiler::target::word Thread_heap_base_offset = 72;
+static constexpr dart::compiler::target::word Thread_callback_code_offset =
     1616;
 static constexpr dart::compiler::target::word
-    Thread_slow_type_test_stub_offset = 480;
-static constexpr dart::compiler::target::word
-    Thread_slow_type_test_entry_point_offset = 640;
-static constexpr dart::compiler::target::word Thread_stack_limit_offset = 64;
-static constexpr dart::compiler::target::word Thread_saved_stack_limit_offset =
-    120;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_flags_offset = 128;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
-static constexpr dart::compiler::target::word
-    Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
-static constexpr dart::compiler::target::word Thread_store_buffer_block_offset =
-    160;
-static constexpr dart::compiler::target::word
-    Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word Thread_top_offset = 104;
-static constexpr dart::compiler::target::word Thread_top_resource_offset = 40;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_int64_runtime_arg_offset = 192;
-static constexpr dart::compiler::target::word
-    Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word Thread_vm_tag_offset = 184;
-static constexpr dart::compiler::target::word Thread_write_barrier_code_offset =
-    232;
-static constexpr dart::compiler::target::word
-    Thread_write_barrier_entry_point_offset = 520;
-static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
-    72;
-static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
-static constexpr dart::compiler::target::word Thread_callback_code_offset =
-    1624;
-static constexpr dart::compiler::target::word
-    Thread_callback_stack_return_offset = 1632;
+    Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
     16;
 static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -6554,9 +6554,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
 static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
 static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -6952,7 +6952,7 @@
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
     800;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 48;
+    AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 792;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -6967,7 +6967,7 @@
     AOT_Thread_double_abs_address_offset = 356;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 56;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word
@@ -6996,11 +6996,11 @@
     AOT_Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_through_ffi_offset = 784;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     804;
 static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 68;
+    AOT_Thread_field_table_values_offset = 64;
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -7008,7 +7008,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 84;
+    AOT_Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -7052,11 +7052,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_entry_point_offset = 328;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    32;
+    28;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 60;
+    AOT_Thread_saved_stack_limit_offset = 56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 64;
+    AOT_Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -7066,24 +7066,24 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 80;
+    AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 52;
+    AOT_Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    20;
+    16;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_code_offset = 124;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 36;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 40;
+    AOT_Thread_write_barrier_mask_offset = 32;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
     776;
 static constexpr dart::compiler::target::word
@@ -7524,188 +7524,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1504;
+    AOT_Thread_active_exception_offset = 1496;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1512;
+    AOT_Thread_active_stacktrace_offset = 1504;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1592;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1584;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1536;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1512;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1568;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1592;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1544;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1520;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1576;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1528;
+    1520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1536;
+    AOT_Thread_saved_shadow_call_stack_offset = 1528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1552;
+    AOT_Thread_safepoint_state_offset = 1544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1560;
+    1552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1568;
+    AOT_Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -7781,8 +7781,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -8147,188 +8147,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1568;
+    AOT_Thread_active_exception_offset = 1560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1576;
+    AOT_Thread_active_stacktrace_offset = 1568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1656;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1648;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1600;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1576;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1632;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1656;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1608;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1584;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1640;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1592;
+    1584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1600;
+    AOT_Thread_saved_shadow_call_stack_offset = 1592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1616;
+    AOT_Thread_safepoint_state_offset = 1608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1624;
+    1616;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1632;
+    AOT_Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -8404,9 +8404,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -8767,188 +8767,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1504;
+    AOT_Thread_active_exception_offset = 1496;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1512;
+    AOT_Thread_active_stacktrace_offset = 1504;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1592;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1584;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1536;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1512;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1568;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1592;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1544;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1520;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1576;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1528;
+    1520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1536;
+    AOT_Thread_saved_shadow_call_stack_offset = 1528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1552;
+    AOT_Thread_safepoint_state_offset = 1544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1560;
+    1552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1568;
+    AOT_Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -9024,8 +9024,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -9386,188 +9386,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1568;
+    AOT_Thread_active_exception_offset = 1560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1576;
+    AOT_Thread_active_stacktrace_offset = 1568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1656;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1648;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1600;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1576;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1632;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1656;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1608;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1584;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1640;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1592;
+    1584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1600;
+    AOT_Thread_saved_shadow_call_stack_offset = 1592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1616;
+    AOT_Thread_safepoint_state_offset = 1608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1624;
+    1616;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1632;
+    AOT_Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -9643,9 +9643,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -10046,7 +10046,7 @@
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
     800;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 48;
+    AOT_Thread_dispatch_table_array_offset = 44;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 792;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -10061,7 +10061,7 @@
     AOT_Thread_double_abs_address_offset = 356;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_negate_address_offset = 352;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 56;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 52;
 static constexpr dart::compiler::target::word
     AOT_Thread_enter_safepoint_stub_offset = 256;
 static constexpr dart::compiler::target::word
@@ -10090,11 +10090,11 @@
     AOT_Thread_invoke_dart_code_stub_offset = 140;
 static constexpr dart::compiler::target::word
     AOT_Thread_exit_through_ffi_offset = 784;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 44;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
 static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     804;
 static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 68;
+    AOT_Thread_field_table_values_offset = 64;
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_deopt_from_return_stub_offset = 240;
 static constexpr dart::compiler::target::word
@@ -10102,7 +10102,7 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_lazy_specialize_type_test_stub_offset = 252;
 static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 84;
+    AOT_Thread_marking_stack_block_offset = 80;
 static constexpr dart::compiler::target::word
     AOT_Thread_megamorphic_call_checked_entry_offset = 308;
 static constexpr dart::compiler::target::word
@@ -10146,11 +10146,11 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_slow_type_test_entry_point_offset = 328;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    32;
+    28;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 60;
+    AOT_Thread_saved_stack_limit_offset = 56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 64;
+    AOT_Thread_stack_overflow_flags_offset = 60;
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 304;
 static constexpr dart::compiler::target::word
@@ -10160,24 +10160,24 @@
 static constexpr dart::compiler::target::word
     AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 80;
+    AOT_Thread_store_buffer_block_offset = 76;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 76;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 52;
+    AOT_Thread_top_exit_frame_info_offset = 72;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 48;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    20;
+    16;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_int64_runtime_arg_offset = 96;
 static constexpr dart::compiler::target::word
     AOT_Thread_unboxed_double_runtime_arg_offset = 104;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 92;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 88;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_code_offset = 124;
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_entry_point_offset = 268;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 36;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 40;
+    AOT_Thread_write_barrier_mask_offset = 32;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 36;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
     776;
 static constexpr dart::compiler::target::word
@@ -10611,188 +10611,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1504;
+    AOT_Thread_active_exception_offset = 1496;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1512;
+    AOT_Thread_active_stacktrace_offset = 1504;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1592;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1584;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1536;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1512;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1568;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1592;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1544;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1520;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1576;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1528;
+    1520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1536;
+    AOT_Thread_saved_shadow_call_stack_offset = 1528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1552;
+    AOT_Thread_safepoint_state_offset = 1544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1560;
+    1552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1568;
+    AOT_Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -10868,8 +10868,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -11227,188 +11227,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1568;
+    AOT_Thread_active_exception_offset = 1560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1576;
+    AOT_Thread_active_stacktrace_offset = 1568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1656;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1648;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1600;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1576;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1632;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1656;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1608;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1584;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1640;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1592;
+    1584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1600;
+    AOT_Thread_saved_shadow_call_stack_offset = 1592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1616;
+    AOT_Thread_safepoint_state_offset = 1608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1624;
+    1616;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1632;
+    AOT_Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -11484,9 +11484,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -11840,188 +11840,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1504;
+    AOT_Thread_active_exception_offset = 1496;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1512;
+    AOT_Thread_active_stacktrace_offset = 1504;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1584;
+    1576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1592;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1584;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1536;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1512;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1568;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1592;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1544;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1520;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1576;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1528;
+    1520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1536;
+    AOT_Thread_saved_shadow_call_stack_offset = 1528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1552;
+    AOT_Thread_safepoint_state_offset = 1544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1560;
+    1552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1568;
+    AOT_Thread_callback_stack_return_offset = 1560;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -12097,8 +12097,8 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, -1,   -1,   1448, 1456,
-        1464, 1472, 1480, -1,   1488, 1496, -1,   -1};
+        1408, 1416, 1424, 1432, -1,   -1,   1440, 1448,
+        1456, 1464, 1472, -1,   1480, 1488, -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -12452,188 +12452,188 @@
 static constexpr dart::compiler::target::word
     AOT_SubtypeTestCache_cache_offset = 8;
 static constexpr dart::compiler::target::word
-    AOT_Thread_AllocateArray_entry_point_offset = 736;
+    AOT_Thread_AllocateArray_entry_point_offset = 728;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_exception_offset = 1568;
+    AOT_Thread_active_exception_offset = 1560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_active_stacktrace_offset = 1576;
+    AOT_Thread_active_stacktrace_offset = 1568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_code_offset = 240;
+    AOT_Thread_array_write_barrier_code_offset = 232;
 static constexpr dart::compiler::target::word
-    AOT_Thread_array_write_barrier_entry_point_offset = 528;
+    AOT_Thread_array_write_barrier_entry_point_offset = 520;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 544;
+    AOT_Thread_allocate_mint_with_fpu_regs_entry_point_offset = 536;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 360;
+    AOT_Thread_allocate_mint_with_fpu_regs_stub_offset = 352;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 552;
+    AOT_Thread_allocate_mint_without_fpu_regs_entry_point_offset = 544;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 368;
+    AOT_Thread_allocate_mint_without_fpu_regs_stub_offset = 360;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_entry_point_offset = 560;
+    AOT_Thread_allocate_object_entry_point_offset = 552;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_stub_offset = 376;
+    AOT_Thread_allocate_object_stub_offset = 368;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_entry_point_offset = 568;
+    AOT_Thread_allocate_object_parameterized_entry_point_offset = 560;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_parameterized_stub_offset = 384;
+    AOT_Thread_allocate_object_parameterized_stub_offset = 376;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_entry_point_offset = 576;
+    AOT_Thread_allocate_object_slow_entry_point_offset = 568;
 static constexpr dart::compiler::target::word
-    AOT_Thread_allocate_object_slow_stub_offset = 392;
+    AOT_Thread_allocate_object_slow_stub_offset = 384;
 static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
-    1648;
+    1640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 664;
+    AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
 static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
-    224;
-static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 216;
+    216;
+static constexpr dart::compiler::target::word AOT_Thread_bool_true_offset = 208;
 static constexpr dart::compiler::target::word
-    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 648;
+    AOT_Thread_bootstrap_native_wrapper_entry_point_offset = 640;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_entry_point_offset = 536;
+    AOT_Thread_call_to_runtime_entry_point_offset = 528;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_to_runtime_stub_offset = 272;
+    AOT_Thread_call_to_runtime_stub_offset = 264;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
+    1656;
+static constexpr dart::compiler::target::word
+    AOT_Thread_dispatch_table_array_offset = 88;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_truncate_round_supported_offset = 1648;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
+    608;
+static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
+    440;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_entry_offset = 616;
+static constexpr dart::compiler::target::word
+    AOT_Thread_deoptimize_stub_offset = 448;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_abs_address_offset = 688;
+static constexpr dart::compiler::target::word
+    AOT_Thread_double_negate_address_offset = 680;
+static constexpr dart::compiler::target::word AOT_Thread_end_offset = 104;
+static constexpr dart::compiler::target::word
+    AOT_Thread_enter_safepoint_stub_offset = 488;
+static constexpr dart::compiler::target::word
+    AOT_Thread_execution_state_offset = 1600;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_safepoint_stub_offset = 496;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_stub_offset = 504;
+static constexpr dart::compiler::target::word
+    AOT_Thread_call_native_through_safepoint_entry_point_offset = 624;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_allocation_stub_code_offset = 248;
+static constexpr dart::compiler::target::word
+    AOT_Thread_fix_callers_target_code_offset = 240;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_absolute_address_offset = 712;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_negate_address_offset = 704;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_not_address_offset = 696;
+static constexpr dart::compiler::target::word
+    AOT_Thread_float_zerow_address_offset = 720;
+static constexpr dart::compiler::target::word
+    AOT_Thread_global_object_pool_offset = 1576;
+static constexpr dart::compiler::target::word
+    AOT_Thread_invoke_dart_code_stub_offset = 256;
+static constexpr dart::compiler::target::word
+    AOT_Thread_exit_through_ffi_offset = 1632;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
+static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
     1664;
 static constexpr dart::compiler::target::word
-    AOT_Thread_dispatch_table_array_offset = 96;
+    AOT_Thread_field_table_values_offset = 128;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_truncate_round_supported_offset = 1656;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
-    616;
-static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
-    448;
+    AOT_Thread_lazy_deopt_from_return_stub_offset = 456;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_entry_offset = 624;
+    AOT_Thread_lazy_deopt_from_throw_stub_offset = 464;
 static constexpr dart::compiler::target::word
-    AOT_Thread_deoptimize_stub_offset = 456;
+    AOT_Thread_lazy_specialize_type_test_stub_offset = 480;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_abs_address_offset = 696;
+    AOT_Thread_marking_stack_block_offset = 160;
 static constexpr dart::compiler::target::word
-    AOT_Thread_double_negate_address_offset = 688;
-static constexpr dart::compiler::target::word AOT_Thread_end_offset = 112;
+    AOT_Thread_megamorphic_call_checked_entry_offset = 592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_enter_safepoint_stub_offset = 496;
+    AOT_Thread_switchable_call_miss_entry_offset = 600;
 static constexpr dart::compiler::target::word
-    AOT_Thread_execution_state_offset = 1608;
+    AOT_Thread_switchable_call_miss_stub_offset = 408;
 static constexpr dart::compiler::target::word
-    AOT_Thread_exit_safepoint_stub_offset = 504;
+    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 648;
 static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_stub_offset = 512;
-static constexpr dart::compiler::target::word
-    AOT_Thread_call_native_through_safepoint_entry_point_offset = 632;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_allocation_stub_code_offset = 256;
-static constexpr dart::compiler::target::word
-    AOT_Thread_fix_callers_target_code_offset = 248;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_absolute_address_offset = 720;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_negate_address_offset = 712;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_not_address_offset = 704;
-static constexpr dart::compiler::target::word
-    AOT_Thread_float_zerow_address_offset = 728;
-static constexpr dart::compiler::target::word
-    AOT_Thread_global_object_pool_offset = 1584;
-static constexpr dart::compiler::target::word
-    AOT_Thread_invoke_dart_code_stub_offset = 264;
-static constexpr dart::compiler::target::word
-    AOT_Thread_exit_through_ffi_offset = 1640;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
-static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
-    1672;
-static constexpr dart::compiler::target::word
-    AOT_Thread_field_table_values_offset = 136;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_return_stub_offset = 464;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_deopt_from_throw_stub_offset = 472;
-static constexpr dart::compiler::target::word
-    AOT_Thread_lazy_specialize_type_test_stub_offset = 488;
-static constexpr dart::compiler::target::word
-    AOT_Thread_marking_stack_block_offset = 168;
-static constexpr dart::compiler::target::word
-    AOT_Thread_megamorphic_call_checked_entry_offset = 600;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_entry_offset = 608;
-static constexpr dart::compiler::target::word
-    AOT_Thread_switchable_call_miss_stub_offset = 416;
-static constexpr dart::compiler::target::word
-    AOT_Thread_no_scope_native_wrapper_entry_point_offset = 656;
-static constexpr dart::compiler::target::word
-    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 288;
+    AOT_Thread_late_initialization_error_shared_with_fpu_regs_stub_offset = 280;
 static constexpr dart::compiler::target::word
     AOT_Thread_late_initialization_error_shared_without_fpu_regs_stub_offset =
-        280;
+        272;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 304;
+    AOT_Thread_null_error_shared_with_fpu_regs_stub_offset = 296;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 296;
+    AOT_Thread_null_error_shared_without_fpu_regs_stub_offset = 288;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 320;
+    AOT_Thread_null_arg_error_shared_with_fpu_regs_stub_offset = 312;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 312;
+    AOT_Thread_null_arg_error_shared_without_fpu_regs_stub_offset = 304;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 336;
+    AOT_Thread_null_cast_error_shared_with_fpu_regs_stub_offset = 328;
 static constexpr dart::compiler::target::word
-    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 328;
+    AOT_Thread_null_cast_error_shared_without_fpu_regs_stub_offset = 320;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 352;
+    AOT_Thread_range_error_shared_with_fpu_regs_stub_offset = 344;
 static constexpr dart::compiler::target::word
-    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 344;
+    AOT_Thread_range_error_shared_without_fpu_regs_stub_offset = 336;
 static constexpr dart::compiler::target::word AOT_Thread_object_null_offset =
-    208;
+    200;
 static constexpr dart::compiler::target::word
-    AOT_Thread_predefined_symbols_address_offset = 672;
+    AOT_Thread_predefined_symbols_address_offset = 664;
 static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
-    1592;
+    1584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_shadow_call_stack_offset = 1600;
+    AOT_Thread_saved_shadow_call_stack_offset = 1592;
 static constexpr dart::compiler::target::word
-    AOT_Thread_safepoint_state_offset = 1616;
+    AOT_Thread_safepoint_state_offset = 1608;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_stub_offset = 480;
+    AOT_Thread_slow_type_test_stub_offset = 472;
 static constexpr dart::compiler::target::word
-    AOT_Thread_slow_type_test_entry_point_offset = 640;
+    AOT_Thread_slow_type_test_entry_point_offset = 632;
 static constexpr dart::compiler::target::word AOT_Thread_stack_limit_offset =
-    64;
+    56;
 static constexpr dart::compiler::target::word
-    AOT_Thread_saved_stack_limit_offset = 120;
+    AOT_Thread_saved_stack_limit_offset = 112;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_flags_offset = 128;
+    AOT_Thread_stack_overflow_flags_offset = 120;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 592;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_entry_point_offset = 584;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 408;
+    AOT_Thread_stack_overflow_shared_with_fpu_regs_stub_offset = 400;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 584;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_entry_point_offset = 576;
 static constexpr dart::compiler::target::word
-    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 400;
+    AOT_Thread_stack_overflow_shared_without_fpu_regs_stub_offset = 392;
 static constexpr dart::compiler::target::word
-    AOT_Thread_store_buffer_block_offset = 160;
+    AOT_Thread_store_buffer_block_offset = 152;
 static constexpr dart::compiler::target::word
-    AOT_Thread_top_exit_frame_info_offset = 152;
-static constexpr dart::compiler::target::word AOT_Thread_top_offset = 104;
+    AOT_Thread_top_exit_frame_info_offset = 144;
+static constexpr dart::compiler::target::word AOT_Thread_top_offset = 96;
 static constexpr dart::compiler::target::word AOT_Thread_top_resource_offset =
-    40;
+    32;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_int64_runtime_arg_offset = 192;
+    AOT_Thread_unboxed_int64_runtime_arg_offset = 184;
 static constexpr dart::compiler::target::word
-    AOT_Thread_unboxed_double_runtime_arg_offset = 200;
-static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 184;
+    AOT_Thread_unboxed_double_runtime_arg_offset = 192;
+static constexpr dart::compiler::target::word AOT_Thread_vm_tag_offset = 176;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_code_offset = 232;
+    AOT_Thread_write_barrier_code_offset = 224;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_entry_point_offset = 520;
+    AOT_Thread_write_barrier_entry_point_offset = 512;
 static constexpr dart::compiler::target::word
-    AOT_Thread_write_barrier_mask_offset = 72;
-static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
+    AOT_Thread_write_barrier_mask_offset = 64;
+static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 72;
 static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
-    1624;
+    1616;
 static constexpr dart::compiler::target::word
-    AOT_Thread_callback_stack_return_offset = 1632;
+    AOT_Thread_callback_stack_return_offset = 1624;
 static constexpr dart::compiler::target::word
     AOT_TimelineStream_enabled_offset = 16;
 static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -12709,9 +12709,9 @@
     8, 24, 16, 32};
 static constexpr dart::compiler::target::word
     AOT_Thread_write_barrier_wrappers_thread_offset[] = {
-        1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488, 1496,
-        1504, 1512, 1520, 1528, -1,   -1,   -1,   -1,   1536, 1544, -1,
-        -1,   1552, 1560, 1568, -1,   -1,   -1,   -1,   -1,   -1};
+        1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472, 1480, 1488,
+        1496, 1504, 1512, 1520, -1,   -1,   -1,   -1,   1528, 1536, -1,
+        -1,   1544, 1552, 1560, -1,   -1,   -1,   -1,   -1,   -1};
 static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
     24;
 static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
index cd3ca635..b041eb8 100644
--- a/runtime/vm/dart.cc
+++ b/runtime/vm/dart.cc
@@ -1091,7 +1091,7 @@
   do {                                                                         \
     const bool value =                                                         \
         isolate_group != nullptr ? isolate_group->name() : flag;               \
-    ADD_FLAG(#name, value);                                                    \
+    ADD_FLAG(name, value);                                                     \
   } while (0);
 
   if (Snapshot::IncludesCode(kind)) {
@@ -1134,7 +1134,9 @@
 #error What architecture?
 #endif
 #if defined(DART_COMPRESSED_POINTERS)
-    buffer.AddString(" compressed");
+    buffer.AddString(" compressed-pointers");
+#else
+    buffer.AddString(" no-compressed-pointers");
 #endif
   }
 
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 6ad719e..1c7026a 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -1301,7 +1301,6 @@
   bool success = false;
   {
     StackZone zone(T);
-    HANDLESCOPE(T);
     // We enter an API scope here as InitializeIsolate could compile some
     // bootstrap library files which call out to a tag handler that may create
     // Api Handles when an error is encountered.
@@ -2053,7 +2052,6 @@
     auto thread = Thread::Current();
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
 
     if (on_error_port != ILLEGAL_PORT) {
       const auto& port =
diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc
index bed2681..7074ded 100644
--- a/runtime/vm/dart_api_impl_test.cc
+++ b/runtime/vm/dart_api_impl_test.cc
@@ -3128,7 +3128,6 @@
   {
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     for (int i = 0; i < 500; i++) {
       String& str = String::Handle();
       str ^= PersistentHandle::Cast(handles[i])->ptr();
@@ -4551,7 +4550,6 @@
   {
     TransitionNativeToVM transition1(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Smi& val = Smi::Handle();
     TransitionVMToNative transition2(thread);
 
@@ -4619,9 +4617,11 @@
   Thread* thread = Thread::Current();
   EXPECT(thread != NULL);
   ApiLocalScope* scope = thread->api_top_scope();
+  EXPECT_EQ(0, thread->ZoneSizeInBytes());
   {
     // Start a new scope and allocate some memory.
     Dart_EnterScope();
+    EXPECT_EQ(0, thread->ZoneSizeInBytes());
     for (int i = 0; i < 100; i++) {
       Dart_ScopeAllocate(16);
     }
diff --git a/runtime/vm/dart_api_state.cc b/runtime/vm/dart_api_state.cc
index 888bab9..5c81c57 100644
--- a/runtime/vm/dart_api_state.cc
+++ b/runtime/vm/dart_api_state.cc
@@ -14,6 +14,4 @@
 
 namespace dart {
 
-RelaxedAtomic<intptr_t> ApiNativeScope::current_memory_usage_ = 0;
-
 }  // namespace dart
diff --git a/runtime/vm/dart_api_state.h b/runtime/vm/dart_api_state.h
index 0741b90..e23252e 100644
--- a/runtime/vm/dart_api_state.h
+++ b/runtime/vm/dart_api_state.h
@@ -110,7 +110,7 @@
     if ((thread != NULL) && (thread->zone() == &zone_)) {
       thread->set_zone(zone_.previous_);
     }
-    zone_.DeleteAll();
+    zone_.Reset();
   }
 
  private:
@@ -656,18 +656,11 @@
     ASSERT(Current() == NULL);
     OSThread::SetThreadLocal(Api::api_native_key_,
                              reinterpret_cast<uword>(this));
-    // We manually increment the memory usage counter since there is memory
-    // initially allocated within the zone on creation.
-    IncrementNativeScopeMemoryCapacity(zone_.GetZone()->CapacityInBytes());
   }
 
   ~ApiNativeScope() {
     ASSERT(Current() == this);
     OSThread::SetThreadLocal(Api::api_native_key_, 0);
-    // We must also manually decrement the memory usage counter since the native
-    // is still holding it's initial memory and ~Zone() won't be able to
-    // determine which memory usage counter to decrement.
-    DecrementNativeScopeMemoryCapacity(zone_.GetZone()->CapacityInBytes());
   }
 
   static inline ApiNativeScope* Current() {
@@ -675,16 +668,6 @@
         OSThread::GetThreadLocal(Api::api_native_key_));
   }
 
-  static uintptr_t current_memory_usage() { return current_memory_usage_; }
-
-  static void IncrementNativeScopeMemoryCapacity(intptr_t size) {
-    current_memory_usage_.fetch_add(size);
-  }
-
-  static void DecrementNativeScopeMemoryCapacity(intptr_t size) {
-    current_memory_usage_.fetch_sub(size);
-  }
-
   Zone* zone() {
     Zone* result = zone_.GetZone();
     ASSERT(result->handles()->CountScopedHandles() == 0);
@@ -693,9 +676,6 @@
   }
 
  private:
-  // The current total memory usage within ApiNativeScopes.
-  static RelaxedAtomic<intptr_t> current_memory_usage_;
-
   ApiZone zone_;
 };
 
diff --git a/runtime/vm/handles.cc b/runtime/vm/handles.cc
index b276a08..b088957 100644
--- a/runtime/vm/handles.cc
+++ b/runtime/vm/handles.cc
@@ -19,16 +19,6 @@
 
 DEFINE_FLAG(bool, verify_handles, false, "Verify handles.");
 
-VMHandles::~VMHandles() {
-  if (FLAG_trace_handles) {
-    OS::PrintErr("***   Handle Counts for 0x(%" Px "):Zone = %d,Scoped = %d\n",
-                 reinterpret_cast<intptr_t>(this), CountZoneHandles(),
-                 CountScopedHandles());
-    OS::PrintErr("*** Deleting VM handle block 0x%" Px "\n",
-                 reinterpret_cast<intptr_t>(this));
-  }
-}
-
 void VMHandles::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   return Handles<kVMHandleSizeInWords, kVMHandlesPerChunk,
                  kOffsetOfRawPtr>::VisitObjectPointers(visitor);
diff --git a/runtime/vm/handles.h b/runtime/vm/handles.h
index ed4e9db..f2f9005 100644
--- a/runtime/vm/handles.h
+++ b/runtime/vm/handles.h
@@ -107,6 +107,24 @@
     return true;
   }
 
+  intptr_t ZoneHandlesCapacityInBytes() const {
+    intptr_t capacity = 0;
+    for (HandlesBlock* block = zone_blocks_; block != nullptr;
+         block = block->next_block()) {
+      capacity += sizeof(*block);
+    }
+    return capacity;
+  }
+
+  intptr_t ScopedHandlesCapacityInBytes() const {
+    intptr_t capacity = 0;
+    for (HandlesBlock* block = scoped_blocks_; block != nullptr;
+         block = block->next_block()) {
+      capacity += sizeof(*block);
+    }
+    return capacity;
+  }
+
  protected:
   // Returns a count of active handles (used for testing purposes).
   int CountScopedHandles() const;
@@ -126,7 +144,7 @@
   class HandlesBlock : public MallocAllocated {
    public:
     explicit HandlesBlock(HandlesBlock* next)
-        : next_handle_slot_(0), next_block_(next) {}
+        : next_block_(next), next_handle_slot_(0) {}
     ~HandlesBlock();
 
     // Reinitializes handle block for reuse.
@@ -175,9 +193,9 @@
     void set_next_block(HandlesBlock* next) { next_block_ = next; }
 
    private:
-    uword data_[kHandleSizeInWords * kHandlesPerChunk];  // Handles area.
-    intptr_t next_handle_slot_;  // Next slot for allocation in current block.
     HandlesBlock* next_block_;   // Link to next block of handles.
+    intptr_t next_handle_slot_;  // Next slot for allocation in current block.
+    uword data_[kHandleSizeInWords * kHandlesPerChunk];  // Handles area.
 
     DISALLOW_COPY_AND_ASSIGN(HandlesBlock);
   };
@@ -222,7 +240,7 @@
 };
 
 static const int kVMHandleSizeInWords = 2;
-static const int kVMHandlesPerChunk = 64;
+static const int kVMHandlesPerChunk = 63;
 static const int kOffsetOfRawPtr = kWordSize;
 class VMHandles : public Handles<kVMHandleSizeInWords,
                                  kVMHandlesPerChunk,
@@ -232,12 +250,25 @@
 
   VMHandles()
       : Handles<kVMHandleSizeInWords, kVMHandlesPerChunk, kOffsetOfRawPtr>() {
+#if defined(DEBUG)
     if (FLAG_trace_handles) {
       OS::PrintErr("*** Starting a new VM handle block 0x%" Px "\n",
                    reinterpret_cast<intptr_t>(this));
     }
+#endif
   }
-  ~VMHandles();
+  ~VMHandles() {
+#if defined(DEBUG)
+    if (FLAG_trace_handles) {
+      OS::PrintErr("***   Handle Counts for 0x(%" Px
+                   "):Zone = %d,Scoped = %d\n",
+                   reinterpret_cast<intptr_t>(this), CountZoneHandles(),
+                   CountScopedHandles());
+      OS::PrintErr("*** Deleting VM handle block 0x%" Px "\n",
+                   reinterpret_cast<intptr_t>(this));
+    }
+#endif
+  }
 
   // Visit all object pointers stored in the various handles.
   void VisitObjectPointers(ObjectPointerVisitor* visitor);
diff --git a/runtime/vm/handles_impl.h b/runtime/vm/handles_impl.h
index 0697a13..c46844f 100644
--- a/runtime/vm/handles_impl.h
+++ b/runtime/vm/handles_impl.h
@@ -81,7 +81,6 @@
     AllocateHandle(Zone* zone) {
 #if defined(DEBUG)
   Thread* thread = Thread::Current();
-  ASSERT(thread->top_handle_scope() != NULL);
   ASSERT(thread->MayAllocateHandles());
 #endif  // DEBUG
   Handles* handles = zone->handles();
diff --git a/runtime/vm/heap/heap_test.cc b/runtime/vm/heap/heap_test.cc
index abbfc5d..b30bf66 100644
--- a/runtime/vm/heap/heap_test.cc
+++ b/runtime/vm/heap/heap_test.cc
@@ -592,7 +592,6 @@
       Thread* thread = Thread::Current();
       TransitionNativeToVM transition(thread);
       StackZone zone(thread);
-      HANDLESCOPE(thread);
 
       String& string = String::Handle(String::New(TEST_MESSAGE));
       PersistentHandle* handle =
@@ -626,7 +625,6 @@
     Thread* thread = Thread::Current();
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
 
     String& string = String::Handle(String::New(TEST_MESSAGE));
 
@@ -644,7 +642,6 @@
     Thread* thread = Thread::Current();
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
 
     EXPECT_EQ(MessageHandler::kOK, handler.HandleNextMessage());
   }
diff --git a/runtime/vm/kernel_isolate.cc b/runtime/vm/kernel_isolate.cc
index c1df592..8926b5d 100644
--- a/runtime/vm/kernel_isolate.cc
+++ b/runtime/vm/kernel_isolate.cc
@@ -174,7 +174,6 @@
     Thread* T = Thread::Current();
     ASSERT(I == T->isolate());
     StackZone zone(T);
-    HANDLESCOPE(T);
     // Invoke main which will return the port to which load requests are sent.
     const Library& root_library =
         Library::Handle(Z, I->group()->object_store()->root_library());
diff --git a/runtime/vm/metrics_test.cc b/runtime/vm/metrics_test.cc
index c5bd41c..2be5b71 100644
--- a/runtime/vm/metrics_test.cc
+++ b/runtime/vm/metrics_test.cc
@@ -53,7 +53,6 @@
     Thread* thread = Thread::Current();
     TransitionNativeToVM transition(thread);
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     MyMetric metric;
 
     metric.InitInstance(Isolate::Current(), "a.b.c", "foobar", Metric::kByte);
diff --git a/runtime/vm/profiler_service.cc b/runtime/vm/profiler_service.cc
index edaafe7..c82c0f9 100644
--- a/runtime/vm/profiler_service.cc
+++ b/runtime/vm/profiler_service.cc
@@ -1777,7 +1777,6 @@
   ASSERT(buffer != nullptr);
 
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   Profile profile;
   profile.Build(thread, filter, buffer);
   profile.PrintProfileJSON(stream, include_code_samples);
diff --git a/runtime/vm/profiler_test.cc b/runtime/vm/profiler_test.cc
index 987787c..74c3027 100644
--- a/runtime/vm/profiler_test.cc
+++ b/runtime/vm/profiler_test.cc
@@ -501,7 +501,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     // Filter for the class in the time range.
     AllocationFilter filter(isolate->main_port(), class_a.id(),
@@ -531,7 +530,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id(),
                             Dart_TimelineGetMicros(), 16000);
@@ -578,7 +576,6 @@
   {
     Thread* thread = Thread::Current();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
 
     // Filter for the class in the time range.
@@ -617,7 +614,6 @@
   {
     Thread* thread = Thread::Current();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
 
     // Filter for the class in the time range.
@@ -632,7 +628,6 @@
   {
     Thread* thread = Thread::Current();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     NativeAllocationSampleFilter filter(Dart_TimelineGetMicros(), 16000);
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -678,7 +673,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -695,7 +689,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -725,7 +718,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -763,7 +755,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -783,7 +774,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -838,7 +828,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -858,7 +847,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -908,7 +896,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), double_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -921,7 +908,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), double_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -943,7 +929,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), double_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -970,7 +955,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), array_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -983,7 +967,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), array_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1005,7 +988,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), array_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1027,7 +1009,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), array_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1057,7 +1038,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), context_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1070,7 +1050,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), context_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1090,7 +1069,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), context_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1130,7 +1108,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), closure_class.id());
     filter.set_enable_vm_ticks(true);
@@ -1154,7 +1131,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), closure_class.id());
     filter.set_enable_vm_ticks(true);
@@ -1185,7 +1161,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), float32_list_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1198,7 +1173,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), float32_list_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1220,7 +1194,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), float32_list_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1233,7 +1206,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), float32_list_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1265,7 +1237,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1278,7 +1249,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1298,7 +1268,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1311,7 +1280,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1343,7 +1311,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1356,7 +1323,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1382,7 +1348,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1395,7 +1360,6 @@
 
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), one_byte_string_class.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1451,7 +1415,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1469,7 +1432,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1598,7 +1560,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1615,7 +1576,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1691,7 +1651,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1786,7 +1745,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1868,7 +1826,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -1946,7 +1903,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -2056,7 +2012,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -2151,7 +2106,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
@@ -2269,7 +2223,6 @@
     Thread* thread = Thread::Current();
     Isolate* isolate = thread->isolate();
     StackZone zone(thread);
-    HANDLESCOPE(thread);
     Profile profile;
     AllocationFilter filter(isolate->main_port(), class_a.id());
     profile.Build(thread, &filter, Profiler::sample_block_buffer());
diff --git a/runtime/vm/program_visitor.cc b/runtime/vm/program_visitor.cc
index 977592d..02a5657 100644
--- a/runtime/vm/program_visitor.cc
+++ b/runtime/vm/program_visitor.cc
@@ -1504,7 +1504,6 @@
 
 uint32_t ProgramVisitor::Hash(Thread* thread) {
   StackZone stack_zone(thread);
-  HANDLESCOPE(thread);
   Zone* zone = thread->zone();
 
   ProgramHashVisitor visitor(zone);
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index ee69f28..549dd9b 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -3265,7 +3265,6 @@
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   StackZone zone(thread);
-  HANDLESCOPE(thread);
 
   // All registers have been saved below last-fp as if they were locals.
   const uword last_fp =
@@ -3337,7 +3336,6 @@
   Thread* thread = Thread::Current();
   Isolate* isolate = thread->isolate();
   StackZone zone(thread);
-  HANDLESCOPE(thread);
 
   DeoptContext* deopt_context = isolate->deopt_context();
   DartFrameIterator iterator(last_fp, thread,
diff --git a/runtime/vm/runtime_entry.h b/runtime/vm/runtime_entry.h
index 3fc3e01..99b6a76 100644
--- a/runtime/vm/runtime_entry.h
+++ b/runtime/vm/runtime_entry.h
@@ -120,7 +120,6 @@
       Isolate* isolate = thread->isolate();                                    \
       TransitionGeneratedToVM transition(thread);                              \
       StackZone zone(thread);                                                  \
-      HANDLESCOPE(thread);                                                     \
       CHECK_SIMULATOR_STACK_OVERFLOW();                                        \
       if (FLAG_deoptimize_on_runtime_call_every > 0) {                         \
         OnEveryRuntimeEntryCall(thread, "" #name, can_lazy_deopt);             \
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index c082f2d..fd3b9ee 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -844,7 +844,6 @@
                         const Error& error) {
   Thread* T = Thread::Current();
   StackZone zone(T);
-  HANDLESCOPE(T);
   JSONStream js;
   js.Setup(zone.GetZone(), SendPort::Cast(reply_port).Id(), id, method_name,
            parameter_keys, parameter_values);
@@ -865,7 +864,6 @@
 
   {
     StackZone zone(T);
-    HANDLESCOPE(T);
 
     Instance& reply_port = Instance::Handle(Z);
     Instance& seq = String::Handle(Z);
@@ -3227,7 +3225,6 @@
 
   // Ensure the array and handles created below are promptly destroyed.
   StackZone zone(thread);
-  HANDLESCOPE(thread);
 
   ZoneGrowableHandlePtrArray<Object> storage(thread->zone(), limit);
   GetInstancesVisitor visitor(&storage, limit);
@@ -3278,7 +3275,6 @@
   Array& instances = Array::Handle();
   {
     StackZone zone(thread);
-    HANDLESCOPE(thread);
 
     ZoneGrowableHandlePtrArray<Object> storage(thread->zone(), 1024);
     GetInstancesVisitor visitor(&storage, kSmiMax);
@@ -3306,7 +3302,6 @@
 static void GetPorts(Thread* thread, JSONStream* js) {
   // Ensure the array and handles created below are promptly destroyed.
   StackZone zone(thread);
-  HANDLESCOPE(thread);
   const GrowableObjectArray& ports = GrowableObjectArray::Handle(
       GrowableObjectArray::RawCast(DartLibraryCalls::LookupOpenPorts()));
   JSONObject jsobj(js);
@@ -4889,9 +4884,13 @@
   jsobj.AddProperty("operatingSystem", OS::Name());
   jsobj.AddProperty("targetCPU", CPU::Id());
   jsobj.AddProperty("version", Version::String());
+#if defined(DART_PRECOMPILED_RUNTIME)
+  Snapshot::Kind kind = Snapshot::kFullAOT;
+#else
+  Snapshot::Kind kind = Snapshot::kFullJIT;
+#endif
+  jsobj.AddProperty("_features", Dart::FeaturesString(nullptr, true, kind));
   jsobj.AddProperty("_profilerMode", FLAG_profile_vm ? "VM" : "Dart");
-  jsobj.AddProperty64("_nativeZoneMemoryUsage",
-                      ApiNativeScope::current_memory_usage());
   jsobj.AddProperty64("pid", OS::ProcessId());
   jsobj.AddPropertyTimeMillis(
       "startTime", OS::GetCurrentTimeMillis() - Dart::UptimeMillis());
diff --git a/runtime/vm/service_isolate.cc b/runtime/vm/service_isolate.cc
index 418aa3a..95add31 100644
--- a/runtime/vm/service_isolate.cc
+++ b/runtime/vm/service_isolate.cc
@@ -438,7 +438,6 @@
     Thread* T = Thread::Current();
     ASSERT(I == T->isolate());
     StackZone zone(T);
-    HANDLESCOPE(T);
     // Invoke main which will set up the service port.
     const Library& root_library =
         Library::Handle(Z, I->group()->object_store()->root_library());
diff --git a/runtime/vm/thread_state.cc b/runtime/vm/thread_state.cc
index 00deaf7..c3bae0c 100644
--- a/runtime/vm/thread_state.cc
+++ b/runtime/vm/thread_state.cc
@@ -9,21 +9,7 @@
 
 namespace dart {
 
-ThreadState::ThreadState(bool is_os_thread) : BaseThread(is_os_thread) {
-  // This thread should not yet own any zones. If it does, we need to make sure
-  // we've accounted for any memory it has already allocated.
-  if (zone_ == nullptr) {
-    ASSERT(current_zone_capacity_ == 0);
-  } else {
-    Zone* current = zone_;
-    uintptr_t total_zone_capacity = 0;
-    while (current != nullptr) {
-      total_zone_capacity += current->CapacityInBytes();
-      current = current->previous();
-    }
-    ASSERT(current_zone_capacity_ == total_zone_capacity);
-  }
-}
+ThreadState::ThreadState(bool is_os_thread) : BaseThread(is_os_thread) {}
 
 ThreadState::~ThreadState() {}
 
diff --git a/runtime/vm/thread_state.h b/runtime/vm/thread_state.h
index e83bc26..61c46c3 100644
--- a/runtime/vm/thread_state.h
+++ b/runtime/vm/thread_state.h
@@ -40,17 +40,6 @@
 
   bool ZoneIsOwnedByThread(Zone* zone) const;
 
-  void IncrementMemoryCapacity(uintptr_t value) {
-    current_zone_capacity_ += value;
-  }
-
-  void DecrementMemoryCapacity(uintptr_t value) {
-    ASSERT(current_zone_capacity_ >= value);
-    current_zone_capacity_ -= value;
-  }
-
-  uintptr_t current_zone_capacity() const { return current_zone_capacity_; }
-
   StackResource* top_resource() const { return top_resource_; }
   void set_top_resource(StackResource* value) { top_resource_ = value; }
   static intptr_t top_resource_offset() {
@@ -86,7 +75,6 @@
 
   OSThread* os_thread_ = nullptr;
   Zone* zone_ = nullptr;
-  uintptr_t current_zone_capacity_ = 0;
   StackResource* top_resource_ = nullptr;
   LongJumpScope* long_jump_base_ = nullptr;
 
diff --git a/runtime/vm/thread_test.cc b/runtime/vm/thread_test.cc
index 14171a6..5faa11b 100644
--- a/runtime/vm/thread_test.cc
+++ b/runtime/vm/thread_test.cc
@@ -121,7 +121,6 @@
       Thread* thread = Thread::Current();
       // Create a zone (which is also a stack resource) and exercise it a bit.
       StackZone stack_zone(thread);
-      HANDLESCOPE(thread);
       Zone* zone = thread->zone();
       EXPECT_EQ(zone, stack_zone.GetZone());
       ZoneGrowableArray<bool>* a0 = new (zone) ZoneGrowableArray<bool>(zone, 1);
@@ -255,7 +254,6 @@
     *thread_ptr_ = thread;
 
     StackZone stack_zone(thread);
-    HANDLESCOPE(thread);
     Zone* zone = thread->zone();
     EXPECT_EQ(zone, stack_zone.GetZone());
 
@@ -390,7 +388,6 @@
 
     {
       StackZone stack_zone(thread);
-      HANDLESCOPE(thread);
 
       ICData& ic_data = ICData::Handle();
       Array& arr = Array::Handle();
@@ -536,7 +533,6 @@
     for (int i = reinterpret_cast<intptr_t>(thread);; ++i) {
       StackZone stack_zone(thread);
       Zone* zone = thread->zone();
-      HANDLESCOPE(thread);
       const intptr_t kUniqueSmi = 928327281;
       Smi& smi = Smi::Handle(zone, Smi::New(kUniqueSmi));
       if ((i % 100) != 0) {
@@ -852,7 +848,6 @@
       Thread* thread = Thread::Current();
       StackZone stack_zone(thread);
       Zone* zone = stack_zone.GetZone();
-      HANDLESCOPE(thread);
       String& old_str = String::Handle(zone, String::New("old", Heap::kOld));
       isolate_->group()->heap()->CollectAllGarbage();
       EXPECT(old_str.Equals("old"));
@@ -900,7 +895,6 @@
       Thread* thread = Thread::Current();
       StackZone stack_zone(thread);
       Zone* zone = stack_zone.GetZone();
-      HANDLESCOPE(thread);
       int count = 100 * 1000;
       while (count-- > 0) {
         String::Handle(zone, String::New("abc"));
diff --git a/runtime/vm/zone.cc b/runtime/vm/zone.cc
index 763617f..fc0fd8d 100644
--- a/runtime/vm/zone.cc
+++ b/runtime/vm/zone.cc
@@ -33,8 +33,6 @@
   // Allocate or delete individual segments.
   static Segment* New(intptr_t size, Segment* next);
   static void DeleteSegmentList(Segment* segment);
-  static void IncrementMemoryCapacity(uintptr_t size);
-  static void DecrementMemoryCapacity(uintptr_t size);
 
  private:
   Segment* next_;
@@ -107,7 +105,6 @@
 
   LSAN_REGISTER_ROOT_REGION(result, sizeof(*result));
 
-  IncrementMemoryCapacity(size);
   return result;
 }
 
@@ -115,7 +112,6 @@
   Segment* current = head;
   while (current != NULL) {
     intptr_t size = current->size();
-    DecrementMemoryCapacity(size);
     Segment* next = current->next();
     VirtualMemory* memory = current->memory();
 #ifdef DEBUG
@@ -141,38 +137,13 @@
   }
 }
 
-void Zone::Segment::IncrementMemoryCapacity(uintptr_t size) {
-  ThreadState* current_thread = ThreadState::Current();
-  if (current_thread != NULL) {
-    current_thread->IncrementMemoryCapacity(size);
-  } else if (ApiNativeScope::Current() != NULL) {
-    // If there is no current thread, we might be inside of a native scope.
-    ApiNativeScope::IncrementNativeScopeMemoryCapacity(size);
-  }
-}
-
-void Zone::Segment::DecrementMemoryCapacity(uintptr_t size) {
-  ThreadState* current_thread = ThreadState::Current();
-  if (current_thread != NULL) {
-    current_thread->DecrementMemoryCapacity(size);
-  } else if (ApiNativeScope::Current() != NULL) {
-    // If there is no current thread, we might be inside of a native scope.
-    ApiNativeScope::DecrementNativeScopeMemoryCapacity(size);
-  }
-}
-
-// TODO(bkonyi): We need to account for the initial chunk size when a new zone
-// is created within a new thread or ApiNativeScope when calculating high
-// watermarks or memory consumption.
 Zone::Zone()
     : position_(reinterpret_cast<uword>(&buffer_)),
       limit_(position_ + kInitialChunkSize),
-      head_(NULL),
-      large_segments_(NULL),
-      previous_(NULL),
+      segments_(nullptr),
+      previous_(nullptr),
       handles_() {
   ASSERT(Utils::IsAligned(position_, kAlignment));
-  Segment::IncrementMemoryCapacity(kInitialChunkSize);
 #ifdef DEBUG
   // Zap the entire initial buffer.
   memset(&buffer_, kZapUninitializedByte, kInitialChunkSize);
@@ -181,70 +152,57 @@
 
 Zone::~Zone() {
   if (FLAG_trace_zones) {
-    DumpZoneSizes();
+    Print();
   }
-  DeleteAll();
-  Segment::DecrementMemoryCapacity(kInitialChunkSize);
+  Segment::DeleteSegmentList(segments_);
 }
 
-void Zone::DeleteAll() {
+void Zone::Reset() {
   // Traverse the chained list of segments, zapping (in debug mode)
   // and freeing every zone segment.
-  if (head_ != NULL) {
-    Segment::DeleteSegmentList(head_);
-  }
-  if (large_segments_ != NULL) {
-    Segment::DeleteSegmentList(large_segments_);
-  }
-// Reset zone state.
+  Segment::DeleteSegmentList(segments_);
+  segments_ = nullptr;
+
 #ifdef DEBUG
   memset(&buffer_, kZapDeletedByte, kInitialChunkSize);
 #endif
   position_ = reinterpret_cast<uword>(&buffer_);
   limit_ = position_ + kInitialChunkSize;
+  size_ = 0;
   small_segment_capacity_ = 0;
-  head_ = NULL;
-  large_segments_ = NULL;
-  previous_ = NULL;
+  previous_ = nullptr;
   handles_.Reset();
 }
 
 uintptr_t Zone::SizeInBytes() const {
-  uintptr_t size = 0;
-  for (Segment* s = large_segments_; s != NULL; s = s->next()) {
-    size += s->size();
-  }
-  if (head_ == NULL) {
-    return size + (position_ - reinterpret_cast<uword>(&buffer_));
-  }
-  size += kInitialChunkSize;
-  for (Segment* s = head_->next(); s != NULL; s = s->next()) {
-    size += s->size();
-  }
-  return size + (position_ - head_->start());
+  return size_;
 }
 
 uintptr_t Zone::CapacityInBytes() const {
-  uintptr_t size = 0;
-  for (Segment* s = large_segments_; s != NULL; s = s->next()) {
-    size += s->size();
-  }
-  if (head_ == NULL) {
-    return size + kInitialChunkSize;
-  }
-  size += kInitialChunkSize;
-  for (Segment* s = head_; s != NULL; s = s->next()) {
+  uintptr_t size = kInitialChunkSize;
+  for (Segment* s = segments_; s != nullptr; s = s->next()) {
     size += s->size();
   }
   return size;
 }
 
+void Zone::Print() const {
+  intptr_t segment_size = CapacityInBytes();
+  intptr_t scoped_handle_size = handles_.ScopedHandlesCapacityInBytes();
+  intptr_t zone_handle_size = handles_.ZoneHandlesCapacityInBytes();
+  intptr_t total_size = segment_size + scoped_handle_size + zone_handle_size;
+  OS::PrintErr("Zone(%p, segments: %" Pd ", scoped_handles: %" Pd
+               ", zone_handles: %" Pd ", total: %" Pd ")\n",
+               this, segment_size, scoped_handle_size, zone_handle_size,
+               total_size);
+}
+
 uword Zone::AllocateExpand(intptr_t size) {
   ASSERT(size >= 0);
   if (FLAG_trace_zones) {
     OS::PrintErr("*** Expanding zone 0x%" Px "\n",
                  reinterpret_cast<intptr_t>(this));
-    DumpZoneSizes();
+    Print();
   }
   // Make sure the requested size is already properly aligned and that
   // there isn't enough room in the Zone to satisfy the request.
@@ -274,13 +232,14 @@
   ASSERT(next_size >= kSegmentSize);
 
   // Allocate another segment and chain it up.
-  head_ = Segment::New(next_size, head_);
+  segments_ = Segment::New(next_size, segments_);
   small_segment_capacity_ += next_size;
 
   // Recompute 'position' and 'limit' based on the new head segment.
-  uword result = Utils::RoundUp(head_->start(), kAlignment);
+  uword result = Utils::RoundUp(segments_->start(), kAlignment);
   position_ = result + size;
-  limit_ = head_->end();
+  limit_ = segments_->end();
+  size_ += size;
   ASSERT(position_ <= limit_);
   return result;
 }
@@ -295,10 +254,11 @@
 
   // Create a new large segment and chain it up.
   // Account for book keeping fields in size.
+  size_ += size;
   size += Utils::RoundUp(sizeof(Segment), kAlignment);
-  large_segments_ = Segment::New(size, large_segments_);
+  segments_ = Segment::New(size, segments_);
 
-  uword result = Utils::RoundUp(large_segments_->start(), kAlignment);
+  uword result = Utils::RoundUp(segments_->start(), kAlignment);
   return result;
 }
 
@@ -337,17 +297,6 @@
   return copy;
 }
 
-void Zone::DumpZoneSizes() {
-  intptr_t size = 0;
-  for (Segment* s = large_segments_; s != NULL; s = s->next()) {
-    size += s->size();
-  }
-  OS::PrintErr("***   Zone(0x%" Px
-               ") size in bytes,"
-               " Total = %" Pd " Large Segments = %" Pd "\n",
-               reinterpret_cast<intptr_t>(this), SizeInBytes(), size);
-}
-
 void Zone::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   Zone* zone = this;
   while (zone != NULL) {
diff --git a/runtime/vm/zone.h b/runtime/vm/zone.h
index b30f446..5156751 100644
--- a/runtime/vm/zone.h
+++ b/runtime/vm/zone.h
@@ -60,13 +60,15 @@
   char* PrintToString(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
   char* VPrint(const char* format, va_list args);
 
-  // Compute the total size of this zone. This includes wasted space that is
-  // due to internal fragmentation in the segments.
+  // Compute the total size of allocations in this zone.
   uintptr_t SizeInBytes() const;
 
-  // Computes the amount of space used in the zone.
+  // Computes the amount of space used by the zone.
   uintptr_t CapacityInBytes() const;
 
+  // Dump the current allocated sizes in the zone object.
+  void Print() const;
+
   // Structure for managing handles allocation.
   VMHandles* handles() { return &handles_; }
 
@@ -95,7 +97,7 @@
   ~Zone();  // Delete all memory associated with the zone.
 
   // Default initial chunk size.
-  static const intptr_t kInitialChunkSize = 1 * KB;
+  static const intptr_t kInitialChunkSize = 128;
 
   // Default segment size.
   static const intptr_t kSegmentSize = 64 * KB;
@@ -119,7 +121,7 @@
   void Link(Zone* current_zone) { previous_ = current_zone; }
 
   // Delete all objects and free all memory allocated in the zone.
-  void DeleteAll();
+  void Reset();
 
   // Does not actually free any memory. Enables templated containers like
   // BaseGrowableArray to use different allocators.
@@ -134,9 +136,6 @@
 #endif
   }
 
-  // Dump the current allocated sizes in the zone object.
-  void DumpZoneSizes();
-
   // Overflow check (FATAL) for array length.
   template <class ElementType>
   static inline void CheckLength(intptr_t len);
@@ -152,14 +151,14 @@
   // implementation is in zone.cc.
   class Segment;
 
+  // Total size of all allocations in this zone.
+  intptr_t size_ = 0;
+
   // Total size of all segments in [head_].
   intptr_t small_segment_capacity_ = 0;
 
-  // The current head segment; may be NULL.
-  Segment* head_;
-
-  // List of large segments allocated in this zone; may be NULL.
-  Segment* large_segments_;
+  // List of all segments allocated in this zone; may be NULL.
+  Segment* segments_;
 
   // Used for chaining zones in order to allow unwinding of stacks.
   Zone* previous_;
@@ -243,6 +242,7 @@
   if (free_size >= size) {
     result = position_;
     position_ += size;
+    size_ += size;
   } else {
     result = AllocateExpand(size);
   }
@@ -284,6 +284,7 @@
       if (new_end <= limit_) {
         ASSERT(new_len >= old_len);
         position_ = Utils::RoundUp(new_end, kAlignment);
+        size_ += (new_end - old_end);
         return old_data;
       }
     }
diff --git a/runtime/vm/zone_test.cc b/runtime/vm/zone_test.cc
index 2f691a9..9231cda 100644
--- a/runtime/vm/zone_test.cc
+++ b/runtime/vm/zone_test.cc
@@ -165,21 +165,6 @@
   EXPECT_STREQ("Hello World!", result);
 }
 
-VM_UNIT_TEST_CASE(NativeScopeZoneAllocation) {
-  ASSERT(ApiNativeScope::Current() == NULL);
-  ASSERT(Thread::Current() == NULL);
-  EXPECT_EQ(0UL, ApiNativeScope::current_memory_usage());
-  {
-    ApiNativeScope scope;
-    EXPECT_EQ(scope.zone()->CapacityInBytes(),
-              ApiNativeScope::current_memory_usage());
-    (void)Dart_ScopeAllocate(2048);
-    EXPECT_EQ(scope.zone()->CapacityInBytes(),
-              ApiNativeScope::current_memory_usage());
-  }
-  EXPECT_EQ(0UL, ApiNativeScope::current_memory_usage());
-}
-
 #if !defined(PRODUCT)
 // Allow for pooling in the malloc implementation.
 static const int64_t kRssSlack = 20 * MB;
diff --git a/tools/VERSION b/tools/VERSION
index ade4524..e2d1273 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 15
 PATCH 0
-PRERELEASE 217
+PRERELEASE 218
 PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/gn.py b/tools/gn.py
index 3090333..dccae52 100755
--- a/tools/gn.py
+++ b/tools/gn.py
@@ -375,7 +375,7 @@
                     % (os_name, arch))
                 return False
         elif os_name == 'fuchsia':
-            if HOST_OS != 'linux':
+            if not HOST_OS in ['linux', 'macos']:
                 print(
                     "Cross-compilation to %s is not supported on host os %s." %
                     (os_name, HOST_OS))
diff --git a/tools/verify_docs/bin/verify_docs.dart b/tools/verify_docs/bin/verify_docs.dart
index 23ffc6a..686b734 100644
--- a/tools/verify_docs/bin/verify_docs.dart
+++ b/tools/verify_docs/bin/verify_docs.dart
@@ -4,6 +4,7 @@
 
 import 'dart:io';
 
+import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/utilities.dart';
@@ -63,6 +64,8 @@
 Future<bool> validateLibrary(Directory dir) async {
   final libName = path.basename(dir.path);
 
+  final analysisHelper = AnalysisHelper(libName);
+
   print('## dart:$libName');
   print('');
 
@@ -72,13 +75,18 @@
       .listSync(recursive: true)
       .whereType<File>()
       .where((file) => file.path.endsWith('.dart'))) {
-    hadErrors |= await verifyFile(libName, file, dir);
+    hadErrors |= await verifyFile(analysisHelper, libName, file, dir);
   }
 
   return hadErrors;
 }
 
-Future<bool> verifyFile(String coreLibName, File file, Directory parent) async {
+Future<bool> verifyFile(
+  AnalysisHelper analysisHelper,
+  String coreLibName,
+  File file,
+  Directory parent,
+) async {
   final text = file.readAsStringSync();
   var parseResult = parseString(
     content: text,
@@ -96,6 +104,7 @@
   }
 
   var visitor = ValidateCommentCodeSamplesVisitor(
+    analysisHelper,
     coreLibName,
     file.path,
     parseResult.lineInfo,
@@ -112,6 +121,7 @@
 /// Visit a compilation unit and collect the list of code samples found in
 /// dartdoc comments.
 class ValidateCommentCodeSamplesVisitor extends GeneralizingAstVisitor {
+  final AnalysisHelper analysisHelper;
   final String coreLibName;
   final String filePath;
   final LineInfo lineInfo;
@@ -120,6 +130,7 @@
   final StringBuffer errors = StringBuffer();
 
   ValidateCommentCodeSamplesVisitor(
+    this.analysisHelper,
     this.coreLibName,
     this.filePath,
     this.lineInfo,
@@ -188,9 +199,6 @@
   }
 
   Future validateCodeSample(CodeSample sample) async {
-    final resourceProvider =
-        OverlayResourceProvider(PhysicalResourceProvider.INSTANCE);
-
     var text = sample.text;
     final lines = sample.text.split('\n').map((l) => l.trim()).toList();
 
@@ -240,24 +248,7 @@
       }
     }
 
-    // Note: the file paths used below will currently only work on posix
-    // filesystems.
-    final sampleFilePath = '/sample.dart';
-
-    resourceProvider.setOverlay(
-      sampleFilePath,
-      content: text,
-      modificationStamp: 0,
-    );
-
-    // TODO(devoncarew): Refactor to use AnalysisContextCollection to avoid
-    // re-creating analysis contexts.
-    final result = await resolveFile2(
-      path: sampleFilePath,
-      resourceProvider: resourceProvider,
-    );
-
-    resourceProvider.removeOverlay(sampleFilePath);
+    final result = await analysisHelper.resolveFile(text);
 
     if (result is ResolvedUnitResult) {
       // Filter out unused imports, since we speculatively add imports to some
@@ -360,3 +351,31 @@
       return 'error';
   }
 }
+
+class AnalysisHelper {
+  final String libraryName;
+  final resourceProvider =
+      OverlayResourceProvider(PhysicalResourceProvider.INSTANCE);
+  late AnalysisContextCollection collection;
+  int index = 0;
+
+  AnalysisHelper(this.libraryName) {
+    collection = AnalysisContextCollection(
+      includedPaths: ['/$libraryName'],
+      resourceProvider: resourceProvider,
+    );
+  }
+
+  Future<SomeResolvedUnitResult> resolveFile(String contents) async {
+    final samplePath = '/$libraryName/sample_${index++}.dart';
+    resourceProvider.setOverlay(
+      samplePath,
+      content: contents,
+      modificationStamp: 0,
+    );
+
+    var analysisContext = collection.contextFor(samplePath);
+    var analysisSession = analysisContext.currentSession;
+    return await analysisSession.getResolvedUnit(samplePath);
+  }
+}