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

Unified Diff: pkg/compiler/lib/src/dart_backend/backend.dart

Issue 1068243002: Overhaul tree IR visitor and rename IR classes. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add dummy use for RootVisitor and InitializerVisitor without arguments Created 5 years, 8 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/dart_backend/backend.dart
diff --git a/pkg/compiler/lib/src/dart_backend/backend.dart b/pkg/compiler/lib/src/dart_backend/backend.dart
index f84157b5b6f9eb6416f7b0b467df9cd888185f64..409b61ffa135e5d58a685a2ef5b0ab683965e633 100644
--- a/pkg/compiler/lib/src/dart_backend/backend.dart
+++ b/pkg/compiler/lib/src/dart_backend/backend.dart
@@ -131,12 +131,12 @@ class DartBackend extends Backend {
void codegen(CodegenWorkItem work) { }
- static bool checkTreeIntegrity(tree_ir.ExecutableDefinition node) {
+ static bool checkTreeIntegrity(tree_ir.RootNode node) {
new CheckTreeIntegrity().check(node);
return true; // So this can be used from assert().
}
- static bool checkCpsIntegrity(cps_ir.ExecutableDefinition node) {
+ static bool checkCpsIntegrity(cps_ir.RootNode node) {
new CheckCpsIntegrity().check(node);
return true; // So this can be used from assert().
}
@@ -145,16 +145,16 @@ class DartBackend extends Backend {
static ElementAst createElementAst(
ElementAstCreationContext context,
Element element,
- cps_ir.ExecutableDefinition cpsDefinition) {
+ cps_ir.RootNode cpsRoot) {
context.traceCompilation(element.name);
- context.traceGraph('CPS builder', cpsDefinition);
- assert(checkCpsIntegrity(cpsDefinition));
+ context.traceGraph('CPS builder', cpsRoot);
+ assert(checkCpsIntegrity(cpsRoot));
// Transformations on the CPS IR.
void applyCpsPass(cps_opt.Pass pass) {
- pass.rewrite(cpsDefinition);
- context.traceGraph(pass.passName, cpsDefinition);
- assert(checkCpsIntegrity(cpsDefinition));
+ pass.rewrite(cpsRoot);
+ context.traceGraph(pass.passName, cpsRoot);
+ assert(checkCpsIntegrity(cpsRoot));
}
// TODO(karlklose): enable type propagation for dart2dart when constant
@@ -170,16 +170,16 @@ class DartBackend extends Backend {
tree_builder.Builder builder =
new tree_builder.Builder(context.internalError);
- tree_ir.ExecutableDefinition treeDefinition = builder.build(cpsDefinition);
- assert(treeDefinition != null);
- context.traceGraph('Tree builder', treeDefinition);
- assert(checkTreeIntegrity(treeDefinition));
+ tree_ir.RootNode treeRoot = builder.build(cpsRoot);
+ assert(treeRoot != null);
+ context.traceGraph('Tree builder', treeRoot);
+ assert(checkTreeIntegrity(treeRoot));
// Transformations on the Tree IR.
void applyTreePass(tree_opt.Pass pass) {
- pass.rewrite(treeDefinition);
- context.traceGraph(pass.passName, treeDefinition);
- assert(checkTreeIntegrity(treeDefinition));
+ pass.rewrite(treeRoot);
+ context.traceGraph(pass.passName, treeRoot);
+ assert(checkTreeIntegrity(treeRoot));
}
applyTreePass(new StatementRewriter());
@@ -188,12 +188,12 @@ class DartBackend extends Backend {
applyTreePass(new LogicalRewriter());
// Backend-specific transformations.
- new backend_ast_emitter.UnshadowParameters().unshadow(treeDefinition);
- context.traceGraph('Unshadow parameters', treeDefinition);
+ new backend_ast_emitter.UnshadowParameters().unshadow(treeRoot);
+ context.traceGraph('Unshadow parameters', treeRoot);
TreeElementMapping treeElements = new TreeElementMapping(element);
- backend_ast.ExecutableDefinition backendAst =
- backend_ast_emitter.emit(treeDefinition);
+ backend_ast.RootNode backendAst =
+ backend_ast_emitter.emit(treeRoot);
Node frontend_ast = backend2frontend.emit(treeElements, backendAst);
return new ElementAst(frontend_ast, treeElements);
@@ -220,9 +220,8 @@ class DartBackend extends Backend {
return new ElementAst(element.resolvedAst.node,
element.resolvedAst.elements);
} else {
- cps_ir.ExecutableDefinition definition =
- compiler.irBuilder.getIr(element);
- return createElementAst(context, element, definition);
+ cps_ir.RootNode irNode = compiler.irBuilder.getIr(element);
+ return createElementAst(context, element, irNode);
}
}
« no previous file with comments | « pkg/compiler/lib/src/cps_ir/type_propagation.dart ('k') | pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698