Version 2.14.0-321.0.dev
Merge commit '4f859fd133d1923d95031b8bd96af6023e777119' into 'dev'
diff --git a/pkg/nnbd_migration/lib/src/edge_builder.dart b/pkg/nnbd_migration/lib/src/edge_builder.dart
index f7d46a6..381a783 100644
--- a/pkg/nnbd_migration/lib/src/edge_builder.dart
+++ b/pkg/nnbd_migration/lib/src/edge_builder.dart
@@ -141,6 +141,12 @@
/// return statements.
DecoratedType? _currentFunctionType;
+ /// If the innermost enclosing executable is a constructor with field formal
+ /// parameters, a map from each field's getter to the corresponding field
+ /// formal parameter element. Otherwise, an empty map.
+ Map<PropertyAccessorElement, FieldFormalParameterElement>
+ _currentFieldFormals = const {};
+
FunctionExpression? _currentFunctionExpression;
/// The [ClassElement] or [ExtensionElement] of the current class or extension
@@ -986,9 +992,11 @@
_addParametersToFlowAnalysis(node.parameters);
var previousFunction = _currentFunctionExpression;
var previousFunctionType = _currentFunctionType;
+ var previousFieldFormals = _currentFieldFormals;
_currentFunctionExpression = node;
_currentFunctionType =
_variables!.decoratedElementType(node.declaredElement!);
+ _currentFieldFormals = const {};
var previousPostDominatedLocals = _postDominatedLocals;
var previousElementsWrittenToInLocalFunction =
_elementsWrittenToInLocalFunction;
@@ -1013,6 +1021,7 @@
previousElementsWrittenToInLocalFunction;
}
_currentFunctionType = previousFunctionType;
+ _currentFieldFormals = previousFieldFormals;
_currentFunctionExpression = previousFunction;
_postDominatedLocals = previousPostDominatedLocals;
}
@@ -1379,7 +1388,7 @@
}
_variables!.recordDecoratedExpressionType(node, expressionType);
}
- _handleArgumentErrorCheckNotNull(node);
+ _handleCustomCheckNotNull(node);
_handleQuiverCheckNotNull(node);
return expressionType;
}
@@ -1647,7 +1656,7 @@
DecoratedType? visitSimpleIdentifier(SimpleIdentifier node) {
DecoratedType? targetType;
DecoratedType? result;
- var staticElement = getWriteOrReadElement(node);
+ var staticElement = _favorFieldFormalElements(getWriteOrReadElement(node));
if (staticElement is PromotableElement) {
if (!node.inDeclarationContext()) {
var promotedType = _flowAnalysis!.variableRead(node, staticElement);
@@ -2067,6 +2076,19 @@
_graph.makeNonNullable(thisType!.node, origin, hard: hard, guards: _guards);
}
+ /// Computes the map to be stored in [_currentFieldFormals] while visiting the
+ /// constructor having the given [constructorElement].
+ Map<PropertyAccessorElement, FieldFormalParameterElement>
+ _computeFieldFormalMap(ConstructorElement constructorElement) {
+ var result = <PropertyAccessorElement, FieldFormalParameterElement>{};
+ for (var parameter in constructorElement.parameters) {
+ if (parameter is FieldFormalParameterElement) {
+ result[parameter.field!.getter!] = parameter;
+ }
+ }
+ return result;
+ }
+
@override
void _connect(NullabilityNode? source, NullabilityNode? destination,
EdgeOrigin origin, FixReasonTarget? edgeTarget,
@@ -2288,6 +2310,24 @@
}
}
+ /// If the innermost enclosing executable is a constructor with field formal
+ /// parameters, and [staticElement] refers to the getter associated with one
+ /// of those fields, returns the corresponding field formal parameter element.
+ /// Otherwise returns [staticElement] unchanged.
+ ///
+ /// This allows us to treat null checks on the field as though they were null
+ /// checks on the field formal parameter, which is not strictly correct, but
+ /// tends to produce migrations that are more in line with user intent.
+ Element? _favorFieldFormalElements(Element? staticElement) {
+ if (staticElement is PropertyAccessorElement) {
+ var fieldFormal = _currentFieldFormals[staticElement];
+ if (fieldFormal != null) {
+ return fieldFormal;
+ }
+ }
+ return staticElement;
+ }
+
DecoratedType _fixNumericTypes(
DecoratedType decoratedType, DartType? undecoratedType) {
if (decoratedType.type!.isDartCoreNum && undecoratedType!.isDartCoreInt) {
@@ -2316,29 +2356,6 @@
.decoratedTypeParameterBound((type.type as TypeParameterType).element);
}
- void _handleArgumentErrorCheckNotNull(MethodInvocation node) {
- var callee = node.methodName.staticElement;
- var calleeIsStatic = callee is ExecutableElement && callee.isStatic;
- var target = node.realTarget;
- bool targetIsArgumentError =
- (target is SimpleIdentifier && target.name == 'ArgumentError') ||
- (target is PrefixedIdentifier &&
- target.identifier.name == 'ArgumentError');
-
- if (calleeIsStatic &&
- targetIsArgumentError &&
- callee!.name == 'checkNotNull' &&
- node.argumentList.arguments.isNotEmpty) {
- var argument = node.argumentList.arguments.first;
- if (argument is SimpleIdentifier && _isReferenceInScope(argument)) {
- var argumentType =
- _variables!.decoratedElementType(argument.staticElement!);
- _graph.makeNonNullable(argumentType.node,
- ArgumentErrorCheckNotNullOrigin(source, argument));
- }
- }
- }
-
/// Creates the necessary constraint(s) for an assignment of the given
/// [expression] to a destination whose type is [destinationType].
///
@@ -2511,6 +2528,32 @@
redirectedClass.typeParameters);
}
+ void _handleCustomCheckNotNull(MethodInvocation node) {
+ var callee = node.methodName.staticElement;
+ if (node.argumentList.arguments.isNotEmpty &&
+ callee is ExecutableElement &&
+ callee.isStatic) {
+ var enclosingElement = callee.enclosingElement;
+ if (enclosingElement is ClassElement) {
+ if (callee.name == 'checkNotNull' &&
+ enclosingElement.name == 'ArgumentError' &&
+ callee.library.isDartCore ||
+ callee.name == 'checkNotNull' &&
+ enclosingElement.name == 'BuiltValueNullFieldError' &&
+ callee.library.source.uri.toString() ==
+ 'package:built_value/built_value.dart') {
+ var argument = node.argumentList.arguments.first;
+ if (argument is SimpleIdentifier && _isReferenceInScope(argument)) {
+ var argumentType = _variables!.decoratedElementType(
+ _favorFieldFormalElements(getWriteOrReadElement(argument))!);
+ _graph.makeNonNullable(argumentType.node,
+ ArgumentErrorCheckNotNullOrigin(source, argument));
+ }
+ }
+ }
+ }
+ }
+
void _handleExecutableDeclaration(
Declaration node,
ExecutableElement declaredElement,
@@ -2521,11 +2564,15 @@
FunctionBody body,
ConstructorName? redirectedConstructor) {
assert(_currentFunctionType == null);
+ assert(_currentFieldFormals.isEmpty);
_dispatchList(metadata);
_dispatch(returnType);
_createFlowAnalysis(node, parameters);
_dispatch(parameters);
_currentFunctionType = _variables!.decoratedElementType(declaredElement);
+ _currentFieldFormals = declaredElement is ConstructorElement
+ ? _computeFieldFormalMap(declaredElement)
+ : const {};
_addParametersToFlowAnalysis(parameters);
// Push a scope of post-dominated declarations on the stack.
_postDominatedLocals.pushScope(elements: declaredElement.parameters);
@@ -2618,6 +2665,7 @@
_flowAnalysis = null;
_assignedVariables = null;
_currentFunctionType = null;
+ _currentFieldFormals = const {};
_postDominatedLocals.popScope();
}
}
@@ -3269,7 +3317,7 @@
Element? _referencedElement(Expression expression) {
expression = expression.unParenthesized;
if (expression is SimpleIdentifier) {
- return expression.staticElement;
+ return _favorFieldFormalElements(expression.staticElement);
} else if (expression is ThisExpression || expression is SuperExpression) {
return _extensionThis;
} else {
diff --git a/pkg/nnbd_migration/lib/src/edit_plan.dart b/pkg/nnbd_migration/lib/src/edit_plan.dart
index 33728b9..1487963 100644
--- a/pkg/nnbd_migration/lib/src/edit_plan.dart
+++ b/pkg/nnbd_migration/lib/src/edit_plan.dart
@@ -3,6 +3,7 @@
// BSD-style license that can be found in the LICENSE file.
import 'dart:convert';
+import 'dart:math';
import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/ast/precedence.dart';
@@ -1424,8 +1425,8 @@
if (firstPlanIndex == 0 && lastPlanIndex == sequenceNodes!.length - 1) {
// We're removing everything. Try to remove additional whitespace so
// that we're left with just `()`, `{}`, or `[]`.
- var candidateFirstRemovalOffset =
- planner._backAcrossWhitespace(firstRemovalOffset, node!.offset);
+ var candidateFirstRemovalOffset = planner._backAcrossWhitespace(
+ firstRemovalOffset, min(firstRemovalOffset, node!.offset));
if (planner
._isJustAfter(candidateFirstRemovalOffset, const ['(', '[', '{'])) {
var candidateLastRemovalEnd =
diff --git a/pkg/nnbd_migration/test/abstract_context.dart b/pkg/nnbd_migration/test/abstract_context.dart
index bd4a688..4e7b83e 100644
--- a/pkg/nnbd_migration/test/abstract_context.dart
+++ b/pkg/nnbd_migration/test/abstract_context.dart
@@ -45,6 +45,17 @@
String get testsPath => '$homePath/tests';
+ void addBuiltValuePackage() {
+ addPackageFile('built_value', 'built_value.dart', '''
+abstract class Built<V extends Built<V, B>, B extends Builder<V, B>> {}
+abstract class Builder<V extends Built<V, B>, B extends Builder<V, B>> {}
+const String nullable = 'nullable';
+class BuiltValueNullFieldError extends Error {
+ static T checkNotNull<T>(T? value, String type, String field) => value!;
+}
+''');
+ }
+
void addMetaPackage() {
addPackageFile('meta', 'meta.dart', r'''
library meta;
diff --git a/pkg/nnbd_migration/test/api_test.dart b/pkg/nnbd_migration/test/api_test.dart
index fc4fe55..df8afb3 100644
--- a/pkg/nnbd_migration/test/api_test.dart
+++ b/pkg/nnbd_migration/test/api_test.dart
@@ -48,7 +48,7 @@
/// Optional parameter [removeViaComments] indicates whether dead code should
/// be removed in its entirety (the default) or removed by commenting it out.
Future<void> _checkMultipleFileChanges(
- Map<String, String> input, Map<String, String> expectedOutput,
+ Map<String, String> input, Map<String, dynamic> expectedOutput,
{Map<String, String> migratedInput = const {},
bool removeViaComments = false,
bool warnOnWeakCode = false,
@@ -495,6 +495,59 @@
await _checkSingleFileChanges(content, expected);
}
+ Future<void> test_built_value_non_nullable_getter() async {
+ addBuiltValuePackage();
+ var root = '$projectPath/lib';
+ var path1 = convertPath('$root/lib.dart');
+ var file1 = r'''
+import 'package:built_value/built_value.dart';
+
+part 'lib.g.dart';
+
+abstract class Foo implements Built<Foo, FooBuilder> {
+ int get value;
+ Foo._();
+ factory Foo([void Function(FooBuilder) updates]) = _$Foo;
+}
+''';
+ var expected1 = r'''
+import 'package:built_value/built_value.dart';
+
+part 'lib.g.dart';
+
+abstract class Foo implements Built<Foo, FooBuilder> {
+ int get value;
+ Foo._();
+ factory Foo([void Function(FooBuilder) updates]) = _$Foo;
+}
+''';
+ // Note: in a real-world scenario the generated file would be in a different
+ // directory but we don't need to simulate that detail for this test. Also,
+ // the generated file would have a lot more code in it, but we don't need to
+ // simulate all the details of what is generated.
+ var path2 = convertPath('$root/lib.g.dart');
+ var file2 = r'''
+part of 'lib.dart';
+
+class _$Foo extends Foo {
+ @override
+ final int value;
+
+ factory _$Foo([void Function(FooBuilder) updates]) => throw '';
+
+ _$Foo._({this.value}) : super._() {
+ BuiltValueNullFieldError.checkNotNull(value, 'Foo', 'value');
+ }
+}
+
+class FooBuilder implements Builder<Foo, FooBuilder> {
+ int get value => throw '';
+}
+''';
+ await _checkMultipleFileChanges(
+ {path1: file1, path2: file2}, {path1: expected1, path2: anything});
+ }
+
Future<void> test_call_already_migrated_extension() async {
var content = '''
import 'already_migrated.dart';
@@ -6106,6 +6159,84 @@
await _checkSingleFileChanges(content, expected);
}
+ Future<void> test_non_null_intent_field_formal_assert() async {
+ var content = '''
+class C {
+ int i;
+ C(this.i) {
+ assert(i != null);
+ }
+}
+f(int j, bool b) {
+ if (b) {
+ C(j);
+ }
+}
+g() {
+ f(null, false);
+}
+''';
+ var expected = '''
+class C {
+ int i;
+ C(this.i) {
+ assert(i != null);
+ }
+}
+f(int? j, bool b) {
+ if (b) {
+ C(j!);
+ }
+}
+g() {
+ f(null, false);
+}
+''';
+ await _checkSingleFileChanges(content, expected);
+ }
+
+ Future<void> test_non_null_intent_field_formal_use() async {
+ var content = '''
+class C {
+ int i;
+ C(this.i) {
+ f(i);
+ }
+}
+f(int j) {
+ assert(j != null);
+}
+g(int k, bool b) {
+ if (b) {
+ C(k);
+ }
+}
+h() {
+ g(null, false);
+}
+''';
+ var expected = '''
+class C {
+ int i;
+ C(this.i) {
+ f(i);
+ }
+}
+f(int j) {
+ assert(j != null);
+}
+g(int? k, bool b) {
+ if (b) {
+ C(k!);
+ }
+}
+h() {
+ g(null, false);
+}
+''';
+ await _checkSingleFileChanges(content, expected);
+ }
+
Future<void>
test_non_null_intent_propagated_through_substitution_nodes() async {
var content = '''
diff --git a/pkg/nnbd_migration/test/edit_plan_test.dart b/pkg/nnbd_migration/test/edit_plan_test.dart
index 3cc00e7..3cf4039 100644
--- a/pkg/nnbd_migration/test/edit_plan_test.dart
+++ b/pkg/nnbd_migration/test/edit_plan_test.dart
@@ -888,6 +888,21 @@
expect(changes.keys, [entry.offset]);
}
+ Future<void>
+ test_remove_metadata_from_defaultFormalParameter_all_full_line() async {
+ await analyze('''
+f({
+ @deprecated
+ int? x}) {}''');
+ var deprecated = findNode.annotation('@deprecated');
+ checkPlan(
+ planner!.passThrough(deprecated.parent,
+ innerPlans: [planner!.removeNode(deprecated)]),
+ '''
+f({
+ int? x}) {}''');
+ }
+
Future<void> test_remove_parameter() async {
await analyze('f(int x, int y, int z) => null;');
var parameter = findNode.simple('y').parent!;
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index 9610153..ba743e7 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -762,6 +762,7 @@
Dart_Isolate isolate = NULL;
+ IsolateData* isolate_data = nullptr;
#if !defined(DART_PRECOMPILED_RUNTIME)
if (!isolate_run_app_snapshot && (isolate_snapshot_data == NULL)) {
const uint8_t* platform_kernel_buffer = NULL;
@@ -783,18 +784,18 @@
// TODO(sivachandra): When the platform program is unavailable, check if
// application kernel binary is self contained or an incremental binary.
// Isolate should be created only if it is a self contained kernel binary.
- auto isolate_data = new IsolateData(isolate_group_data);
+ isolate_data = new IsolateData(isolate_group_data);
isolate = Dart_CreateIsolateGroupFromKernel(
script_uri, name, platform_kernel_buffer, platform_kernel_buffer_size,
flags, isolate_group_data, isolate_data, error);
} else {
- auto isolate_data = new IsolateData(isolate_group_data);
+ isolate_data = new IsolateData(isolate_group_data);
isolate = Dart_CreateIsolateGroup(script_uri, name, isolate_snapshot_data,
isolate_snapshot_instructions, flags,
isolate_group_data, isolate_data, error);
}
#else
- auto isolate_data = new IsolateData(isolate_group_data);
+ isolate_data = new IsolateData(isolate_group_data);
isolate = Dart_CreateIsolateGroup(script_uri, name, isolate_snapshot_data,
isolate_snapshot_instructions, flags,
isolate_group_data, isolate_data, error);
@@ -802,6 +803,7 @@
Dart_Isolate created_isolate = NULL;
if (isolate == NULL) {
+ delete isolate_data;
delete isolate_group_data;
} else {
created_isolate = IsolateSetupHelper(
diff --git a/runtime/platform/thread_sanitizer.h b/runtime/platform/thread_sanitizer.h
index e8c4fcf..baff130 100644
--- a/runtime/platform/thread_sanitizer.h
+++ b/runtime/platform/thread_sanitizer.h
@@ -15,6 +15,8 @@
#if defined(USING_THREAD_SANITIZER)
#define NO_SANITIZE_THREAD __attribute__((no_sanitize("thread")))
+extern "C" void __tsan_acquire(void* addr);
+extern "C" void __tsan_release(void* addr);
#else
#define NO_SANITIZE_THREAD
#endif
diff --git a/runtime/tests/vm/dart_2/isolates/dart_api_create_lightweight_isolate_test.dart b/runtime/tests/vm/dart_2/isolates/dart_api_create_lightweight_isolate_test.dart
index 4611883..0ce180f 100644
--- a/runtime/tests/vm/dart_2/isolates/dart_api_create_lightweight_isolate_test.dart
+++ b/runtime/tests/vm/dart_2/isolates/dart_api_create_lightweight_isolate_test.dart
@@ -19,6 +19,9 @@
final bool isAOT = Platform.executable.contains('dart_precompiled_runtime');
final bool isolateGroupsEnabled =
Platform.executableArguments.contains('--enable-isolate-groups');
+final bool usesDwarfStackTraces = Platform.executableArguments
+ .any((entry) => RegExp('--dwarf[-_]stack[-_]traces').hasMatch(entry));
+final bool hasSymbolicStackTraces = !usesDwarfStackTraces;
final bool isolateGroupsEnabledInJIT = Platform.executableArguments
.contains('--experimental-enable-isolate-groups-jit');
final sdkRoot = Platform.script.resolve('../../../../../');
@@ -173,8 +176,10 @@
Expect.equals(10, accumulatedErrors.length);
for (int i = 0; i < 10; ++i) {
Expect.equals('error-$i', accumulatedErrors[i][0]);
- Expect.isTrue(
- accumulatedErrors[i][1].contains('childTestMultipleErrors'));
+ if (hasSymbolicStackTraces) {
+ Expect.isTrue(
+ accumulatedErrors[i][1].contains('childTestMultipleErrors'));
+ }
}
exit.close();
@@ -204,7 +209,9 @@
await exit.first;
Expect.equals(1, accumulatedErrors.length);
Expect.equals('error-0', accumulatedErrors[0][0]);
- Expect.contains('childTestFatalError', accumulatedErrors[0][1]);
+ if (hasSymbolicStackTraces) {
+ Expect.contains('childTestFatalError', accumulatedErrors[0][1]);
+ }
exit.close();
errors.close();
diff --git a/runtime/tests/vm/vm.status b/runtime/tests/vm/vm.status
index 9c5c5af..9cba115 100644
--- a/runtime/tests/vm/vm.status
+++ b/runtime/tests/vm/vm.status
@@ -15,6 +15,8 @@
dart/data_uri_import_test/none: SkipByDesign
dart/emit_aot_size_info_flag_test: Pass, Slow # Spawns several subprocesses
dart/isolates/*: Pass, Slow # Tests use many isolates and take a longer time.
+dart/isolates/concurrency_stress_sanity_test: Pass, Slow # Spawns subprocesses
+dart/isolates/fast_object_copy_test: Pass, Slow # Slow due to doing a lot of transitive object copies.
dart/minimal_kernel_test: Pass, Slow # Spawns several subprocesses
dart/null_safety_autodetection_in_kernel_compiler_test: Pass, Slow # Spawns several subprocesses
dart/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
@@ -25,6 +27,8 @@
dart_2/data_uri_import_test/none: SkipByDesign
dart_2/emit_aot_size_info_flag_test: Pass, Slow # Spawns several subprocesses
dart_2/isolates/*: Pass, Slow # Tests use many isolates and take a longer time.
+dart_2/isolates/concurrency_stress_sanity_test: Pass, Slow # Spawns subprocesses
+dart_2/isolates/fast_object_copy_test: Pass, Slow # Slow due to doing a lot of transitive object copies.
dart_2/minimal_kernel_test: Pass, Slow # Spawns several subprocesses
dart_2/null_safety_autodetection_in_kernel_compiler_test: Pass, Slow # Spawns several subprocesses
dart_2/slow_path_shared_stub_test: Pass, Slow # Uses --shared-slow-path-triggers-gc flag.
diff --git a/runtime/vm/compiler/assembler/assembler_arm64.cc b/runtime/vm/compiler/assembler/assembler_arm64.cc
index 7e9299f..3502a6e 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64.cc
+++ b/runtime/vm/compiler/assembler/assembler_arm64.cc
@@ -250,6 +250,22 @@
label->BindTo(bound_pc, lr_state());
}
+#if defined(USING_THREAD_SANITIZER)
+void Assembler::TsanLoadAcquire(Register addr) {
+ EnterCallRuntimeFrame(/*frame_size=*/0, /*is_leaf=*/true);
+ ASSERT(kTsanLoadAcquireRuntimeEntry.is_leaf());
+ CallRuntime(kTsanLoadAcquireRuntimeEntry, /*argument_count=*/1);
+ LeaveCallRuntimeFrame(/*is_leaf=*/true);
+}
+
+void Assembler::TsanStoreRelease(Register addr) {
+ EnterCallRuntimeFrame(/*frame_size=*/0, /*is_leaf=*/true);
+ ASSERT(kTsanStoreReleaseRuntimeEntry.is_leaf());
+ CallRuntime(kTsanStoreReleaseRuntimeEntry, /*argument_count=*/1);
+ LeaveCallRuntimeFrame(/*is_leaf=*/true);
+}
+#endif
+
static int CountLeadingZeros(uint64_t value, int width) {
if (width == 64) return Utils::CountLeadingZeros64(value);
if (width == 32) return Utils::CountLeadingZeros32(value);
diff --git a/runtime/vm/compiler/assembler/assembler_arm64.h b/runtime/vm/compiler/assembler/assembler_arm64.h
index f99eb33..596ee9d 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64.h
+++ b/runtime/vm/compiler/assembler/assembler_arm64.h
@@ -557,22 +557,56 @@
void StoreMemoryValue(Register src, Register base, int32_t offset) {
StoreToOffset(src, base, offset, kEightBytes);
}
+
+#if defined(USING_THREAD_SANITIZER)
+ void TsanLoadAcquire(Register addr);
+ void TsanStoreRelease(Register addr);
+#endif
+
void LoadAcquire(Register dst, Register address, int32_t offset = 0) {
if (offset != 0) {
AddImmediate(TMP2, address, offset);
ldar(dst, TMP2);
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(TMP2);
+#endif
} else {
ldar(dst, address);
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(address);
+#endif
}
}
+
void LoadAcquireCompressed(Register dst,
Register address,
int32_t offset = 0) {
if (offset != 0) {
AddImmediate(TMP2, address, offset);
ldar(dst, TMP2, kObjectBytes);
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(TMP2);
+#endif
} else {
ldar(dst, address, kObjectBytes);
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(address);
+#endif
+ }
+ }
+
+ void StoreRelease(Register dst, Register address, int32_t offset = 0) {
+ if (offset != 0) {
+ AddImmediate(TMP2, address, offset);
+ stlr(dst, TMP2);
+#if defined(USING_THREAD_SANITIZER)
+ TsanStoreRelease(TMP2);
+#endif
+ } else {
+ stlr(dst, address);
+#if defined(USING_THREAD_SANITIZER)
+ TsanStoreRelease(address);
+#endif
}
}
diff --git a/runtime/vm/compiler/assembler/assembler_arm64_test.cc b/runtime/vm/compiler/assembler/assembler_arm64_test.cc
index 6aa5b48..03f8341 100644
--- a/runtime/vm/compiler/assembler/assembler_arm64_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_arm64_test.cc
@@ -4855,6 +4855,54 @@
EXECUTE_TEST_CODE_INTPTR_INTPTR(IntPtrReturn, test->entry(), -511));
}
+#if !defined(USING_THREAD_SANITIZER)
+// can't call (tsan) runtime methods
+
+ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire, assembler) {
+ __ SetupDartSP();
+ __ Push(R1);
+ __ LoadImmediate(R1, 0);
+ __ Push(R1);
+ __ mov(R1, R0);
+ __ LoadImmediate(R0, 0);
+ __ StoreRelease(R1, SP, 0);
+ __ LoadAcquire(R0, SP, 0);
+ __ Pop(R1);
+ __ Pop(R1);
+ __ RestoreCSP();
+ __ ret();
+}
+
+ASSEMBLER_TEST_RUN(StoreReleaseLoadAcquire, test) {
+ typedef intptr_t (*StoreReleaseLoadAcquire)(intptr_t) DART_UNUSED;
+ EXPECT_EQ(123, EXECUTE_TEST_CODE_INTPTR_INTPTR(StoreReleaseLoadAcquire,
+ test->entry(), 123));
+}
+
+ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire1024, assembler) {
+ __ SetupDartSP();
+ __ Push(R1);
+ __ LoadImmediate(R1, 0);
+ __ Push(R1);
+ __ mov(R1, R0);
+ __ LoadImmediate(R0, 0);
+ __ sub(SP, SP, Operand(1024 * target::kWordSize));
+ __ StoreRelease(R1, SP, 1024);
+ __ LoadAcquire(R0, SP, 1024);
+ __ add(SP, SP, Operand(1024 * target::kWordSize));
+ __ Pop(R1);
+ __ Pop(R1);
+ __ RestoreCSP();
+ __ ret();
+}
+
+ASSEMBLER_TEST_RUN(StoreReleaseLoadAcquire1024, test) {
+ typedef intptr_t (*StoreReleaseLoadAcquire1024)(intptr_t) DART_UNUSED;
+ EXPECT_EQ(123, EXECUTE_TEST_CODE_INTPTR_INTPTR(StoreReleaseLoadAcquire1024,
+ test->entry(), 123));
+}
+#endif
+
} // namespace compiler
} // namespace dart
diff --git a/runtime/vm/compiler/assembler/assembler_x64.cc b/runtime/vm/compiler/assembler/assembler_x64.cc
index 8bc3290..22b6673 100644
--- a/runtime/vm/compiler/assembler/assembler_x64.cc
+++ b/runtime/vm/compiler/assembler/assembler_x64.cc
@@ -1876,6 +1876,24 @@
entry.Call(this, argument_count);
}
+#if defined(USING_THREAD_SANITIZER)
+void Assembler::TsanLoadAcquire(Address addr) {
+ PushRegisters(kVolatileRegisterSet);
+ leaq(CallingConventions::kArg1Reg, addr);
+ ASSERT(kTsanLoadAcquireRuntimeEntry.is_leaf());
+ CallRuntime(kTsanLoadAcquireRuntimeEntry, /*argument_count=*/1);
+ PopRegisters(kVolatileRegisterSet);
+}
+
+void Assembler::TsanStoreRelease(Address addr) {
+ PushRegisters(kVolatileRegisterSet);
+ leaq(CallingConventions::kArg1Reg, addr);
+ ASSERT(kTsanStoreReleaseRuntimeEntry.is_leaf());
+ CallRuntime(kTsanStoreReleaseRuntimeEntry, /*argument_count=*/1);
+ PopRegisters(kVolatileRegisterSet);
+}
+#endif
+
void Assembler::RestoreCodePointer() {
movq(CODE_REG,
Address(RBP, target::frame_layout.code_from_fp * target::kWordSize));
diff --git a/runtime/vm/compiler/assembler/assembler_x64.h b/runtime/vm/compiler/assembler/assembler_x64.h
index c9fb518..27b45dd 100644
--- a/runtime/vm/compiler/assembler/assembler_x64.h
+++ b/runtime/vm/compiler/assembler/assembler_x64.h
@@ -1027,10 +1027,19 @@
void StoreMemoryValue(Register src, Register base, int32_t offset) {
movq(Address(base, offset), src);
}
+
+#if defined(USING_THREAD_SANITIZER)
+ void TsanLoadAcquire(Address addr);
+ void TsanStoreRelease(Address addr);
+#endif
+
void LoadAcquire(Register dst, Register address, int32_t offset = 0) {
// On intel loads have load-acquire behavior (i.e. loads are not re-ordered
// with other loads).
movq(dst, Address(address, offset));
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(Address(address, offset));
+#endif
}
void LoadAcquireCompressed(Register dst,
Register address,
@@ -1038,11 +1047,17 @@
// On intel loads have load-acquire behavior (i.e. loads are not re-ordered
// with other loads).
LoadCompressed(dst, Address(address, offset));
+#if defined(USING_THREAD_SANITIZER)
+ TsanLoadAcquire(Address(address, offset));
+#endif
}
void StoreRelease(Register src, Register address, int32_t offset = 0) {
// On intel stores have store-release behavior (i.e. stores are not
// re-ordered with other stores).
movq(Address(address, offset), src);
+#if defined(USING_THREAD_SANITIZER)
+ TsanStoreRelease(Address(address, offset));
+#endif
}
void CompareWithFieldValue(Register value, FieldAddress address) {
diff --git a/runtime/vm/compiler/assembler/assembler_x64_test.cc b/runtime/vm/compiler/assembler/assembler_x64_test.cc
index 5745bd1..3d2deb2 100644
--- a/runtime/vm/compiler/assembler/assembler_x64_test.cc
+++ b/runtime/vm/compiler/assembler/assembler_x64_test.cc
@@ -6167,6 +6167,110 @@
Address(RSP, 0),
__ popq(RAX))
+ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire, assembler) {
+ __ pushq(RCX);
+ __ xorq(RCX, RCX);
+ __ pushq(RCX);
+
+ for (intptr_t i = 0; i < kNumberOfXmmRegisters; ++i) {
+ XmmRegister xmm_reg = static_cast<XmmRegister>(i);
+ if ((CallingConventions::kVolatileXmmRegisters & (1 << xmm_reg)) != 0) {
+ __ movq(RCX, Immediate(bit_cast<int32_t, float>(12.34f + i)));
+ __ movd(xmm_reg, RCX);
+ }
+ }
+
+ for (intptr_t i = 0; i < kNumberOfCpuRegisters; ++i) {
+ Register reg = static_cast<Register>(i);
+ if (reg == CallingConventions::kArg3Reg) {
+ continue;
+ }
+ if ((CallingConventions::kVolatileCpuRegisters & (1 << reg)) != 0) {
+ __ movq(reg, Immediate(0xAABBCCDD + i));
+ }
+ }
+ __ StoreRelease(CallingConventions::kArg3Reg, RSP, 0);
+
+ __ pushq(TMP);
+
+ for (intptr_t i = 0; i < kNumberOfCpuRegisters; ++i) {
+ Register reg = static_cast<Register>(i);
+ if (reg == CallingConventions::kArg3Reg) {
+ continue;
+ }
+ if ((CallingConventions::kVolatileCpuRegisters & (1 << reg)) != 0) {
+ Label ok;
+ if (reg == TMP) {
+ __ popq(TMP);
+ // Use kArg3Reg to validate TMP because TMP is
+ // needed for 64-bit cmpq below.
+ __ pushq(CallingConventions::kArg3Reg);
+ __ movq(CallingConventions::kArg3Reg, TMP);
+ reg = CallingConventions::kArg3Reg;
+ }
+ __ cmpq(reg, Immediate(0xAABBCCDD + i));
+ __ j(EQUAL, &ok);
+ __ int3();
+ __ Bind(&ok);
+ if (reg == CallingConventions::kArg3Reg) {
+ __ popq(CallingConventions::kArg3Reg);
+ }
+ }
+ }
+
+ for (intptr_t i = 0; i < kNumberOfXmmRegisters; ++i) {
+ XmmRegister xmm_reg = static_cast<XmmRegister>(i);
+ if ((CallingConventions::kVolatileXmmRegisters & (1 << xmm_reg)) != 0) {
+ Label ok;
+ __ movq(RCX, xmm_reg);
+ __ cmpq(RCX, Immediate(bit_cast<int32_t, float>(12.34f + i)));
+ __ j(EQUAL, &ok);
+ __ int3();
+ __ Bind(&ok);
+ }
+ }
+ __ LoadAcquire(CallingConventions::kReturnReg, RSP, 0);
+ __ popq(RCX);
+ __ popq(RCX);
+ __ ret();
+}
+
+ASSEMBLER_TEST_RUN(StoreReleaseLoadAcquire, test) {
+ int res = test->InvokeWithCodeAndThread<int>(123);
+ EXPECT_EQ(123, res);
+}
+
+ASSEMBLER_TEST_GENERATE(StoreReleaseLoadAcquire1024, assembler) {
+ __ pushq(RCX);
+ __ xorq(RCX, RCX);
+ __ pushq(RCX);
+ __ subq(RSP, Immediate(1024));
+ __ StoreRelease(CallingConventions::kArg3Reg, RSP, 1024);
+ __ LoadAcquire(CallingConventions::kReturnReg, RSP, 1024);
+ __ addq(RSP, Immediate(1024));
+ __ popq(RCX);
+ __ popq(RCX);
+ __ ret();
+}
+
+ASSEMBLER_TEST_RUN(StoreReleaseLoadAcquire1024, test) {
+ int res = test->InvokeWithCodeAndThread<int>(123);
+ EXPECT_EQ(123, res);
+#if !defined(USING_THREAD_SANITIZER)
+ EXPECT_DISASSEMBLY_NOT_WINDOWS(
+ "push rcx\n"
+ "xorq rcx,rcx\n"
+ "push rcx\n"
+ "subq rsp,0x...\n"
+ "movq [rsp+0x...],rdx\n"
+ "movq rax,[rsp+0x...]\n"
+ "addq rsp,0x...\n"
+ "pop rcx\n"
+ "pop rcx\n"
+ "ret\n");
+#endif
+}
+
} // namespace compiler
} // namespace dart
diff --git a/runtime/vm/compiler/jit/compiler.cc b/runtime/vm/compiler/jit/compiler.cc
index 0104e80..9d15661 100644
--- a/runtime/vm/compiler/jit/compiler.cc
+++ b/runtime/vm/compiler/jit/compiler.cc
@@ -514,14 +514,6 @@
CompilerState::ShouldTrace(function));
{
- if (optimized()) {
- // In background compilation the deoptimization counter may have
- // already reached the limit.
- ASSERT(Compiler::IsBackgroundCompilation() ||
- (function.deoptimization_counter() <
- FLAG_max_deoptimization_counter_threshold));
- }
-
// Extract type feedback before the graph is built, as the graph
// builder uses it to attach it to nodes.
ic_data_array = new (zone) ZoneGrowableArray<const ICData*>();
diff --git a/runtime/vm/compiler/runtime_offsets_extracted.h b/runtime/vm/compiler/runtime_offsets_extracted.h
index b57c17d..b038391 100644
--- a/runtime/vm/compiler/runtime_offsets_extracted.h
+++ b/runtime/vm/compiler/runtime_offsets_extracted.h
@@ -245,9 +245,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 724;
+ 732;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 728;
+ 736;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -272,7 +272,7 @@
Thread_allocate_object_slow_entry_point_offset = 288;
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 196;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 764;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 772;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 112;
@@ -283,7 +283,7 @@
Thread_call_to_runtime_entry_point_offset = 268;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 136;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 772;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 780;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -301,7 +301,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 744;
+ 752;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -321,13 +321,13 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 732;
+ 740;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 760;
+ 768;
static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 776;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 784;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
68;
static constexpr dart::compiler::target::word
@@ -369,11 +369,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 104;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 736;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 744;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 740;
+ Thread_saved_shadow_call_stack_offset = 748;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 748;
+ 756;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -407,9 +407,9 @@
static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
36;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 752;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 760;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 756;
+ Thread_callback_stack_return_offset = 764;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 12;
static constexpr dart::compiler::target::word Type_arguments_offset = 16;
@@ -469,7 +469,7 @@
4, 12, 8, 16};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 692, 696, 700, 704, 708, -1, 712, -1, 716, 720, -1, -1, -1, -1, -1, -1};
+ 700, 704, 708, 712, 716, -1, 720, -1, 724, 728, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 12;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -788,9 +788,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1464;
+ 1480;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1472;
+ 1488;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -816,7 +816,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -827,7 +827,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1560;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1576;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -845,7 +845,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1504;
+ 1520;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -865,14 +865,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1480;
+ 1496;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -914,11 +914,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1488;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1504;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1496;
+ Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1512;
+ 1528;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -953,9 +953,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1528;
+ Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -1016,8 +1016,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -1334,9 +1334,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 692;
+ 700;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 696;
+ 704;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -1361,7 +1361,7 @@
Thread_allocate_object_slow_entry_point_offset = 288;
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 196;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 732;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 740;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 112;
@@ -1372,7 +1372,7 @@
Thread_call_to_runtime_entry_point_offset = 268;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 136;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 740;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 748;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -1390,7 +1390,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 712;
+ 720;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -1410,13 +1410,13 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 700;
+ 708;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 728;
+ 736;
static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 744;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 752;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
68;
static constexpr dart::compiler::target::word
@@ -1458,11 +1458,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 104;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 704;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 712;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 708;
+ Thread_saved_shadow_call_stack_offset = 716;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 716;
+ 724;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -1496,9 +1496,9 @@
static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
36;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 720;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 728;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 724;
+ Thread_callback_stack_return_offset = 732;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 12;
static constexpr dart::compiler::target::word Type_arguments_offset = 16;
@@ -1874,9 +1874,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1528;
+ 1544;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -1902,7 +1902,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -1913,7 +1913,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1624;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1640;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -1931,7 +1931,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -1951,14 +1951,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1600;
+ 1616;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -2000,11 +2000,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1552;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1568;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1560;
+ Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1576;
+ 1592;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -2039,9 +2039,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1592;
+ Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -2102,9 +2102,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -2422,9 +2422,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1464;
+ 1480;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1472;
+ 1488;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -2450,7 +2450,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -2461,7 +2461,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1560;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1576;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -2479,7 +2479,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1504;
+ 1520;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -2499,14 +2499,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1480;
+ 1496;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -2548,11 +2548,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1488;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1504;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1496;
+ Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1512;
+ 1528;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -2587,9 +2587,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1528;
+ Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -2650,8 +2650,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -2969,9 +2969,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1528;
+ 1544;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -2997,7 +2997,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -3008,7 +3008,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1624;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1640;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -3026,7 +3026,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -3046,14 +3046,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1600;
+ 1616;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -3095,11 +3095,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1552;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1568;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1560;
+ Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1576;
+ 1592;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -3134,9 +3134,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1592;
+ Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -3197,9 +3197,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -3512,9 +3512,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 724;
+ 732;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 728;
+ 736;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -3539,7 +3539,7 @@
Thread_allocate_object_slow_entry_point_offset = 288;
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 196;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 764;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 772;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 112;
@@ -3550,7 +3550,7 @@
Thread_call_to_runtime_entry_point_offset = 268;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 136;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 772;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 780;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -3568,7 +3568,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 744;
+ 752;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -3588,13 +3588,13 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 732;
+ 740;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 760;
+ 768;
static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 776;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 784;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
68;
static constexpr dart::compiler::target::word
@@ -3636,11 +3636,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 104;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 736;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 744;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 740;
+ Thread_saved_shadow_call_stack_offset = 748;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 748;
+ 756;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -3674,9 +3674,9 @@
static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
36;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 752;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 760;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 756;
+ Thread_callback_stack_return_offset = 764;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 12;
static constexpr dart::compiler::target::word Type_arguments_offset = 16;
@@ -3736,7 +3736,7 @@
4, 12, 8, 16};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 692, 696, 700, 704, 708, -1, 712, -1, 716, 720, -1, -1, -1, -1, -1, -1};
+ 700, 704, 708, 712, 716, -1, 720, -1, 724, 728, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 12;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 8;
static constexpr dart::compiler::target::word Array_header_size = 12;
@@ -4049,9 +4049,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1464;
+ 1480;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1472;
+ 1488;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -4077,7 +4077,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -4088,7 +4088,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1560;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1576;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -4106,7 +4106,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1504;
+ 1520;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -4126,14 +4126,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1480;
+ 1496;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -4175,11 +4175,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1488;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1504;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1496;
+ Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1512;
+ 1528;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -4214,9 +4214,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1528;
+ Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -4277,8 +4277,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -4589,9 +4589,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 692;
+ 700;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 696;
+ 704;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -4616,7 +4616,7 @@
Thread_allocate_object_slow_entry_point_offset = 288;
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 196;
-static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 732;
+static constexpr dart::compiler::target::word Thread_api_top_scope_offset = 740;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 112;
@@ -4627,7 +4627,7 @@
Thread_call_to_runtime_entry_point_offset = 268;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 136;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 740;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 748;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -4645,7 +4645,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 712;
+ 720;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -4665,13 +4665,13 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 700;
+ 708;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 728;
+ 736;
static constexpr dart::compiler::target::word Thread_isolate_offset = 44;
-static constexpr dart::compiler::target::word Thread_isolate_group_offset = 744;
+static constexpr dart::compiler::target::word Thread_isolate_group_offset = 752;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
68;
static constexpr dart::compiler::target::word
@@ -4713,11 +4713,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 104;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 704;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 712;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 708;
+ Thread_saved_shadow_call_stack_offset = 716;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 716;
+ 724;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -4751,9 +4751,9 @@
static constexpr dart::compiler::target::word Thread_write_barrier_mask_offset =
36;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 40;
-static constexpr dart::compiler::target::word Thread_callback_code_offset = 720;
+static constexpr dart::compiler::target::word Thread_callback_code_offset = 728;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 724;
+ Thread_callback_stack_return_offset = 732;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 12;
static constexpr dart::compiler::target::word Type_arguments_offset = 16;
@@ -5123,9 +5123,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1528;
+ 1544;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -5151,7 +5151,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -5162,7 +5162,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1624;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1640;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -5180,7 +5180,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -5200,14 +5200,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1600;
+ 1616;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -5249,11 +5249,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1552;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1568;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1560;
+ Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1576;
+ 1592;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -5288,9 +5288,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1592;
+ Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -5351,9 +5351,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 24;
@@ -5665,9 +5665,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1464;
+ 1480;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1472;
+ 1488;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -5693,7 +5693,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -5704,7 +5704,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1560;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1576;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -5722,7 +5722,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1504;
+ 1520;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -5742,14 +5742,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1480;
+ 1496;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -5791,11 +5791,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1488;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1504;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1496;
+ Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1512;
+ 1528;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -5830,9 +5830,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1528;
+ Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -5893,8 +5893,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -6206,9 +6206,9 @@
static constexpr dart::compiler::target::word
Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word Thread_active_exception_offset =
- 1528;
+ 1544;
static constexpr dart::compiler::target::word Thread_active_stacktrace_offset =
- 1536;
+ 1552;
static constexpr dart::compiler::target::word
Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -6234,7 +6234,7 @@
static constexpr dart::compiler::target::word
Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word Thread_bool_false_offset = 216;
@@ -6245,7 +6245,7 @@
Thread_call_to_runtime_entry_point_offset = 528;
static constexpr dart::compiler::target::word
Thread_call_to_runtime_stub_offset = 264;
-static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1624;
+static constexpr dart::compiler::target::word Thread_dart_stream_offset = 1640;
static constexpr dart::compiler::target::word
Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word Thread_optimize_entry_offset =
@@ -6263,7 +6263,7 @@
static constexpr dart::compiler::target::word
Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word Thread_execution_state_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -6283,14 +6283,14 @@
static constexpr dart::compiler::target::word
Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word Thread_global_object_pool_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word Thread_exit_through_ffi_offset =
- 1600;
+ 1616;
static constexpr dart::compiler::target::word Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word Thread_field_table_values_offset =
136;
static constexpr dart::compiler::target::word
@@ -6332,11 +6332,11 @@
static constexpr dart::compiler::target::word Thread_object_null_offset = 200;
static constexpr dart::compiler::target::word
Thread_predefined_symbols_address_offset = 664;
-static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1552;
+static constexpr dart::compiler::target::word Thread_resume_pc_offset = 1568;
static constexpr dart::compiler::target::word
- Thread_saved_shadow_call_stack_offset = 1560;
+ Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word Thread_safepoint_state_offset =
- 1576;
+ 1592;
static constexpr dart::compiler::target::word
Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -6371,9 +6371,9 @@
72;
static constexpr dart::compiler::target::word Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- Thread_callback_stack_return_offset = 1592;
+ Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word TimelineStream_enabled_offset =
16;
static constexpr dart::compiler::target::word TwoByteString_data_offset = 16;
@@ -6434,9 +6434,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AbstractType_InstanceSize = 24;
static constexpr dart::compiler::target::word ApiError_InstanceSize = 16;
static constexpr dart::compiler::target::word Array_header_size = 16;
@@ -6785,9 +6785,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 724;
+ AOT_Thread_active_exception_offset = 732;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 728;
+ AOT_Thread_active_stacktrace_offset = 736;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -6813,7 +6813,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 196;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 764;
+ 772;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -6826,7 +6826,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 136;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 772;
+ 780;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -6845,7 +6845,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 744;
+ AOT_Thread_execution_state_offset = 752;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -6865,14 +6865,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 732;
+ AOT_Thread_global_object_pool_offset = 740;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 760;
+ AOT_Thread_exit_through_ffi_offset = 768;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 44;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 776;
+ 784;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 68;
static constexpr dart::compiler::target::word
@@ -6916,11 +6916,11 @@
104;
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 736;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 744;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 740;
+ AOT_Thread_saved_shadow_call_stack_offset = 748;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 748;
+ AOT_Thread_safepoint_state_offset = 756;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -6957,9 +6957,9 @@
AOT_Thread_write_barrier_mask_offset = 36;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 752;
+ 760;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 756;
+ AOT_Thread_callback_stack_return_offset = 764;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -7032,7 +7032,7 @@
4, 12, 8, 16};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 692, 696, 700, 704, 708, -1, 712, -1, 716, 720, -1, -1, -1, -1, -1, -1};
+ 700, 704, 708, 712, 716, -1, 720, -1, 724, 728, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
12;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -7392,9 +7392,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1464;
+ AOT_Thread_active_exception_offset = 1480;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1472;
+ AOT_Thread_active_stacktrace_offset = 1488;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -7420,7 +7420,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -7433,7 +7433,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1560;
+ 1576;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -7452,7 +7452,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1504;
+ AOT_Thread_execution_state_offset = 1520;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -7472,14 +7472,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1480;
+ AOT_Thread_global_object_pool_offset = 1496;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1536;
+ AOT_Thread_exit_through_ffi_offset = 1552;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -7524,11 +7524,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1488;
+ 1504;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1496;
+ AOT_Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1512;
+ AOT_Thread_safepoint_state_offset = 1528;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -7565,9 +7565,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1528;
+ AOT_Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -7641,8 +7641,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -8005,9 +8005,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1528;
+ AOT_Thread_active_exception_offset = 1544;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1536;
+ AOT_Thread_active_stacktrace_offset = 1552;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -8033,7 +8033,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -8046,7 +8046,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1624;
+ 1640;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -8065,7 +8065,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1568;
+ AOT_Thread_execution_state_offset = 1584;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -8085,14 +8085,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1544;
+ AOT_Thread_global_object_pool_offset = 1560;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1600;
+ AOT_Thread_exit_through_ffi_offset = 1616;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -8137,11 +8137,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1552;
+ 1568;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1560;
+ AOT_Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1576;
+ AOT_Thread_safepoint_state_offset = 1592;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -8178,9 +8178,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1592;
+ AOT_Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -8254,9 +8254,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -8615,9 +8615,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1464;
+ AOT_Thread_active_exception_offset = 1480;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1472;
+ AOT_Thread_active_stacktrace_offset = 1488;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -8643,7 +8643,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -8656,7 +8656,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1560;
+ 1576;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -8675,7 +8675,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1504;
+ AOT_Thread_execution_state_offset = 1520;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -8695,14 +8695,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1480;
+ AOT_Thread_global_object_pool_offset = 1496;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1536;
+ AOT_Thread_exit_through_ffi_offset = 1552;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -8747,11 +8747,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1488;
+ 1504;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1496;
+ AOT_Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1512;
+ AOT_Thread_safepoint_state_offset = 1528;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -8788,9 +8788,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1528;
+ AOT_Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -8864,8 +8864,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -9224,9 +9224,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1528;
+ AOT_Thread_active_exception_offset = 1544;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1536;
+ AOT_Thread_active_stacktrace_offset = 1552;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -9252,7 +9252,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -9265,7 +9265,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1624;
+ 1640;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -9284,7 +9284,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1568;
+ AOT_Thread_execution_state_offset = 1584;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -9304,14 +9304,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1544;
+ AOT_Thread_global_object_pool_offset = 1560;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1600;
+ AOT_Thread_exit_through_ffi_offset = 1616;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -9356,11 +9356,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1552;
+ 1568;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1560;
+ AOT_Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1576;
+ AOT_Thread_safepoint_state_offset = 1592;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -9397,9 +9397,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1592;
+ AOT_Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -9473,9 +9473,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -9829,9 +9829,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 368;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 724;
+ AOT_Thread_active_exception_offset = 732;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 728;
+ AOT_Thread_active_stacktrace_offset = 736;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 120;
static constexpr dart::compiler::target::word
@@ -9857,7 +9857,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 196;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 764;
+ 772;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 332;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -9870,7 +9870,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 136;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 772;
+ 780;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 48;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -9889,7 +9889,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 248;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 744;
+ AOT_Thread_execution_state_offset = 752;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 252;
static constexpr dart::compiler::target::word
@@ -9909,14 +9909,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 364;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 732;
+ AOT_Thread_global_object_pool_offset = 740;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 132;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 760;
+ AOT_Thread_exit_through_ffi_offset = 768;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 44;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 776;
+ 784;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 68;
static constexpr dart::compiler::target::word
@@ -9960,11 +9960,11 @@
104;
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 336;
-static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 736;
+static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset = 744;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 740;
+ AOT_Thread_saved_shadow_call_stack_offset = 748;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 748;
+ AOT_Thread_safepoint_state_offset = 756;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 240;
static constexpr dart::compiler::target::word
@@ -10001,9 +10001,9 @@
AOT_Thread_write_barrier_mask_offset = 36;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 40;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 752;
+ 760;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 756;
+ AOT_Thread_callback_stack_return_offset = 764;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 8;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -10076,7 +10076,7 @@
4, 12, 8, 16};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 692, 696, 700, 704, 708, -1, 712, -1, 716, 720, -1, -1, -1, -1, -1, -1};
+ 700, 704, 708, 712, 716, -1, 720, -1, 724, 728, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
12;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 8;
@@ -10429,9 +10429,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1464;
+ AOT_Thread_active_exception_offset = 1480;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1472;
+ AOT_Thread_active_stacktrace_offset = 1488;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -10457,7 +10457,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -10470,7 +10470,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1560;
+ 1576;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -10489,7 +10489,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1504;
+ AOT_Thread_execution_state_offset = 1520;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -10509,14 +10509,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1480;
+ AOT_Thread_global_object_pool_offset = 1496;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1536;
+ AOT_Thread_exit_through_ffi_offset = 1552;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -10561,11 +10561,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1488;
+ 1504;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1496;
+ AOT_Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1512;
+ AOT_Thread_safepoint_state_offset = 1528;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -10602,9 +10602,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1528;
+ AOT_Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -10678,8 +10678,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -11035,9 +11035,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1528;
+ AOT_Thread_active_exception_offset = 1544;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1536;
+ AOT_Thread_active_stacktrace_offset = 1552;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -11063,7 +11063,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -11076,7 +11076,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1624;
+ 1640;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -11095,7 +11095,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1568;
+ AOT_Thread_execution_state_offset = 1584;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -11115,14 +11115,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1544;
+ AOT_Thread_global_object_pool_offset = 1560;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1600;
+ AOT_Thread_exit_through_ffi_offset = 1616;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -11167,11 +11167,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1552;
+ 1568;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1560;
+ AOT_Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1576;
+ AOT_Thread_safepoint_state_offset = 1592;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -11208,9 +11208,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1592;
+ AOT_Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -11284,9 +11284,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -11638,9 +11638,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1464;
+ AOT_Thread_active_exception_offset = 1480;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1472;
+ AOT_Thread_active_stacktrace_offset = 1488;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -11666,7 +11666,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1544;
+ 1560;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -11679,7 +11679,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1560;
+ 1576;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -11698,7 +11698,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1504;
+ AOT_Thread_execution_state_offset = 1520;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -11718,14 +11718,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1480;
+ AOT_Thread_global_object_pool_offset = 1496;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1536;
+ AOT_Thread_exit_through_ffi_offset = 1552;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1568;
+ 1584;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -11770,11 +11770,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1488;
+ 1504;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1496;
+ AOT_Thread_saved_shadow_call_stack_offset = 1512;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1512;
+ AOT_Thread_safepoint_state_offset = 1528;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -11811,9 +11811,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1520;
+ 1536;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1528;
+ AOT_Thread_callback_stack_return_offset = 1544;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -11887,8 +11887,8 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, -1, -1, 1408, 1416,
- 1424, 1432, 1440, -1, 1448, 1456, -1, -1};
+ 1392, 1400, 1408, 1416, -1, -1, 1424, 1432,
+ 1440, 1448, 1456, -1, 1464, 1472, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
@@ -12240,9 +12240,9 @@
static constexpr dart::compiler::target::word
AOT_Thread_AllocateArray_entry_point_offset = 728;
static constexpr dart::compiler::target::word
- AOT_Thread_active_exception_offset = 1528;
+ AOT_Thread_active_exception_offset = 1544;
static constexpr dart::compiler::target::word
- AOT_Thread_active_stacktrace_offset = 1536;
+ AOT_Thread_active_stacktrace_offset = 1552;
static constexpr dart::compiler::target::word
AOT_Thread_array_write_barrier_code_offset = 232;
static constexpr dart::compiler::target::word
@@ -12268,7 +12268,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_allocate_object_slow_stub_offset = 384;
static constexpr dart::compiler::target::word AOT_Thread_api_top_scope_offset =
- 1608;
+ 1624;
static constexpr dart::compiler::target::word
AOT_Thread_auto_scope_native_wrapper_entry_point_offset = 656;
static constexpr dart::compiler::target::word AOT_Thread_bool_false_offset =
@@ -12281,7 +12281,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_call_to_runtime_stub_offset = 264;
static constexpr dart::compiler::target::word AOT_Thread_dart_stream_offset =
- 1624;
+ 1640;
static constexpr dart::compiler::target::word
AOT_Thread_dispatch_table_array_offset = 96;
static constexpr dart::compiler::target::word AOT_Thread_optimize_entry_offset =
@@ -12300,7 +12300,7 @@
static constexpr dart::compiler::target::word
AOT_Thread_enter_safepoint_stub_offset = 488;
static constexpr dart::compiler::target::word
- AOT_Thread_execution_state_offset = 1568;
+ AOT_Thread_execution_state_offset = 1584;
static constexpr dart::compiler::target::word
AOT_Thread_exit_safepoint_stub_offset = 496;
static constexpr dart::compiler::target::word
@@ -12320,14 +12320,14 @@
static constexpr dart::compiler::target::word
AOT_Thread_float_zerow_address_offset = 720;
static constexpr dart::compiler::target::word
- AOT_Thread_global_object_pool_offset = 1544;
+ AOT_Thread_global_object_pool_offset = 1560;
static constexpr dart::compiler::target::word
AOT_Thread_invoke_dart_code_stub_offset = 256;
static constexpr dart::compiler::target::word
- AOT_Thread_exit_through_ffi_offset = 1600;
+ AOT_Thread_exit_through_ffi_offset = 1616;
static constexpr dart::compiler::target::word AOT_Thread_isolate_offset = 88;
static constexpr dart::compiler::target::word AOT_Thread_isolate_group_offset =
- 1632;
+ 1648;
static constexpr dart::compiler::target::word
AOT_Thread_field_table_values_offset = 136;
static constexpr dart::compiler::target::word
@@ -12372,11 +12372,11 @@
static constexpr dart::compiler::target::word
AOT_Thread_predefined_symbols_address_offset = 664;
static constexpr dart::compiler::target::word AOT_Thread_resume_pc_offset =
- 1552;
+ 1568;
static constexpr dart::compiler::target::word
- AOT_Thread_saved_shadow_call_stack_offset = 1560;
+ AOT_Thread_saved_shadow_call_stack_offset = 1576;
static constexpr dart::compiler::target::word
- AOT_Thread_safepoint_state_offset = 1576;
+ AOT_Thread_safepoint_state_offset = 1592;
static constexpr dart::compiler::target::word
AOT_Thread_slow_type_test_stub_offset = 472;
static constexpr dart::compiler::target::word
@@ -12413,9 +12413,9 @@
AOT_Thread_write_barrier_mask_offset = 72;
static constexpr dart::compiler::target::word AOT_Thread_heap_base_offset = 80;
static constexpr dart::compiler::target::word AOT_Thread_callback_code_offset =
- 1584;
+ 1600;
static constexpr dart::compiler::target::word
- AOT_Thread_callback_stack_return_offset = 1592;
+ AOT_Thread_callback_stack_return_offset = 1608;
static constexpr dart::compiler::target::word
AOT_TimelineStream_enabled_offset = 16;
static constexpr dart::compiler::target::word AOT_TwoByteString_data_offset =
@@ -12489,9 +12489,9 @@
8, 24, 16, 32};
static constexpr dart::compiler::target::word
AOT_Thread_write_barrier_wrappers_thread_offset[] = {
- 1376, 1384, 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456,
- 1464, 1472, 1480, 1488, -1, -1, -1, -1, 1496, 1504, -1,
- -1, 1512, 1520, 1528, -1, -1, -1, -1, -1, -1};
+ 1392, 1400, 1408, 1416, 1424, 1432, 1440, 1448, 1456, 1464, 1472,
+ 1480, 1488, 1496, 1504, -1, -1, -1, -1, 1512, 1520, -1,
+ -1, 1528, 1536, 1544, -1, -1, -1, -1, -1, -1};
static constexpr dart::compiler::target::word AOT_AbstractType_InstanceSize =
24;
static constexpr dart::compiler::target::word AOT_ApiError_InstanceSize = 16;
diff --git a/runtime/vm/elf.cc b/runtime/vm/elf.cc
index 4ea2271..a31f66b 100644
--- a/runtime/vm/elf.cc
+++ b/runtime/vm/elf.cc
@@ -652,6 +652,9 @@
class DynamicTable : public Section {
public:
+ // .dynamic section is expected to be writable on most Linux systems
+ // unless dynamic linker is explicitly built with support for an read-only
+ // .dynamic section (DL_RO_DYN_SECTION).
DynamicTable(Zone* zone, SymbolTable* symtab, SymbolHashTable* hash)
: Section(elf::SectionHeaderType::SHT_DYNAMIC,
/*allocate=*/true,
@@ -897,7 +900,7 @@
: BitsContainer(elf::SectionHeaderType::SHT_NOTE,
/*allocate=*/true,
/*executable=*/false,
- /*writable=*/true,
+ /*writable=*/false,
kNoteAlignment) {}
};
@@ -989,11 +992,10 @@
class ProgramTable : public PseudoSection {
public:
- // See SectionTable::CreateProgramTable as to why this section is writable.
explicit ProgramTable(Zone* zone)
: PseudoSection(/*allocate=*/true,
/*executable=*/false,
- /*writable=*/true),
+ /*writable=*/false),
segments_(zone, 0) {
entry_size = sizeof(elf::ProgramHeader);
}
@@ -1101,12 +1103,11 @@
class ElfHeader : public PseudoSection {
public:
- // See SectionTable::CreateProgramTable as to why this section is writable.
ElfHeader(const ProgramTable& program_table,
const SectionTable& section_table)
: PseudoSection(/*allocate=*/true,
/*executable=*/false,
- /*writable=*/true),
+ /*writable=*/false),
program_table_(program_table),
section_table_(section_table) {}
@@ -1521,17 +1522,29 @@
// entry containing only 0 values, so copy it over from sections_.
add_to_reordered_sections(sections_[0]);
- // Android requires the program header table be in the first load segment, so
- // create PseudoSections representing the ELF header and program header
- // table to initialize that segment.
+ // There are few important invariants originating from Android idiosyncrasies
+ // we are trying to maintain when ordering sections:
//
- // The Android dynamic linker in Jelly Bean incorrectly assumes that all
- // non-writable segments are continguous. Thus, we make the first segment
- // writable and put all writable sections (like the BSS) into it, which means
- // we mark the created PseudoSections as writable to pass the segment checks.
+ // - Android requires the program header table be in the first load segment,
+ // so create PseudoSections representing the ELF header and program header
+ // table to initialize that segment.
//
- // The bug is here:
- // https://github.com/aosp-mirror/platform_bionic/blob/94963af28e445384e19775a838a29e6a71708179/linker/linker.c#L1991-L2001
+ // - The Android dynamic linker in Jelly Bean incorrectly assumes that all
+ // non-writable segments are continguous. Thus we write them all together.
+ // The bug is here: https://github.com/aosp-mirror/platform_bionic/blob/94963af28e445384e19775a838a29e6a71708179/linker/linker.c#L1991-L2001
+ //
+ // - On Android native libraries can be mapped directly from an APK
+ // they are stored uncompressed in it. In such situations the name
+ // of the mapping no longer provides enough information for libunwindstack
+ // to find the original ELF file and instead it has to rely on heuristics
+ // to locate program header table. These heuristics currently assume that
+ // program header table will be located in the RO mapping which precedes
+ // RX mapping.
+ //
+ // These invariants imply the following order of segments: RO (program
+ // header, .note.gnu.build-id, .dynstr, .dynsym, .hash, .rodata
+ // and .eh_frame), RX (.text), RW (.dynamic and .bss).
+ //
auto* const elf_header = new (zone_) ElfHeader(*program_table, *this);
// Self-reference to program header table. Required by Android but not by
@@ -1556,30 +1569,30 @@
ASSERT(build_id->type == elf::SectionHeaderType::SHT_NOTE);
add_to_reordered_sections(build_id);
}
- // Now add all the other writable sections.
- for (auto* const section : sections_) {
- if (section == build_id) continue;
- if (section->IsWritable()) { // Implies IsAllocated() && !IsExecutable()
- add_to_reordered_sections(section);
- }
- }
- // Now add the non-writable, non-executable allocated sections in a new
- // segment, starting with the data sections.
+ // Now add the other non-writable, non-executable allocated sections.
for (auto* const section : sections_) {
+ if (section == build_id) continue; // Already added.
if (section->IsAllocated() && !section->IsWritable() &&
!section->IsExecutable()) {
add_to_reordered_sections(section);
}
}
- // Now add the non-writable, executable sections in a new segment.
+ // Now add the executable sections in a new segment.
for (auto* const section : sections_) {
if (section->IsExecutable()) { // Implies IsAllocated() && !IsWritable()
add_to_reordered_sections(section);
}
}
+ // Now add all the writable sections.
+ for (auto* const section : sections_) {
+ if (section->IsWritable()) { // Implies IsAllocated() && !IsExecutable()
+ add_to_reordered_sections(section);
+ }
+ }
+
// We put all non-reserved unallocated sections last. Otherwise, they would
// affect the file offset but not the memory offset of any following allocated
// sections. Doing it in this order makes it easier to keep file and memory
diff --git a/runtime/vm/runtime_entry.cc b/runtime/vm/runtime_entry.cc
index 8a5ad77..333df32 100644
--- a/runtime/vm/runtime_entry.cc
+++ b/runtime/vm/runtime_entry.cc
@@ -4,6 +4,7 @@
#include "vm/runtime_entry.h"
+#include "platform/thread_sanitizer.h"
#include "vm/code_descriptors.h"
#include "vm/code_patcher.h"
#include "vm/compiler/api/deopt_id.h"
@@ -3671,4 +3672,24 @@
false /* is_float */,
reinterpret_cast<RuntimeFunction>(&DLRT_AllocateHandle));
+DEFINE_RAW_LEAF_RUNTIME_ENTRY(TsanLoadAcquire,
+ /*argument_count=*/1,
+ /*is_float=*/false,
+#if defined(USING_THREAD_SANITIZER)
+ reinterpret_cast<RuntimeFunction>(&__tsan_acquire)
+#else
+ nullptr
+#endif
+);
+
+DEFINE_RAW_LEAF_RUNTIME_ENTRY(TsanStoreRelease,
+ /*argument_count=*/1,
+ /*is_float=*/false,
+#if defined(USING_THREAD_SANITIZER)
+ reinterpret_cast<RuntimeFunction>(&__tsan_release)
+#else
+ nullptr
+#endif
+);
+
} // namespace dart
diff --git a/runtime/vm/runtime_entry_list.h b/runtime/vm/runtime_entry_list.h
index 69b2872..f22572c 100644
--- a/runtime/vm/runtime_entry_list.h
+++ b/runtime/vm/runtime_entry_list.h
@@ -96,7 +96,9 @@
V(void, ExitSafepoint) \
V(ApiLocalScope*, EnterHandleScope, Thread*) \
V(void, ExitHandleScope, Thread*) \
- V(LocalHandle*, AllocateHandle, ApiLocalScope*)
+ V(LocalHandle*, AllocateHandle, ApiLocalScope*) \
+ V(void, TsanLoadAcquire, uword /* address */) \
+ V(void, TsanStoreRelease, uword /* address */)
} // namespace dart
diff --git a/tests/standalone/io/issue_30687_test.dart b/tests/standalone/io/issue_30687_test.dart
index aed91cf..e994f09 100644
--- a/tests/standalone/io/issue_30687_test.dart
+++ b/tests/standalone/io/issue_30687_test.dart
@@ -34,11 +34,11 @@
Expect.isTrue(renamed.existsSync());
Expect.equals(renamed.path, link2.path);
} finally {
- target1.delete();
- target2.delete();
- link2.delete();
+ target1.deleteSync();
+ target2.deleteSync();
+ link2.deleteSync();
if (link1.existsSync()) {
- link1.delete();
+ link1.deleteSync();
}
}
});
diff --git a/tests/standalone_2/io/issue_30687_test.dart b/tests/standalone_2/io/issue_30687_test.dart
index a74b33e..71ee6fd 100644
--- a/tests/standalone_2/io/issue_30687_test.dart
+++ b/tests/standalone_2/io/issue_30687_test.dart
@@ -36,11 +36,11 @@
Expect.isTrue(renamed.existsSync());
Expect.equals(renamed.path, link2.path);
} finally {
- target1.delete();
- target2.delete();
- link2.delete();
+ target1.deleteSync();
+ target2.deleteSync();
+ link2.deleteSync();
if (link1.existsSync()) {
- link1.delete();
+ link1.deleteSync();
}
}
});
diff --git a/tools/VERSION b/tools/VERSION
index da86114..d612693 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 320
+PRERELEASE 321
PRERELEASE_PATCH 0
\ No newline at end of file
diff --git a/tools/generate_idefiles.py b/tools/generate_idefiles.py
index 7809c64..ac75696 100755
--- a/tools/generate_idefiles.py
+++ b/tools/generate_idefiles.py
@@ -23,7 +23,6 @@
def GenerateIdeFiles(options):
GenerateCompileCommands(options)
- GenerateAnalysisOptions(options)
def GenerateCompileCommands(options):
@@ -81,64 +80,6 @@
return 0
-def GenerateAnalysisOptions(options):
- """Generate analysis_optioms.yaml for the Dart analyzer.
-
- To prevent dartanalyzer from tripping on the non-Dart files when it is
- started from the root dart-sdk directory.
- https://github.com/dart-lang/sdk/issues/35562
-
- Args:
- options: supported options include: force, dir
- """
- contents = """analyzer:
- exclude:
- - benchmarks/**
- - benchmarks-internal/**
- - docs/newsletter/20171103/**
- - pkg/**
- - out/**
- - runtime/**
- - samples-dev/swarm/**
- - sdk/lib/**
- - tests/co19/**
- - tests/co19_2/**
- - tests/corelib/**
- - tests/corelib_2/**
- - tests/web/**
- - tests/web_2/**
- - tests/dartdevc/**
- - tests/dartdevc_2/**
- - tests/ffi/**
- - tests/ffi_2/**
- - tests/language/**
- - tests/language_2/**
- - tests/lib/**
- - tests/lib_2/**
- - tests/modular/**
- - tests/standalone/**
- - tests/standalone_2/**
- - third_party/observatory_pub_packages/**
- - third_party/pkg/**
- - third_party/pkg_tested/dart_style/**
- - third_party/tcmalloc/**
- - tools/apps/update_homebrew/**
- - tools/dart2js/**
- - tools/dom/**
- - tools/sdks/dart-sdk/lib/**
- - tools/status_clean.dart
- - xcodebuild/**"""
-
- fname = os.path.join(options.dir, "analysis_options.yaml")
-
- if os.path.isfile(fname) and not options.force:
- print(fname + " already exists, use --force to override")
- return
-
- with open(fname, "w") as f:
- f.write(contents)
-
-
def main(argv):
parser = argparse.ArgumentParser(
description="Python script to generate compile_commands.json and "
