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

Unified Diff: frog/leg/ssa/builder.dart

Issue 9166010: Implement super calls. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. Created 8 years, 11 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: frog/leg/ssa/builder.dart
diff --git a/frog/leg/ssa/builder.dart b/frog/leg/ssa/builder.dart
index f846ad1ab8eb74d87a4a1a5bf79f8a6374c75d6f..e2996f70598a57de7210cd13b05dc2289cfab276 100644
--- a/frog/leg/ssa/builder.dart
+++ b/frog/leg/ssa/builder.dart
@@ -551,6 +551,9 @@ class SsaBuilder implements Visitor {
compiler.unimplemented("Ssa.visitIdentifier.", node: node);
}
stack.add(thisDefinition);
+ } else if (node.isSuper()) {
+ // super should not be visited as an identifier.
+ compiler.internalError("unexpected identifier: super", node: node);
} else {
Element element = elements[node];
compiler.ensure(element !== null);
@@ -801,7 +804,7 @@ class SsaBuilder implements Visitor {
if (send.receiver == null) {
receiver = thisDefinition;
if (receiver === null) {
- compiler.unimplemented("Ssa.generateGetter.", node: node);
+ compiler.unimplemented("Ssa.generateGetter.", node: send);
}
} else {
visit(send.receiver);
@@ -839,7 +842,7 @@ class SsaBuilder implements Visitor {
String methodName = compiler.namer.setterName(element.name);
HInstruction receiver = thisDefinition;
if (receiver === null) {
- compiler.unimplemented("Ssa.generateSetter.", node: node);
+ compiler.unimplemented("Ssa.generateSetter.", node: send);
}
add(new HInvokeDynamicSetter(element, methodName, receiver, value));
stack.add(value);
@@ -850,7 +853,7 @@ class SsaBuilder implements Visitor {
if (send.receiver == null) {
receiver = thisDefinition;
if (receiver === null) {
- compiler.unimplemented("Ssa.generateSetter.", node: node);
+ compiler.unimplemented("Ssa.generateSetter.", node: send);
}
} else {
visit(send.receiver);
@@ -957,7 +960,7 @@ class SsaBuilder implements Visitor {
}
visitForeignSend(Send node) {
- switch (node.selector.source.stringValue) {
+ switch (node.selector.asIdentifier().source.stringValue) {
case "JS":
Link<Node> link = node.arguments;
// If the invoke is on foreign code, don't visit the first
@@ -988,6 +991,20 @@ class SsaBuilder implements Visitor {
}
}
+ visitSuperSend(Send node) {
+ Element element = elements[node];
+ HStatic target = new HStatic(element);
+ HThis context = thisDefinition;
+ if (context === null) {
+ compiler.unimplemented("Ssa.visitSuperSend without thisDefinition.",
+ node: node);
+ }
+ add(target);
+ var inputs = <HInstruction>[target, context];
+ addVisitedSendArgumentsToList(node.arguments, inputs);
+ push(new HInvokeSuper(inputs));
+ }
+
visitStaticSend(Send node) {
Element element = elements[node];
HStatic target = new HStatic(element);
@@ -1005,6 +1022,10 @@ class SsaBuilder implements Visitor {
generateGetter(node, elements[node]);
} else if (Elements.isClosureSend(node, elements)) {
visitClosureSend(node);
+ } else if (node.receiver !== null &&
+ node.receiver.asIdentifier() !== null &&
+ node.receiver.asIdentifier().isSuper()) {
ngeoffray 2012/01/11 13:00:48 I think we can add a Send.isSuperCall to the Send
karlklose 2012/01/11 13:46:12 Done.
+ visitSuperSend(node);
} else {
Element element = elements[node];
if (element === null) {

Powered by Google App Engine
This is Rietveld 408576698