Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(865)

Unified Diff: pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart

Issue 1227643003: dart2js: Move most of the code_emitter_task code into the program-builder. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Upload Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
diff --git a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
index b4a9c37988f063303fc6cdf245149ddeeb8bff66..0dc9df9e160035552f5678b329048e6b0b7ef37e 100644
--- a/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
+++ b/pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart
@@ -4,7 +4,7 @@
library dart2js.js_emitter.program_builder;
-import '../js_emitter.dart' show computeMixinClass;
+import '../js_emitter.dart' show computeMixinClass, Emitter;
import '../model.dart';
import '../../common.dart';
@@ -29,6 +29,7 @@ import '../../elements/elements.dart' show ParameterElement, MethodElement;
import '../../universe/universe.dart' show Universe, TypeMaskSet;
import '../../deferred_load.dart' show DeferredLoadTask, OutputUnit;
+part 'collector.dart';
part 'registry.dart';
/// Builds a self-contained representation of the program that can then be
@@ -38,15 +39,27 @@ class ProgramBuilder {
final Namer namer;
final CodeEmitterTask _task;
+ /// Contains the collected information the program builder used to build
+ /// the model.
+ // The collector will be filled on the first call to `buildProgram`.
+ // It is stored and publicly exposed for backwards compatibility.
+ final Collector collector;
+
final Registry _registry;
/// True if the program should store function types in the metadata.
bool _storeFunctionTypesInMetadata = false;
ProgramBuilder(Compiler compiler,
- this.namer,
- this._task)
+ Namer namer,
+ this._task,
+ Emitter emitter,
+ Emitter oldEmitter,
+ Set<ClassElement> rtiNeededClasses)
: this._compiler = compiler,
+ this.namer = namer,
+ this.collector = new Collector(
+ compiler, namer, rtiNeededClasses, emitter, oldEmitter),
this._registry = new Registry(compiler);
JavaScriptBackend get backend => _compiler.backend;
@@ -67,16 +80,19 @@ class ProgramBuilder {
Set<Class> _unneededNativeClasses;
Program buildProgram({bool storeFunctionTypesInMetadata: false}) {
+ collector.collect();
+
this._storeFunctionTypesInMetadata = storeFunctionTypesInMetadata;
// Note: In rare cases (mostly tests) output units can be empty. This
// happens when the deferred code is dead-code eliminated but we still need
// to check that the library has been loaded.
_compiler.deferredLoadTask.allOutputUnits.forEach(
_registry.registerOutputUnit);
- _task.outputClassLists.forEach(_registry.registerElements);
- _task.outputStaticLists.forEach(_registry.registerElements);
- _task.outputConstantLists.forEach(_registerConstants);
- _task.outputStaticNonFinalFieldLists.forEach(_registry.registerElements);
+ collector.outputClassLists.forEach(_registry.registerElements);
+ collector.outputStaticLists.forEach(_registry.registerElements);
+ collector.outputConstantLists.forEach(_registerConstants);
+ collector.outputStaticNonFinalFieldLists.forEach(
+ _registry.registerElements);
// TODO(kasperl): There's code that implicitly needs access to the special
// $ holder so we have to register that. Can we track if we have to?
@@ -85,7 +101,7 @@ class ProgramBuilder {
// We need to run the native-preparation before we build the output. The
// preparation code, in turn needs the classes to be set up.
// We thus build the classes before building their containers.
- _task.outputClassLists.forEach((OutputUnit _, List<ClassElement> classes) {
+ collector.outputClassLists.forEach((OutputUnit _, List<ClassElement> classes) {
classes.forEach(_buildClass);
});
@@ -101,12 +117,19 @@ class ProgramBuilder {
}
});
- List<Class> nativeClasses = _task.nativeClassesAndSubclasses
+ List<Class> nativeClasses = collector.nativeClassesAndSubclasses
.map((ClassElement classElement) => _classes[classElement])
.toList();
- _unneededNativeClasses =
- _task.nativeEmitter.prepareNativeClasses(nativeClasses);
+ Set<ClassElement> interceptorClassesNeededByConstants =
+ collector.computeInterceptorsReferencedFromConstants();
+ Set<ClassElement> classesModifiedByEmitRTISupport =
+ _task.typeTestRegistry.computeClassesModifiedByEmitRuntimeTypeSupport();
+
+
+ _unneededNativeClasses = _task.nativeEmitter.prepareNativeClasses(
+ nativeClasses, interceptorClassesNeededByConstants,
+ classesModifiedByEmitRTISupport);
MainFragment mainFragment = _buildMainFragment(_registry.mainLibrariesMap);
Iterable<Fragment> deferredFragments =
@@ -139,7 +162,7 @@ class ProgramBuilder {
_task.metadataCollector,
finalizers,
needsNativeSupport: needsNativeSupport,
- outputContainsConstantList: _task.outputContainsConstantList,
+ outputContainsConstantList: collector.outputContainsConstantList,
hasIsolateSupport: _compiler.hasIsolateSupport);
}
@@ -200,7 +223,7 @@ class ProgramBuilder {
List<Constant> _buildConstants(LibrariesMap librariesMap) {
List<ConstantValue> constantValues =
- _task.outputConstantLists[librariesMap.outputUnit];
+ collector.outputConstantLists[librariesMap.outputUnit];
if (constantValues == null) return const <Constant>[];
return constantValues.map((ConstantValue value) => _constants[value])
.toList(growable: false);
@@ -208,7 +231,7 @@ class ProgramBuilder {
List<StaticField> _buildStaticNonFinalFields(LibrariesMap librariesMap) {
List<VariableElement> staticNonFinalFields =
- _task.outputStaticNonFinalFieldLists[librariesMap.outputUnit];
+ collector.outputStaticNonFinalFieldLists[librariesMap.outputUnit];
if (staticNonFinalFields == null) return const <StaticField>[];
return staticNonFinalFields
@@ -325,7 +348,7 @@ class ProgramBuilder {
}
Class _buildClass(ClassElement element) {
- bool onlyForRti = _task.classesOnlyNeededForRti.contains(element);
+ bool onlyForRti = collector.classesOnlyNeededForRti.contains(element);
List<Method> methods = [];
List<StubMethod> callStubs = <StubMethod>[];
« no previous file with comments | « pkg/compiler/lib/src/js_emitter/program_builder/collector.dart ('k') | pkg/dart2js_incremental/lib/caching_compiler.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698