Properly resolve top-level setters

runtime/vm/ast.h

 // 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.
 
 #ifndef VM_AST_H_
 #define VM_AST_H_
 
 #include "platform/assert.h"
 #include "vm/allocation.h"
 #include "vm/growable_array.h"
@@ skipping 1268 matching lines @@
 
 class LoadStaticFieldNode : public AstNode {
  public:
   LoadStaticFieldNode(intptr_t token_pos, const Field& field)
       : AstNode(token_pos), field_(field), is_deferred_reference_(false) {
     ASSERT(field_.IsZoneHandle());
   }
 
   const Field& field() const { return field_; }
   void set_is_deferred(bool value) { is_deferred_reference_ = value; }
+  bool is_deferred_reference() const { return is_deferred_reference_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   virtual bool IsPotentiallyConst() const {
     return field_.is_const();
   }
 
   virtual const Instance* EvalConstExpr() const {
@@ skipping 244 matching lines @@
 
 
 class StaticGetterNode : public AstNode {
  public:
   StaticGetterNode(intptr_t token_pos,
                    AstNode* receiver,
                    const Class& cls,
                    const String& field_name)
       : AstNode(token_pos),
         receiver_(receiver),
+        owner_(Object::ZoneHandle(cls.raw())),
         cls_(cls),
         field_name_(field_name),
         is_deferred_reference_(false) {
     ASSERT(cls_.IsZoneHandle());
     ASSERT(field_name_.IsZoneHandle());
     ASSERT(field_name_.IsSymbol());
   }
 
   // The receiver is required for a super getter (an instance method that
   // is resolved at compile time rather than at runtime).
   AstNode* receiver() const { return receiver_; }
+
+  // The getter node needs to remmeber how the getter was referenced
+  // so that it can resolve a corresponding setter if necessary.
+  // The owner of this getter is either a class, the top-level library scope,
+  // or a prefix (if the getter has been referenced throug a library prefix).
+  void set_owner(const Object& value) {
+    ASSERT(value.IsLibraryPrefix() || value.IsLibrary() || value.IsClass());
+    owner_ = value.raw();
+  }
+  const Object& owner() const { return owner_; }
+
   const Class& cls() const { return cls_; }
   const String& field_name() const { return field_name_; }
   bool is_super_getter() const { return receiver_ != NULL; }
   void set_is_deferred(bool value) { is_deferred_reference_ = value; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   virtual bool IsPotentiallyConst() const;
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(StaticGetterNode);
 
  private:
   AstNode* receiver_;
+  Object& owner_;
   const Class& cls_;
   const String& field_name_;
   bool is_deferred_reference_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticGetterNode);
 };
 
 
 class StaticSetterNode : public AstNode {
  public:
+  // Static setter with resolved setter function.
+  StaticSetterNode(intptr_t token_pos,
+                   AstNode* receiver,
+                   const String& field_name,
+                   const Function& function,
+                   AstNode* value)
+      : AstNode(token_pos),
+        receiver_(receiver),
+        cls_(Class::ZoneHandle(function.Owner())),
+        field_name_(field_name),
+        function_(function),
+        value_(value) {
+    ASSERT(function_.IsZoneHandle());
+    ASSERT(function.is_static() || receiver != NULL);
+    ASSERT(field_name_.IsZoneHandle());
+    ASSERT(value_ != NULL);
+  }
+
+  // For unresolved setters.
   StaticSetterNode(intptr_t token_pos,
                    AstNode* receiver,
                    const Class& cls,
                    const String& field_name,
                    AstNode* value)
-      : AstNode(token_pos),
-        receiver_(receiver),
-        cls_(cls),
-        field_name_(field_name),
-        value_(value) {
+  : AstNode(token_pos),
+  receiver_(receiver),
+  cls_(cls),
+  field_name_(field_name),
+  function_(Function::ZoneHandle()),
+  value_(value) {
     ASSERT(cls_.IsZoneHandle());
     ASSERT(field_name_.IsZoneHandle());
     ASSERT(value_ != NULL);
   }
 
   // The receiver is required for a super setter (an instance method
   // that is resolved at compile time rather than at runtime).
   AstNode* receiver() const { return receiver_; }
   const Class& cls() const { return cls_; }
   const String& field_name() const { return field_name_; }
+  // function() returns null for unresolved setters.
+  const Function& function() const { return function_; }
   AstNode* value() const { return value_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const {
     value()->Visit(visitor);
   }
 
   DECLARE_COMMON_NODE_FUNCTIONS(StaticSetterNode);
 
  private:
   AstNode* receiver_;
   const Class& cls_;
   const String& field_name_;
+  const Function& function_;
   AstNode* value_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticSetterNode);
 };
 
 
 class StaticCallNode : public AstNode {
  public:
   StaticCallNode(intptr_t token_pos,
                  const Function& function,
@@ skipping 330 matching lines @@
   const intptr_t try_index_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_