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

Side by Side Diff: lib/compiler/implementation/enqueue.dart

Issue 10827180: Move types out of the HInstructions. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address comments. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 compiler.backend.createItemCompilationContext),
14 resolution = new Enqueuer(compiler,
15 compiler.backend.createItemCompilationContext),
14 super(compiler) { 16 super(compiler) {
15 codegen.task = this; 17 codegen.task = this;
16 resolution.task = this; 18 resolution.task = this;
17 } 19 }
18 } 20 }
19 21
20 class RecompilationQueue { 22 class RecompilationQueue {
23 final Function itemCompilationContextCreator;
21 final Queue<WorkItem> queue; 24 final Queue<WorkItem> queue;
22 final Set<Element> queueElements; 25 final Set<Element> queueElements;
23 int processed = 0; 26 int processed = 0;
24 27
25 RecompilationQueue() 28 RecompilationQueue(ItemCompilationContext itemCompilationContextCreator())
26 : queue = new Queue<WorkItem>(), 29 : this.itemCompilationContextCreator = itemCompilationContextCreator,
30 queue = new Queue<WorkItem>(),
27 queueElements = new Set<Element>(); 31 queueElements = new Set<Element>();
28 32
29 void add(Element element, TreeElements elements) { 33 void add(Element element, TreeElements elements) {
30 if (queueElements.contains(element)) return; 34 if (queueElements.contains(element)) return;
31 queueElements.add(element); 35 queueElements.add(element);
32 queue.add(new WorkItem(element, elements)); 36 queue.add(new WorkItem(element, elements, itemCompilationContextCreator()));
33 } 37 }
34 38
35 int get length() => queue.length; 39 int get length() => queue.length;
36 40
37 bool isEmpty() => queue.isEmpty(); 41 bool isEmpty() => queue.isEmpty();
38 42
39 WorkItem next() { 43 WorkItem next() {
40 WorkItem item = queue.removeLast(); 44 WorkItem item = queue.removeLast();
41 queueElements.remove(item.element); 45 queueElements.remove(item.element);
42 processed++; 46 processed++;
43 return item; 47 return item;
44 } 48 }
45 } 49 }
46 50
47 class Enqueuer { 51 class Enqueuer {
48 final Compiler compiler; // TODO(ahe): Remove this dependency. 52 final Compiler compiler; // TODO(ahe): Remove this dependency.
53 final Function itemCompilationContextCreator;
49 final Map<String, Link<Element>> instanceMembersByName; 54 final Map<String, Link<Element>> instanceMembersByName;
50 final Set<ClassElement> seenClasses; 55 final Set<ClassElement> seenClasses;
51 final Universe universe; 56 final Universe universe;
52 final Queue<WorkItem> queue; 57 final Queue<WorkItem> queue;
53 final Map<Element, TreeElements> resolvedElements; 58 final Map<Element, TreeElements> resolvedElements;
54 final RecompilationQueue recompilationCandidates; 59 final RecompilationQueue recompilationCandidates;
55 60
56 bool queueIsClosed = false; 61 bool queueIsClosed = false;
57 EnqueueTask task; 62 EnqueueTask task;
58 63
59 Enqueuer(this.compiler) 64 Enqueuer(this.compiler,
60 : instanceMembersByName = new Map<String, Link<Element>>(), 65 ItemCompilationContext itemCompilationContextCreator())
66 : this.itemCompilationContextCreator = itemCompilationContextCreator,
67 instanceMembersByName = new Map<String, Link<Element>>(),
61 seenClasses = new Set<ClassElement>(), 68 seenClasses = new Set<ClassElement>(),
62 universe = new Universe(), 69 universe = new Universe(),
63 queue = new Queue<WorkItem>(), 70 queue = new Queue<WorkItem>(),
64 resolvedElements = new Map<Element, TreeElements>(), 71 resolvedElements = new Map<Element, TreeElements>(),
65 recompilationCandidates = new RecompilationQueue(); 72 recompilationCandidates =
73 new RecompilationQueue(itemCompilationContextCreator);
66 74
67 bool get isResolutionQueue() => compiler.enqueuer.resolution === this; 75 bool get isResolutionQueue() => compiler.enqueuer.resolution === this;
68 76
69 TreeElements getCachedElements(Element element) { 77 TreeElements getCachedElements(Element element) {
70 Element owner = element.getOutermostEnclosingMemberOrTopLevel(); 78 Element owner = element.getOutermostEnclosingMemberOrTopLevel();
71 return compiler.enqueuer.resolution.resolvedElements[owner]; 79 return compiler.enqueuer.resolution.resolvedElements[owner];
72 } 80 }
73 81
74 String lookupCode(Element element) => 82 String lookupCode(Element element) =>
75 universe.generatedCode[element].toString(); 83 universe.generatedCode[element].toString();
76 84
77 void addToWorkList(Element element, [TreeElements elements]) { 85 void addToWorkList(Element element, [TreeElements elements]) {
78 if (element.isForeign()) return; 86 if (element.isForeign()) return;
79 if (compiler.phase == Compiler.PHASE_RECOMPILING) return; 87 if (compiler.phase == Compiler.PHASE_RECOMPILING) return;
80 if (queueIsClosed) { 88 if (queueIsClosed) {
81 if (isResolutionQueue && getCachedElements(element) !== null) return; 89 if (isResolutionQueue && getCachedElements(element) !== null) return;
82 compiler.internalErrorOnElement(element, "Work list is closed."); 90 compiler.internalErrorOnElement(element, "Work list is closed.");
83 } 91 }
84 if (!isResolutionQueue && 92 if (!isResolutionQueue &&
85 element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) { 93 element.kind === ElementKind.GENERATIVE_CONSTRUCTOR) {
86 registerInstantiatedClass(element.getEnclosingClass()); 94 registerInstantiatedClass(element.getEnclosingClass());
87 } 95 }
88 if (elements === null) { 96 if (elements === null) {
89 elements = getCachedElements(element); 97 elements = getCachedElements(element);
90 } 98 }
91 queue.add(new WorkItem(element, elements)); 99 queue.add(new WorkItem(element, elements, itemCompilationContextCreator()));
92 } 100 }
93 101
94 void eagerRecompile(Element element) { 102 void eagerRecompile(Element element) {
95 universe.generatedCode.remove(element); 103 universe.generatedCode.remove(element);
96 universe.generatedBailoutCode.remove(element); 104 universe.generatedBailoutCode.remove(element);
97 addToWorkList(element); 105 addToWorkList(element);
98 } 106 }
99 107
100 bool canBeRecompiled(Element element) { 108 bool canBeRecompiled(Element element) {
101 // Only member functions can be recompiled. An exception to this is members 109 // Only member functions can be recompiled. An exception to this is members
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 void registerIsCheck(Element element) { 329 void registerIsCheck(Element element) {
322 universe.isChecks.add(element); 330 universe.isChecks.add(element);
323 } 331 }
324 332
325 void forEach(f(WorkItem work)) { 333 void forEach(f(WorkItem work)) {
326 while (!queue.isEmpty()) { 334 while (!queue.isEmpty()) {
327 f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst? 335 f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst?
328 } 336 }
329 } 337 }
330 } 338 }
OLDNEW
« no previous file with comments | « lib/compiler/implementation/compiler.dart ('k') | lib/compiler/implementation/js_backend/backend.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698