Version 2.19.0-374.0.dev

Merge fbcccde into dev

Author: Dart CI

pkg/compiler/lib/src/call_graph/applies_to.dart

@@ -5,9 +5,10 @@
 import 'package:compiler/src/common/names.dart';
 import 'package:compiler/src/elements/entities.dart';
 import 'package:compiler/src/inferrer/abstract_value_domain.dart';
-import 'package:compiler/src/world.dart';
 import 'package:compiler/src/universe/selector.dart';
 
+import '../js_model/js_world.dart';
+
 class MemberAppliesTo {
   final MemberEntity member;
   AbstractValue mask;

pkg/compiler/lib/src/common/codegen.dart

@@ -25,6 +25,7 @@ import '../js_backend/deferred_holder_expression.dart'
 import '../js_backend/string_reference.dart' show StringReference;
 import '../js_backend/type_reference.dart' show TypeReference;
 import '../js_emitter/code_emitter_task.dart' show Emitter;
+import '../js_model/js_world.dart';
 import '../js_model/type_recipe.dart' show TypeRecipe;
 import '../native/behavior.dart';
 import '../serialization/serialization.dart';
@@ -35,7 +36,6 @@ import '../universe/use.dart' show ConstantUse, DynamicUse, StaticUse, TypeUse;
 import '../universe/world_impact.dart' show WorldImpact, WorldImpactBuilderImpl;
 import '../util/enumset.dart';
 import '../util/util.dart';
-import '../world.dart';
 
 import 'codegen_interfaces.dart' as interfaces;
 import 'codegen_migrated.dart';

pkg/compiler/lib/src/compiler.dart

@@ -75,7 +75,6 @@ import 'universe/selector.dart' show Selector;
 import 'universe/codegen_world_builder.dart';
 import 'universe/resolution_world_builder.dart';
 import 'universe/world_impact.dart' show WorldImpact, WorldImpactBuilderImpl;
-import 'world.dart' show JClosedWorld;
 import 'compiler_migrated.dart';
 
 /// Implementation of the compiler using  a [api.CompilerInput] for supplying
@@ -598,16 +597,16 @@ class Compiler
         globalTypeInferenceResultsData);
   }
 
