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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10825337: Add name and library to selectors. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 4 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/resolver.dart ('k') | lib/compiler/implementation/ssa/codegen.dart » ('j') | lib/compiler/implementation/universe.dart » ('J')
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 e32848f3dfb0c82ec2c03c4d2592b04f94ecb2ad..3f86137aeaeb47c1b8b676cb1957c07eff8b048c 100644
--- a/lib/compiler/implementation/ssa/builder.dart
+++ b/lib/compiler/implementation/ssa/builder.dart
@@ -989,12 +989,14 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
if (enclosingClass != compiler.objectClass) {
assert(superClass !== null);
assert(superClass.resolutionState == ClassElement.STATE_DONE);
+ Selector selector =
+ new Selector.call(superClass.name, enclosingClass.getLibrary(), 0);
FunctionElement target = superClass.lookupConstructor(superClass.name);
if (target === null) {
compiler.internalError("no default constructor available");
}
inlineSuperOrRedirect(target,
- Selector.INVOCATION_0,
+ selector,
const EmptyLink<Node>(),
constructors,
fieldValues);
@@ -1773,10 +1775,9 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
Constant value = compiler.constantHandler.compileVariable(element);
stack.add(graph.addConstant(value));
} else {
- Selector selector = elements.getSelector(send);
push(new HStatic(element));
if (element.kind == ElementKind.GETTER) {
- push(new HInvokeStatic(selector, <HInstruction>[pop()]));
+ push(new HInvokeStatic(<HInstruction>[pop()]));
}
}
} else if (Elements.isInstanceSend(send, elements)) {
@@ -1816,11 +1817,10 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
void generateSetter(SendSet send, Element element, HInstruction value) {
if (Elements.isStaticOrTopLevelField(element)) {
- Selector selector = elements.getSelector(send);
if (element.kind == ElementKind.SETTER) {
HStatic target = new HStatic(element);
add(target);
- add(new HInvokeStatic(selector, <HInstruction>[target, value]));
+ add(new HInvokeStatic(<HInstruction>[target, value]));
} else {
add(new HStaticStore(element, value));
}
@@ -1843,6 +1843,30 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
}
}
+ void pushInvokeHelper0(Element helper) {
Søren Gjesse 2012/08/14 12:01:38 How about "pushInvokeStatic0" and rename argument
kasperl 2012/08/14 12:15:46 I'll fix this in another CL. Still trying to merge
+ HInstruction reference = new HStatic(helper);
+ add(reference);
+ List<HInstruction> inputs = <HInstruction>[reference];
+ HInstruction result = new HInvokeStatic(inputs);
+ push(result);
+ }
+
+ void pushInvokeHelper1(Element helper, HInstruction a0) {
Søren Gjesse 2012/08/14 12:01:38 Ditto.
+ HInstruction reference = new HStatic(helper);
+ add(reference);
+ List<HInstruction> inputs = <HInstruction>[reference, a0];
+ HInstruction result = new HInvokeStatic(inputs);
+ push(result);
+ }
+
+ void pushInvokeHelper2(Element helper, HInstruction a0, HInstruction a1) {
Søren Gjesse 2012/08/14 12:01:38 Ditto.
+ HInstruction reference = new HStatic(helper);
+ add(reference);
+ List<HInstruction> inputs = <HInstruction>[reference, a0, a1];
+ HInstruction result = new HInvokeStatic(inputs);
+ push(result);
+ }
+
visitOperatorSend(node) {
assert(node.selector is Operator);
if (!methodInterceptionEnabled) {
@@ -1882,13 +1906,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
Type type = elements.getType(typeAnnotation);
HInstruction typeInfo = null;
if (compiler.codegenWorld.rti.hasTypeArguments(type)) {
- HInstruction typeInfoGetter =
- new HStatic(interceptors.getGetRuntimeTypeInfo());
- add(typeInfoGetter);
- typeInfo = new HInvokeStatic(Selector.INVOCATION_1,
- <HInstruction>[typeInfoGetter,
- expression]);
- add(typeInfo);
+ pushInvokeHelper1(interceptors.getGetRuntimeTypeInfo(), expression);
+ typeInfo = pop();
}
if (type.element.kind === ElementKind.TYPE_VARIABLE) {
// TODO(karlklose): We emulate the frog behavior and answer
@@ -2142,10 +2161,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
compiler.cancel(
'Isolate library and compiler mismatch', node: node);
}
- HStatic target = new HStatic(element);
- add(target);
- push(new HInvokeStatic(Selector.INVOCATION_0,
- <HInstruction>[target]));
+ pushInvokeHelper0(element);
}
}
@@ -2155,8 +2171,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
// If the isolate library is not used, we just invoke the
// closure.
visit(link.tail.head);
- push(new HInvokeClosure(Selector.INVOCATION_0,
- <HInstruction>[pop()]));
+ Selector selector = new Selector.callAny(0);
+ push(new HInvokeClosure(selector, <HInstruction>[pop()]));
} else {
// Call a helper method from the isolate library.
Element element = compiler.isolateLibrary.find(
@@ -2169,7 +2185,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
add(target);
List<HInstruction> inputs = <HInstruction>[target];
addGenericSendArgumentsToList(link, inputs);
- push(new HInvokeStatic(Selector.INVOCATION_0, inputs));
+ push(new HInvokeStatic(inputs));
}
}
@@ -2195,7 +2211,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
visit(closure);
List<HInstruction> inputs = <HInstruction>[pop()];
String invocationName = compiler.namer.closureInvocationName(
- new Selector.invocation(params.requiredParameterCount));
+ new Selector.callAny(params.requiredParameterCount));
push(new HForeign(new DartString.literal('#.$invocationName'),
const LiteralDartString('var'),
inputs));
@@ -2235,7 +2251,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
self,
graph.addConstantString(new DartString.literal(name), node),
pop()];
- push(new HInvokeSuper(Selector.INVOCATION_2, inputs));
+ push(new HInvokeSuper(inputs));
}
visitSend(Send node) {
@@ -2255,7 +2271,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
add(target);
var inputs = <HInstruction>[target, context];
if (node.isPropertyAccess) {
- push(new HInvokeSuper(selector, inputs));
+ push(new HInvokeSuper(inputs));
} else if (element.kind == ElementKind.FUNCTION ||
element.kind == ElementKind.GENERATIVE_CONSTRUCTOR) {
bool succeeded = addStaticSendArgumentsToList(selector, node.arguments,
@@ -2265,9 +2281,9 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
// exception at runtime.
compiler.cancel('Unimplemented non-matching static call', node);
}
- push(new HInvokeSuper(selector, inputs));
+ push(new HInvokeSuper(inputs));
} else {
- target = new HInvokeSuper(Selector.GETTER, inputs);
+ target = new HInvokeSuper(inputs);
add(target);
inputs = <HInstruction>[target];
addDynamicSendArgumentsToList(node, inputs);
@@ -2312,7 +2328,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
}
HType elementType = computeType(element);
- HInstruction newInstance = new HInvokeStatic(selector, inputs, elementType);
+ HInstruction newInstance = new HInvokeStatic(inputs, elementType);
pushWithPosition(newInstance, node);
TypeAnnotation annotation = getTypeAnnotationFromSend(node);
@@ -2327,12 +2343,11 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
new LiteralDartString('Object'),
<HInstruction>[]);
add(typeInfo);
- HInstruction typeInfoSetter =
- new HStatic(interceptors.getSetRuntimeTypeInfo());
+ Element typeInfoSetterElement = interceptors.getSetRuntimeTypeInfo();
+ HInstruction typeInfoSetter = new HStatic(typeInfoSetterElement);
add(typeInfoSetter);
- Selector setSelector = Selector.INVOCATION_2;
var inputs = <HInstruction>[typeInfoSetter, instance, typeInfo];
- add(new HInvokeStatic(setSelector, inputs));
+ add(new HInvokeStatic(inputs));
}
}
@@ -2356,10 +2371,10 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
// exception at runtime.
compiler.cancel('Unimplemented non-matching static call', node: node);
}
- pushWithPosition(new HInvokeStatic(selector, inputs), node);
+ pushWithPosition(new HInvokeStatic(inputs), node);
} else {
if (element.kind == ElementKind.GETTER) {
- target = new HInvokeStatic(Selector.GETTER, inputs);
+ target = new HInvokeStatic(inputs);
add(target);
inputs = <HInstruction>[target];
}
@@ -2405,7 +2420,6 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
visitSendSet(SendSet node) {
Operator op = node.assignmentOperator;
if (node.isSuperCall) {
- Selector selector = elements.getSelector(node);
Element element = elements[node];
if (element === null) return generateSuperNoSuchMethodSend(node);
HInstruction target = new HStatic(element);
@@ -2413,7 +2427,7 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
add(target);
var inputs = <HInstruction>[target, context];
addDynamicSendArgumentsToList(node, inputs);
- push(new HInvokeSuper(selector, inputs));
+ push(new HInvokeSuper(inputs));
} else if (node.isIndex) {
if (!methodInterceptionEnabled) {
assert(op.source.stringValue === '=');
@@ -2719,29 +2733,26 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
// <body>
// }
- // All the generated calls are to zero-argument functions.
- Selector selector = Selector.INVOCATION_0;
// The iterator is shared between initializer, condition and body.
HInstruction iterator;
void buildInitializer() {
SourceString iteratorName = const SourceString("iterator");
Element interceptor = interceptors.getStaticInterceptor(iteratorName, 0);
assert(interceptor != null);
- HStatic target = new HStatic(interceptor);
- add(target);
visit(node.expression);
- List<HInstruction> inputs = <HInstruction>[target, pop()];
- iterator = new HInvokeInterceptor(selector, iteratorName, inputs);
- add(iterator);
+ pushInvokeHelper1(interceptor, pop());
+ iterator = pop();
}
HInstruction buildCondition() {
- push(new HInvokeDynamicMethod(
- selector, const SourceString('hasNext'), <HInstruction>[iterator]));
+ SourceString name = const SourceString('hasNext');
+ Selector call = new Selector.call(name, work.element.getLibrary(), 0);
+ push(new HInvokeDynamicMethod(call, name, <HInstruction>[iterator]));
return popBoolified();
}
void buildBody() {
- push(new HInvokeDynamicMethod(
- selector, const SourceString('next'), <HInstruction>[iterator]));
+ SourceString name = const SourceString('next');
+ Selector call = new Selector.call(name, work.element.getLibrary(), 0);
+ push(new HInvokeDynamicMethod(call, name, <HInstruction>[iterator]));
Element variable;
if (node.declaredIdentifier.asSend() !== null) {
@@ -2827,12 +2838,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
inputs.addLast(pop());
}
HLiteralList keyValuePairs = new HLiteralList(inputs);
- HStatic mapMaker = new HStatic(interceptors.getMapMaker());
add(keyValuePairs);
- add(mapMaker);
- inputs = <HInstruction>[mapMaker, keyValuePairs];
- // TODO(ngeoffray): give the concrete type of our map literal.
- push(new HInvokeStatic(Selector.INVOCATION_1, inputs, HType.UNKNOWN));
+ pushInvokeHelper1(interceptors.getMapMaker(), keyValuePairs);
}
visitLiteralMapEntry(LiteralMapEntry node) {
@@ -2962,10 +2969,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
localsHandler = new LocalsHandler.from(savedLocals);
visit(switchCase.statements);
if (!isAborted() && caseIterator.hasNext()) {
- push(new HStatic(getFallThroughErrorElement));
- HInstruction error = new HInvokeStatic(
- Selector.INVOCATION_0, <HInstruction>[pop()]);
- add(error);
+ pushInvokeHelper0(getFallThroughErrorElement);
+ HInstruction error = pop();
close(new HThrow(error));
}
statements.add(
@@ -3046,10 +3051,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
compiler.reportWarning(node, 'Missing break at end of switch case');
Element element =
compiler.findHelper(const SourceString("getFallThroughError"));
- push(new HStatic(element));
- HInstruction error = new HInvokeStatic(
- Selector.INVOCATION_0, <HInstruction>[pop()]);
- add(error);
+ pushInvokeHelper0(element);
+ HInstruction error = pop();
close(new HThrow(error));
}
}
@@ -3202,13 +3205,10 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
add(exception);
HInstruction oldRethrowableException = rethrowableException;
rethrowableException = exception;
- push(new HStatic(interceptors.getExceptionUnwrapper()));
- List<HInstruction> inputs = <HInstruction>[pop(), exception];
- HInvokeStatic unwrappedException =
- new HInvokeStatic(Selector.INVOCATION_1, inputs);
- add(unwrappedException);
- tryInstruction.exception = exception;
+ pushInvokeHelper1(interceptors.getExceptionUnwrapper(), exception);
+ HInvokeStatic unwrappedException = pop();
+ tryInstruction.exception = exception;
Link<Node> link = node.catchBlocks.nodes;
void pushCondition(CatchBlock catchBlock) {
@@ -3234,10 +3234,8 @@ class SsaBuilder extends ResolvedVisitor implements Visitor {
unwrappedException);
Node trace = catchBlock.trace;
if (trace != null) {
- push(new HStatic(interceptors.getTraceFromException()));
- HInstruction traceInstruction = new HInvokeStatic(
- Selector.INVOCATION_1, <HInstruction>[pop(), exception]);
- add(traceInstruction);
+ pushInvokeHelper1(interceptors.getTraceFromException(), exception);
+ HInstruction traceInstruction = pop();
localsHandler.updateLocal(elements[trace], traceInstruction);
}
visit(catchBlock);
« no previous file with comments | « lib/compiler/implementation/resolver.dart ('k') | lib/compiler/implementation/ssa/codegen.dart » ('j') | lib/compiler/implementation/universe.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698