| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, 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 library dev_compiler.src.codegen.js_field_storage; | 5 library dev_compiler.src.codegen.js_field_storage; |
| 6 | 6 |
| 7 import 'dart:collection' show HashMap, HashSet; | 7 import 'dart:collection' show HashMap, HashSet; |
| 8 import 'package:analyzer/src/generated/ast.dart' show Identifier; | 8 import 'package:analyzer/src/generated/ast.dart' show Identifier; |
| 9 import 'package:analyzer/src/generated/element.dart'; | 9 import 'package:analyzer/src/generated/element.dart'; |
| 10 | 10 |
| 11 import '../info.dart' show LibraryUnit; | 11 import '../info.dart' show LibraryUnit; |
| 12 | 12 |
| 13 /// We use a storage slot for fields that override or can be overridden by | 13 /// We use a storage slot for fields that override or can be overridden by |
| 14 /// getter/setter pairs. | 14 /// getter/setter pairs. |
| 15 HashSet<FieldElement> findFieldsNeedingStorage(LibraryUnit library) { | 15 HashSet<FieldElement> findFieldsNeedingStorage( |
| 16 LibraryUnit library, HashSet<ClassElement> extensionTypes) { |
| 16 var overrides = new HashSet<FieldElement>(); | 17 var overrides = new HashSet<FieldElement>(); |
| 17 for (var unit in library.partsThenLibrary) { | 18 for (var unit in library.partsThenLibrary) { |
| 18 for (var cls in unit.element.types) { | 19 for (var cls in unit.element.types) { |
| 19 var superclasses = getSuperclasses(cls); | 20 var superclasses = getSuperclasses(cls); |
| 20 for (var field in cls.fields) { | 21 for (var field in cls.fields) { |
| 21 if (!field.isSynthetic && !overrides.contains(field)) { | 22 if (!field.isSynthetic && !overrides.contains(field)) { |
| 22 checkForPropertyOverride(field, superclasses, overrides); | 23 checkForPropertyOverride( |
| 24 field, superclasses, overrides, extensionTypes); |
| 23 } | 25 } |
| 24 } | 26 } |
| 25 } | 27 } |
| 26 } | 28 } |
| 27 | 29 |
| 28 return overrides; | 30 return overrides; |
| 29 } | 31 } |
| 30 | 32 |
| 31 void checkForPropertyOverride(FieldElement field, | 33 void checkForPropertyOverride( |
| 32 List<ClassElement> superclasses, HashSet<FieldElement> overrides) { | 34 FieldElement field, |
| 35 List<ClassElement> superclasses, |
| 36 HashSet<FieldElement> overrides, |
| 37 HashSet<ClassElement> extensionTypes) { |
| 33 assert(!field.isSynthetic); | 38 assert(!field.isSynthetic); |
| 34 | 39 |
| 35 var library = field.library; | 40 var library = field.library; |
| 36 | 41 |
| 37 bool found = false; | 42 bool found = false; |
| 38 for (var superclass in superclasses) { | 43 for (var superclass in superclasses) { |
| 39 var superprop = getProperty(superclass, library, field.name); | 44 var superprop = getProperty(superclass, library, field.name); |
| 40 if (superprop != null) { | 45 if (superprop != null) { |
| 41 // If we find an abstract getter/setter pair, stop the search. | 46 // If we find an abstract getter/setter pair, stop the search. |
| 42 var getter = superprop.getter; | 47 var getter = superprop.getter; |
| 43 var setter = superprop.setter; | 48 var setter = superprop.setter; |
| 44 if ((getter == null || getter.isAbstract) && | 49 if (!extensionTypes.contains(superclass) && |
| 50 (getter == null || getter.isAbstract) && |
| 45 (setter == null || setter.isAbstract)) { | 51 (setter == null || setter.isAbstract)) { |
| 46 break; | 52 break; |
| 47 } | 53 } |
| 48 | 54 |
| 49 found = true; | 55 found = true; |
| 50 // Record that the super property is overridden. | 56 // Record that the super property is overridden. |
| 51 if (superprop.library == library) overrides.add(superprop); | 57 if (superprop.library == library) overrides.add(superprop); |
| 52 } | 58 } |
| 53 } | 59 } |
| 54 | 60 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 78 if (mixin != null) result.add(mixin); | 84 if (mixin != null) result.add(mixin); |
| 79 } | 85 } |
| 80 var supertype = cls.supertype; | 86 var supertype = cls.supertype; |
| 81 if (supertype == null) break; | 87 if (supertype == null) break; |
| 82 | 88 |
| 83 cls = supertype.element; | 89 cls = supertype.element; |
| 84 result.add(cls); | 90 result.add(cls); |
| 85 } | 91 } |
| 86 return result; | 92 return result; |
| 87 } | 93 } |
| OLD | NEW |