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; |
| 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]) { |
36 if (queueIsClosed) { | 45 // int allowed = ElementCategory.VARIABLE | ElementCategory.FUNCTION |
| 46 // | ElementCategory.FACTORY; |
| 47 // if (element is AbstractFieldElement) return; |
| 48 // if (!element.isAccessor() && (element.kind.category & allowed) == 0) retu
rn; |
| 49 // if (!element.isParameter() && !element.isTopLevel() && !element.enclosing
Element.isClass()) return; |
| 50 if (element.isForeign()) return; |
| 51 if (queueIsClosed && !isFirstQueue) { |
37 compiler.internalErrorOnElement(element, "Work list is closed."); | 52 compiler.internalErrorOnElement(element, "Work list is closed."); |
38 } | 53 } |
39 if (element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { | 54 if (element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { |
40 registerInstantiatedClass(element.enclosingElement); | 55 registerInstantiatedClass(element.enclosingElement); |
41 } | 56 } |
42 queue.add(new WorkItem(element, elements)); | 57 if (elements === null) { |
| 58 elements = getCachedElements(element); |
| 59 if (!isFirstQueue && elements === null) { |
| 60 if (element.getLibrary() !== compiler.interceptorsLibrary && |
| 61 element.getLibrary() !== compiler.jsHelperLibrary) { |
| 62 // compiler.internalErrorOnElement(element, 'Unresolved element'); |
| 63 } |
| 64 } |
| 65 } |
| 66 _queue.add(new WorkItem(element, elements)); |
43 } | 67 } |
44 | 68 |
45 void registerInstantiatedClass(ClassElement cls) { | 69 void registerInstantiatedClass(ClassElement cls) { |
46 universe.instantiatedClasses.add(cls); | 70 universe.instantiatedClasses.add(cls); |
47 onRegisterInstantiatedClass(cls); | 71 onRegisterInstantiatedClass(cls); |
48 } | 72 } |
49 | 73 |
50 bool checkNoEnqueuedInvokedInstanceMethods() { | 74 bool checkNoEnqueuedInvokedInstanceMethods() { |
51 task.measure(() { | 75 task.measure(() { |
52 // Run through the classes and see if we need to compile methods. | 76 // Run through the classes and see if we need to compile methods. |
(...skipping 26 matching lines...) Expand all Loading... |
79 for (Selector selector in invokedSelectors) { | 103 for (Selector selector in invokedSelectors) { |
80 registerDynamicInvocation(Namer.CLOSURE_INVOCATION_NAME, selector); | 104 registerDynamicInvocation(Namer.CLOSURE_INVOCATION_NAME, selector); |
81 } | 105 } |
82 } | 106 } |
83 } | 107 } |
84 }); | 108 }); |
85 } | 109 } |
86 | 110 |
87 void processInstantiatedClassMember(Element member) { | 111 void processInstantiatedClassMember(Element member) { |
88 if (universe.generatedCode.containsKey(member)) return; | 112 if (universe.generatedCode.containsKey(member)) return; |
| 113 if (resolvedElements[member] !== null) return; |
89 | 114 |
90 if (!member.isInstanceMember()) return; | 115 if (!member.isInstanceMember()) return; |
91 if (member.isField()) return; | 116 if (member.isField()) return; |
92 | 117 |
93 String memberName = member.name.slowToString(); | 118 String memberName = member.name.slowToString(); |
94 Link<Element> members = instanceMembersByName.putIfAbsent( | 119 Link<Element> members = instanceMembersByName.putIfAbsent( |
95 memberName, () => const EmptyLink<Element>()); | 120 memberName, () => const EmptyLink<Element>()); |
96 instanceMembersByName[memberName] = members.prepend(member); | 121 instanceMembersByName[memberName] = members.prepend(member); |
97 | 122 |
98 if (member.kind === ElementKind.GETTER || | 123 if (member.kind === ElementKind.GETTER || |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 } | 245 } |
221 | 246 |
222 void registerDynamicSetter(SourceString methodName, Selector selector) { | 247 void registerDynamicSetter(SourceString methodName, Selector selector) { |
223 registerSetter(methodName, selector); | 248 registerSetter(methodName, selector); |
224 } | 249 } |
225 | 250 |
226 // TODO(ngeoffray): This should get a type. | 251 // TODO(ngeoffray): This should get a type. |
227 void registerIsCheck(Element element) { | 252 void registerIsCheck(Element element) { |
228 universe.isChecks.add(element); | 253 universe.isChecks.add(element); |
229 } | 254 } |
| 255 |
| 256 void forEach(f(WorkItem work)) { |
| 257 while (!_queue.isEmpty()) { |
| 258 f(_queue.removeLast()); |
| 259 } |
| 260 } |
230 } | 261 } |
OLD | NEW |