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

Unified Diff: pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart

Issue 787603003: Generative constructors in the new dart backend. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments, set element for constructors in frontend_ast_to_backend_ast, adjust status-file 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/optimization/statement_rewriter.dart
diff --git a/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart b/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
index 49b61c9ad0e4c6ea218c2f15d48614e4feedeed0..a483add674163d309447c017b3b039b93780da8b 100644
--- a/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
+++ b/pkg/compiler/lib/src/tree_ir/optimization/statement_rewriter.dart
@@ -91,7 +91,7 @@ part of tree_ir.optimization;
* This may trigger a flattening of nested ifs in case the eliminated label
* separated two ifs.
*/
-class StatementRewriter extends Visitor<Statement, Expression> implements Pass {
+class StatementRewriter extends Visitor<Statement, Expression> with PassMixin {
// The binding environment. The rightmost element of the list is the nearest
// available enclosing binding.
List<Assign> environment;
@@ -107,32 +107,41 @@ class StatementRewriter extends Visitor<Statement, Expression> implements Pass {
return newJump != null ? newJump : jump;
}
- void rewrite(ExecutableDefinition definition) => definition.applyPass(this);
- void rewriteFieldDefinition(FieldDefinition definition) {
- if (!definition.hasInitializer) return;
-
- environment = <Assign>[];
- definition.body = visitStatement(definition.body);
-
- // TODO(kmillikin): Allow definitions that are not propagated. Here,
- // this means rebuilding the binding with a recursively unnamed definition,
- // or else introducing a variable definition and an assignment.
- assert(environment.isEmpty);
+ rewriteExecutableDefinition(ExecutableDefinition definition) {
+ definition.body = rewriteInEmptyEnvironment(definition.body);
}
- void rewriteFunctionDefinition(FunctionDefinition definition) {
+ void rewriteConstructorDefinition(ConstructorDefinition definition) {
if (definition.isAbstract) return;
+ definition.initializers.forEach(visitExpression);
+ rewriteExecutableDefinition(definition);
+ }
+ Statement rewriteInEmptyEnvironment(Statement body) {
+ List<Assign> oldEnvironment = environment;
environment = <Assign>[];
- definition.body = visitStatement(definition.body);
+ Statement result = visitStatement(body);
// TODO(kmillikin): Allow definitions that are not propagated. Here,
// this means rebuilding the binding with a recursively unnamed definition,
// or else introducing a variable definition and an assignment.
assert(environment.isEmpty);
+ environment = oldEnvironment;
+ return result;
}
+ Expression visitFieldInitializer(FieldInitializer node) {
+ node.body = rewriteInEmptyEnvironment(node.body);
+ return node;
+ }
+
+ Expression visitSuperInitializer(SuperInitializer node) {
+ for (int i = node.arguments.length - 1; i >= 0; --i) {
+ node.arguments[i] = rewriteInEmptyEnvironment(node.arguments[i]);
+ }
+ return node;
+ }
Expression visitExpression(Expression e) => e.processed ? e : e.accept(this);
« no previous file with comments | « pkg/compiler/lib/src/tree_ir/optimization/optimization.dart ('k') | pkg/compiler/lib/src/tree_ir/tree_ir_builder.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698