Version 2.14.0-257.0.dev

Merge commit '354d9e256e58cb7d9a472be4f182155d1a480ea6' into 'dev'

Author: Dart CI

DEPS

@@ -73,7 +73,7 @@ vars = {
 
   # Revisions of /third_party/* dependencies.
   "args_rev": "d8fea36c10ef96797be02e3d132d572445cd86f4",
-  "async_rev": "92e7119aa068bfb86a6a9519d44037ffff5eece8",
+  "async_rev": "b8850b3851026676083413c67fa0a22f63a8edbc",
   "bazel_worker_rev": "0885637b037979afbf5bcd05fd748b309fd669c0",
   "benchmark_harness_rev": "c546dbd9f639f75cd2f75de8df2eb9f8ea15e8e7",
   "boolean_selector_rev": "665e6921ab246569420376f827bff4585dff0b14",
@@ -105,8 +105,8 @@ vars = {
   # For more details, see https://github.com/dart-lang/sdk/issues/30164
   "dart_style_rev": "f17c23e0eea9a870601c19d904e2a9c1a7c81470",
 
-  "dartdoc_rev" : "b733d4952dbd25374d55e28476a5f44bd60ed63f",
-  "devtools_rev" : "b3bf672474a2bff82f33e1176aa803539baa0d60+1",
+  "dartdoc_rev" : "b86cddcedf0737763d2e337c7474ad18d973fd4a",
+  "devtools_rev" : "64cffbed6366329ad05e44d48fa2298367643bb6",
   "jsshell_tag": "version:88.0",
   "ffi_rev": "4dd32429880a57b64edaf54c9d5af8a9fa9a4ffb",
   "fixnum_rev": "16d3890c6dc82ca629659da1934e412292508bba",

pkg/analyzer/lib/src/dart/analysis/library_context.dart

@@ -183,21 +183,18 @@ class LibraryContext {
         counterUnlinkedLinkedBytes += resolutionBytes.length;
 
         librariesLinkedTimer.stop();
-        // TODO(scheglov) Uncomment to keep linking elements.
-        // return;
       } else {
         // TODO(scheglov) Take / clear parsed units in files.
         bytesGet += resolutionBytes.length;
         librariesLoaded += cycle.libraries.length;
+        elementFactory.addBundle(
+          BundleReader(
+            elementFactory: elementFactory,
+            unitsInformativeBytes: unitsInformativeBytes,
+            resolutionBytes: resolutionBytes,
+          ),
+        );
       }
-
-      elementFactory.addBundle(
-        BundleReader(
-          elementFactory: elementFactory,
-          unitsInformativeBytes: unitsInformativeBytes,
-          resolutionBytes: resolutionBytes,
-        ),
-      );
     }
 
     logger.run('Prepare linked bundles', () {

pkg/analyzer/lib/src/dart/element/element.dart

@@ -1862,6 +1862,17 @@ class ElementAnnotationImpl implements ElementAnnotation {
   @override
   bool get isOverride => _isDartCoreGetter(_OVERRIDE_VARIABLE_NAME);
 
+  /// Return `true` if this is an annotation of the form
+  /// `@pragma("vm:entry-point")`.
+  bool get isPragmaVmEntryPoint {
+    if (_isConstructor(libraryName: 'dart.core', className: 'pragma')) {
+      var value = computeConstantValue();
+      var nameValue = value?.getField('name');
+      return nameValue?.toStringValue() == 'vm:entry-point';
+    }
+    return false;
+  }
+
   @override
   bool get isProtected => _isPackageMetaGetter(_PROTECTED_VARIABLE_NAME);
 
@@ -2221,6 +2232,20 @@ abstract class ElementImpl implements Element {
     return false;
   }
 
+  /// Return `true` if this element has an annotation of the form
+  /// `@pragma("vm:entry-point")`.
+  bool get hasPragmaVmEntryPoint {
+    final metadata = this.metadata;
+    for (var i = 0; i < metadata.length; i++) {
+      var annotation = metadata[i];
+      if (annotation is ElementAnnotationImpl &&
+          annotation.isPragmaVmEntryPoint) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   @override
   bool get hasProtected {
     final metadata = this.metadata;

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

@@ -908,17 +908,16 @@ class _LibraryContext {
       } else {
         performance.getDataInt('bytesGet').add(resolutionBytes.length);
         performance.getDataInt('libraryLoadCount').add(cycle.libraries.length);
+        elementFactory.addBundle(
+          BundleReader(
+            elementFactory: elementFactory,
+            unitsInformativeBytes: unitsInformativeBytes,
+            resolutionBytes: resolutionBytes as Uint8List,
+          ),
+        );
       }
       cycle.resolutionId = resolutionData!.id;
 
-      elementFactory.addBundle(
-        BundleReader(
-          elementFactory: elementFactory,
-          unitsInformativeBytes: unitsInformativeBytes,
-          resolutionBytes: resolutionBytes as Uint8List,
-        ),
-      );
-
       // We might have just linked dart:core, ensure the type provider.
       _createElementFactoryTypeProvider();
     }

pkg/analyzer/lib/src/error/unused_local_elements_verifier.dart

@@ -11,6 +11,7 @@ import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
+import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/element/member.dart' show ExecutableMember;
 import 'package:analyzer/src/error/codes.dart';
@@ -432,6 +433,9 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     if (element.isSynthetic) {
       return true;
     }
+    if (_hasPragmaVmEntryPoint(element)) {
+      return true;
+    }
     if (element is LocalVariableElement ||
         element is FunctionElement && !element.isStatic) {
       // local variable or function
@@ -470,6 +474,9 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
     if (element.isSynthetic) {
       return true;
     }
+    if (_hasPragmaVmEntryPoint(element)) {
+      return true;
+    }
     if (_usedElements.members.contains(element)) {
       return true;
     }
@@ -625,6 +632,10 @@ class UnusedLocalElementsVerifier extends RecursiveAstVisitor<void> {
           HintCode.UNUSED_ELEMENT, element, [element.displayName]);
     }
   }
+
+  static bool _hasPragmaVmEntryPoint(Element element) {
+    return element is ElementImpl && element.hasPragmaVmEntryPoint;
+  }
 }
 
 /// A container with sets of used [Element]s.

pkg/analyzer/lib/src/summary2/link.dart

@@ -24,7 +24,6 @@ import 'package:analyzer/src/summary2/types_builder.dart';
 import 'package:analyzer/src/summary2/variance_builder.dart';
 
 var timerLinkingLinkingBundle = Stopwatch();
-var timerLinkingRemoveBundle = Stopwatch();
 
 /// Note that AST units and tokens of [inputLibraries] will be damaged.
 ///
@@ -81,13 +80,6 @@ class Linker {
     timerLinkingLinkingBundle.start();
     _writeLibraries();
     timerLinkingLinkingBundle.stop();
-
-    // TODO(scheglov) Remove to keep linking elements.
-    timerLinkingRemoveBundle.start();
-    elementFactory.removeBundle(
-      inputLibraries.map((e) => e.uriStr).toSet(),
-    );
-    timerLinkingRemoveBundle.stop();
   }
 
   void _buildEnumChildren() {

pkg/analyzer/test/src/diagnostics/unused_element_test.dart

@@ -541,6 +541,16 @@ class A {
     ]);
   }
 
+  test_method_isUsed_hasPragma_vmEntryPoint() async {
+    pragma;
+    await assertNoErrorsInCode(r'''
+class A {
+  @pragma('vm:entry-point')
+  void _foo() {}
+}
+''');
+  }
+
   test_method_isUsed_hasReference_implicitThis() async {
     await assertNoErrorsInCode(r'''
 class A {
@@ -1440,6 +1450,13 @@ int f() {
 ''');
   }
 
+  test_topLevelFunction_isUsed_hasPragma_vmEntryPoint() async {
+    await assertNoErrorsInCode(r'''
+@pragma('vm:entry-point')
+void _f() {}
+''');
+  }
+
   test_topLevelFunction_isUsed_invocation() async {
     await assertNoErrorsInCode(r'''
 _f() {}

pkg/analyzer/test/src/summary/resynthesize_ast2_test.dart

@@ -26,7 +26,8 @@ import 'test_strategies.dart';
 
 main() {
   defineReflectiveSuite(() {
-    defineReflectiveTests(ResynthesizeAst2Test);
+    defineReflectiveTests(ResynthesizeAstKeepLinkingTest);
+    defineReflectiveTests(ResynthesizeAstFromBytesTest);
     // defineReflectiveTests(ApplyCheckElementTextReplacements);
   });
 }
@@ -39,11 +40,16 @@ class ApplyCheckElementTextReplacements {
 }
 
 @reflectiveTest
-class ResynthesizeAst2Test extends AbstractResynthesizeTest
+abstract class ResynthesizeAst2Test extends AbstractResynthesizeTest
     with ResynthesizeTestCases {
   /// The shared SDK bundle, computed once and shared among test invocations.
   static _SdkBundle? _sdkBundle;
 
+  /// We need to test both cases - when we keep linking libraries (happens for
+  /// new or invalidated libraries), and when we load libraries from bytes
+  /// (happens internally in Blaze or when we have cached summaries).
+  bool get keepLinkingLibraries;
+
   _SdkBundle get sdkBundle {
     if (_sdkBundle != null) {
       return _sdkBundle!;
@@ -124,14 +130,18 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
 
     var linkResult = link(elementFactory, inputLibraries, true);
 
-    // TODO(scheglov) Remove to keep linking elements.
-    elementFactory.addBundle(
-      BundleReader(
-        elementFactory: elementFactory,
-        unitsInformativeBytes: unitsInformativeBytes,
-        resolutionBytes: linkResult.resolutionBytes,
-      ),
-    );
+    if (!keepLinkingLibraries) {
+      elementFactory.removeBundle(
+        inputLibraries.map((e) => e.uriStr).toSet(),
+      );
+      elementFactory.addBundle(
+        BundleReader(
+          elementFactory: elementFactory,
+          unitsInformativeBytes: unitsInformativeBytes,
+          resolutionBytes: linkResult.resolutionBytes,
+        ),
+      );
+    }
 
     return elementFactory.libraryOfUri('${source.uri}')!;
   }
@@ -232,6 +242,18 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
   }
 }
 
+@reflectiveTest
+class ResynthesizeAstFromBytesTest extends ResynthesizeAst2Test {
+  @override
+  bool get keepLinkingLibraries => false;
+}
+
+@reflectiveTest
+class ResynthesizeAstKeepLinkingTest extends ResynthesizeAst2Test {
+  @override
+  bool get keepLinkingLibraries => true;
+}
+
 class _AnalysisSessionForLinking implements AnalysisSessionImpl {
   @override
   final ClassHierarchy classHierarchy = ClassHierarchy();

pkg/compiler/lib/src/js_emitter/code_emitter_task.dart

@@ -79,9 +79,6 @@ class CodeEmitterTask extends CompilerTask {
     // 'is$' method.
     typeTestRegistry.computeRequiredTypeChecks(
         _backendStrategy.rtiChecksBuilder, codegenWorld);
-    // Compute the classes needed by RTI.
-    typeTestRegistry.computeRtiNeededClasses(
-        codegen.rtiSubstitutions, _backendStrategy.generatedCode.keys);
   }
 
   /// Creates the [Emitter] for this task.
@@ -104,8 +101,7 @@ class CodeEmitterTask extends CompilerTask {
           _generateSourceMap);
       metadataCollector = new MetadataCollector(
           _compiler.reporter, _emitter, codegen.rtiRecipeEncoder);
-      typeTestRegistry = new TypeTestRegistry(
-          _compiler.options, closedWorld.elementEnvironment);
+      typeTestRegistry = new TypeTestRegistry(_compiler.options);
     });
   }
 

pkg/compiler/lib/src/js_emitter/program_builder/collector.dart

@@ -175,9 +175,7 @@ class Collector {
     // 4. Find all class types needed for rti.
     for (ClassEntity cls in _rtiNeededClasses) {
       if (backendTypeHelpers.contains(cls)) continue;
-      while (cls != null && neededClassTypes.add(cls)) {
-        cls = _elementEnvironment.getSuperClass(cls);
-      }
+      neededClassTypes.add(cls);
     }
 
     // 5. Sort classes and add them to their respective OutputUnits.

pkg/compiler/lib/src/js_emitter/type_test_registry.dart

@@ -5,27 +5,20 @@
 library dart2js.js_emitter.type_test_registry;
 
 import '../common.dart';
-import '../common_elements.dart';
 import '../elements/entities.dart';
 import '../js_backend/runtime_types.dart'
     show RuntimeTypesChecks, RuntimeTypesChecksBuilder;
-import '../js_backend/runtime_types_codegen.dart'
-    show RuntimeTypesSubstitutions;
 import '../options.dart';
 import '../universe/codegen_world_builder.dart';
 
+/// TODO(joshualitt): Delete this class and store [RuntimeTypeChecks] on
+/// [CodeEmitterTask] directly.
 class TypeTestRegistry {
-  final ElementEnvironment _elementEnvironment;
-
-  /// After [computeNeededClasses] this set only contains classes that are only
-  /// used for RTI.
-  Set<ClassEntity> _rtiNeededClasses;
-
   final CompilerOptions _options;
 
   RuntimeTypesChecks _rtiChecks;
 
-  TypeTestRegistry(this._options, this._elementEnvironment);
+  TypeTestRegistry(this._options);
 
   RuntimeTypesChecks get rtiChecks {
     assert(
@@ -36,35 +29,7 @@ class TypeTestRegistry {
   }
 
   Iterable<ClassEntity> get rtiNeededClasses {
-    assert(
-        _rtiNeededClasses != null,
-        failedAt(NO_LOCATION_SPANNABLE,
-            "rtiNeededClasses has not been computed yet."));
-    return _rtiNeededClasses;
-  }
-
-  void computeRtiNeededClasses(RuntimeTypesSubstitutions rtiSubstitutions,
-      Iterable<MemberEntity> liveMembers) {
-    _rtiNeededClasses = new Set<ClassEntity>();
-
-    void addClassWithSuperclasses(ClassEntity cls) {
-      _rtiNeededClasses.add(cls);
-      for (ClassEntity superclass = _elementEnvironment.getSuperClass(cls);
-          superclass != null;
-          superclass = _elementEnvironment.getSuperClass(superclass)) {
-        _rtiNeededClasses.add(superclass);
-      }
-    }
-
-    void addClassesWithSuperclasses(Iterable<ClassEntity> classes) {
-      for (ClassEntity cls in classes) {
-        addClassWithSuperclasses(cls);
-      }
-    }
-
-    // Add classes that are referenced by type arguments or substitutions in
-    // argument checks.
-    addClassesWithSuperclasses(rtiChecks.requiredClasses);
+    return rtiChecks.requiredClasses;
   }
 
   void computeRequiredTypeChecks(