diff --git a/pkg/front_end/lib/src/kernel/dynamic_module_validator.dart b/pkg/front_end/lib/src/kernel/dynamic_module_validator.dart index 31ba450d581..44ba1fe17b4 100644 --- a/pkg/front_end/lib/src/kernel/dynamic_module_validator.dart +++ b/pkg/front_end/lib/src/kernel/dynamic_module_validator.dart @@ -157,21 +157,6 @@ class DynamicInterfaceSpecification { } final String librarySpec = yamlMap['library'] as String; - if (librarySpec.endsWith('*')) { - // Coverage-ignore-block(suite): Not run. - _verifyKeys(yamlMap, const {'library'}); - final String prefix = baseUri - .resolve(librarySpec.substring(0, librarySpec.length - 1)) - .toString(); - final List libs = component.libraries - .where((lib) => lib.importUri.toString().startsWith(prefix)) - .toList(); - if (libs.isEmpty) { - throw 'No libraries found for pattern "$librarySpec"'; - } - result.addAll(libs); - return; - } final String libraryUri = baseUri.resolve(librarySpec).toString(); if (yamlMap.containsKey('class')) { diff --git a/pkg/vm/dynamic_interface.md b/pkg/vm/dynamic_interface.md index d4397fb66b7..28d2f377faa 100644 --- a/pkg/vm/dynamic_interface.md +++ b/pkg/vm/dynamic_interface.md @@ -51,16 +51,6 @@ dynamic module can override. Library item specifies all _public_ classes and members in the given library. Public members of private classes are not included. -## Library prefix - -``` - - library: '*' -``` - -Library prefix item specifies all _public_ classes and members of -all libraries with given prefix. Public members of private classes are not included. - - ## Class ``` @@ -105,9 +95,6 @@ callable: # All public classes and members in `dart:core`. - library: 'dart:core' - # All public classes and members in `package:flutter`. - - library: 'package:flutter/*' - # Only `foo` in `package:my_app/dyn_interface.dart`. - library: 'package:my_app/dyn_interface.dart' member: foo diff --git a/pkg/vm/testcases/transformations/dynamic_interface_annotator/dynamic_interface.yaml b/pkg/vm/testcases/transformations/dynamic_interface_annotator/dynamic_interface.yaml index 82157218445..330effcd277 100644 --- a/pkg/vm/testcases/transformations/dynamic_interface_annotator/dynamic_interface.yaml +++ b/pkg/vm/testcases/transformations/dynamic_interface_annotator/dynamic_interface.yaml @@ -10,7 +10,8 @@ callable: - library: 'lib3.dart' class: ['A', 'B'] - library: 'lib4.dart' - - library: 'prefix/lib*' + - library: 'prefix/lib1.dart' + - library: 'prefix/lib2.dart' extendable: - library: 'lib1.dart' diff --git a/sdk/lib/internal/errors.dart b/sdk/lib/internal/errors.dart index 11cddb45faa..0f206035c41 100644 --- a/sdk/lib/internal/errors.dart +++ b/sdk/lib/internal/errors.dart @@ -32,6 +32,7 @@ class LateError extends Error { : _message = "Local '${localName}' has not been initialized."; /// Final variable written more than once. + @pragma("vm:entry-point") LateError.fieldAI(String fieldName) : _message = "Field '${fieldName}' has already been initialized."; @@ -59,6 +60,7 @@ class LateError extends Error { class ReachabilityError extends Error { final String? _message; + @pragma("vm:entry-point") ReachabilityError([this._message]); String toString() { diff --git a/utils/dynamic_module_runner/dynamic_interface.yaml b/utils/dynamic_module_runner/dynamic_interface.yaml index edbbf296a35..ba3d8674762 100644 --- a/utils/dynamic_module_runner/dynamic_interface.yaml +++ b/utils/dynamic_module_runner/dynamic_interface.yaml @@ -3,10 +3,51 @@ # BSD-style license that can be found in the LICENSE file. extendable: - - library: 'dart:*' + - library: 'dart:async' + - library: 'dart:cli' + - library: 'dart:collection' + - library: 'dart:concurrent' + - library: 'dart:convert' + - library: 'dart:core' + - library: 'dart:developer' + - library: 'dart:ffi' + - library: 'dart:io' + - library: 'dart:isolate' + - library: 'dart:math' + - library: 'dart:nativewrappers' + - library: 'dart:typed_data' + - library: 'dart:vmservice_io' can-be-overridden: - - library: 'dart:*' + - library: 'dart:async' + - library: 'dart:cli' + - library: 'dart:collection' + - library: 'dart:concurrent' + - library: 'dart:convert' + - library: 'dart:core' + - library: 'dart:developer' + - library: 'dart:ffi' + - library: 'dart:io' + - library: 'dart:isolate' + - library: 'dart:math' + - library: 'dart:nativewrappers' + - library: 'dart:typed_data' + - library: 'dart:vmservice_io' callable: - - library: 'dart:*' + - library: 'dart:async' + - library: 'dart:cli' + - library: 'dart:collection' + - library: 'dart:concurrent' + - library: 'dart:convert' + - library: 'dart:core' + - library: 'dart:developer' + - library: 'dart:ffi' + - library: 'dart:io' + - library: 'dart:isolate' + - library: 'dart:math' + - library: 'dart:nativewrappers' + - library: 'dart:typed_data' + - library: 'dart:vmservice_io' + - library: 'dart:_internal' + member: 'extractTypeArguments'