diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index e2cc04a0e2d..e3ed6332998 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -354,13 +354,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x454;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x458;
+    Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -1072,13 +1072,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x890;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a8;
+    Thread_service_extension_stream_offset = 0x898;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -1790,13 +1790,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x444;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x408;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x450;
+    Thread_service_extension_stream_offset = 0x448;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -2507,13 +2507,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f0;
+    Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -3229,13 +3229,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x898;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8b0;
+    Thread_service_extension_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -3948,13 +3948,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8f0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f8;
+    Thread_service_extension_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -4667,13 +4667,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x47c;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x474;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x480;
+    Thread_service_extension_stream_offset = 0x478;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -5386,13 +5386,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8c8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8e0;
+    Thread_service_extension_stream_offset = 0x8d0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -6098,13 +6098,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x454;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x458;
+    Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -6808,13 +6808,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x890;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8a8;
+    Thread_service_extension_stream_offset = 0x898;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -7518,13 +7518,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x44c;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x444;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x408;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x450;
+    Thread_service_extension_stream_offset = 0x448;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -8227,13 +8227,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f0;
+    Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -8941,13 +8941,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8a8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x898;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8b0;
+    Thread_service_extension_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -9652,13 +9652,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x208;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd8;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8f0;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8f8;
+    Thread_service_extension_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -10363,13 +10363,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x100;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0x68;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x47c;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x474;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x480;
+    Thread_service_extension_stream_offset = 0x478;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -11074,13 +11074,13 @@ static constexpr dart::compiler::target::word
     Thread_call_to_runtime_entry_point_offset = 0x200;
 static constexpr dart::compiler::target::word
     Thread_call_to_runtime_stub_offset = 0xd0;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8d8;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 0x8c8;
 static constexpr dart::compiler::target::word
     Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    Thread_service_extension_stream_offset = 0x8e0;
+    Thread_service_extension_stream_offset = 0x8d0;
 static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word Thread_optimize_stub_offset =
@@ -11823,13 +11823,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0x68;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x454;
+    0x44c;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x458;
+    AOT_Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -12619,13 +12619,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a0;
+    0x890;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a8;
+    AOT_Thread_service_extension_stream_offset = 0x898;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -13422,13 +13422,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e8;
+    0x8d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f0;
+    AOT_Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -14221,13 +14221,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a8;
+    0x898;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8b0;
+    AOT_Thread_service_extension_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -15020,13 +15020,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8f0;
+    0x8e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f8;
+    AOT_Thread_service_extension_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -15821,13 +15821,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0x68;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x47c;
+    0x474;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x480;
+    AOT_Thread_service_extension_stream_offset = 0x478;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -16618,13 +16618,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8d8;
+    0x8c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8e0;
+    AOT_Thread_service_extension_stream_offset = 0x8d0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -17409,13 +17409,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0x68;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x454;
+    0x44c;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x414;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x458;
+    AOT_Thread_service_extension_stream_offset = 0x450;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -18196,13 +18196,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a0;
+    0x890;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x840;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8a8;
+    AOT_Thread_service_extension_stream_offset = 0x898;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -18990,13 +18990,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8e8;
+    0x8d8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x888;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f0;
+    AOT_Thread_service_extension_stream_offset = 0x8e0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19780,13 +19780,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8a8;
+    0x898;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x848;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8b0;
+    AOT_Thread_service_extension_stream_offset = 0x8a0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -20570,13 +20570,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd8;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8f0;
+    0x8e0;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x70;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x890;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8f8;
+    AOT_Thread_service_extension_stream_offset = 0x8e8;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x258;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -21362,13 +21362,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0x68;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x47c;
+    0x474;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x34;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x43c;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x480;
+    AOT_Thread_service_extension_stream_offset = 0x478;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x128;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -22150,13 +22150,13 @@ static constexpr dart::compiler::target::word
 static constexpr dart::compiler::target::word
     AOT_Thread_call_to_runtime_stub_offset = 0xd0;
 static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
