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

Unified Diff: lib/src/codegen/js_field_storage.dart

Issue 1090313002: fixes #52, fields shadowing getters/setters or other fields (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: Created 5 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: lib/src/codegen/js_field_storage.dart
diff --git a/lib/src/codegen/js_field_storage.dart b/lib/src/codegen/js_field_storage.dart
new file mode 100644
index 0000000000000000000000000000000000000000..85847798e986d5787faa5f88f9637c28796a305b
--- /dev/null
+++ b/lib/src/codegen/js_field_storage.dart
@@ -0,0 +1,86 @@
+// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library dev_compiler.src.codegen.js_field_storage;
+
+import 'dart:collection' show HashMap, HashSet;
+import 'package:analyzer/src/generated/ast.dart' show Identifier;
+import 'package:analyzer/src/generated/element.dart';
+
+import 'package:dev_compiler/src/info.dart' show LibraryUnit;
+
+/// We use a storage slot for fields that override or can be overridden by
+/// getter/setter pairs.
+HashSet<FieldElement> findFieldsNeedingStorage(LibraryUnit library) {
+ var propertyOverrides = new HashSet<PropertyInducingElement>();
+ for (var unit in library.partsThenLibrary) {
+ for (var cls in unit.element.types) {
+ var visited = new HashSet<PropertyInducingElement>();
+ for (var accessor in cls.accessors) {
+ var prop = accessor.variable;
+ if (visited.add(prop) && !propertyOverrides.contains(prop)) {
+ checkForPropertyOverride(prop, propertyOverrides);
+ }
+ }
+ }
+ }
+
+ // Return only the field overrides.
+ return new HashSet<FieldElement>.from(
+ propertyOverrides.where((a) => a is FieldElement));
+}
+
+void checkForPropertyOverride(PropertyInducingElement prop,
+ HashSet<PropertyInducingElement> propertyOverrides) {
+
+ // Public fields on public types always need storage, because they could be
+ // extended later in another compilation unit.
+ var library = prop.library;
+ var cls = prop.enclosingElement;
+ if (prop.isPublic && cls.isPublic) {
+ propertyOverrides.add(prop);
+ return;
+ }
+
+ bool found = false;
+ for (var superclass in superclasses(cls)) {
+ var superprop = getProperty(superclass, library, prop.name);
+ if (superprop != null) {
+ found = true;
+ // Record that the super property is overridden.
+ if (superprop.library == library) propertyOverrides.add(superprop);
+ }
+ }
+
+ // If this we found a super property, then this property overrides it.
+ if (found) propertyOverrides.add(prop);
+}
+
+PropertyInducingElement getProperty(
+ ClassElement cls, LibraryElement fromLibrary, String name) {
+ // Properties from a different library are not accessible.
+ if (Identifier.isPrivateName(name) && cls.library != fromLibrary) {
+ return null;
+ }
+ for (var accessor in cls.accessors) {
+ var prop = accessor.variable;
+ if (prop.name == name) return prop;
+ }
+ return null;
+}
+
+Iterable<ClassElement> superclasses(ClassElement cls) sync* {
Jacob 2015/04/17 20:28:53 bold move... using sync* :) maybe chat with sra i
Jennifer Messerly 2015/04/20 17:44:34 Good point. Forgot about performance. Will change
Brian Wilkerson 2015/04/20 17:59:19 DBC: This looks like information that other client
Jennifer Messerly 2015/04/20 18:30:39 Good point. What's the best workflow there? I'm gu
+ var visited = new HashSet<ClassElement>();
+ while (cls != null && visited.add(cls)) {
+ for (var mixinType in cls.mixins.reversed) {
+ var mixin = mixinType.element;
+ if (mixin != null) yield mixin;
+ }
+ var supertype = cls.supertype;
+ if (supertype == null) return;
+
+ cls = supertype.element;
+ yield cls;
+ }
+}

Powered by Google App Engine
This is Rietveld 408576698