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

Unified Diff: pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart

Issue 2942863002: Compile and run Hello World! (Closed)
Patch Set: Rebased Created 3 years, 6 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/full_emitter/emitter.dart
diff --git a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
index 702f2f8d6a114f4e7b65d699ed372137dc14bdca..5cca900cf9aa183632ba846aecac4445fc6ec331 100644
--- a/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
+++ b/pkg/compiler/lib/src/js_emitter/full_emitter/emitter.dart
@@ -19,12 +19,7 @@ import '../../common_elements.dart' show CommonElements, ElementEnvironment;
import '../../elements/resolution_types.dart' show ResolutionDartType;
import '../../deferred_load.dart' show OutputUnit;
import '../../elements/elements.dart'
- show
- ClassElement,
- ConstructorBodyElement,
- FieldElement,
- LibraryElement,
- TypedefElement;
+ show ClassElement, ConstructorBodyElement, LibraryElement, TypedefElement;
import '../../elements/entities.dart';
import '../../elements/entity_utils.dart' as utils;
import '../../elements/names.dart';
@@ -38,7 +33,6 @@ import '../../js_backend/js_backend.dart'
show
ConstantEmitter,
JavaScriptBackend,
- JavaScriptConstantCompiler,
Namer,
SetterName,
TypeVariableCodegenAnalysis;
@@ -124,6 +118,7 @@ class Emitter extends js_emitter.EmitterBase {
TypeTestRegistry get typeTestRegistry => task.typeTestRegistry;
CommonElements get commonElements => _closedWorld.commonElements;
ElementEnvironment get _elementEnvironment => _closedWorld.elementEnvironment;
+ CodegenWorldBuilder get _worldBuilder => compiler.codegenWorldBuilder;
// The full code that is written to each hunk part-file.
Map<OutputUnit, CodeOutput> outputBuffers = new Map<OutputUnit, CodeOutput>();
@@ -633,22 +628,22 @@ class Emitter extends js_emitter.EmitterBase {
jsAst.Statement buildStaticNonFinalFieldInitializations(
OutputUnit outputUnit) {
jsAst.Statement buildInitialization(
- FieldElement element, jsAst.Expression initialValue) {
+ FieldEntity element, jsAst.Expression initialValue) {
return js.statement('${namer.staticStateHolder}.# = #',
[namer.globalPropertyNameForMember(element), initialValue]);
}
bool inMainUnit = (outputUnit == compiler.deferredLoadTask.mainOutputUnit);
- JavaScriptConstantCompiler handler = backend.constants;
List<jsAst.Statement> parts = <jsAst.Statement>[];
Iterable<FieldEntity> fields = outputStaticNonFinalFieldLists[outputUnit];
// If the outputUnit does not contain any static non-final fields, then
// [fields] is `null`.
if (fields != null) {
- for (FieldElement element in fields) {
+ for (FieldEntity element in fields) {
reporter.withCurrentElement(element, () {
- ConstantValue constant = handler.getConstantValue(element.constant);
+ ConstantValue constant =
+ _worldBuilder.getConstantFieldInitializer(element);
parts.add(buildInitialization(element, constantReference(constant)));
});
}
« no previous file with comments | « pkg/compiler/lib/src/js_backend/namer.dart ('k') | pkg/compiler/lib/src/js_emitter/program_builder/program_builder.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698