-    0x8d8;
+    0x8c8;
 static constexpr dart::compiler::target::word
     AOT_Thread_dispatch_table_array_offset = 0x68;
 static constexpr dart::compiler::target::word
     AOT_Thread_double_truncate_round_supported_offset = 0x878;
 static constexpr dart::compiler::target::word
-    AOT_Thread_service_extension_stream_offset = 0x8e0;
+    AOT_Thread_service_extension_stream_offset = 0x8d0;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
     0x250;
 static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index 3ddc816d6e2..0172dcd6afc 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -3777,7 +3777,7 @@ static void HandleStackOverflowTestCases(Thread* thread) {
       // TODO(turnidge): To make --deoptimize_every and
       // --stacktrace-every faster we could move this increment/test to
       // the generated code.
-      int32_t count = thread->IncrementAndGetStackOverflowCount();
+      uint32_t count = thread->IncrementAndGetStackOverflowCount();
       if (FLAG_deoptimize_every > 0 && (count % FLAG_deoptimize_every) == 0) {
         do_deopt = true;
       }
diff --git a/runtime/vm/thread.cc b/runtime/vm/thread.cc
index bafc5c9c0a8..6b6d68d23c0 100644
--- a/runtime/vm/thread.cc
+++ b/runtime/vm/thread.cc
@@ -77,17 +77,12 @@ Thread::Thread(bool is_vm_isolate)
       active_exception_(Object::null()),
       active_stacktrace_(Object::null()),
       global_object_pool_(ObjectPool::null()),
-      resume_pc_(0),
-      execution_state_(kThreadInNative),
-      safepoint_state_(0),
-      api_top_scope_(nullptr),
       double_truncate_round_supported_(
           TargetCPUFeatures::double_truncate_round_supported() ? 1 : 0),
       random_(),
       tsan_utils_(DO_IF_TSAN(new TsanUtils()) DO_IF_NOT_TSAN(nullptr)),
       current_tag_(UserTag::null()),
       default_tag_(UserTag::null()),
-      task_kind_(kUnknownTask),
 #if defined(SUPPORT_TIMELINE)
       dart_stream_(ASSERT_NOTNULL(Timeline::GetDartStream())),
 #else
@@ -99,23 +94,12 @@ Thread::Thread(bool is_vm_isolate)
       service_extension_stream_(nullptr),
 #endif
       thread_lock_(),
-      api_reusable_scope_(nullptr),
-      no_callback_scope_depth_(0),
-#if defined(DEBUG)
-      no_safepoint_scope_depth_(0),
-#endif
       reusable_handles_(),
-      stack_overflow_count_(0),
-      hierarchy_info_(nullptr),
-      type_usage_info_(nullptr),
       sticky_error_(Error::null()),
       REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_INITIALIZERS)
           REUSABLE_HANDLE_LIST(REUSABLE_HANDLE_SCOPE_INIT)
-#if defined(USING_SAFE_STACK)
-              saved_safestack_limit_(0),
-#endif
 #if !defined(PRODUCT) || defined(FORCE_INCLUDE_SAMPLING_HEAP_PROFILER)
