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

Unified Diff: pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart

Issue 762213002: Support top-level field declaration and assignment in analyzer2dart. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated cf. comments. Created 6 years 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
« no previous file with comments | « pkg/compiler/lib/src/cps_ir/cps_ir_builder.dart ('k') | pkg/compiler/lib/src/cps_ir/cps_ir_nodes.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart
diff --git a/pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart b/pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart
index c6f8d160c4cac0e874e5ce4972fdabe32f8b5e43..c2920361cc061daa33de32097a11b7f51eb95ff3 100644
--- a/pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart
+++ b/pkg/compiler/lib/src/cps_ir/cps_ir_builder_visitor.dart
@@ -158,10 +158,6 @@ class IrBuilderVisitor extends ResolvedVisitor<ir.Primitive>
}
assert(fieldDefinition != null);
assert(elements[fieldDefinition] != null);
- // This means there is no initializer.
- // TODO(sigurdm): Avoid ever getting here. Abstract functions and fields
- // with no initializer should not have a representation in the IR.
- if (fieldDefinition is! ast.SendSet) return null;
DetectClosureVariables closureLocals =
new DetectClosureVariables(elements);
closureLocals.visit(fieldDefinition);
@@ -170,10 +166,12 @@ class IrBuilderVisitor extends ResolvedVisitor<ir.Primitive>
element,
closureLocals.usedFromClosure);
return withBuilder(builder, () {
- ast.SendSet sendSet = fieldDefinition;
- ir.Primitive result = visit(sendSet.arguments.first);
- builder.buildReturn(result);
- return builder.makeFieldDefinition();
+ ir.Primitive initializer;
+ if (fieldDefinition is ast.SendSet) {
+ ast.SendSet sendSet = fieldDefinition;
+ initializer = visit(sendSet.arguments.first);
+ }
+ return builder.makeFieldDefinition(initializer);
});
}
@@ -201,7 +199,7 @@ class IrBuilderVisitor extends ResolvedVisitor<ir.Primitive>
});
visit(function.body);
- return irBuilder.buildFunctionDefinition(defaults);
+ return irBuilder.makeFunctionDefinition(defaults);
});
}
« no previous file with comments | « pkg/compiler/lib/src/cps_ir/cps_ir_builder.dart ('k') | pkg/compiler/lib/src/cps_ir/cps_ir_nodes.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698