Cleanup obsolete setter code

runtime/vm/ast.cc

 // Copyright (c) 2011, 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.
 
 #include "vm/ast.h"
 #include "vm/compiler.h"
 #include "vm/dart_entry.h"
 #include "vm/isolate.h"
 #include "vm/object_store.h"
 #include "vm/resolver.h"
@@ skipping 541 matching lines @@
 }
 
 
 AstNode* LoadIndexedNode::MakeAssignmentNode(AstNode* rhs) {
   return new StoreIndexedNode(token_pos(), array(), index_expr(),
                               rhs, super_class());
 }
 
 
 AstNode* StaticGetterNode::MakeAssignmentNode(AstNode* rhs) {
-  const String& setter_name = String::Handle(Field::SetterName(field_name()));
-
-  if (is_super_getter_) {
+  if (is_super_getter()) {
     ASSERT(receiver() != NULL);
     // If the static setter is not found in the superclass, noSuchMethod will be
     // called at runtime.
     return new StaticSetterNode(token_pos(),
                                 receiver(),
                                 cls(),
                                 field_name(),
                                 rhs);
   }
+
   const Function& setter =
-      Function::ZoneHandle(cls().LookupStaticFunction(setter_name));
-  if (!setter.IsNull()) {
+      Function::Handle(cls().LookupSetterFunction(field_name()));
+  if (!setter.IsNull() && setter.IsStaticFunction()) {
     return new StaticSetterNode(token_pos(), NULL, cls(), field_name(), rhs);
   }
   // Could not find a static setter. Look for a field.
   // Access to a lazily initialized static field that has not yet been
   // initialized is compiled to a static implicit getter.
   // A setter may not exist for such a field.
   const Field& field = Field::ZoneHandle(cls().LookupStaticField(field_name()));
   if (!field.IsNull()) {
     if (field.is_final()) {
       // Attempting to assign to a final variable will cause a NoSuchMethodError
@@ skipping 10 matching lines @@
 #endif
     if (Isolate::Current()->TypeChecksEnabled()) {
       rhs = new AssignableNode(
           field.token_pos(),
           rhs,
           AbstractType::ZoneHandle(field.type()),
           String::ZoneHandle(field.name()));
     }
     return new StoreStaticFieldNode(token_pos(), field, rhs);
   }
-  // Didn't find a static setter or a static field.
-  // If this static getter is in an instance function where
-  // a receiver is available, we turn this static getter
-  // into an instance setter (and will get an error at runtime if an
-  // instance setter cannot be found either).
-  if (receiver() != NULL) {
-    return new InstanceSetterNode(token_pos(), receiver(), field_name(), rhs);
-  }
+  // Didn't find a static setter or a static field. Make a call to
+  // the non-existent setter to trigger a NoSuchMethodError at runtime.
   return new StaticSetterNode(token_pos(), NULL, cls(), field_name(), rhs);
 }
 
 
 AstNode* StaticCallNode::MakeAssignmentNode(AstNode* rhs) {
   // Return this node if it represents a 'throw NoSuchMethodError' indicating
   // that a getter was not found, otherwise return null.
   const Class& cls = Class::Handle(function().Owner());
   const String& cls_name = String::Handle(cls.Name());
   const String& func_name = String::Handle(function().name());
@@ skipping 36 matching lines @@
   if (result.IsError() || result.IsNull()) {
     // TODO(turnidge): We could get better error messages by returning
     // the Error object directly to the parser.  This will involve
     // replumbing all of the EvalConstExpr methods.
     return NULL;
   }
   return &Instance::ZoneHandle(Instance::Cast(result).raw());
 }
 
 }  // namespace dart