Skip to content

Commit 1f89a5e

Browse files
alexmarkovCommit Queue
authored andcommitted
[vm,dyn_modules] Disable dart:mirrors in standalone VM when using interpreter
Bytecode doesn't fully support dart:mirrors and support for dart:mirrors is already disabled in dart2bytecode. This change disables dart:mirrors in the standalone VM running with --interpreter flag and updates status files. TEST=ci Change-Id: Id9423bafb10926e8274835b77a6f50a825ad7fd7 Cq-Include-Trybots: luci.dart.try:vm-aot-dyn-linux-debug-x64-try,vm-aot-dyn-linux-product-x64-try,vm-dyn-linux-debug-x64-try,vm-dyn-mac-debug-arm64-try,vm-ffi-dyn-mac-debug-simarm64_arm64-try,vm-ffi-dyn-mac-release-simarm64_arm64-try Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/451580 Reviewed-by: Ryan Macnak <[email protected]> Reviewed-by: Bob Nystrom <[email protected]> Commit-Queue: Alexander Markov <[email protected]>
1 parent fddae16 commit 1f89a5e

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

runtime/tests/vm/vm.status

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ cc/TryCatchOptimizer_DeadParameterElimination_*: SkipByDesign # Building flow gr
9797
cc/TwoWayInduction: SkipByDesign # Building flow graph is not supported from bytecode.
9898
cc/TypePropagator_*: SkipByDesign # Building flow graph is not supported from bytecode.
9999
cc/WrapAroundAndDerived: SkipByDesign # Building flow graph is not supported from bytecode.
100+
dart/await_type_check_with_dynamic_loading_test: SkipByDesign # dart:mirrors is not supported.
101+
dart/redirection_type_shuffling_test: SkipByDesign # dart:mirrors is not supported.
100102
dart/regress_52703_test: Pass, Slow
101103

102104
[ $compiler == dartk ]

runtime/vm/kernel_isolate.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -917,7 +917,7 @@ class KernelCompilationRequest : public ValueObject {
917917

918918
Dart_CObject enable_mirrors;
919919
enable_mirrors.type = Dart_CObject_kBool;
920-
enable_mirrors.value.as_bool = FLAG_enable_mirrors;
920+
enable_mirrors.value.as_bool = FLAG_enable_mirrors && !FLAG_interpreter;
921921

922922
Dart_CObject generate_bytecode;
923923
generate_bytecode.type = Dart_CObject_kBool;

tests/co19/co19-kernel.status

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
# for details. All rights reserved. Use of this source code is governed by a
33
# BSD-style license that can be found in the LICENSE file.
44

5-
[ $runtime == dart_precompiled ]
6-
Language/Classes/Instance_Methods/Operators/unary_minus_t01: SkipByDesign # dart:mirrors is not supported
7-
Language/Expressions/Constants/Constant_Contexts/constant_context_A02_t01: SkipByDesign # dart:mirrors is not supported.
8-
LibTest/mirrors/*: SkipByDesign # dart:mirrors is not supported:
9-
105
[ $runtime == vm ]
116
LibTest/collection/ListBase/ListBase_class_A01_t02: Slow, Pass # Does many calls
127
LibTest/collection/ListMixin/ListMixin_class_A01_t02: Slow, Pass # Does many calls
@@ -27,6 +22,11 @@ LibTest/core/List/List_class_A01_t03: Slow, Pass
2722
LibTest/collection/ListBase/ListBase_class_A01_t01: SkipSlow # Issue 43036
2823
LibTest/collection/ListMixin/ListMixin_class_A01_t01: SkipSlow # Issue 43036
2924

25+
[ $compiler == dart2bytecode || $runtime == dart_precompiled ]
26+
Language/Classes/Instance_Methods/Operators/unary_minus_t01: SkipByDesign # dart:mirrors is not supported.
27+
Language/Expressions/Constants/Constant_Contexts/constant_context_A02_t01: SkipByDesign # dart:mirrors is not supported.
28+
LibTest/mirrors/*: SkipByDesign # dart:mirrors is not supported.
29+
3030
# It makes no sense to run any test that uses spawnURI under the simulator
3131
# as that would involve running CFE (the front end) in simulator mode
3232
# to compile the URI file specified in spawnURI code.

tests/language/language.status

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ unsorted/invocation_mirror_test: SkipByDesign # Relies on symbol names
2424
vm/type_cast_vm_test: SkipByDesign # Relies on symbol names
2525

2626
[ $compiler == dart2bytecode ]
27-
vm/reflect_core_vm_test: Crash
27+
vm/reflect_core_vm_test: SkipByDesign # dart:mirrors is not supported.
2828

2929
[ $compiler != fasta ]
3030
value_class/*: Skip # Internship, jlcontreras

tests/language/library/env_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ main() {
5353

5454
// `dart:mirrors` is only supported in JIT mode.
5555
Expect.equals(
56-
isVmJitConfiguration,
56+
isVmJitConfiguration && !configAsString.contains('-dyn-'),
5757
const bool.fromEnvironment("dart.library.mirrors"),
5858
);
5959

tests/lib/lib.status

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ html/cross_frame_test: Skip # Issue 32039, test reloads itself (not by design -
66
[ $arch == simarm ]
77
convert/utf85_test: Skip # Pass, Slow Issue 12644.
88

9+
[ $compiler == dart2bytecode ]
10+
isolate/illegal_msg_mirror_test: SkipByDesign # dart:mirrors is not supported.
11+
mirrors/*: SkipByDesign # dart:mirrors is not supported.
12+
913
[ $compiler == dart2wasm ]
1014
fix_data_tests/*: SkipByDesign
1115
html/*: SkipByDesign # dart:html not supported on dart2wasm

tests/standalone/standalone.status

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ io/socket_sigpipe_test: SkipByDesign # Spawns server process using Platform.exec
4646
[ $compiler == dart2analyzer ]
4747
deferred_transitive_import_error_test: Skip
4848

49+
[ $compiler == dart2bytecode ]
50+
io/http_redirect_test: SkipByDesign # dart:mirrors is not supported.
51+
4952
[ $compiler == dartkp ]
5053
lazy_async_stack_test: Skip # Flaky.
5154

0 commit comments

Comments
 (0)