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

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

Issue 10910088: Fix host-checked + checked by registering when a class is being instantiated, not when being proces… (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « lib/compiler/implementation/compiler.dart ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 } 162 }
163 163
164 void processInstantiatedClass(ClassElement cls) { 164 void processInstantiatedClass(ClassElement cls) {
165 cls.localMembers.forEach(processInstantiatedClassMember); 165 cls.localMembers.forEach(processInstantiatedClassMember);
166 } 166 }
167 167
168 void processInstantiatedClassMember(Element member) { 168 void processInstantiatedClassMember(Element member) {
169 if (universe.generatedCode.containsKey(member)) return; 169 if (universe.generatedCode.containsKey(member)) return;
170 if (resolvedElements[member] !== null) return; 170 if (resolvedElements[member] !== null) return;
171 if (!member.isInstanceMember()) return; 171 if (!member.isInstanceMember()) return;
172 172 if (member.isField()) return;
173 if (member.kind === ElementKind.FIELD) {
174 universe.instantiatedClassInstanceFields.add(member.name);
ahe 2012/09/05 12:52:04 I think this field is unused. Could you remove it
ngeoffray 2012/09/05 12:57:30 Done.
175 if (compiler.enableTypeAssertions) {
176 DartType type = member.computeType(compiler);
177 registerIsCheck(type.element);
178 SourceString helper = compiler.backend.getCheckedModeHelper(type);
179 if (helper != null) {
180 Element helperElement = compiler.findHelper(helper);
181 registerStaticUse(helperElement);
182 }
183 }
184 return;
185 }
186 173
187 String memberName = member.name.slowToString(); 174 String memberName = member.name.slowToString();
188 Link<Element> members = instanceMembersByName.putIfAbsent( 175 Link<Element> members = instanceMembersByName.putIfAbsent(
189 memberName, () => const EmptyLink<Element>()); 176 memberName, () => const EmptyLink<Element>());
190 instanceMembersByName[memberName] = members.prepend(member); 177 instanceMembersByName[memberName] = members.prepend(member);
191 178
192 179
193 if (member.kind == ElementKind.FUNCTION) { 180 if (member.kind == ElementKind.FUNCTION) {
194 if (member.name == Compiler.NO_SUCH_METHOD) { 181 if (member.name == Compiler.NO_SUCH_METHOD) {
195 compiler.enableNoSuchMethod(member); 182 compiler.enableNoSuchMethod(member);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 cls = supertypes.head.element; 221 cls = supertypes.head.element;
235 if (seenClasses.contains(cls)) continue; 222 if (seenClasses.contains(cls)) continue;
236 seenClasses.add(cls); 223 seenClasses.add(cls);
237 cls.ensureResolved(compiler); 224 cls.ensureResolved(compiler);
238 if (!cls.isInterface()) { 225 if (!cls.isInterface()) {
239 cls.localMembers.forEach(processInstantiatedClassMember); 226 cls.localMembers.forEach(processInstantiatedClassMember);
240 } 227 }
241 if (isResolutionQueue) { 228 if (isResolutionQueue) {
242 compiler.resolver.checkMembers(cls); 229 compiler.resolver.checkMembers(cls);
243 } 230 }
231
232 if (compiler.enableTypeAssertions) {
ahe 2012/09/05 12:52:04 This still doesn't feel right.
ngeoffray 2012/09/05 12:57:30 Added a TODO.
233 // We need to register is checks and helpers for checking
234 // assignments to fields.
235 cls.localMembers.forEach((Element member) {
236 if (!member.isInstanceMember() && !member.isField()) return;
237 DartType type = member.computeType(compiler);
238 registerIsCheck(type.element);
239 SourceString helper = compiler.backend.getCheckedModeHelper(type);
240 if (helper != null) {
241 Element helperElement = compiler.findHelper(helper);
242 registerStaticUse(helperElement);
243 }
244 });
245 }
244 } 246 }
245 }); 247 });
246 } 248 }
247 249
248 void registerNewSelector(SourceString name, 250 void registerNewSelector(SourceString name,
249 Selector selector, 251 Selector selector,
250 Map<SourceString, Set<Selector>> selectorsMap) { 252 Map<SourceString, Set<Selector>> selectorsMap) {
251 if (name != selector.name) { 253 if (name != selector.name) {
252 String message = "$name != ${selector.name} (${selector.kind})"; 254 String message = "$name != ${selector.name} (${selector.kind})";
253 compiler.internalError("Wrong selector name: $message."); 255 compiler.internalError("Wrong selector name: $message.");
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 void registerIsCheck(Element element) { 354 void registerIsCheck(Element element) {
353 universe.isChecks.add(element); 355 universe.isChecks.add(element);
354 } 356 }
355 357
356 void forEach(f(WorkItem work)) { 358 void forEach(f(WorkItem work)) {
357 while (!queue.isEmpty()) { 359 while (!queue.isEmpty()) {
358 f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst? 360 f(queue.removeLast()); // TODO(kasperl): Why isn't this removeFirst?
359 } 361 }
360 } 362 }
361 } 363 }
OLDNEW
« no previous file with comments | « lib/compiler/implementation/compiler.dart ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698