Fix for Issue 2878

frog/member_set.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.
 
 class MemberSet {
   final String name;
   final List<Member> members;
   final bool isVar;
-  String jsname;
 
   bool _treatAsField;
   Type _returnTypeForGet;
   bool _preparedForSet = false;
   List<InvokeKey> _invokes;
 
-  MemberSet(Member member, [bool isVar=false]):
-    name = member.name, members = [member], jsname = member.jsname,
-    isVar = isVar;
+  MemberSet(Member member, [bool isVar=false])
+      : name = member.name, members = [member], isVar = isVar;
 
   toString() => '$name:${members.length}';
 
+  /**
+   * [jsname] should be called only when it is known that all the members have
+   * the same jsname.  (The name safety pass can cause members of the same
+   * MemberSet to have different jsnames.)
+   */
+  String get jsname() => members[0].jsname;
+
   void add(Member member) {
     // Only methods on classes "really exist" - so warn if we add others?
     members.add(member);
   }
 
   // TODO(jimhug): Better way to check for operator.
   bool get isOperator() => members[0].isOperator;
 
   bool get treatAsField() {
     if (_treatAsField == null) {
-      _treatAsField = !isVar && members.every((m) => m.isField);
+      // Must be all fields, all with the same jsname.
+      _treatAsField = !isVar &&
+          members.every((m) => m.isField && m.jsname == members[0].jsname);
     }
     return _treatAsField;
   }
 
   static Type unionTypes(Type t1, Type t2) {
     if (t1 == null) return t2;
     if (t2 == null) return t1;
     return Type.union(t1, t2);
   }
 
@@ skipping 18 matching lines @@
         // TODO(jimhug): Need to make target less specific...
         var r = member._get(context, node, target);
         _returnTypeForGet = unionTypes(_returnTypeForGet, r.type);
       }
       if (_returnTypeForGet == null) {
         world.error('no valid getters for "$name"', node.span);
       }
     }
 
     if (_treatAsField) {
-      return new Value(_returnTypeForGet, '${target.code}.$jsname',
-        node.span);
+      return new Value(_returnTypeForGet,
+        '${target.code}.$jsname', node.span);
     } else {
-      return new Value(_returnTypeForGet, '${target.code}.get\$$jsname()',
-          node.span);
+      return new Value(_returnTypeForGet,
+        '${target.code}.${members[0].jsnameOfGetter}()', node.span);
     }
   }
 
   // TODO(jimhug): Return value of this method is unclear.
   Value _set(CallingContext context, Node node, Value target, Value value) {
     // If this is the global MemberSet from world, always bind dynamically.
     // Note: we need this for proper noSuchMethod and REPL behavior.
     if (members.length == 1 && !isVar) {
       return members[0]._set(context, node, target, value);
     }
 
     if (!_preparedForSet) {
       _preparedForSet = true;
 
       for (var member in members) {
         if (!member.canSet) continue;
         if (!treatAsField) member.provideSetter();
         // !!! Need more generic args to this call below.
         var r = member._set(context, node, target, value);
       }
     }
 
     if (treatAsField) {
       return new Value(value.type,
         '${target.code}.$jsname = ${value.code}', node.span);
     } else {
       return new Value(value.type,
-        '${target.code}.set\$$jsname(${value.code})', node.span);
+        '${target.code}.${members[0].jsnameOfSetter}(${value.code})', node.span);
     }
   }
 
   Value invoke(CallingContext context, Node node, Value target,
       Arguments args) {
     if (members.length == 1 && !isVar) {
       return members[0].invoke(context, node, target, args);
     }
 
     var invokeKey = null;
@@ skipping 174 matching lines @@
           returnType = world.varType;
         }
       }
     }
     if (returnType == null) {
       // TODO(jimhug): Warning here for no match anywhere in the world?
       returnType = world.varType;
     }
   }
 }