Skip to content

Commit 7397194

Browse files
aamCommit Queue
authored and
Commit Queue
committed
[gardening] Clean up fuchsia build for IsolateGroup shared callbacks.
Follow-up to 50e0e0d TEST=ci Change-Id: I48114f5677a010561638fedf37390479885c8eef Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/427041 Commit-Queue: Alexander Aprelev <[email protected]> Reviewed-by: Ryan Macnak <[email protected]>
1 parent c954620 commit 7397194

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

BUILD.gn

-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ if (is_fuchsia) {
309309
"tests/ffi/inline_array_test.dart",
310310
"tests/ffi/inline_array_variable_length_test.dart",
311311
"tests/ffi/invoke_callback_after_suspension_test.dart",
312-
"tests/ffi/isolate_group_shared_callback_test.dart",
313312
"tests/ffi/isolate_local_function_callbacks_test.dart",
314313
"tests/ffi/msan_test.dart",
315314
"tests/ffi/native_assets/asset_absolute_test.dart",

runtime/vm/compiler/stub_code_compiler_arm64.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ void StubCodeCompiler::GenerateFfiCallbackTrampolineStub() {
622622
#if defined(DART_TARGET_OS_FUCHSIA)
623623
// TODO(https://dartbug.com/52579): Remove.
624624
if (FLAG_precompiled_mode) {
625-
GenerateLoadBSSEntry(BSS::Relocation::DRT_ExitIsolateGroupSharedIsolate,
625+
GenerateLoadBSSEntry(BSS::Relocation::DLRT_ExitIsolateGroupSharedIsolate,
626626
R4, R9);
627627
} else {
628628
Label call;

runtime/vm/compiler/stub_code_compiler_x64.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ void StubCodeCompiler::GenerateFfiCallbackTrampolineStub() {
576576
#if defined(DART_TARGET_OS_FUCHSIA)
577577
// TODO(https://dartbug.com/52579): Remove.
578578
if (FLAG_precompiled_mode) {
579-
GenerateLoadBSSEntry(BSS::Relocation::DRT_ExitIsolateGroupSharedIsolate,
579+
GenerateLoadBSSEntry(BSS::Relocation::DLRT_ExitIsolateGroupSharedIsolate,
580580
RAX, TMP);
581581
} else {
582582
__ movq(RAX, Immediate(reinterpret_cast<int64_t>(

tests/ffi/ffi.status

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ function_callbacks_many_test/*: Skip # Test harness doesn't support multitest wi
5959
function_callbacks_structs_by_value_generated_test/*: Skip # Test harness doesn't support multitest with Fuchsia
6060
function_callbacks_structs_by_value_native_callable_generated_test/*: Skip # Test harness doesn't support multitest with Fuchsia
6161
function_callbacks_subtype_test/*: Skip # Test harness doesn't support multitest with Fuchsia
62+
isolate_group_shared_callback_test: Skip # gen_snapshot requires experimental-shared-data flag
6263
native_assets/*: Skip # Source not available in the emulator
6364
run_isolate_group_run_test: Skip # gen_snapshot requires experimental-shared-data flag
6465
static_checks/*: SkipByDesign # Expecting compile time failures in multi tests doesn't work on the Fuchsia test runner.

0 commit comments

Comments
 (0)