Correctly handle setters in KernelWorldBuilder

pkg/compiler/lib/src/kernel/world_builder.dart

 // Copyright (c) 2017, 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 dart2js.kernel.world_builder;
 
 import 'package:kernel/ast.dart' as ir;
 
 import '../common.dart';
 import '../common/resolution.dart';
@@ skipping 619 matching lines @@
   }
 }
 
 /// Environment for fast lookup of library classes and members.
 // TODO(johnniwinther): Add member lookup.
 class KLibraryEnv {
   final ir.Library library;
 
   Map<String, KClassEnv> _classMap;
   Map<String, ir.Member> _memberMap;
+  Map<String, ir.Member> _setterMap;
 
   KLibraryEnv(this.library);
 
   void _ensureClassMap() {
     if (_classMap == null) {
       _classMap = <String, KClassEnv>{};
       for (ir.Class cls in library.classes) {
         _classMap[cls.name] = new KClassEnv(cls);
       }
     }
   }
 
   /// Return the [KClassEnv] for the class [name] in [library].
   KClassEnv lookupClass(String name) {
     _ensureClassMap();
     return _classMap[name];
   }
 
   /// Calls [f] for each class in this library.
   void forEachClass(void f(KClassEnv cls)) {
     _ensureClassMap();
     _classMap.values.forEach(f);
   }
 
   /// Return the [ir.Member] for the member [name] in [library].
   ir.Member lookupMember(String name, {bool setter: false}) {
     if (_memberMap == null) {
       _memberMap = <String, ir.Member>{};
+      _setterMap = <String, ir.Member>{};
       for (ir.Member member in library.members) {
-        // TODO(johnniwinther): Support setter vs. getter.
-        _memberMap[member.name.name] = member;
+        if (member is ir.Procedure) {
+          if (member.kind == ir.ProcedureKind.Setter) {
+            _setterMap[member.name.name] = member;
+          } else {
+            _memberMap[member.name.name] = member;
+          }
+        } else if (member is ir.Field) {
+          _memberMap[member.name.name] = member;
+          if (member.isMutable) {
+            _setterMap[member.name.name] = member;
+          }
+        } else {
+          throw new SpannableAssertionFailure(
+              NO_LOCATION_SPANNABLE, "Unexpected library member node: $member");
+        }
       }
     }
     return _memberMap[name];
   }
 }
 
 /// Environment for fast lookup of class members.
 // TODO(johnniwinther): Add member lookup.
 class KClassEnv {
   final ir.Class cls;
 
   InterfaceType thisType;
   InterfaceType rawType;
   InterfaceType supertype;
   OrderedTypeSet orderedTypeSet;
 
   Map<String, ir.Member> _constructorMap;
   Map<String, ir.Member> _memberMap;
+  Map<String, ir.Member> _setterMap;
 
   Iterable<ConstantExpression> _metadata;
 
   KClassEnv(this.cls);
 
   void _ensureMaps() {
     if (_memberMap == null) {
       _memberMap = <String, ir.Member>{};
+      _setterMap = <String, ir.Member>{};
       _constructorMap = <String, ir.Member>{};
       for (ir.Member member in cls.members) {
-        if (member is ir.Procedure && member.kind == ir.ProcedureKind.Factory) {
+        if (member is ir.Constructor ||
+            member is ir.Procedure && member.kind == ir.ProcedureKind.Factory) {
           _constructorMap[member.name.name] = member;
+        } else if (member is ir.Procedure) {
+          if (member.kind == ir.ProcedureKind.Setter) {
+            _setterMap[member.name.name] = member;
+          } else {
+            _memberMap[member.name.name] = member;
+          }
+        } else if (member is ir.Field) {
+          _memberMap[member.name.name] = member;
+          if (member.isMutable) {
+            _setterMap[member.name.name] = member;
+          }
+          _memberMap[member.name.name] = member;
         } else {
-          // TODO(johnniwinther): Support setter vs. getter.
-          _memberMap[member.name.name] = member;
+          throw new SpannableAssertionFailure(
+              NO_LOCATION_SPANNABLE, "Unexpected class member node: $member");
         }
       }
-      for (ir.Member member in cls.constructors) {
-        _constructorMap[member.name.name] = member;
-      }
     }
   }
 
   /// Return the [ir.Member] for the member [name] in [library].
   ir.Member lookupMember(String name, {bool setter: false}) {
     _ensureMaps();
-    return _memberMap[name];
+    return setter ? _setterMap[name] : _memberMap[name];
   }
 
   /// Return the [ir.Member] for the member [name] in [library].
-  ir.Member lookupConstructor(String name, {bool setter: false}) {
+  ir.Member lookupConstructor(String name) {
     _ensureMaps();
     return _constructorMap[name];
   }
 
   void forEachMember(f(ir.Member member)) {
     _ensureMaps();
     _memberMap.values.forEach(f);
   }
 
   Iterable<ConstantExpression> getMetadata(KernelWorldBuilder worldBuilder) {
@@ skipping 387 matching lines @@
   }
 
   InterfaceType getMixinTypeForClass(KClass cls) {
     KClassEnv env = builder._classEnvs[cls.classIndex];
     ir.Supertype mixedInType = env.cls.mixedInType;
     if (mixedInType == null) return null;
     return builder.createInterfaceType(
         mixedInType.classNode, mixedInType.typeArguments);
   }
 }