Index: sdk/lib/_internal/compiler/implementation/enqueue.dart |
diff --git a/sdk/lib/_internal/compiler/implementation/enqueue.dart b/sdk/lib/_internal/compiler/implementation/enqueue.dart |
index 8c351c203181515dd59255ee802a027e6501539b..1ed3fe4ab79565b84f867c7c9248e30edb016dca 100644 |
--- a/sdk/lib/_internal/compiler/implementation/enqueue.dart |
+++ b/sdk/lib/_internal/compiler/implementation/enqueue.dart |
@@ -68,7 +68,7 @@ abstract class Enqueuer { |
if (element.isGetter() && element.name == Compiler.RUNTIME_TYPE) { |
compiler.enabledRuntimeType = true; |
// TODO(ahe): Record precise dependency here. |
- compiler.backend.registerRuntimeType(compiler.globalDependencies); |
+ compiler.backend.registerRuntimeType(this, compiler.globalDependencies); |
} else if (element == compiler.functionApplyMethod) { |
compiler.enabledFunctionApply = true; |
} else if (element == compiler.invokeOnMethod) { |
@@ -150,12 +150,20 @@ abstract class Enqueuer { |
if (member.name == Compiler.NO_SUCH_METHOD) { |
enableNoSuchMethod(member); |
} |
+ if (member.name == Compiler.CALL_OPERATOR_NAME) { |
+ if (!cls.typeVariables.isEmpty) { |
karlklose
2013/03/22 13:17:46
use '&&'. Consider storing '!cls.typeVariables.is
Johnni Winther
2013/06/21 12:19:14
Done. '!cls.typeVariables.isEmpty' is only used on
|
+ registerGenericCallMethod(member, compiler.globalDependencies); |
+ } |
+ } |
if (universe.hasInvocation(member, compiler)) { |
return addToWorkList(member); |
} |
// If there is a property access with the same name as a method we |
// need to emit the method. |
if (universe.hasInvokedGetter(member, compiler)) { |
+ if (!cls.typeVariables.isEmpty) { |
+ registerGenericClosure(member, compiler.globalDependencies); |
+ } |
// We will emit a closure, so make sure the closure class is |
// generated. |
compiler.closureClass.ensureResolved(compiler); |
@@ -271,17 +279,24 @@ abstract class Enqueuer { |
String memberName = n.slowToString(); |
Link<Element> members = instanceMembersByName[memberName]; |
if (members != null) { |
+ instanceMembersByName[memberName] = const Link<Element>(); |
karlklose
2013/03/22 13:17:46
Could you add a comment why you do this?
Johnni Winther
2013/06/21 12:19:14
Done.
|
LinkBuilder<Element> remaining = new LinkBuilder<Element>(); |
for (; !members.isEmpty; members = members.tail) { |
if (!f(members.head)) remaining.addLast(members.head); |
} |
- instanceMembersByName[memberName] = remaining.toLink(); |
+ instanceMembersByName[memberName] = |
+ remaining.toLink(instanceMembersByName[memberName]); |
} |
} |
void handleUnseenSelector(SourceString methodName, Selector selector) { |
processInstanceMembers(methodName, (Element member) { |
if (selector.appliesUnnamed(member, compiler)) { |
+ if (member.isFunction() && selector.isGetter()) { |
+ if (!member.getEnclosingClass().typeVariables.isEmpty) { |
+ registerGenericClosure(member, compiler.globalDependencies); |
+ } |
+ } |
if (member.isField() && member.enclosingElement.isNative()) { |
if (selector.isGetter() || selector.isCall()) { |
nativeEnqueuer.registerFieldLoad(member); |
@@ -377,6 +392,7 @@ abstract class Enqueuer { |
} |
void registerIsCheck(DartType type, TreeElements elements) { |
+ type = type.unalias(compiler); |
// Even in checked mode, type annotations for return type and argument |
// types do not imply type checks, so there should never be a check |
// against the type variable of a typedef. |
@@ -391,6 +407,16 @@ abstract class Enqueuer { |
compiler.backend.registerAsCheck(type, elements); |
} |
+ void registerGenericCallMethod(Element element, TreeElements elements) { |
+ compiler.backend.registerGenericCallMethod(element, this, elements); |
+ universe.genericCallMethods.add(element); |
+ } |
+ |
+ void registerGenericClosure(Element element, TreeElements elements) { |
+ compiler.backend.registerGenericClosure(element, this, elements); |
+ universe.closurizedGenericMembers.add(element); |
+ } |
+ |
void forEach(f(WorkItem work)); |
void logSummary(log(message)) { |