-  Future<DataAndIndices<JsClosedWorld>> produceClosedWorld(
+  Future<DataAndIndices<JClosedWorld>> produceClosedWorld(
       load_kernel.Output output, ModuleData moduleData) async {
     ir.Component component = output.component;
-    DataAndIndices<JsClosedWorld> closedWorldAndIndices;
+    DataAndIndices<JClosedWorld> closedWorldAndIndices;
     if (options.readClosedWorldUri == null) {
       Uri rootLibraryUri = output.rootLibraryUri;
       Iterable<Uri> libraries = output.libraries;
-      JsClosedWorld closedWorld =
+      JClosedWorld closedWorld =
           computeClosedWorld(component, moduleData, rootLibraryUri, libraries);
-      closedWorldAndIndices = DataAndIndices<JsClosedWorld>(closedWorld, null);
+      closedWorldAndIndices = DataAndIndices<JClosedWorld>(closedWorld, null);
       if (options.writeClosedWorldUri != null) {
         serializationTask.serializeComponent(
             closedWorld.elementMap.programEnv.mainComponent);
@@ -633,15 +632,15 @@ class Compiler
       options.writeClosedWorldUri != null;
 
   bool shouldStopAfterClosedWorld(
-          DataAndIndices<JsClosedWorld> closedWorldAndIndices) =>
+          DataAndIndices<JClosedWorld> closedWorldAndIndices) =>
       closedWorldAndIndices == null ||
       closedWorldAndIndices.data == null ||
       shouldStopAfterClosedWorldFromFlags;
 
   Future<DataAndIndices<GlobalTypeInferenceResults>>
       produceGlobalTypeInferenceResults(
-          DataAndIndices<JsClosedWorld> closedWorldAndIndices) async {
-    JsClosedWorld closedWorld = closedWorldAndIndices.data;
+          DataAndIndices<JClosedWorld> closedWorldAndIndices) async {
+    JClosedWorld closedWorld = closedWorldAndIndices.data;
     DataAndIndices<GlobalTypeInferenceResults> globalTypeInferenceResults;
     if (options.readDataUri == null) {
       if (options.experimentalInferrer) {
@@ -727,7 +726,7 @@ class Compiler
     if (shouldStopAfterModularAnalysis) return;
 
     // Compute closed world.
-    DataAndIndices<JsClosedWorld> closedWorldAndIndices =
+    DataAndIndices<JClosedWorld> closedWorldAndIndices =
         await produceClosedWorld(output, moduleData);
     if (shouldStopAfterClosedWorld(closedWorldAndIndices)) return;
 

pkg/compiler/lib/src/dump_info.dart

@@ -34,10 +34,10 @@ import 'inferrer/types.dart'
     show GlobalTypeInferenceMemberResult, GlobalTypeInferenceResults;
 import 'js/js.dart' as jsAst;
 import 'js_model/js_strategy_interfaces.dart';
+import 'js_model/js_world.dart' show JClosedWorld;
 import 'js_backend/field_analysis.dart';
 import 'universe/world_impact.dart' show WorldImpact;
 import 'util/sink_adapter.dart';
-import 'world.dart' show JClosedWorld;
 
 class ElementInfoCollector {
   final CompilerDumpInfoFacade compiler;

pkg/compiler/lib/src/inferrer/abstract_value_strategy.dart

@@ -2,8 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import '../js_model/js_world.dart';
 import '../universe/world_builder.dart' show SelectorConstraintsStrategy;
-import '../world.dart';
 import 'abstract_value_domain.dart';
 
 /// Strategy for the abstraction of runtime values used by the global type

pkg/compiler/lib/src/inferrer/builder.dart

@@ -41,7 +41,7 @@ import 'type_system.dart';
 class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
     with ir.VisitorNullMixin<TypeInformation> {
   final CompilerOptions _options;
-  final JsClosedWorld _closedWorld;
+  final JClosedWorld _closedWorld;
   final InferrerEngine _inferrer;
   final TypeSystem _types;
   final MemberEntity _analyzedMember;

pkg/compiler/lib/src/inferrer/computable.dart

@@ -7,6 +7,7 @@ import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/types.dart' show DartType;
 import '../ir/class_relation.dart';
+import '../js_model/js_world.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer/engine.dart

@@ -27,7 +27,6 @@ import '../serialization/serialization.dart';
 import '../universe/call_structure.dart';
 import '../universe/selector.dart';
 import '../universe/side_effects.dart';
-import '../world.dart';
 import 'abstract_value_domain.dart';
 import 'builder.dart';
 import 'closure_tracer.dart';
@@ -60,7 +59,7 @@ class InferrerEngine {
   ]);
 
   /// The [JClosedWorld] on which inference reasoning is based.
-  final JsClosedWorld closedWorld;
+  final JClosedWorld closedWorld;
 
   final TypeSystem types;
   final Map<ir.TreeNode, TypeInformation> concreteTypes = {};
@@ -1159,7 +1158,7 @@ class _InferrerEngineMetrics extends MetricsBase {
 }
 
 class KernelTypeSystemStrategy implements TypeSystemStrategy {
-  final JsClosedWorld _closedWorld;
+  final JClosedWorld _closedWorld;
   final GlobalLocalsMap _globalLocalsMap;
 
   KernelTypeSystemStrategy(this._closedWorld, this._globalLocalsMap);

pkg/compiler/lib/src/inferrer/powersets/powerset_bits.dart

@@ -8,8 +8,8 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart';
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart';
 import '../../universe/selector.dart';
-import '../../world.dart';
 import '../abstract_value_domain.dart';
 
 /// This class is used to store bits information about class entities.

pkg/compiler/lib/src/inferrer/powersets/powersets.dart

@@ -7,6 +7,7 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart' show DartType;
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart';
 import '../../serialization/serialization.dart';
 import '../../universe/selector.dart';
 import '../../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer/trivial.dart

@@ -7,6 +7,7 @@ import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/types.dart' show DartType;
 import '../ir/class_relation.dart';
+import '../js_model/js_world.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer/type_graph_inferrer.dart

@@ -21,7 +21,7 @@ import 'types.dart';
 
 class TypeGraphInferrer implements TypesInferrer {
   late InferrerEngine inferrer;
-  final JsClosedWorld closedWorld;
+  final JClosedWorld closedWorld;
 
   final CompilerInferrerFacade _compiler;
   final GlobalLocalsMap _globalLocalsMap;

pkg/compiler/lib/src/inferrer/type_graph_nodes.dart

@@ -12,9 +12,9 @@ import '../common/names.dart' show Identifiers;
 import '../constants/values.dart';
 import '../elements/entities.dart';
 import '../elements/types.dart';
+import '../js_model/js_world.dart' show JClosedWorld;
 import '../universe/selector.dart' show Selector;
 import '../util/util.dart' show Setlet;
-import '../world.dart' show JClosedWorld;
 import 'abstract_value_domain.dart';
 import 'debug.dart' as debug;
 import 'engine.dart';

pkg/compiler/lib/src/inferrer/type_system.dart

@@ -7,7 +7,7 @@ import '../common.dart';
 import '../constants/values.dart' show BoolConstantValue;
 import '../elements/entities.dart';
 import '../elements/types.dart';
-import '../world.dart';
+import '../js_model/js_world.dart';
 import 'abstract_value_domain.dart';
 import 'type_graph_nodes.dart';
 

pkg/compiler/lib/src/inferrer/typemasks/constants.dart

@@ -6,7 +6,7 @@ library types.constants;
 
 import '../../constants/constant_system.dart' as constant_system;
 import '../../constants/values.dart';
-import '../../world.dart' show JClosedWorld;
+import '../../js_model/js_world.dart' show JClosedWorld;
 import 'masks.dart';
 
 /// Computes the [TypeMask] for the constant [value].

pkg/compiler/lib/src/inferrer/typemasks/masks.dart

@@ -13,14 +13,14 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart';
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart' show JClosedWorld;
 import '../../serialization/serialization.dart';
 import '../../universe/class_hierarchy.dart';
 import '../../universe/selector.dart' show Selector;
 import '../../universe/use.dart' show DynamicUse;
 import '../../universe/world_builder.dart'
     show UniverseSelectorConstraints, SelectorConstraintsStrategy;
 import '../../util/util.dart';
-import '../../world.dart' show JClosedWorld;
 import '../abstract_value_domain.dart';
 import '../abstract_value_strategy.dart';
 import 'constants.dart';

pkg/compiler/lib/src/inferrer/types.dart

@@ -14,12 +14,11 @@ import '../elements/entities.dart';
 import '../inferrer/engine.dart' show KernelGlobalTypeInferenceElementData;
 import '../js_backend/inferred_data.dart';
 import '../js_model/element_map.dart';
-import '../js_model/js_world.dart' show LocalLookupImpl;
+import '../js_model/js_world.dart' show JClosedWorld, LocalLookupImpl;
 import '../js_model/locals.dart';
 import '../serialization/deferrable.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart' show Selector;
-import '../world.dart' show JClosedWorld;
 import 'abstract_value_domain.dart';
 
 /// Results about a single element (e.g. a method, parameter, or field)

pkg/compiler/lib/src/inferrer/wrapped.dart

@@ -7,6 +7,7 @@ import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/types.dart' show DartType;
 import '../ir/class_relation.dart';
+import '../js_model/js_world.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer_experimental/builder.dart

@@ -41,7 +41,7 @@ import 'type_system.dart';
 class KernelTypeGraphBuilder extends ir.Visitor<TypeInformation?>
     with ir.VisitorNullMixin<TypeInformation> {
   final CompilerOptions _options;
-  final JsClosedWorld _closedWorld;
+  final JClosedWorld _closedWorld;
   final InferrerEngine _inferrer;
   final TypeSystem _types;
   final MemberEntity _analyzedMember;

pkg/compiler/lib/src/inferrer_experimental/engine.dart

@@ -27,7 +27,6 @@ import '../serialization/serialization.dart';
 import '../universe/call_structure.dart';
 import '../universe/selector.dart';
 import '../universe/side_effects.dart';
-import '../world.dart';
 import '../inferrer/abstract_value_domain.dart';
 import 'builder.dart';
 import 'closure_tracer.dart';
@@ -60,7 +59,7 @@ class InferrerEngine {
   ]);
 
   /// The [JClosedWorld] on which inference reasoning is based.
-  final JsClosedWorld closedWorld;
+  final JClosedWorld closedWorld;
 
   final TypeSystem types;
   final Map<ir.TreeNode, TypeInformation> concreteTypes = {};
@@ -1159,7 +1158,7 @@ class _InferrerEngineMetrics extends MetricsBase {
 }
 
 class KernelTypeSystemStrategy implements TypeSystemStrategy {
-  final JsClosedWorld _closedWorld;
+  final JClosedWorld _closedWorld;
   final GlobalLocalsMap _globalLocalsMap;
 
   KernelTypeSystemStrategy(this._closedWorld, this._globalLocalsMap);

pkg/compiler/lib/src/inferrer_experimental/powersets/powerset_bits.dart

@@ -8,8 +8,8 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart';
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart';
 import '../../universe/selector.dart';
-import '../../world.dart';
 import '../../inferrer/abstract_value_domain.dart';
 
 /// This class is used to store bits information about class entities.

pkg/compiler/lib/src/inferrer_experimental/powersets/powersets.dart

@@ -7,6 +7,7 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart' show DartType;
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart';
 import '../../serialization/serialization.dart';
 import '../../universe/selector.dart';
 import '../../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer_experimental/trivial.dart

@@ -7,6 +7,7 @@ import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/types.dart' show DartType;
 import '../ir/class_relation.dart';
+import '../js_model/js_world.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';

pkg/compiler/lib/src/inferrer_experimental/type_graph_inferrer.dart

@@ -21,7 +21,7 @@ import 'types.dart';
 
 class TypeGraphInferrer implements TypesInferrer {
   late InferrerEngine inferrer;
-  final JsClosedWorld closedWorld;
+  final JClosedWorld closedWorld;
 
   final CompilerInferrerFacade _compiler;
   final GlobalLocalsMap _globalLocalsMap;

pkg/compiler/lib/src/inferrer_experimental/type_graph_nodes.dart

@@ -12,9 +12,9 @@ import '../common/names.dart' show Identifiers;
 import '../constants/values.dart';
 import '../elements/entities.dart';
 import '../elements/types.dart';
+import '../js_model/js_world.dart' show JClosedWorld;
 import '../universe/selector.dart' show Selector;
 import '../util/util.dart' show Setlet;
-import '../world.dart' show JClosedWorld;
 import '../inferrer/abstract_value_domain.dart';
 import 'debug.dart' as debug;
 import 'engine.dart';

pkg/compiler/lib/src/inferrer_experimental/type_system.dart

@@ -7,8 +7,8 @@ import '../common.dart';
 import '../constants/values.dart' show BoolConstantValue;
 import '../elements/entities.dart';
 import '../elements/types.dart';
-import '../world.dart';
 import '../inferrer/abstract_value_domain.dart';
+import '../js_model/js_world.dart';
 import 'type_graph_nodes.dart';
 
 /// Strategy for creating type information from members and parameters and type

pkg/compiler/lib/src/inferrer_experimental/typemasks/constants.dart

@@ -6,7 +6,7 @@ library types.constants;
 
 import '../../constants/constant_system.dart' as constant_system;
 import '../../constants/values.dart';
-import '../../world.dart' show JClosedWorld;
+import '../../js_model/js_world.dart' show JClosedWorld;
 import 'masks.dart';
 
 /// Computes the [TypeMask] for the constant [value].

pkg/compiler/lib/src/inferrer_experimental/typemasks/masks.dart

@@ -13,14 +13,14 @@ import '../../elements/entities.dart';
 import '../../elements/names.dart';
 import '../../elements/types.dart';
 import '../../ir/class_relation.dart';
+import '../../js_model/js_world.dart';
 import '../../serialization/serialization.dart';
 import '../../universe/class_hierarchy.dart';
 import '../../universe/selector.dart' show Selector;
 import '../../universe/use.dart' show DynamicUse;
 import '../../universe/world_builder.dart'
     show UniverseSelectorConstraints, SelectorConstraintsStrategy;
 import '../../util/util.dart';
-import '../../world.dart' show JClosedWorld;
 import '../../inferrer/abstract_value_domain.dart';
 import '../../inferrer/abstract_value_strategy.dart';
 import 'constants.dart';

pkg/compiler/lib/src/inferrer_experimental/types.dart

@@ -16,12 +16,11 @@ import '../inferrer_experimental/engine.dart'
     show KernelGlobalTypeInferenceElementData;
 import '../js_backend/inferred_data.dart';
 import '../js_model/element_map.dart';
-import '../js_model/js_world.dart' show LocalLookupImpl;
+import '../js_model/js_world.dart' show JClosedWorld, LocalLookupImpl;
 import '../js_model/locals.dart';
 import '../serialization/deferrable.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart' show Selector;
-import '../world.dart' show JClosedWorld;
 import '../inferrer/types.dart' as base
     show GlobalTypeInferenceResults, GlobalTypeInferenceMemberResult;
 

pkg/compiler/lib/src/inferrer_experimental/wrapped.dart

@@ -7,6 +7,7 @@ import '../elements/entities.dart';
 import '../elements/names.dart';
 import '../elements/types.dart' show DartType;
 import '../ir/class_relation.dart';
+import '../js_model/js_world.dart';
 import '../serialization/serialization.dart';
 import '../universe/selector.dart';
 import '../universe/world_builder.dart';