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

pkg/compiler/lib/src/resolution/members.dart

Index: pkg/compiler/lib/src/resolution/members.dart
diff --git a/pkg/compiler/lib/src/resolution/members.dart b/pkg/compiler/lib/src/resolution/members.dart
index 7465fb1e238a8137cca92233168e87e6017a0123..acb0b986a1ce312a0dc2d24cc8cef3ca5eb6470c 100644
--- a/pkg/compiler/lib/src/resolution/members.dart
+++ b/pkg/compiler/lib/src/resolution/members.dart
@@ -3350,14 +3350,13 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
           registry.registerStaticUse(new StaticUse.superGet(semantics.getter));
           break;
         case AccessKind.SUPER_SETTER:
-          registry.registerStaticUse(
-              new StaticUse.superSetterSet(semantics.setter));
+          registry.registerStaticUse(new StaticUse.superSet(semantics.setter));
           break;
         case AccessKind.SUPER_FIELD:
           registry.registerStaticUse(
               new StaticUse.superGet(semantics.element));
           registry.registerStaticUse(
-              new StaticUse.superFieldSet(semantics.element));
+              new StaticUse.superSet(semantics.element));
           break;
         case AccessKind.SUPER_FINAL_FIELD:
           registry.registerStaticUse(
@@ -3366,27 +3365,22 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
         case AccessKind.COMPOUND:
           CompoundAccessSemantics compoundSemantics = semantics;
           switch (compoundSemantics.compoundAccessKind) {
+            case CompoundAccessKind.SUPER_GETTER_SETTER:
             case CompoundAccessKind.SUPER_GETTER_FIELD:
-            case CompoundAccessKind.SUPER_FIELD_FIELD:
-              registry.registerStaticUse(
-                  new StaticUse.superGet(semantics.getter));
-              registry.registerStaticUse(
-                  new StaticUse.superFieldSet(semantics.setter));
-              break;
             case CompoundAccessKind.SUPER_FIELD_SETTER:
-            case CompoundAccessKind.SUPER_GETTER_SETTER:
+            case CompoundAccessKind.SUPER_FIELD_FIELD:
               registry.registerStaticUse(
                   new StaticUse.superGet(semantics.getter));
               registry.registerStaticUse(
-                  new StaticUse.superSetterSet(semantics.setter));
+                  new StaticUse.superSet(semantics.setter));
               break;
             case CompoundAccessKind.SUPER_METHOD_SETTER:
               registry.registerStaticUse(
-                  new StaticUse.superSetterSet(semantics.setter));
+                  new StaticUse.superSet(semantics.setter));
               break;
             case CompoundAccessKind.UNRESOLVED_SUPER_GETTER:
               registry.registerStaticUse(
-                  new StaticUse.superSetterSet(semantics.setter));
+                  new StaticUse.superSet(semantics.setter));
               break;
             case CompoundAccessKind.UNRESOLVED_SUPER_SETTER:
               registry.registerStaticUse(
@@ -3441,12 +3435,9 @@ class ResolverVisitor extends MappingVisitor<ResolutionResult> {
               registry.registerFeature(Feature.SUPER_NO_SUCH_METHOD);
               break;
             case AccessKind.SUPER_FIELD:
-              registry.registerStaticUse(
-                  new StaticUse.superFieldSet(semantics.setter));
-              break;
             case AccessKind.SUPER_SETTER:
               registry.registerStaticUse(
-                  new StaticUse.superSetterSet(semantics.setter));
+                  new StaticUse.superSet(semantics.setter));
               break;
             default:
               break;