Revert "Register super field set explicitly in the universe."

pkg/compiler/lib/src/universe/universe.dart

 // Copyright (c) 2012, 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 universe;
 
 import 'dart:collection';
 
 import '../common.dart';
 import '../compiler.dart' show
@@ skipping 264 matching lines @@
   bool hasInvocation(Element member, World world) {
     return _hasMatchingSelector(_invokedNames[member.name], member, world);
   }
 
   bool hasInvokedGetter(Element member, World world) {
     return _hasMatchingSelector(_invokedGetters[member.name], member, world) ||
         member.isFunction && methodsNeedingSuperGetter.contains(member);
   }
 
   bool hasInvokedSetter(Element member, World world) {
-    return _hasMatchingSelector(_invokedSetters[member.name], member, world) ||
-        fieldSetters.contains(member);
+    return _hasMatchingSelector(_invokedSetters[member.name], member, world);
   }
 
   bool registerDynamicUse(DynamicUse dynamicUse) {
     switch (dynamicUse.kind) {
       case DynamicUseKind.INVOKE:
         return _registerNewSelector(dynamicUse, _invokedNames);
       case DynamicUseKind.GET:
         return _registerNewSelector(dynamicUse, _invokedGetters);
       case DynamicUseKind.SET:
         return _registerNewSelector(dynamicUse, _invokedSetters);
     }
   }
 
   bool _registerNewSelector(
       DynamicUse dynamicUse,
       Map<String, Map<Selector, SelectorConstraints>> selectorMap) {
     Selector selector = dynamicUse.selector;
     String name = selector.name;
     ReceiverConstraint mask = dynamicUse.mask;
     Map<Selector, SelectorConstraints> selectors = selectorMap.putIfAbsent(
         name, () => new Maplet<Selector, SelectorConstraints>());
     UniverseSelectorConstraints constraints = selectors.putIfAbsent(
-        selector, () {
-      return selectorConstraintsStrategy.createSelectorConstraints(selector);
-    });
+        selector, () => selectorConstraintsStrategy.createSelectorConstraints(selector));
     return constraints.addReceiverConstraint(mask);
   }
 
   Map<Selector, SelectorConstraints> _asUnmodifiable(
       Map<Selector, SelectorConstraints> map) {
     if (map == null) return null;
     return new UnmodifiableMapView(map);
   }
 
   Map<Selector, SelectorConstraints> invocationsByName(String name) {
@@ skipping 38 matching lines @@
     if (Elements.isStaticOrTopLevel(element) && element.isField) {
       allReferencedStaticFields.add(element);
     }
     switch (staticUse.kind) {
       case StaticUseKind.STATIC_TEAR_OFF:
         staticFunctionsNeedingGetter.add(element);
         break;
       case StaticUseKind.FIELD_GET:
         fieldGetters.add(element);
         break;
-      case StaticUseKind.SUPER_FIELD_SET:
       case StaticUseKind.FIELD_SET:
         fieldSetters.add(element);
         break;
       case StaticUseKind.SUPER_TEAR_OFF:
         methodsNeedingSuperGetter.add(element);
         break;
       case StaticUseKind.GENERAL:
         break;
       case StaticUseKind.CLOSURE:
         allClosures.add(element);
@@ skipping 21 matching lines @@
   // TODO(ahe): Replace this method with something that is O(1), for example,
   // by using a map.
   List<LocalFunctionElement> slowDirectlyNestedClosures(Element element) {
     // Return new list to guard against concurrent modifications.
     return new List<LocalFunctionElement>.from(
         allClosures.where((LocalFunctionElement closure) {
           return closure.executableContext == element;
         }));
   }
 }