-      next_(nullptr),
+              next_(nullptr),
       heap_sampler_(this) {
 #else
               next_(nullptr) {
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index 888d69a8085..6affe3ae69a 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -476,7 +476,7 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
     return OFFSET_OF(Thread, stack_overflow_flags_);
   }
 
-  int32_t IncrementAndGetStackOverflowCount() {
+  uint32_t IncrementAndGetStackOverflowCount() {
     return ++stack_overflow_count_;
   }
 
@@ -1458,7 +1458,7 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
   ObjectPtr active_stacktrace_;
 
   ObjectPoolPtr global_object_pool_;
-  uword resume_pc_;
+  uword resume_pc_ = 0;
   uword saved_shadow_call_stack_ = 0;
 
   /*
@@ -1474,7 +1474,7 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
    * to be in [kThreadInNative] and still not be at-safepoint (e.g. due to a
    * pending Dart_TypedDataAcquire() that increases no-callback-scope)
    */
-  uword execution_state_;
+  uword execution_state_ = kThreadInNative;
 
   /*
    * Stores
@@ -1506,14 +1506,14 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
    *     entering a reload safepoint
    *     [NoReloadScopeField]
    */
-  std::atomic<uword> safepoint_state_;
+  std::atomic<uword> safepoint_state_ = 0;
   uword exit_through_ffi_ = 0;
 
 #define DECLARE_MEMBERS(returntype, name, ...) uword name##_entry_point_;
   LEAF_RUNTIME_ENTRY_LIST(DECLARE_MEMBERS)
 #undef DECLARE_MEMBERS
 
-  ApiLocalScope* api_top_scope_;
+  ApiLocalScope* api_top_scope_ = nullptr;
   uint8_t double_truncate_round_supported_;
   // Memory locations dedicated for passing unboxed int64 and double
   // values from generated code to runtime.
@@ -1530,6 +1530,8 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
   uword user_tag_ = 0;
   UserTagPtr current_tag_;
   UserTagPtr default_tag_;
+  TimelineStream* const dart_stream_;
+  StreamInfo* const service_extension_stream_;
 
   // ---- End accessed from generated code. ----
 
@@ -1539,22 +1541,20 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
   // DART_PRECOMPILED_RUNTIME.
 
   uword true_end_ = 0;
-  std::atomic<TaskKind> task_kind_;
-  TimelineStream* const dart_stream_;
-  StreamInfo* const service_extension_stream_;
   mutable Monitor thread_lock_;
-  ApiLocalScope* api_reusable_scope_;
-  int32_t no_callback_scope_depth_;
+  ApiLocalScope* api_reusable_scope_ = nullptr;
+  std::atomic<TaskKind> task_kind_ = kUnknownTask;
+  int32_t no_callback_scope_depth_ = 0;
   int32_t force_growth_scope_depth_ = 0;
-  intptr_t no_reload_scope_depth_ = 0;
-  intptr_t allow_reload_scope_depth_ = 0;
-  intptr_t stopped_mutators_scope_depth_ = 0;
+  int32_t no_reload_scope_depth_ = 0;
+  int32_t allow_reload_scope_depth_ = 0;
+  int32_t stopped_mutators_scope_depth_ = 0;
 #if defined(DEBUG)
-  int32_t no_safepoint_scope_depth_;
+  int32_t no_safepoint_scope_depth_ = 0;
 #endif
-  VMHandles reusable_handles_;
-  int32_t stack_overflow_count_;
+  uint32_t stack_overflow_count_ = 0;
   uint32_t runtime_call_count_ = 0;
+  VMHandles reusable_handles_;
 
   // Deoptimization of stack frames.
   RuntimeCallDeoptAbility runtime_call_deopt_ability_ =
@@ -1563,8 +1563,8 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
 
   // Compiler state:
   CompilerState* compiler_state_ = nullptr;
-  HierarchyInfo* hierarchy_info_;
-  TypeUsageInfo* type_usage_info_;
+  HierarchyInfo* hierarchy_info_ = nullptr;
+  TypeUsageInfo* type_usage_info_ = nullptr;
   NoActiveIsolateScope* no_active_isolate_scope_ = nullptr;
 
   CompilerTimings* compiler_timings_ = nullptr;
@@ -1629,7 +1629,7 @@ class Thread : public ThreadState, public IntrusiveDListEntry<Thread> {
   }
 
 #if defined(USING_SAFE_STACK)
-  uword saved_safestack_limit_;
+  uword saved_safestack_limit_ = 0;
 #endif
 
   Thread* next_;  // Used to chain the thread structures in an isolate.