@@ -75,7 +75,6 @@ import 'universe/selector.dart' show Selector;
75
75
import 'universe/codegen_world_builder.dart' ;
76
76
import 'universe/resolution_world_builder.dart' ;
77
77
import 'universe/world_impact.dart' show WorldImpact, WorldImpactBuilderImpl;
78
- import 'world.dart' show JClosedWorld;
79
78
import 'compiler_migrated.dart' ;
80
79
81
80
/// Implementation of the compiler using a [api.CompilerInput] for supplying
@@ -598,16 +597,16 @@ class Compiler
598
597
globalTypeInferenceResultsData);
599
598
}
600
599
601
- Future <DataAndIndices <JsClosedWorld >> produceClosedWorld (
600
+ Future <DataAndIndices <JClosedWorld >> produceClosedWorld (
602
601
load_kernel.Output output, ModuleData moduleData) async {
603
602
ir.Component component = output.component;
604
- DataAndIndices <JsClosedWorld > closedWorldAndIndices;
603
+ DataAndIndices <JClosedWorld > closedWorldAndIndices;
605
604
if (options.readClosedWorldUri == null ) {
606
605
Uri rootLibraryUri = output.rootLibraryUri;
607
606
Iterable <Uri > libraries = output.libraries;
608
- JsClosedWorld closedWorld =
607
+ JClosedWorld closedWorld =
609
608
computeClosedWorld (component, moduleData, rootLibraryUri, libraries);
610
- closedWorldAndIndices = DataAndIndices <JsClosedWorld >(closedWorld, null );
609
+ closedWorldAndIndices = DataAndIndices <JClosedWorld >(closedWorld, null );
611
610
if (options.writeClosedWorldUri != null ) {
612
611
serializationTask.serializeComponent (
613
612
closedWorld.elementMap.programEnv.mainComponent);
@@ -633,15 +632,15 @@ class Compiler
633
632
options.writeClosedWorldUri != null ;
634
633
635
634
bool shouldStopAfterClosedWorld (
636
- DataAndIndices <JsClosedWorld > closedWorldAndIndices) =>
635
+ DataAndIndices <JClosedWorld > closedWorldAndIndices) =>
637
636
closedWorldAndIndices == null ||
638
637
closedWorldAndIndices.data == null ||
639
638
shouldStopAfterClosedWorldFromFlags;
640
639
641
640
Future <DataAndIndices <GlobalTypeInferenceResults >>
642
641
produceGlobalTypeInferenceResults (
643
- DataAndIndices <JsClosedWorld > closedWorldAndIndices) async {
644
- JsClosedWorld closedWorld = closedWorldAndIndices.data;
642
+ DataAndIndices <JClosedWorld > closedWorldAndIndices) async {
643
+ JClosedWorld closedWorld = closedWorldAndIndices.data;
645
644
DataAndIndices <GlobalTypeInferenceResults > globalTypeInferenceResults;
646
645
if (options.readDataUri == null ) {
647
646
if (options.experimentalInferrer) {
@@ -727,7 +726,7 @@ class Compiler
727
726
if (shouldStopAfterModularAnalysis) return ;
728
727
729
728
// Compute closed world.
730
- DataAndIndices <JsClosedWorld > closedWorldAndIndices =
729
+ DataAndIndices <JClosedWorld > closedWorldAndIndices =
731
730
await produceClosedWorld (output, moduleData);
732
731
if (shouldStopAfterClosedWorld (closedWorldAndIndices)) return ;
733
732
0 commit comments