Version 2.18.0-246.0.dev
Merge commit '81d86a05b2d7159cf8c63acbcc752a86d49bbaad' into 'dev'
diff --git a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
index 5e18cbd..efd5fc2 100644
--- a/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
+++ b/pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart
@@ -8531,9 +8531,20 @@
if (comment.indexOf('```', /* start = */ 3) != -1) {
inCodeBlock = !inCodeBlock;
}
- if (!inCodeBlock && !comment.startsWith('/// ')) {
- count += parseCommentReferencesInText(
- token, /* start = */ 3, comment.length);
+ if (!inCodeBlock) {
+ bool parseReferences;
+ if (comment.startsWith('/// ')) {
+ String? previousComment = token.previous?.lexeme;
+ parseReferences = previousComment != null &&
+ previousComment.startsWith('///') &&
+ previousComment.trim().length > 3;
+ } else {
+ parseReferences = true;
+ }
+ if (parseReferences) {
+ count += parseCommentReferencesInText(
+ token, /* start = */ 3, comment.length);
+ }
}
}
token = token.next;
diff --git a/pkg/analyzer/test/generated/simple_parser_test.dart b/pkg/analyzer/test/generated/simple_parser_test.dart
index 6237d6f..64c7860 100644
--- a/pkg/analyzer/test/generated/simple_parser_test.dart
+++ b/pkg/analyzer/test/generated/simple_parser_test.dart
@@ -866,6 +866,20 @@
expect(nextToken.type, TokenType.EOF);
}
+ void test_parseCommentReferences_notCodeBlock_4spaces_afterText() {
+ List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// comment:", 0),
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// a[i] == b[i]", 0)
+ ];
+ createParser('');
+ List<CommentReference> references = parser.parseCommentReferences(tokens);
+ expectNotNullIfNoErrors(references);
+ assertNoErrors();
+ expect(references, hasLength(2));
+ }
+
void test_parseCommentReferences_singleLine() {
List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
DocumentationCommentToken(
@@ -891,6 +905,36 @@
expect(reference.offset, 35);
}
+ void test_parseCommentReferences_skipCodeBlock_4spaces_afterEmptyComment() {
+ List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
+ DocumentationCommentToken(TokenType.SINGLE_LINE_COMMENT, "///", 0),
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// a[i] == b[i]", 0)
+ ];
+ createParser('');
+ List<CommentReference> references = parser.parseCommentReferences(tokens);
+ expectNotNullIfNoErrors(references);
+ assertNoErrors();
+ expect(references, isEmpty);
+ }
+
+ void test_parseCommentReferences_skipCodeBlock_4spaces_afterEmptyLine() {
+ List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
+ DocumentationCommentToken(TokenType.SINGLE_LINE_COMMENT, "", 0),
+ DocumentationCommentToken(
+ TokenType.SINGLE_LINE_COMMENT, "/// a[i] == b[i]", 0)
+ ];
+ createParser('');
+ List<CommentReference> references = parser.parseCommentReferences(tokens);
+ expectNotNullIfNoErrors(references);
+ assertNoErrors();
+ expect(references, isEmpty);
+ }
+
void test_parseCommentReferences_skipCodeBlock_4spaces_block() {
List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
DocumentationCommentToken(TokenType.MULTI_LINE_COMMENT,
@@ -903,12 +947,10 @@
expect(references, isEmpty);
}
- void test_parseCommentReferences_skipCodeBlock_4spaces_lines() {
+ void test_parseCommentReferences_skipCodeBlock_4spaces_first() {
List<DocumentationCommentToken> tokens = <DocumentationCommentToken>[
DocumentationCommentToken(
- TokenType.SINGLE_LINE_COMMENT, "/// Code block:", 0),
- DocumentationCommentToken(
- TokenType.SINGLE_LINE_COMMENT, "/// a[i] == b[i]", 0)
+ TokenType.SINGLE_LINE_COMMENT, "/// a[i] == b[i]", 0)
];
createParser('');
List<CommentReference> references = parser.parseCommentReferences(tokens);
diff --git a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
index 7d5fb89..be7c3783 100644
--- a/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
+++ b/pkg/dev_compiler/lib/src/kernel/expression_compiler.dart
@@ -163,13 +163,17 @@
@override
void visitVariableDeclaration(VariableDeclaration decl) {
+ var name = decl.name;
// Collect locals and formals appearing before current breakpoint.
// Note that we include variables with no offset because the offset
// is not set in many cases in generated code, so omitting them would
// make expression evaluation fail in too many cases.
// Issue: https://github.com/dart-lang/sdk/issues/43966
- if (decl.fileOffset < 0 || decl.fileOffset < _offset) {
- _definitions[decl.name!] = decl.type;
+ //
+ // A null name signals that the variable was synthetically introduced by the
+ // compiler so they are skipped.
+ if ((decl.fileOffset < 0 || decl.fileOffset < _offset) && name != null) {
+ _definitions[name] = decl.type;
}
super.visitVariableDeclaration(decl);
}
diff --git a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
index 501a2de..1bf8c27 100644
--- a/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
+++ b/pkg/dev_compiler/test/expression_compiler/expression_compiler_e2e_shared.dart
@@ -356,6 +356,35 @@
expectedResult: 'true');
});
});
+
+ group('Synthetic variables', () {
+ var source = r'''
+ dynamic couldReturnNull() => null;
+
+ main() {
+ var i = couldReturnNull() ?? 10;
+ // Breakpoint: bp
+ print(i);
+ }
+ ''';
+
+ setUpAll(() async {
+ await driver.initSource(setup, source);
+ });
+
+ tearDownAll(() async {
+ await driver.cleanupTest();
+ });
+
+ test('do not cause a crash the expression compiler', () async {
+ // The null aware code in the test source causes the compiler to introduce
+ // a let statement that includes a synthetic variable declaration.
+ // That variable has no name and was causing a crash in the expression
+ // compiler https://github.com/dart-lang/sdk/issues/49373.
+ await driver.check(
+ breakpointId: 'bp', expression: 'true', expectedResult: 'true');
+ });
+ });
}
/// Shared tests that are valid in legacy (before 2.12) and are agnostic to
diff --git a/pkg/test_runner/lib/src/configuration.dart b/pkg/test_runner/lib/src/configuration.dart
index e9bf880..adf5008 100644
--- a/pkg/test_runner/lib/src/configuration.dart
+++ b/pkg/test_runner/lib/src/configuration.dart
@@ -333,16 +333,19 @@
_compilerConfiguration ??= CompilerConfiguration(this);
/// The set of [Feature]s supported by this configuration.
- late final Set<Feature> supportedFeatures = {
- // TODO(rnystrom): Define more features for things like "dart:io", separate
- // int/double representation, etc.
- if (NnbdMode.legacy == configuration.nnbdMode)
- Feature.nnbdLegacy
- else
- Feature.nnbd,
- if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
- if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
- };
+ late final Set<Feature> supportedFeatures = compiler == Compiler.dart2analyzer
+ // The analyzer should parse all tests.
+ ? {...Feature.all}
+ : {
+ // TODO(rnystrom): Define more features for things like "dart:io", separate
+ // int/double representation, etc.
+ if (NnbdMode.legacy == configuration.nnbdMode)
+ Feature.nnbdLegacy
+ else
+ Feature.nnbd,
+ if (NnbdMode.weak == configuration.nnbdMode) Feature.nnbdWeak,
+ if (NnbdMode.strong == configuration.nnbdMode) Feature.nnbdStrong,
+ };
/// Determines if this configuration has a compatible compiler and runtime
/// and other valid fields.
diff --git a/pkg/test_runner/lib/src/testing_servers.dart b/pkg/test_runner/lib/src/testing_servers.dart
index 6f86bd4..3617b84 100644
--- a/pkg/test_runner/lib/src/testing_servers.dart
+++ b/pkg/test_runner/lib/src/testing_servers.dart
@@ -48,7 +48,7 @@
/// directory (i.e. '$BuildDirectory/X').
/// /FOO/packages/PAZ/BAR: This will serve files from the packages listed in
/// the package spec .packages. Supports a package
-/// root or custom package spec, and uses [dart_dir]/.packages
+/// root or custom package spec, and uses $dart_dir/.packages
/// as the default. This will serve file lib/BAR from the package PAZ.
/// /ws: This will upgrade the connection to a WebSocket connection and echo
/// all data back to the client.
diff --git a/runtime/lib/timeline.cc b/runtime/lib/timeline.cc
index 7deea5c..0b3816c 100644
--- a/runtime/lib/timeline.cc
+++ b/runtime/lib/timeline.cc
@@ -24,11 +24,15 @@
return Bool::False().ptr();
}
-DEFINE_NATIVE_ENTRY(Timeline_getNextTaskId, 0, 0) {
+DEFINE_NATIVE_ENTRY(Timeline_getNextAsyncId, 0, 0) {
#if !defined(SUPPORT_TIMELINE)
return Integer::New(0);
#else
- return Integer::New(thread->GetNextTaskId());
+ TimelineEventRecorder* recorder = Timeline::recorder();
+ if (recorder == NULL) {
+ return Integer::New(0);
+ }
+ return Integer::New(recorder->GetNextAsyncId());
#endif
}
diff --git a/runtime/vm/bootstrap_natives.h b/runtime/vm/bootstrap_natives.h
index dbbaa95..6e82679 100644
--- a/runtime/vm/bootstrap_natives.h
+++ b/runtime/vm/bootstrap_natives.h
@@ -153,7 +153,7 @@
V(TypeError_throwNew, 4) \
V(Stopwatch_now, 0) \
V(Stopwatch_frequency, 0) \
- V(Timeline_getNextTaskId, 0) \
+ V(Timeline_getNextAsyncId, 0) \
V(Timeline_getTraceClock, 0) \
V(Timeline_isDartStreamEnabled, 0) \
V(Timeline_reportFlowEvent, 5) \
diff --git a/runtime/vm/compiler/asm_intrinsifier_arm.cc b/runtime/vm/compiler/asm_intrinsifier_arm.cc
index c061a93..5bd61d7 100644
--- a/runtime/vm/compiler/asm_intrinsifier_arm.cc
+++ b/runtime/vm/compiler/asm_intrinsifier_arm.cc
@@ -1900,23 +1900,6 @@
#endif
}
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
- Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
- __ LoadImmediate(R0, target::ToRawSmi(0));
- __ Ret();
-#else
- __ ldr(R1, Address(THR, target::Thread::next_task_id_offset()));
- __ ldr(R2, Address(THR, target::Thread::next_task_id_offset() + 4));
- __ SmiTag(R0, R1); // Ignore loss of precision.
- __ adds(R1, R1, Operand(1));
- __ adcs(R2, R2, Operand(0));
- __ str(R1, Address(THR, target::Thread::next_task_id_offset()));
- __ str(R2, Address(THR, target::Thread::next_task_id_offset() + 4));
- __ Ret();
-#endif
-}
-
#undef __
} // namespace compiler
diff --git a/runtime/vm/compiler/asm_intrinsifier_arm64.cc b/runtime/vm/compiler/asm_intrinsifier_arm64.cc
index 33e850c..2cd0d6e 100644
--- a/runtime/vm/compiler/asm_intrinsifier_arm64.cc
+++ b/runtime/vm/compiler/asm_intrinsifier_arm64.cc
@@ -2146,20 +2146,6 @@
#endif
}
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
- Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
- __ LoadImmediate(R0, target::ToRawSmi(0));
- __ ret();
-#else
- __ ldr(R0, Address(THR, target::Thread::next_task_id_offset()));
- __ add(R1, R0, Operand(1));
- __ str(R1, Address(THR, target::Thread::next_task_id_offset()));
- __ SmiTag(R0); // Ignore loss of precision.
- __ ret();
-#endif
-}
-
#undef __
} // namespace compiler
diff --git a/runtime/vm/compiler/asm_intrinsifier_ia32.cc b/runtime/vm/compiler/asm_intrinsifier_ia32.cc
index bc39517..538ce05 100644
--- a/runtime/vm/compiler/asm_intrinsifier_ia32.cc
+++ b/runtime/vm/compiler/asm_intrinsifier_ia32.cc
@@ -1937,24 +1937,6 @@
#endif
}
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
- Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
- __ LoadImmediate(EAX, target::ToRawSmi(0));
- __ ret();
-#else
- __ movl(EBX, Address(THR, target::Thread::next_task_id_offset()));
- __ movl(ECX, Address(THR, target::Thread::next_task_id_offset() + 4));
- __ movl(EAX, EBX);
- __ SmiTag(EAX); // Ignore loss of precision.
- __ addl(EBX, Immediate(1));
- __ adcl(ECX, Immediate(0));
- __ movl(Address(THR, target::Thread::next_task_id_offset()), EBX);
- __ movl(Address(THR, target::Thread::next_task_id_offset() + 4), ECX);
- __ ret();
-#endif
-}
-
#undef __
} // namespace compiler
diff --git a/runtime/vm/compiler/asm_intrinsifier_riscv.cc b/runtime/vm/compiler/asm_intrinsifier_riscv.cc
index e6bdde0..a1b94de 100644
--- a/runtime/vm/compiler/asm_intrinsifier_riscv.cc
+++ b/runtime/vm/compiler/asm_intrinsifier_riscv.cc
@@ -2160,30 +2160,6 @@
#endif
}
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
- Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
- __ LoadImmediate(A0, target::ToRawSmi(0));
- __ ret();
-#elif XLEN == 64
- __ ld(A0, Address(THR, target::Thread::next_task_id_offset()));
- __ addi(A1, A0, 1);
- __ sd(A1, Address(THR, target::Thread::next_task_id_offset()));
- __ SmiTag(A0); // Ignore loss of precision.
- __ ret();
-#else
- __ lw(T0, Address(THR, target::Thread::next_task_id_offset()));
- __ lw(T1, Address(THR, target::Thread::next_task_id_offset() + 4));
- __ SmiTag(A0, T0); // Ignore loss of precision.
- __ addi(T2, T0, 1);
- __ sltu(T3, T2, T0); // Carry.
- __ add(T1, T1, T3);
- __ sw(T2, Address(THR, target::Thread::next_task_id_offset()));
- __ sw(T1, Address(THR, target::Thread::next_task_id_offset() + 4));
- __ ret();
-#endif
-}
-
#undef __
} // namespace compiler
diff --git a/runtime/vm/compiler/asm_intrinsifier_x64.cc b/runtime/vm/compiler/asm_intrinsifier_x64.cc
index ad0d3a8..9ff337a 100644
--- a/runtime/vm/compiler/asm_intrinsifier_x64.cc
+++ b/runtime/vm/compiler/asm_intrinsifier_x64.cc
@@ -2034,21 +2034,6 @@
#endif
}
-void AsmIntrinsifier::Timeline_getNextTaskId(Assembler* assembler,
- Label* normal_ir_body) {
-#if !defined(SUPPORT_TIMELINE)
- __ xorq(RAX, RAX); // Return Smi 0.
- __ ret();
-#else
- __ movq(RAX, Address(THR, target::Thread::next_task_id_offset()));
- __ movq(RBX, RAX);
- __ incq(RBX);
- __ movq(Address(THR, target::Thread::next_task_id_offset()), RBX);
- __ SmiTag(RAX); // Ignore loss of precision.
- __ ret();
-#endif
-}
-
#undef __
} // namespace compiler
diff --git a/runtime/vm/compiler/recognized_methods_list.h b/runtime/vm/compiler/recognized_methods_list.h
index 36d758a..010e653 100644
--- a/runtime/vm/compiler/recognized_methods_list.h
+++ b/runtime/vm/compiler/recognized_methods_list.h
@@ -438,7 +438,6 @@
V(::, _getDefaultTag, UserTag_defaultTag, 0x6c19c8a5) \
V(::, _getCurrentTag, Profiler_getCurrentTag, 0x70ead08e) \
V(::, _isDartStreamEnabled, Timeline_isDartStreamEnabled, 0xc97aafb3) \
- V(::, _getNextTaskId, Timeline_getNextTaskId, 0x5b2b0b0b) \
#define INTERNAL_LIB_INTRINSIC_LIST(V) \
V(::, allocateOneByteString, AllocateOneByteString, 0x9e7745d5) \
diff --git a/runtime/vm/compiler/runtime_api.h b/runtime/vm/compiler/runtime_api.h
index ecbf16a..fb828f0 100644
--- a/runtime/vm/compiler/runtime_api.h
+++ b/runtime/vm/compiler/runtime_api.h
@@ -1250,7 +1250,6 @@
THREAD_XMM_CONSTANT_LIST(DECLARE_CONSTANT_OFFSET_GETTER)
#undef DECLARE_CONSTANT_OFFSET_GETTER
- static word next_task_id_offset();
static word random_offset();
static word suspend_state_init_async_entry_point_offset();
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index fea08a0..fe183da 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -322,13 +322,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 912;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 904;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 880;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 916;
+ Thread_service_extension_stream_offset = 908;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -372,7 +372,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
872;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 920;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 912;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -486,11 +486,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 864;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 868;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 888;
-static constexpr dart::compiler::target::word Thread_random_offset = 896;
+static constexpr dart::compiler::target::word Thread_random_offset = 888;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 904;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 896;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -991,13 +990,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1800;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1792;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1760;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1808;
+ Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -1042,7 +1041,7 @@
1744;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -1157,11 +1156,10 @@
1728;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1768;
-static constexpr dart::compiler::target::word Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1784;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1776;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -1661,13 +1659,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 880;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 872;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 848;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 884;
+ Thread_service_extension_stream_offset = 876;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -1711,7 +1709,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
840;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 888;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 880;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -1825,11 +1823,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 832;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 836;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 856;
-static constexpr dart::compiler::target::word Thread_random_offset = 864;
+static constexpr dart::compiler::target::word Thread_random_offset = 856;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 872;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 864;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -2327,13 +2324,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1864;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1824;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1872;
+ Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -2378,7 +2375,7 @@
1808;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -2493,11 +2490,10 @@
1792;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1832;
-static constexpr dart::compiler::target::word Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1848;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -3000,13 +2996,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1800;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1792;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1760;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1808;
+ Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -3051,7 +3047,7 @@
1744;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -3166,11 +3162,10 @@
1728;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1768;
-static constexpr dart::compiler::target::word Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1784;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1776;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -3672,13 +3667,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1864;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1824;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1872;
+ Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -3723,7 +3718,7 @@
1808;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -3838,11 +3833,10 @@
1792;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1832;
-static constexpr dart::compiler::target::word Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1848;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -4343,13 +4337,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 952;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 944;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 920;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 956;
+ Thread_service_extension_stream_offset = 948;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -4393,7 +4387,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
912;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 960;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 952;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -4507,11 +4501,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 904;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 908;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 928;
-static constexpr dart::compiler::target::word Thread_random_offset = 936;
+static constexpr dart::compiler::target::word Thread_random_offset = 928;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 944;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 936;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -5014,13 +5007,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1816;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1864;
+ Thread_service_extension_stream_offset = 1856;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -5065,7 +5058,7 @@
1800;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1872;
+ 1864;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -5180,11 +5173,10 @@
1784;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -5679,13 +5671,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 912;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 904;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 880;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 916;
+ Thread_service_extension_stream_offset = 908;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -5729,7 +5721,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
872;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 920;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 912;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -5843,11 +5835,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 864;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 868;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 888;
-static constexpr dart::compiler::target::word Thread_random_offset = 896;
+static constexpr dart::compiler::target::word Thread_random_offset = 888;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 904;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 896;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -6340,13 +6331,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1800;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1792;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1760;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1808;
+ Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -6391,7 +6382,7 @@
1744;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -6506,11 +6497,10 @@
1728;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1768;
-static constexpr dart::compiler::target::word Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1784;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1776;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -7002,13 +6992,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 880;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 872;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 848;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 884;
+ Thread_service_extension_stream_offset = 876;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -7052,7 +7042,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
840;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 888;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 880;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -7166,11 +7156,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 832;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 836;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 856;
-static constexpr dart::compiler::target::word Thread_random_offset = 864;
+static constexpr dart::compiler::target::word Thread_random_offset = 856;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 872;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 864;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -7660,13 +7649,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1864;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1824;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1872;
+ Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -7711,7 +7700,7 @@
1808;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -7826,11 +7815,10 @@
1792;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1832;
-static constexpr dart::compiler::target::word Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1848;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -8325,13 +8313,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1800;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1792;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1760;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1808;
+ Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -8376,7 +8364,7 @@
1744;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -8491,11 +8479,10 @@
1728;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1768;
-static constexpr dart::compiler::target::word Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1784;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1776;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -8989,13 +8976,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1864;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1824;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1872;
+ Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -9040,7 +9027,7 @@
1808;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -9155,11 +9142,10 @@
1792;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1832;
-static constexpr dart::compiler::target::word Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1848;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -9652,13 +9638,13 @@
Thread_call_to_runtime_entry_point_offset = 300;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 140;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 952;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 944;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 920;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 956;
+ Thread_service_extension_stream_offset = 948;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 252;
@@ -9702,7 +9688,7 @@
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
912;
static constexpr dart::compiler::target::word Thread_isolate_offset = 40;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 960;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 952;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
64;
static constexpr dart::compiler::target::word
@@ -9816,11 +9802,10 @@
static constexpr dart::compiler::target::word Thread_callback_code_offset = 904;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 908;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 928;
-static constexpr dart::compiler::target::word Thread_random_offset = 936;
+static constexpr dart::compiler::target::word Thread_random_offset = 928;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 352;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 944;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 936;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -10315,13 +10300,13 @@
Thread_call_to_runtime_entry_point_offset = 576;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 256;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1856;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1848;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
Thread_double_truncate_round_supported_offset = 1816;
static constexpr dart::compiler::target::word
- Thread_service_extension_stream_offset = 1864;
+ Thread_service_extension_stream_offset = 1856;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word Thread_optimize_stub_offset = 480;
@@ -10366,7 +10351,7 @@
1800;
static constexpr dart::compiler::target::word Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1872;
+ 1864;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
128;
static constexpr dart::compiler::target::word
@@ -10481,11 +10466,10 @@
1784;
static constexpr dart::compiler::target::word
Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word Thread_next_task_id_offset = 1824;
-static constexpr dart::compiler::target::word Thread_random_offset = 1832;
+static constexpr dart::compiler::target::word Thread_random_offset = 1824;
static constexpr dart::compiler::target::word
Thread_jump_to_frame_entry_point_offset = 680;
-static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1840;
+static constexpr dart::compiler::target::word Thread_tsan_utils_offset = 1832;
static constexpr dart::compiler::target::word TsanUtils_setjmp_function_offset =
0;
static constexpr dart::compiler::target::word TsanUtils_setjmp_buffer_offset =
@@ -11018,13 +11002,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 140;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 912;
+ 904;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 880;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 916;
+ AOT_Thread_service_extension_stream_offset = 908;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -11070,7 +11054,7 @@
AOT_Thread_exit_through_ffi_offset = 872;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 920;
+ 912;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 64;
static constexpr dart::compiler::target::word
@@ -11190,13 +11174,11 @@
864;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 868;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 888;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 896;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 888;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 352;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 904;
+ 896;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -11759,13 +11741,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1800;
+ 1792;
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 = 1760;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1808;
+ AOT_Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -11811,7 +11793,7 @@
AOT_Thread_exit_through_ffi_offset = 1744;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -11932,13 +11914,11 @@
1728;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1768;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1784;
+ 1776;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -12506,13 +12486,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1864;
+ 1856;
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 = 1824;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1872;
+ AOT_Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -12558,7 +12538,7 @@
AOT_Thread_exit_through_ffi_offset = 1808;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -12679,13 +12659,11 @@
1792;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1832;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1848;
+ 1840;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -13250,13 +13228,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1800;
+ 1792;
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 = 1760;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1808;
+ AOT_Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -13302,7 +13280,7 @@
AOT_Thread_exit_through_ffi_offset = 1744;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -13423,13 +13401,11 @@
1728;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1768;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1784;
+ 1776;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -13993,13 +13969,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1864;
+ 1856;
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 = 1824;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1872;
+ AOT_Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -14045,7 +14021,7 @@
AOT_Thread_exit_through_ffi_offset = 1808;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -14166,13 +14142,11 @@
1792;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1832;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1848;
+ 1840;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -14737,13 +14711,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 140;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 952;
+ 944;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 920;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 956;
+ AOT_Thread_service_extension_stream_offset = 948;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -14789,7 +14763,7 @@
AOT_Thread_exit_through_ffi_offset = 912;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 960;
+ 952;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 64;
static constexpr dart::compiler::target::word
@@ -14909,13 +14883,11 @@
904;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 908;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 928;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 936;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 928;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 352;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 944;
+ 936;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -15480,13 +15452,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1856;
+ 1848;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 1816;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1864;
+ AOT_Thread_service_extension_stream_offset = 1856;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -15532,7 +15504,7 @@
AOT_Thread_exit_through_ffi_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1872;
+ 1864;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -15653,13 +15625,11 @@
1784;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1840;
+ 1832;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -16217,13 +16187,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 140;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 912;
+ 904;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 880;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 916;
+ AOT_Thread_service_extension_stream_offset = 908;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -16269,7 +16239,7 @@
AOT_Thread_exit_through_ffi_offset = 872;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 920;
+ 912;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 64;
static constexpr dart::compiler::target::word
@@ -16389,13 +16359,11 @@
864;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 868;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 888;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 896;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 888;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 352;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 904;
+ 896;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -16949,13 +16917,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1800;
+ 1792;
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 = 1760;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1808;
+ AOT_Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -17001,7 +16969,7 @@
AOT_Thread_exit_through_ffi_offset = 1744;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -17122,13 +17090,11 @@
1728;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1768;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1784;
+ 1776;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -17687,13 +17653,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1864;
+ 1856;
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 = 1824;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1872;
+ AOT_Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -17739,7 +17705,7 @@
AOT_Thread_exit_through_ffi_offset = 1808;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -17860,13 +17826,11 @@
1792;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1832;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1848;
+ 1840;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -18422,13 +18386,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1800;
+ 1792;
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 = 1760;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1808;
+ AOT_Thread_service_extension_stream_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -18474,7 +18438,7 @@
AOT_Thread_exit_through_ffi_offset = 1744;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1816;
+ 1808;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -18595,13 +18559,11 @@
1728;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1736;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1768;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1776;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1768;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1784;
+ 1776;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -19156,13 +19118,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1864;
+ 1856;
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 = 1824;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1872;
+ AOT_Thread_service_extension_stream_offset = 1864;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19208,7 +19170,7 @@
AOT_Thread_exit_through_ffi_offset = 1808;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1880;
+ 1872;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -19329,13 +19291,11 @@
1792;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1800;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1832;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1840;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1848;
+ 1840;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -19891,13 +19851,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 140;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 952;
+ 944;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 44;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 920;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 956;
+ AOT_Thread_service_extension_stream_offset = 948;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
340;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -19943,7 +19903,7 @@
AOT_Thread_exit_through_ffi_offset = 912;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 960;
+ 952;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 64;
static constexpr dart::compiler::target::word
@@ -20063,13 +20023,11 @@
904;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 908;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 928;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 936;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 928;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 352;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 944;
+ 936;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
@@ -20625,13 +20583,13 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 256;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1856;
+ 1848;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 88;
static constexpr dart::compiler::target::word
AOT_Thread_double_truncate_round_supported_offset = 1816;
static constexpr dart::compiler::target::word
- AOT_Thread_service_extension_stream_offset = 1864;
+ AOT_Thread_service_extension_stream_offset = 1856;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
656;
static constexpr dart::compiler::target::word AOT_Thread_optimize_stub_offset =
@@ -20677,7 +20635,7 @@
AOT_Thread_exit_through_ffi_offset = 1800;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1872;
+ 1864;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 128;
static constexpr dart::compiler::target::word
@@ -20798,13 +20756,11 @@
1784;
static constexpr dart::compiler::target::word
AOT_Thread_callback_stack_return_offset = 1792;
-static constexpr dart::compiler::target::word AOT_Thread_next_task_id_offset =
- 1824;
-static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1832;
+static constexpr dart::compiler::target::word AOT_Thread_random_offset = 1824;
static constexpr dart::compiler::target::word
AOT_Thread_jump_to_frame_entry_point_offset = 680;
static constexpr dart::compiler::target::word AOT_Thread_tsan_utils_offset =
- 1840;
+ 1832;
static constexpr dart::compiler::target::word
AOT_TsanUtils_setjmp_function_offset = 0;
static constexpr dart::compiler::target::word
diff --git a/runtime/vm/compiler/runtime_offsets_list.h b/runtime/vm/compiler/runtime_offsets_list.h
index 7450b1f..4b3ba6c 100644
--- a/runtime/vm/compiler/runtime_offsets_list.h
+++ b/runtime/vm/compiler/runtime_offsets_list.h
@@ -321,7 +321,6 @@
FIELD(Thread, heap_base_offset) \
FIELD(Thread, callback_code_offset) \
FIELD(Thread, callback_stack_return_offset) \
- FIELD(Thread, next_task_id_offset) \
FIELD(Thread, random_offset) \
FIELD(Thread, jump_to_frame_entry_point_offset) \
FIELD(Thread, tsan_utils_offset) \
diff --git a/runtime/vm/dart.cc b/runtime/vm/dart.cc
index a12f853..9d66e4d 100644
--- a/runtime/vm/dart.cc
+++ b/runtime/vm/dart.cc
@@ -307,7 +307,6 @@
#endif
OSThread::Init();
- Random::Init();
Zone::Init();
#if defined(SUPPORT_TIMELINE)
Timeline::Init();
@@ -780,7 +779,6 @@
Timeline::Cleanup();
#endif
Zone::Cleanup();
- Random::Cleanup();
// Delete the current thread's TLS and set it's TLS to null.
// If it is the last thread then the destructor would call
// OSThread::Cleanup.
diff --git a/runtime/vm/dart_api_impl.cc b/runtime/vm/dart_api_impl.cc
index 1522efb..adac74b 100644
--- a/runtime/vm/dart_api_impl.cc
+++ b/runtime/vm/dart_api_impl.cc
@@ -6359,10 +6359,10 @@
if (event != NULL) {
switch (type) {
case Dart_Timeline_Event_Begin:
- event->Begin(label, timestamp0, timestamp1_or_async_id);
+ event->Begin(label, timestamp0);
break;
case Dart_Timeline_Event_End:
- event->End(label, timestamp0, timestamp1_or_async_id);
+ event->End(label, timestamp0);
break;
case Dart_Timeline_Event_Instant:
event->Instant(label, timestamp0);
diff --git a/runtime/vm/dart_api_impl_test.cc b/runtime/vm/dart_api_impl_test.cc
index 98a84ec..0e7442a 100644
--- a/runtime/vm/dart_api_impl_test.cc
+++ b/runtime/vm/dart_api_impl_test.cc
@@ -9500,7 +9500,8 @@
JSONArray jstream(&obj, "available");
Timeline::PrintFlagsToJSONArray(&jstream);
const char* js_str = js.ToCString();
-#define TIMELINE_STREAM_CHECK(name, ...) EXPECT_SUBSTRING(#name, js_str);
+#define TIMELINE_STREAM_CHECK(name, fuchsia_name) \
+ EXPECT_SUBSTRING(#name, js_str);
TIMELINE_STREAM_LIST(TIMELINE_STREAM_CHECK)
#undef TIMELINE_STREAM_CHECK
}
diff --git a/runtime/vm/random.cc b/runtime/vm/random.cc
index e14ab64..2cc2335 100644
--- a/runtime/vm/random.cc
+++ b/runtime/vm/random.cc
@@ -75,26 +75,4 @@
return static_cast<uint32_t>(NextState() & MASK_32);
}
-static Random* global_random = nullptr;
-static Mutex* global_random_mutex = nullptr;
-
-void Random::Init() {
- ASSERT(global_random_mutex == nullptr);
- global_random_mutex = new Mutex(NOT_IN_PRODUCT("global_random_mutex"));
- ASSERT(global_random == nullptr);
- global_random = new Random();
-}
-
-void Random::Cleanup() {
- delete global_random_mutex;
- global_random_mutex = nullptr;
- delete global_random;
- global_random = nullptr;
-}
-
-uint64_t Random::GlobalNextUInt64() {
- MutexLocker locker(global_random_mutex);
- return global_random->NextUInt64();
-}
-
} // namespace dart
diff --git a/runtime/vm/random.h b/runtime/vm/random.h
index 077089b..4af724b 100644
--- a/runtime/vm/random.h
+++ b/runtime/vm/random.h
@@ -28,10 +28,6 @@
static_cast<uint64_t>(NextUInt32());
}
- static uint64_t GlobalNextUInt64();
- static void Init();
- static void Cleanup();
-
private:
uint64_t NextState();
void Initialize(uint64_t seed);
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index af7a225..85cf403 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -296,7 +296,7 @@
#if defined(SUPPORT_TIMELINE)
static const char* const timeline_streams_enum_names[] = {
"all",
-#define DEFINE_NAME(name, ...) #name,
+#define DEFINE_NAME(name, unused) #name,
TIMELINE_STREAM_LIST(DEFINE_NAME)
#undef DEFINE_NAME
NULL};
@@ -328,7 +328,7 @@
return false;
}
-#define SET_ENABLE_STREAM(name, ...) \
+#define SET_ENABLE_STREAM(name, unused) \
Timeline::SetStream##name##Enabled(HasStream(streams, #name));
TIMELINE_STREAM_LIST(SET_ENABLE_STREAM);
#undef SET_ENABLE_STREAM
diff --git a/runtime/vm/thread.cc b/runtime/vm/thread.cc
index 1bc5236..9689781 100644
--- a/runtime/vm/thread.cc
+++ b/runtime/vm/thread.cc
@@ -143,12 +143,6 @@
if (!is_vm_isolate) {
InitVMConstants();
}
-
-#if defined(DART_HOST_OS_FUCHSIA)
- next_task_id_ = trace_generate_nonce();
-#else
- next_task_id_ = Random::GlobalNextUInt64();
-#endif
}
static const double double_nan_constant = NAN;
diff --git a/runtime/vm/thread.h b/runtime/vm/thread.h
index ecfeec7..5f9660d 100644
--- a/runtime/vm/thread.h
+++ b/runtime/vm/thread.h
@@ -1096,10 +1096,6 @@
void InitVMConstants();
- int64_t GetNextTaskId() { return next_task_id_++; }
- static intptr_t next_task_id_offset() {
- return OFFSET_OF(Thread, next_task_id_);
- }
Random* random() { return &thread_random_; }
static intptr_t random_offset() { return OFFSET_OF(Thread, thread_random_); }
@@ -1213,7 +1209,6 @@
uword exit_through_ffi_ = 0;
ApiLocalScope* api_top_scope_;
uint8_t double_truncate_round_supported_;
- ALIGN8 int64_t next_task_id_;
ALIGN8 Random thread_random_;
TsanUtils* tsan_utils_ = nullptr;
diff --git a/runtime/vm/timeline.cc b/runtime/vm/timeline.cc
index f5140c6..086b86b 100644
--- a/runtime/vm/timeline.cc
+++ b/runtime/vm/timeline.cc
@@ -202,7 +202,7 @@
ASSERT(recorder_ != NULL);
enabled_streams_ = GetEnabledByDefaultTimelineStreams();
// Global overrides.
-#define TIMELINE_STREAM_FLAG_DEFAULT(name, ...) \
+#define TIMELINE_STREAM_FLAG_DEFAULT(name, fuchsia_name) \
stream_##name##_.set_enabled(HasStream(enabled_streams_, #name));
TIMELINE_STREAM_LIST(TIMELINE_STREAM_FLAG_DEFAULT)
#undef TIMELINE_STREAM_FLAG_DEFAULT
@@ -218,7 +218,7 @@
#endif
// Disable global streams.
-#define TIMELINE_STREAM_DISABLE(name, ...) \
+#define TIMELINE_STREAM_DISABLE(name, fuchsia_name) \
Timeline::stream_##name##_.set_enabled(false);
TIMELINE_STREAM_LIST(TIMELINE_STREAM_DISABLE)
#undef TIMELINE_STREAM_DISABLE
@@ -265,7 +265,7 @@
#ifndef PRODUCT
void Timeline::PrintFlagsToJSONArray(JSONArray* arr) {
-#define ADD_RECORDED_STREAM_NAME(name, ...) \
+#define ADD_RECORDED_STREAM_NAME(name, fuchsia_name) \
if (stream_##name##_.enabled()) { \
arr->AddValue(#name); \
}
@@ -285,13 +285,13 @@
}
{
JSONArray availableStreams(&obj, "availableStreams");
-#define ADD_STREAM_NAME(name, ...) availableStreams.AddValue(#name);
+#define ADD_STREAM_NAME(name, fuchsia_name) availableStreams.AddValue(#name);
TIMELINE_STREAM_LIST(ADD_STREAM_NAME);
#undef ADD_STREAM_NAME
}
{
JSONArray recordedStreams(&obj, "recordedStreams");
-#define ADD_RECORDED_STREAM_NAME(name, ...) \
+#define ADD_RECORDED_STREAM_NAME(name, fuchsia_name) \
if (stream_##name##_.enabled()) { \
recordedStreams.AddValue(#name); \
}
@@ -402,9 +402,8 @@
MallocGrowableArray<char*>* Timeline::enabled_streams_ = NULL;
bool Timeline::recorder_discards_clock_values_ = false;
-#define TIMELINE_STREAM_DEFINE(name, fuchsia_name, static_labels) \
- TimelineStream Timeline::stream_##name##_(#name, fuchsia_name, \
- static_labels, false);
+#define TIMELINE_STREAM_DEFINE(name, fuchsia_name) \
+ TimelineStream Timeline::stream_##name##_(#name, fuchsia_name, false);
TIMELINE_STREAM_LIST(TIMELINE_STREAM_DEFINE)
#undef TIMELINE_STREAM_DEFINE
@@ -499,25 +498,19 @@
}
void TimelineEvent::Begin(const char* label,
- int64_t id,
int64_t micros,
int64_t thread_micros) {
Init(kBegin, label);
set_timestamp0(micros);
set_thread_timestamp0(thread_micros);
- // Overload timestamp1_ with the async_id.
- set_timestamp1(id);
}
void TimelineEvent::End(const char* label,
- int64_t id,
int64_t micros,
int64_t thread_micros) {
Init(kEnd, label);
set_timestamp0(micros);
set_thread_timestamp0(thread_micros);
- // Overload timestamp1_ with the async_id.
- set_timestamp1(id);
}
void TimelineEvent::Counter(const char* label, int64_t micros) {
@@ -662,31 +655,31 @@
} break;
case kAsyncBegin: {
writer->PrintProperty("ph", "b");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kAsyncInstant: {
writer->PrintProperty("ph", "n");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kAsyncEnd: {
writer->PrintProperty("ph", "e");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kCounter: {
writer->PrintProperty("ph", "C");
} break;
case kFlowBegin: {
writer->PrintProperty("ph", "s");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kFlowStep: {
writer->PrintProperty("ph", "t");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kFlowEnd: {
writer->PrintProperty("ph", "f");
writer->PrintProperty("bp", "e");
- writer->PrintfProperty("id", "%" Px64 "", Id());
+ writer->PrintfProperty("id", "%" Px64 "", AsyncId());
} break;
case kMetadata: {
writer->PrintProperty("ph", "M");
@@ -735,6 +728,14 @@
writer->CloseObject();
}
+int64_t TimelineEvent::TimeOrigin() const {
+ return timestamp0_;
+}
+
+int64_t TimelineEvent::AsyncId() const {
+ return timestamp1_;
+}
+
int64_t TimelineEvent::LowTime() const {
return timestamp0_;
}
@@ -775,7 +776,6 @@
TimelineStream::TimelineStream(const char* name,
const char* fuchsia_name,
- bool has_static_labels,
bool enabled)
: name_(name),
fuchsia_name_(fuchsia_name),
@@ -788,7 +788,6 @@
#if defined(DART_HOST_OS_MACOS)
if (__builtin_available(iOS 12.0, macOS 10.14, *)) {
macos_log_ = os_log_create("Dart", name);
- has_static_labels_ = has_static_labels;
}
#endif
}
@@ -842,13 +841,6 @@
return;
}
enabled_ = true;
- Thread* thread = static_cast<Thread*>(this->thread());
- if (thread != NULL) {
- id_ = thread->GetNextTaskId();
- } else {
- static RelaxedAtomic<int64_t> next_bootstrap_task_id = {0};
- id_ = next_bootstrap_task_id.fetch_add(1);
- }
}
void TimelineEventScope::SetNumArguments(intptr_t length) {
@@ -927,7 +919,7 @@
}
ASSERT(event != NULL);
// Emit a begin event.
- event->Begin(label(), id());
+ event->Begin(label());
event->Complete();
}
@@ -943,7 +935,7 @@
}
ASSERT(event != NULL);
// Emit an end event.
- event->End(label(), id());
+ event->End(label());
StealArguments(event);
event->Complete();
}
@@ -966,7 +958,7 @@
isolate_id_(isolate_id) {}
TimelineEventRecorder::TimelineEventRecorder()
- : time_low_micros_(0), time_high_micros_(0) {}
+ : async_id_(0), time_low_micros_(0), time_high_micros_(0) {}
#ifndef PRODUCT
void TimelineEventRecorder::PrintJSONMeta(JSONArray* events) const {
@@ -1128,6 +1120,16 @@
}
#endif
+int64_t TimelineEventRecorder::GetNextAsyncId() {
+ // TODO(johnmccutchan): Gracefully handle wrap around.
+#if defined(DART_HOST_OS_FUCHSIA)
+ return trace_generate_nonce();
+#else
+ uint32_t next = static_cast<uint32_t>(async_id_.fetch_add(1u));
+ return static_cast<int64_t>(next);
+#endif
+}
+
void TimelineEventRecorder::FinishBlock(TimelineEventBlock* block) {
if (block == NULL) {
return;
@@ -1704,10 +1706,10 @@
event->AsyncEnd(name, id, start);
break;
case 'B':
- event->Begin(name, id, start, start_cpu);
+ event->Begin(name, start, start_cpu);
break;
case 'E':
- event->End(name, id, start, start_cpu);
+ event->End(name, start, start_cpu);
break;
default:
UNREACHABLE();
diff --git a/runtime/vm/timeline.h b/runtime/vm/timeline.h
index 8071185..759e09f 100644
--- a/runtime/vm/timeline.h
+++ b/runtime/vm/timeline.h
@@ -57,26 +57,23 @@
#define STARTUP_RECORDER_NAME "Startup"
#define SYSTRACE_RECORDER_NAME "Systrace"
-// (name, fuchsia_name, has_static_labels).
+// (name, fuchsia_name).
#define TIMELINE_STREAM_LIST(V) \
- V(API, "dart:api", true) \
- V(Compiler, "dart:compiler", true) \
- V(CompilerVerbose, "dart:compiler.verbose", true) \
- V(Dart, "dart:dart", false) \
- V(Debugger, "dart:debugger", true) \
- V(Embedder, "dart:embedder", false) \
- V(GC, "dart:gc", true) \
- V(Isolate, "dart:isolate", true) \
- V(VM, "dart:vm", true)
+ V(API, "dart:api") \
+ V(Compiler, "dart:compiler") \
+ V(CompilerVerbose, "dart:compiler.verbose") \
+ V(Dart, "dart:dart") \
+ V(Debugger, "dart:debugger") \
+ V(Embedder, "dart:embedder") \
+ V(GC, "dart:gc") \
+ V(Isolate, "dart:isolate") \
+ V(VM, "dart:vm")
// A stream of timeline events. A stream has a name and can be enabled or
// disabled (globally and per isolate).
class TimelineStream {
public:
- TimelineStream(const char* name,
- const char* fuchsia_name,
- bool static_labels,
- bool enabled);
+ TimelineStream(const char* name, const char* fuchsia_name, bool enabled);
const char* name() const { return name_; }
const char* fuchsia_name() const { return fuchsia_name_; }
@@ -108,8 +105,7 @@
#if defined(DART_HOST_OS_FUCHSIA)
trace_site_t* trace_site() { return &trace_site_; }
#elif defined(DART_HOST_OS_MACOS)
- os_log_t macos_log() const { return macos_log_; }
- bool has_static_labels() const { return has_static_labels_; }
+ os_log_t macos_log() { return macos_log_; }
#endif
private:
@@ -124,7 +120,6 @@
trace_site_t trace_site_ = {};
#elif defined(DART_HOST_OS_MACOS)
os_log_t macos_log_ = {};
- bool has_static_labels_ = false;
#endif
};
@@ -201,12 +196,12 @@
static void PrintFlagsToJSONArray(JSONArray* arr);
#endif
-#define TIMELINE_STREAM_ACCESSOR(name, ...) \
+#define TIMELINE_STREAM_ACCESSOR(name, fuchsia_name) \
static TimelineStream* Get##name##Stream() { return &stream_##name##_; }
TIMELINE_STREAM_LIST(TIMELINE_STREAM_ACCESSOR)
#undef TIMELINE_STREAM_ACCESSOR
-#define TIMELINE_STREAM_FLAGS(name, ...) \
+#define TIMELINE_STREAM_FLAGS(name, fuchsia_name) \
static void SetStream##name##Enabled(bool enabled) { \
stream_##name##_.set_enabled(enabled); \
}
@@ -221,7 +216,7 @@
static MallocGrowableArray<char*>* enabled_streams_;
static bool recorder_discards_clock_values_;
-#define TIMELINE_STREAM_DECLARE(name, ...) \
+#define TIMELINE_STREAM_DECLARE(name, fuchsia_name) \
static TimelineStream stream_##name##_;
TIMELINE_STREAM_LIST(TIMELINE_STREAM_DECLARE)
#undef TIMELINE_STREAM_DECLARE
@@ -339,12 +334,10 @@
void Begin(
const char* label,
- int64_t id,
int64_t micros = OS::GetCurrentMonotonicMicrosForTimeline(),
int64_t thread_micros = OS::GetCurrentThreadCPUMicrosForTimeline());
void End(const char* label,
- int64_t id,
int64_t micros = OS::GetCurrentMonotonicMicrosForTimeline(),
int64_t thread_micros = OS::GetCurrentThreadCPUMicrosForTimeline());
@@ -397,11 +390,8 @@
int64_t ThreadCPUTimeDuration() const;
int64_t ThreadCPUTimeOrigin() const;
- int64_t TimeOrigin() const { return timestamp0_; }
- int64_t Id() const {
- ASSERT(event_type() != kDuration);
- return timestamp1_;
- }
+ int64_t TimeOrigin() const;
+ int64_t AsyncId() const;
int64_t TimeDuration() const;
int64_t TimeEnd() const {
ASSERT(IsFinishedDuration());
@@ -608,8 +598,6 @@
const char* label() const { return label_; }
- int64_t id() const { return id_; }
-
TimelineEventArgument* arguments() const { return arguments_.buffer(); }
intptr_t arguments_length() const { return arguments_.length(); }
@@ -625,7 +613,6 @@
TimelineStream* stream_;
const char* label_;
- int64_t id_;
TimelineEventArguments arguments_;
bool enabled_;
@@ -796,6 +783,7 @@
virtual void PrintTraceEvent(JSONStream* js, TimelineEventFilter* filter) = 0;
#endif
virtual const char* name() const = 0;
+ int64_t GetNextAsyncId();
void FinishBlock(TimelineEventBlock* block);
@@ -826,6 +814,7 @@
int64_t TimeExtentMicros() const;
Mutex lock_;
+ RelaxedAtomic<uintptr_t> async_id_;
int64_t time_low_micros_;
int64_t time_high_micros_;
diff --git a/runtime/vm/timeline_android.cc b/runtime/vm/timeline_android.cc
index 37844f7..f91ee42 100644
--- a/runtime/vm/timeline_android.cc
+++ b/runtime/vm/timeline_android.cc
@@ -79,12 +79,12 @@
}
case TimelineEvent::kAsyncBegin: {
length = Utils::SNPrint(buffer, buffer_size, "S|%" Pd64 "|%s|%" Pd64 "",
- pid, event->label(), event->Id());
+ pid, event->label(), event->AsyncId());
break;
}
case TimelineEvent::kAsyncEnd: {
length = Utils::SNPrint(buffer, buffer_size, "F|%" Pd64 "|%s|%" Pd64 "",
- pid, event->label(), event->Id());
+ pid, event->label(), event->AsyncId());
break;
}
default:
diff --git a/runtime/vm/timeline_fuchsia.cc b/runtime/vm/timeline_fuchsia.cc
index 6dd671a..38bca29 100644
--- a/runtime/vm/timeline_fuchsia.cc
+++ b/runtime/vm/timeline_fuchsia.cc
@@ -78,19 +78,19 @@
args, num_args);
break;
case TimelineEvent::kAsyncBegin:
- trace_context_write_async_begin_event_record(context, start_time, &thread,
- &category, &name,
- event->Id(), args, num_args);
+ trace_context_write_async_begin_event_record(
+ context, start_time, &thread, &category, &name, event->AsyncId(),
+ args, num_args);
break;
case TimelineEvent::kAsyncEnd:
- trace_context_write_async_end_event_record(context, end_time, &thread,
- &category, &name, event->Id(),
- args, num_args);
+ trace_context_write_async_end_event_record(
+ context, end_time, &thread, &category, &name, event->AsyncId(), args,
+ num_args);
break;
case TimelineEvent::kAsyncInstant:
trace_context_write_async_instant_event_record(
- context, start_time, &thread, &category, &name, event->Id(), args,
- num_args);
+ context, start_time, &thread, &category, &name, event->AsyncId(),
+ args, num_args);
break;
case TimelineEvent::kDuration:
trace_context_write_duration_event_record(context, start_time, end_time,
@@ -98,19 +98,19 @@
num_args);
break;
case TimelineEvent::kFlowBegin:
- trace_context_write_flow_begin_event_record(context, start_time, &thread,
- &category, &name, event->Id(),
- args, num_args);
+ trace_context_write_flow_begin_event_record(
+ context, start_time, &thread, &category, &name, event->AsyncId(),
+ args, num_args);
break;
case TimelineEvent::kFlowStep:
- trace_context_write_flow_step_event_record(context, start_time, &thread,
- &category, &name, event->Id(),
- args, num_args);
+ trace_context_write_flow_step_event_record(
+ context, start_time, &thread, &category, &name, event->AsyncId(),
+ args, num_args);
break;
case TimelineEvent::kFlowEnd:
- trace_context_write_flow_end_event_record(context, start_time, &thread,
- &category, &name, event->Id(),
- args, num_args);
+ trace_context_write_flow_end_event_record(
+ context, start_time, &thread, &category, &name, event->AsyncId(),
+ args, num_args);
break;
default:
// TODO(zra): Figure out what to do with kCounter and kMetadata.
diff --git a/runtime/vm/timeline_linux.cc b/runtime/vm/timeline_linux.cc
index 407a790..a85f9e5 100644
--- a/runtime/vm/timeline_linux.cc
+++ b/runtime/vm/timeline_linux.cc
@@ -79,12 +79,12 @@
}
case TimelineEvent::kAsyncBegin: {
length = Utils::SNPrint(buffer, buffer_size, "S|%" Pd64 "|%s|%" Pd64 "",
- pid, event->label(), event->Id());
+ pid, event->label(), event->AsyncId());
break;
}
case TimelineEvent::kAsyncEnd: {
length = Utils::SNPrint(buffer, buffer_size, "F|%" Pd64 "|%s|%" Pd64 "",
- pid, event->label(), event->Id());
+ pid, event->label(), event->AsyncId());
break;
}
default:
diff --git a/runtime/vm/timeline_macos.cc b/runtime/vm/timeline_macos.cc
index 55e0b24..cbb2efa 100644
--- a/runtime/vm/timeline_macos.cc
+++ b/runtime/vm/timeline_macos.cc
@@ -30,45 +30,49 @@
}
const char* label = event->label();
- bool is_static_label = event->stream_->has_static_labels();
uint8_t _Alignas(16) buffer[64];
buffer[0] = 0;
switch (event->event_type()) {
- case TimelineEvent::kInstant:
- if (is_static_label) {
- _os_signpost_emit_with_name_impl(&__dso_handle, log, OS_SIGNPOST_EVENT,
- OS_SIGNPOST_ID_EXCLUSIVE, label, "",
- buffer, sizeof(buffer));
- } else {
- os_signpost_event_emit(log, OS_SIGNPOST_ID_EXCLUSIVE, "Event", "%s",
- label);
- }
+ case TimelineEvent::kInstant: {
+ _os_signpost_emit_with_name_impl(&__dso_handle, log, OS_SIGNPOST_EVENT,
+ OS_SIGNPOST_ID_EXCLUSIVE, label, "",
+ buffer, sizeof(buffer));
break;
- case TimelineEvent::kBegin:
- case TimelineEvent::kAsyncBegin:
- if (is_static_label) {
- _os_signpost_emit_with_name_impl(
- &__dso_handle, log, OS_SIGNPOST_INTERVAL_BEGIN, event->Id(), label,
- "", buffer, sizeof(buffer));
- } else {
- os_signpost_interval_begin(log, event->Id(), "Event", "%s", label);
- }
+ }
+ case TimelineEvent::kBegin: {
+ _os_signpost_emit_with_name_impl(
+ &__dso_handle, log, OS_SIGNPOST_INTERVAL_BEGIN,
+ OS_SIGNPOST_ID_EXCLUSIVE, label, "", buffer, sizeof(buffer));
break;
- case TimelineEvent::kEnd:
- case TimelineEvent::kAsyncEnd:
- if (is_static_label) {
- _os_signpost_emit_with_name_impl(&__dso_handle, log,
- OS_SIGNPOST_INTERVAL_END, event->Id(),
- label, "", buffer, sizeof(buffer));
- } else {
- os_signpost_interval_end(log, event->Id(), "Event");
- }
+ }
+ case TimelineEvent::kEnd: {
+ _os_signpost_emit_with_name_impl(
+ &__dso_handle, log, OS_SIGNPOST_INTERVAL_END,
+ OS_SIGNPOST_ID_EXCLUSIVE, label, "", buffer, sizeof(buffer));
break;
- case TimelineEvent::kCounter:
- os_signpost_event_emit(log, OS_SIGNPOST_ID_EXCLUSIVE, "Counter", "%s=%s",
- label, event->arguments()[0].value);
+ }
+ case TimelineEvent::kAsyncBegin: {
+ _os_signpost_emit_with_name_impl(
+ &__dso_handle, log, OS_SIGNPOST_INTERVAL_BEGIN, event->AsyncId(),
+ label, "", buffer, sizeof(buffer));
break;
+ }
+ case TimelineEvent::kAsyncEnd: {
+ _os_signpost_emit_with_name_impl(
+ &__dso_handle, log, OS_SIGNPOST_INTERVAL_END, event->AsyncId(), label,
+ "", buffer, sizeof(buffer));
+ break;
+ }
+ case TimelineEvent::kCounter: {
+ const char* fmt = "%s";
+ Utils::SNPrint(reinterpret_cast<char*>(buffer), sizeof(buffer), fmt,
+ event->arguments()[0].value);
+ _os_signpost_emit_with_name_impl(&__dso_handle, log, OS_SIGNPOST_EVENT,
+ event->AsyncId(), label, fmt, buffer,
+ sizeof(buffer));
+ break;
+ }
default:
break;
}
diff --git a/runtime/vm/timeline_test.cc b/runtime/vm/timeline_test.cc
index 09d226b..97699cd 100644
--- a/runtime/vm/timeline_test.cc
+++ b/runtime/vm/timeline_test.cc
@@ -105,7 +105,7 @@
TEST_CASE(TimelineEventIsValid) {
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
TimelineEvent event;
TimelineTestHelper::SetStream(&event, &stream);
@@ -124,7 +124,7 @@
TEST_CASE(TimelineEventDuration) {
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
// Create a test event.
TimelineEvent event;
@@ -139,7 +139,7 @@
TEST_CASE(TimelineEventDurationPrintJSON) {
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
// Create a test event.
TimelineEvent event;
@@ -169,7 +169,7 @@
char buffer[kBufferLength];
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
// Create a test event.
TimelineEvent event;
@@ -213,7 +213,7 @@
TEST_CASE(TimelineEventArguments) {
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
// Create a test event.
TimelineEvent event;
@@ -233,7 +233,7 @@
TEST_CASE(TimelineEventArgumentsPrintJSON) {
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
// Create a test event.
TimelineEvent event;
@@ -296,7 +296,7 @@
}
// Create a test stream.
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
TimelineEvent* event = NULL;
@@ -318,8 +318,8 @@
event = stream.StartEvent();
EXPECT_EQ(0, override.recorder()->CountFor(TimelineEvent::kAsyncBegin));
- int64_t async_id = thread->GetNextTaskId();
- EXPECT(async_id != 0);
+ int64_t async_id = override.recorder()->GetNextAsyncId();
+ EXPECT(async_id >= 0);
event->AsyncBegin("asyncBeginCabbage", async_id);
EXPECT_EQ(0, override.recorder()->CountFor(TimelineEvent::kAsyncBegin));
event->Complete();
@@ -341,7 +341,7 @@
}
TEST_CASE(TimelineRingRecorderJSONOrder) {
- TimelineStream stream("testStream", "testStream", false, true);
+ TimelineStream stream("testStream", "testStream", true);
TimelineEventRingRecorder* recorder =
new TimelineEventRingRecorder(TimelineEventBlock::kBlockSize * 2);
diff --git a/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart b/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart
index 1a7ec1c..c451d7f 100644
--- a/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart
+++ b/sdk/lib/_internal/js_dev_runtime/patch/developer_patch.dart
@@ -157,7 +157,7 @@
}
@patch
-int _getNextTaskId() {
+int _getNextAsyncId() {
return 0;
}
diff --git a/sdk/lib/_internal/js_runtime/lib/developer_patch.dart b/sdk/lib/_internal/js_runtime/lib/developer_patch.dart
index 5b32bea..54f7ca1 100644
--- a/sdk/lib/_internal/js_runtime/lib/developer_patch.dart
+++ b/sdk/lib/_internal/js_runtime/lib/developer_patch.dart
@@ -80,7 +80,7 @@
}
@patch
-int _getNextTaskId() {
+int _getNextAsyncId() {
return 0;
}
diff --git a/sdk/lib/_internal/vm/lib/timeline.dart b/sdk/lib/_internal/vm/lib/timeline.dart
index d65d975..e3e172c 100644
--- a/sdk/lib/_internal/vm/lib/timeline.dart
+++ b/sdk/lib/_internal/vm/lib/timeline.dart
@@ -13,8 +13,8 @@
external int _getTraceClock();
@patch
-@pragma("vm:external-name", "Timeline_getNextTaskId")
-external int _getNextTaskId();
+@pragma("vm:external-name", "Timeline_getNextAsyncId")
+external int _getNextAsyncId();
@patch
@pragma("vm:external-name", "Timeline_reportTaskEvent")
diff --git a/sdk/lib/_internal/wasm/lib/developer.dart b/sdk/lib/_internal/wasm/lib/developer.dart
index 32eb53d..32d3050 100644
--- a/sdk/lib/_internal/wasm/lib/developer.dart
+++ b/sdk/lib/_internal/wasm/lib/developer.dart
@@ -49,7 +49,7 @@
int _traceClock = 0;
@patch
-int _getNextTaskId() => 0;
+int _getNextAsyncId() => 0;
@patch
void _reportTaskEvent(int taskId, String phase, String category, String name,
diff --git a/sdk/lib/developer/timeline.dart b/sdk/lib/developer/timeline.dart
index fc4abd4..a9990a3 100644
--- a/sdk/lib/developer/timeline.dart
+++ b/sdk/lib/developer/timeline.dart
@@ -60,7 +60,7 @@
/// If [id] is not provided, an id that conflicts with no other Dart-generated
/// flow id's will be generated.
static Flow begin({int? id}) {
- return new Flow._(_begin, id ?? _getNextTaskId());
+ return new Flow._(_begin, id ?? _getNextAsyncId());
}
/// A "step" Flow event.
@@ -112,8 +112,7 @@
_stack.add(null);
return;
}
- var block = new _SyncBlock._(name, _getNextTaskId(),
- arguments: arguments, flow: flow);
+ var block = new _SyncBlock._(name, arguments: arguments, flow: flow);
_stack.add(block);
block._startSync();
}
@@ -191,7 +190,7 @@
TimelineTask({TimelineTask? parent, String? filterKey})
: _parent = parent,
_filterKey = filterKey,
- _taskId = _getNextTaskId() {}
+ _taskId = _getNextAsyncId() {}
/// Create a task with an explicit [taskId]. This is useful if you are
/// passing a task from one isolate to another.
@@ -336,9 +335,6 @@
/// The name of this block.
final String name;
- /// Signpost needs help matching begin and end events.
- final int taskId;
-
/// An (optional) set of arguments which will be serialized to JSON and
/// associated with this block.
final Map? arguments;
@@ -348,18 +344,18 @@
late final String _jsonArguments = _argumentsAsJson(arguments);
- _SyncBlock._(this.name, this.taskId, {this.arguments, this.flow});
+ _SyncBlock._(this.name, {this.arguments, this.flow});
/// Start this block of time.
void _startSync() {
- _reportTaskEvent(taskId, 'B', category, name, _jsonArguments);
+ _reportTaskEvent(0, 'B', category, name, _jsonArguments);
}
/// Finish this block of time. At this point, this block can no longer be
/// used.
void finish() {
// Report event to runtime.
- _reportTaskEvent(taskId, 'E', category, name, _jsonArguments);
+ _reportTaskEvent(0, 'E', category, name, _jsonArguments);
final Flow? tempFlow = flow;
if (tempFlow != null) {
_reportFlowEvent(category, "${tempFlow.id}", tempFlow._type, tempFlow.id,
@@ -380,9 +376,8 @@
@pragma("vm:recognized", "asm-intrinsic")
external bool _isDartStreamEnabled();
-/// Returns the next task id.
-@pragma("vm:recognized", "asm-intrinsic")
-external int _getNextTaskId();
+/// Returns the next async task id.
+external int _getNextAsyncId();
/// Returns the current value from the trace clock.
external int _getTraceClock();
diff --git a/tools/VERSION b/tools/VERSION
index 55034e0..9bc408b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 18
PATCH 0
-PRERELEASE 245
+PRERELEASE 246
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/bots/test_matrix.json b/tools/bots/test_matrix.json
index c47ad38..15cb7565 100644
--- a/tools/bots/test_matrix.json
+++ b/tools/bots/test_matrix.json
@@ -979,20 +979,6 @@
"enable-asserts": true,
"use-sdk": true
}
- },
- "analyzer-asserts-strong-(linux|mac|win)": {
- "options": {
- "compiler": "dart2analyzer",
- "enable-asserts": true,
- "use-sdk": true
- }
- },
- "analyzer-asserts-weak-(linux|mac|win)": {
- "options": {
- "compiler": "dart2analyzer",
- "enable-asserts": true,
- "use-sdk": true
- }
}
},
"builder_configurations": [
@@ -3298,12 +3284,32 @@
"fileset": "analyzer_unit_tests"
},
{
+ "name": "nnbd_migration unit tests",
+ "arguments": [
+ "-nanalyzer-unittest-asserts-${mode}-${system}",
+ "pkg/nnbd_migration"
+ ],
+ "shards": 2,
+ "fileset": "analyzer_unit_tests"
+ },
+ {
"name": "analyze tests enable-asserts",
"arguments": [
"-nanalyzer-asserts-${system}"
]
},
{
+ "name": "analyze migrated tests enable-asserts",
+ "arguments": [
+ "-nanalyzer-asserts-${system}",
+ "corelib",
+ "ffi",
+ "language",
+ "lib",
+ "standalone"
+ ]
+ },
+ {
"name": "analyze pkg tests enable-asserts",
"arguments": [
"-nanalyzer-asserts-${system}",
@@ -3325,18 +3331,10 @@
]
},
{
- "name": "nnbd_migration unit tests",
- "arguments": [
- "-nanalyzer-unittest-asserts-${mode}-${system}",
- "pkg/nnbd_migration"
- ],
- "shards": 2,
- "fileset": "analyzer_unit_tests"
- },
- {
- "name": "analyze tests co19_2",
+ "name": "analyze co19 tests",
"arguments": [
"-nanalyzer-asserts-${system}",
+ "co19",
"co19_2"
]
}
@@ -3344,62 +3342,6 @@
},
{
"builders": [
- "analyzer-nnbd-linux-release",
- "analyzer-nnbd-mac-release",
- "analyzer-nnbd-win-release"
- ],
- "meta": {
- "description": "This configuration is used by the nnbd analyzer builders."
- },
- "steps": [
- {
- "name": "build dart",
- "script": "tools/build.py",
- "arguments": [
- "create_sdk"
- ]
- },
- {
- "name": "analyze nnbd strong tests enable-asserts",
- "arguments": [
- "-nanalyzer-asserts-strong-${system}",
- "corelib",
- "ffi",
- "language",
- "lib",
- "standalone"
- ]
- },
- {
- "name": "analyze nnbd weak tests enable-asserts",
- "arguments": [
- "-nanalyzer-asserts-weak-${system}",
- "corelib",
- "ffi",
- "language",
- "lib",
- "service",
- "standalone"
- ]
- },
- {
- "name": "analyze nnbd strong co19 tests",
- "arguments": [
- "-nanalyzer-asserts-strong-${system}",
- "co19"
- ]
- },
- {
- "name": "analyze nnbd weak co19 tests",
- "arguments": [
- "-nanalyzer-asserts-weak-${system}",
- "co19"
- ]
- }
- ]
- },
- {
- "builders": [
"analyzer-analysis-server-linux"
],
"meta": {
