Chromium Code Reviews| 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 RecompilationQueue { | |
| 21 final Queue<WorkItem> queue; | |
| 22 final Set<Element> queueElements; | |
| 23 | |
| 24 RecompilationQueue() | |
| 25 : queue = new Queue<WorkItem>(), | |
| 26 queueElements = new Set<Element>(); | |
| 27 | |
| 28 void add(Element element, [TreeElements elements]) { | |
|
floitsch
2012/06/07 10:59:39
not that it matters, but afaics the second argumen
Søren Gjesse
2012/06/13 10:55:09
Done.
| |
| 29 if (queueElements.contains(element)) return; | |
| 30 if (element.kind !== ElementKind.GENERATIVE_CONSTRUCTOR_BODY && | |
|
floitsch
2012/06/07 10:59:39
Explain why these are not recompilation canditates
Søren Gjesse
2012/06/13 10:55:09
Turned out that it is only for generative construc
| |
| 31 element.kind !== ElementKind.GENERATIVE_CONSTRUCTOR) { | |
| 32 queueElements.add(element); | |
| 33 queue.add(new WorkItem(element, elements)); | |
| 34 } | |
| 35 } | |
| 36 | |
| 37 int get length() => queue.length; | |
| 38 | |
| 39 bool isEmpty() => queue.isEmpty(); | |
| 40 | |
| 41 WorkItem next() { | |
| 42 WorkItem item = queue.removeLast(); | |
| 43 queueElements.remove(item.element); | |
| 44 return item; | |
| 45 } | |
| 46 } | |
| 47 | |
| 20 class Enqueuer { | 48 class Enqueuer { |
| 21 final Compiler compiler; // TODO(ahe): Remove this dependency. | 49 final Compiler compiler; // TODO(ahe): Remove this dependency. |
| 22 final Map<String, Link<Element>> instanceMembersByName; | 50 final Map<String, Link<Element>> instanceMembersByName; |
| 23 final Set<ClassElement> seenClasses; | 51 final Set<ClassElement> seenClasses; |
| 24 final Universe universe; | 52 final Universe universe; |
| 25 final Queue<WorkItem> queue; | 53 final Queue<WorkItem> queue; |
| 54 final RecompilationQueue recompilationCandidates; | |
| 26 bool queueIsClosed = false; | 55 bool queueIsClosed = false; |
| 27 EnqueueTask task; | 56 EnqueueTask task; |
| 28 | 57 |
| 29 Enqueuer(this.compiler) | 58 Enqueuer(this.compiler) |
| 30 : instanceMembersByName = new Map<String, Link<Element>>(), | 59 : instanceMembersByName = new Map<String, Link<Element>>(), |
| 31 seenClasses = new Set<ClassElement>(), | 60 seenClasses = new Set<ClassElement>(), |
| 32 universe = new Universe(), | 61 universe = new Universe(), |
| 33 queue = new Queue<WorkItem>(); | 62 queue = new Queue<WorkItem>(), |
| 63 recompilationCandidates = new RecompilationQueue(); | |
| 34 | 64 |
| 35 void addToWorkList(Element element, [TreeElements elements]) { | 65 void addToWorkList(Element element, [TreeElements elements]) { |
| 66 if (compiler.pass == 2) return; | |
|
floitsch
2012/06/07 10:59:39
assert that the element has already been compiled?
Søren Gjesse
2012/06/13 10:55:09
Done.
| |
| 36 if (queueIsClosed) { | 67 if (queueIsClosed) { |
| 37 compiler.internalErrorOnElement(element, "Work list is closed."); | 68 compiler.internalErrorOnElement(element, "Work list is closed."); |
| 38 } | 69 } |
| 39 if (element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { | 70 if (element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { |
| 40 registerInstantiatedClass(element.enclosingElement); | 71 registerInstantiatedClass(element.enclosingElement); |
| 41 } | 72 } |
| 42 queue.add(new WorkItem(element, elements)); | 73 queue.add(new WorkItem(element, elements)); |
| 43 } | 74 } |
| 44 | 75 |
| 76 void addToRecompilationCandidates(Element element, [TreeElements elements]) { | |
| 77 if (queueIsClosed) { | |
| 78 compiler.internalErrorOnElement(element, "Work list is closed."); | |
| 79 } | |
| 80 recompilationCandidates.add(element, elements); | |
| 81 } | |
| 82 | |
| 45 void registerInstantiatedClass(ClassElement cls) { | 83 void registerInstantiatedClass(ClassElement cls) { |
| 46 universe.instantiatedClasses.add(cls); | 84 universe.instantiatedClasses.add(cls); |
| 47 onRegisterInstantiatedClass(cls); | 85 onRegisterInstantiatedClass(cls); |
| 48 } | 86 } |
| 49 | 87 |
| 50 bool checkNoEnqueuedInvokedInstanceMethods() { | 88 bool checkNoEnqueuedInvokedInstanceMethods() { |
| 51 task.measure(() { | 89 task.measure(() { |
| 52 // Run through the classes and see if we need to compile methods. | 90 // Run through the classes and see if we need to compile methods. |
| 53 for (ClassElement classElement in universe.instantiatedClasses) { | 91 for (ClassElement classElement in universe.instantiatedClasses) { |
| 54 for (ClassElement currentClass = classElement; | 92 for (ClassElement currentClass = classElement; |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 | 259 |
| 222 void registerDynamicSetter(SourceString methodName, Selector selector) { | 260 void registerDynamicSetter(SourceString methodName, Selector selector) { |
| 223 registerSetter(methodName, selector); | 261 registerSetter(methodName, selector); |
| 224 } | 262 } |
| 225 | 263 |
| 226 // TODO(ngeoffray): This should get a type. | 264 // TODO(ngeoffray): This should get a type. |
| 227 void registerIsCheck(Element element) { | 265 void registerIsCheck(Element element) { |
| 228 universe.isChecks.add(element); | 266 universe.isChecks.add(element); |
| 229 } | 267 } |
| 230 } | 268 } |
| OLD | NEW |