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

Unified Diff: lib/compiler/implementation/ssa/builder.dart

Issue 10441044: Refactor common logic of SsaBuilder.visitSend. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Minor typo Created 8 years, 6 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 | « lib/compiler/implementation/resolved_visitor.dart ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/ssa/builder.dart
diff --git a/lib/compiler/implementation/ssa/builder.dart b/lib/compiler/implementation/ssa/builder.dart
index 8b0011ee304a10bdcc59c46c120ab955cd5c898a..0470f1b7f8961f4acf714b432aff82e15c590886 100644
--- a/lib/compiler/implementation/ssa/builder.dart
+++ b/lib/compiler/implementation/ssa/builder.dart
@@ -785,9 +785,8 @@ class JumpHandlerImpl implements JumpHandler {
}
}
-class SsaBuilder implements Visitor {
+class SsaBuilder extends ResolvedVisitor implements Visitor {
final SsaBuilderTask builder;
- TreeElements elements;
final Interceptors interceptors;
final WorkItem work;
bool methodInterceptionEnabled;
@@ -824,11 +823,11 @@ class SsaBuilder implements Visitor {
this.work = work,
interceptors = builder.interceptors,
methodInterceptionEnabled = true,
- elements = work.resolutionTree,
graph = new HGraph(),
stack = new List<HInstruction>(),
activationVariables = new Map<Element, HParameterValue>(),
- jumpTargets = new Map<TargetElement, JumpHandler>() {
+ jumpTargets = new Map<TargetElement, JumpHandler>(),
+ super(work.resolutionTree) {
localsHandler = new LocalsHandler(this);
}
@@ -1904,6 +1903,11 @@ class SsaBuilder implements Visitor {
visitOperatorSend(node) {
assert(node.selector is Operator);
+ if (!methodInterceptionEnabled) {
+ visitDynamicSend(node);
+ return;
+ }
+
Operator op = node.selector;
if (const SourceString("[]") == op.source) {
HStatic target = new HStatic(interceptors.getIndexInterceptor());
@@ -2246,7 +2250,7 @@ class SsaBuilder implements Visitor {
inputs));
}
- handleForeignSend(Send node) {
+ visitForeignSend(Send node) {
Element element = elements[node];
if (element.name == const SourceString('JS')) {
handleForeignJs(node);
@@ -2401,37 +2405,13 @@ class SsaBuilder implements Visitor {
}
}
- visitSend(Send node) {
- if (node.isSuperCall) {
- visitSuperSend(node);
- } else if (node.isOperator && methodInterceptionEnabled) {
- visitOperatorSend(node);
- } else if (node.isPropertyAccess) {
- generateGetter(node, elements[node]);
- } else if (Elements.isClosureSend(node, elements)) {
- visitClosureSend(node);
- } else {
- Element element = elements[node];
- if (element === null) {
- // Example: f() with 'f' unbound.
- // This can only happen inside an instance method.
- visitDynamicSend(node);
- } else if (element.kind == ElementKind.CLASS) {
- compiler.internalError("Cannot generate code for send", node: node);
- } else if (element.isInstanceMember()) {
- // Example: f() with 'f' bound to instance method.
- visitDynamicSend(node);
- } else if (element.kind === ElementKind.FOREIGN) {
- handleForeignSend(node);
- } else if (!element.isInstanceMember()) {
- // Example: A.f() or f() with 'f' bound to a static function.
- // Also includes new A() or new A.named() which is treated like a
- // static call to a factory.
- visitStaticSend(node);
- } else {
- compiler.internalError("Cannot generate code for send", node: node);
- }
- }
+ visitGetterSend(Send node) {
+ generateGetter(node, elements[node]);
+ }
+
+ // TODO(antonm): migrate rest of SsaBuilder to internalError.
+ internalError(String reason, [Node node]) {
+ compiler.internalError(reason, node: node);
}
// TODO(karlklose): share with resolver.
« no previous file with comments | « lib/compiler/implementation/resolved_visitor.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698