OLD | NEW |
---|---|
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
4 | 4 |
5 class EnqueueTask extends CompilerTask { | 5 class EnqueueTask extends CompilerTask { |
6 final Enqueuer codegen; | 6 final Enqueuer codegen; |
7 final Enqueuer resolution; | 7 final Enqueuer resolution; |
8 | 8 |
9 String get name() => 'Enqueue'; | 9 String get name() => 'Enqueue'; |
10 | 10 |
11 EnqueueTask(Compiler compiler) | 11 EnqueueTask(Compiler compiler) |
12 : codegen = new Enqueuer(compiler), | 12 : codegen = new Enqueuer(compiler), |
13 resolution = new Enqueuer(compiler), | 13 resolution = new Enqueuer(compiler), |
14 super(compiler) { | 14 super(compiler) { |
15 codegen.task = this; | 15 codegen.task = this; |
16 resolution.task = this; | 16 resolution.task = this; |
17 } | 17 } |
18 } | 18 } |
19 | 19 |
20 class Enqueuer { | 20 class Enqueuer { |
21 final Compiler compiler; // TODO(ahe): Remove this dependency. | 21 final Compiler compiler; // TODO(ahe): Remove this dependency. |
22 final Map<String, Link<Element>> instanceMembersByName; | 22 final Map<String, Link<Element>> instanceMembersByName; |
23 final Set<ClassElement> seenClasses; | 23 final Set<ClassElement> seenClasses; |
24 final Universe universe; | 24 final Universe universe; |
25 final Queue<WorkItem> queue; | 25 final Queue<WorkItem> queue; |
26 final Map<Element, TreeElements> resolvedElements; | |
26 bool queueIsClosed = false; | 27 bool queueIsClosed = false; |
27 EnqueueTask task; | 28 EnqueueTask task; |
28 | 29 |
29 Enqueuer(this.compiler) | 30 Enqueuer(this.compiler) |
30 : instanceMembersByName = new Map<String, Link<Element>>(), | 31 : instanceMembersByName = new Map<String, Link<Element>>(), |
31 seenClasses = new Set<ClassElement>(), | 32 seenClasses = new Set<ClassElement>(), |
32 universe = new Universe(), | 33 universe = new Universe(), |
33 queue = new Queue<WorkItem>(); | 34 queue = new Queue<WorkItem>(), |
35 resolvedElements = new Map<Element, TreeElements>(); | |
36 | |
37 bool get isFirstQueue() => compiler.enqueuer.resolution === this; | |
ngeoffray
2012/06/12 12:44:14
isResolutionQueue?
ahe
2012/06/12 18:47:13
Done.
| |
38 | |
39 TreeElements getCachedElements(Element element) { | |
40 Element owner = element.getOutermostEnclosingMemberOrTopLevel(); | |
41 return compiler.enqueuer.resolution.resolvedElements[owner]; | |
42 } | |
34 | 43 |
35 void addToWorkList(Element element, [TreeElements elements]) { | 44 void addToWorkList(Element element, [TreeElements elements]) { |
45 if (element.isForeign()) return; | |
36 if (queueIsClosed) { | 46 if (queueIsClosed) { |
47 if (isFirstQueue && getCachedElements(element) !== null) return; | |
37 compiler.internalErrorOnElement(element, "Work list is closed."); | 48 compiler.internalErrorOnElement(element, "Work list is closed."); |
38 } | 49 } |
39 if (element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { | 50 if (!isFirstQueue && element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { |
40 registerInstantiatedClass(element.enclosingElement); | 51 registerInstantiatedClass(element.enclosingElement); |
41 } | 52 } |
53 if (elements === null) { | |
54 elements = getCachedElements(element); | |
55 } | |
42 queue.add(new WorkItem(element, elements)); | 56 queue.add(new WorkItem(element, elements)); |
43 } | 57 } |
44 | 58 |
45 void registerInstantiatedClass(ClassElement cls) { | 59 void registerInstantiatedClass(ClassElement cls) { |
60 if (cls.isInterface()) { | |
61 compiler.internalErrorOnElement( | |
62 // Use the current element, as this is where cls is referenced from. | |
63 compiler.currentElement, | |
64 'Expected a class, but $cls is an interface.'); | |
65 } | |
46 universe.instantiatedClasses.add(cls); | 66 universe.instantiatedClasses.add(cls); |
47 onRegisterInstantiatedClass(cls); | 67 onRegisterInstantiatedClass(cls); |
48 } | 68 } |
49 | 69 |
50 bool checkNoEnqueuedInvokedInstanceMethods() { | 70 bool checkNoEnqueuedInvokedInstanceMethods() { |
51 task.measure(() { | 71 task.measure(() { |
52 // Run through the classes and see if we need to compile methods. | 72 // Run through the classes and see if we need to compile methods. |
53 for (ClassElement classElement in universe.instantiatedClasses) { | 73 for (ClassElement classElement in universe.instantiatedClasses) { |
54 for (ClassElement currentClass = classElement; | 74 for (ClassElement currentClass = classElement; |
55 currentClass !== null; | 75 currentClass !== null; |
(...skipping 23 matching lines...) Expand all Loading... | |
79 for (Selector selector in invokedSelectors) { | 99 for (Selector selector in invokedSelectors) { |
80 registerDynamicInvocation(Namer.CLOSURE_INVOCATION_NAME, selector); | 100 registerDynamicInvocation(Namer.CLOSURE_INVOCATION_NAME, selector); |
81 } | 101 } |
82 } | 102 } |
83 } | 103 } |
84 }); | 104 }); |
85 } | 105 } |
86 | 106 |
87 void processInstantiatedClassMember(Element member) { | 107 void processInstantiatedClassMember(Element member) { |
88 if (universe.generatedCode.containsKey(member)) return; | 108 if (universe.generatedCode.containsKey(member)) return; |
109 if (resolvedElements[member] !== null) return; | |
89 | 110 |
90 if (!member.isInstanceMember()) return; | 111 if (!member.isInstanceMember()) return; |
91 if (member.isField()) return; | 112 if (member.isField()) return; |
92 | 113 |
93 String memberName = member.name.slowToString(); | 114 String memberName = member.name.slowToString(); |
94 Link<Element> members = instanceMembersByName.putIfAbsent( | 115 Link<Element> members = instanceMembersByName.putIfAbsent( |
95 memberName, () => const EmptyLink<Element>()); | 116 memberName, () => const EmptyLink<Element>()); |
96 instanceMembersByName[memberName] = members.prepend(member); | 117 instanceMembersByName[memberName] = members.prepend(member); |
97 | 118 |
98 if (member.kind === ElementKind.GETTER || | 119 if (member.kind === ElementKind.GETTER || |
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
236 registerNewSelector(setterName, | 257 registerNewSelector(setterName, |
237 new TypedSelector(type, Selector.SETTER), | 258 new TypedSelector(type, Selector.SETTER), |
238 universe.fieldSetters); | 259 universe.fieldSetters); |
239 }); | 260 }); |
240 } | 261 } |
241 | 262 |
242 // TODO(ngeoffray): This should get a type. | 263 // TODO(ngeoffray): This should get a type. |
243 void registerIsCheck(Element element) { | 264 void registerIsCheck(Element element) { |
244 universe.isChecks.add(element); | 265 universe.isChecks.add(element); |
245 } | 266 } |
267 | |
268 void forEach(f(WorkItem work)) { | |
269 while (!queue.isEmpty()) { | |
270 f(queue.removeLast()); | |
271 } | |
272 } | |
246 } | 273 } |
OLD | NEW |