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

Unified Diff: pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart

Issue 787603003: Generative constructors in the new dart backend. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: 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
Index: pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
diff --git a/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart b/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
index eb39923f58d657892d10a6192eb2a049fffaabdc..d3c80ffbbb9d5e3d02bbf513476e688918c52145 100644
--- a/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
+++ b/pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart
@@ -119,17 +119,20 @@ class Builder extends cps_ir.Visitor<Node> {
ExecutableDefinition build(cps_ir.ExecutableDefinition node) {
if (node is cps_ir.FieldDefinition) {
return buildField(node);
+ } else if (node is cps_ir.ConstructorDefinition) {
+ return buildConstructor(node);
} else if (node is cps_ir.FunctionDefinition) {
return buildFunction(node);
}
assert(false);
+ return null;
}
FieldDefinition buildField(cps_ir.FieldDefinition node) {
Statement body;
if (node.hasInitializer) {
currentElement = node.element;
- returnContinuation = node.returnContinuation;
+ returnContinuation = node.body.returnContinuation;
phiTempVar = new Variable(node.element, null);
@@ -155,10 +158,10 @@ class Builder extends cps_ir.Visitor<Node> {
++parameter.writeCount; // Being a parameter counts as a write.
parameters.add(parameter);
}
- returnContinuation = node.returnContinuation;
Statement body;
if (!node.isAbstract) {
+ returnContinuation = node.body.returnContinuation;
phiTempVar = new Variable(node.element, null);
body = visit(node.body);
}
@@ -167,6 +170,31 @@ class Builder extends cps_ir.Visitor<Node> {
body, node.localConstants, node.defaultParameterValues);
}
+ ConstructorDefinition buildConstructor(cps_ir.ConstructorDefinition node) {
+ currentElement = node.element;
+ List<Variable> parameters = <Variable>[];
+ for (cps_ir.Definition p in node.parameters) {
+ Variable parameter = getFunctionParameter(p);
+ assert(parameter != null);
+ ++parameter.writeCount; // Being a parameter counts as a write.
+ parameters.add(parameter);
+ }
+ List<Initializer> initializers;
+ Statement body;
+ if (!node.isAbstract) {
+ initializers = node.initializers.map(visit).toList();
+ returnContinuation = node.body.returnContinuation;
+
+ phiTempVar = new Variable(node.element, null);
+ body = visit(node.body);
+ }
+
+ return new ConstructorDefinition(node.element, parameters,
+ body, initializers, node.localConstants, node.defaultParameterValues,
+ node.isConst);
+ }
+
+
List<Expression> translateArguments(List<cps_ir.Reference> args) {
return new List<Expression>.generate(args.length,
(int index) => getVariableReference(args[index]));
@@ -278,6 +306,20 @@ class Builder extends cps_ir.Visitor<Node> {
visitNode(cps_ir.Node node) => throw "Unhandled node: $node";
+ Initializer visitFieldInitializer(cps_ir.FieldInitializer node) {
+ returnContinuation = node.body.returnContinuation;
+ return new FieldInitializer(node.element, visit(node.body.body));
+ }
+
+ Initializer visitSuperInitializer(cps_ir.SuperInitializer node) {
+ List<Statement> arguments =
+ node.arguments.map((cps_ir.RunnableBody argument) {
+ returnContinuation = argument.returnContinuation;
+ return visit(argument.body);
+ }).toList();
+ return new SuperInitializer(node.target, node.selector, arguments);
+ }
+
Statement visitLetPrim(cps_ir.LetPrim node) {
Variable variable = getVariable(node.primitive);
@@ -296,6 +338,10 @@ class Builder extends cps_ir.Visitor<Node> {
}
}
+ Statement visitRunnableBody(cps_ir.RunnableBody node) {
+ return visit(node.body);
+ }
+
Statement visitLetCont(cps_ir.LetCont node) {
Label label;
if (node.continuation.hasMultipleUses) {

Powered by Google App Engine
This is Rietveld 408576698