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

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

Issue 958603002: Added VariableUse expression to tree IR. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Updated docs regarding catch parameters Created 5 years, 10 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
« no previous file with comments | « no previous file | pkg/compiler/lib/src/js_backend/codegen/codegen.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart
diff --git a/pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart b/pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart
index 8b6ccfb525570a5b15857fa55db1582130946663..787dd5f3739eadb55c92ce7f6adfe5a1fe42534f 100644
--- a/pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart
+++ b/pkg/compiler/lib/src/dart_backend/backend_ast_emitter.dart
@@ -96,6 +96,12 @@ class BuilderContext<T> {
variables.add(decl);
}
+ /// Creates an [Identifier] referring to the given variable.
+ Expression makeVariableAccess(tree.Variable variable) {
+ return new Identifier(getVariableName(variable))
+ ..element = variable.element;
+ }
+
/// Generates a name for the given variable and synthesizes an element for it,
/// if necessary.
String getVariableName(tree.Variable variable) {
@@ -540,7 +546,7 @@ class ASTEmitter
}
// Emit a variable declaration if we are required to do so.
- // This is to ensure that a fresh closure variable is created.
+ // For captured variables, this ensures that a fresh variable is created.
if (stmt.isDeclaration) {
assert(isFirstOccurrence);
assert(isDeclaredHere);
@@ -554,7 +560,7 @@ class ASTEmitter
}
context.addStatement(new ExpressionStatement(makeAssignment(
- visitVariable(stmt.variable, context),
+ context.makeVariableAccess(stmt.variable),
definition)));
visitStatement(stmt.next, context);
}
@@ -863,10 +869,9 @@ class ASTEmitter
}
@override
- Expression visitVariable(tree.Variable exp,
- BuilderContext<Statement> context) {
- return new Identifier(context.getVariableName(exp))
- ..element = exp.element;
+ Expression visitVariableUse(tree.VariableUse exp,
+ BuilderContext<Statement> context) {
+ return context.makeVariableAccess(exp.variable);
}
FunctionExpression makeSubFunction(tree.FunctionDefinition function,
@@ -1265,12 +1270,15 @@ class UnshadowParameters extends tree.RecursiveVisitor {
tree.Variable newParam = new tree.Variable(definition.element,
param.element);
definition.parameters[i] = newParam;
- definition.body = new tree.Assign(param, newParam, definition.body);
+ definition.body = new tree.Assign(param, new tree.VariableUse(newParam),
+ definition.body);
newParam.writeCount = 1; // Being a parameter counts as a write.
+ param.writeCount--; // Not a parameter anymore.
}
}
}
+ @override
visitVariable(tree.Variable variable) {
if (shadowedParameters.contains(variable)) {
hasShadowedUse.add(variable);
« no previous file with comments | « no previous file | pkg/compiler/lib/src/js_backend/codegen/codegen.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698