Fix super getter/setter

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 1220 matching lines @@
   const String& field_name_;
   AstNode* value_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstanceSetterNode);
 };
 
 
 class StaticGetterNode : public AstNode {
  public:
   StaticGetterNode(intptr_t token_pos,
-                   AstNode* receiver,  // Null if called from static context.
+                   AstNode* receiver,
+                   bool is_super_getter,
                    const Class& cls,
                    const String& field_name)
       : AstNode(token_pos),
         receiver_(receiver),
         cls_(cls),
-        field_name_(field_name) {
+        field_name_(field_name),
+        is_super_getter_(is_super_getter) {
     ASSERT(cls_.IsZoneHandle());
     ASSERT(field_name_.IsZoneHandle());
     ASSERT(field_name_.IsSymbol());
   }
 
-  // The receiver is required when transforming this StaticGetterNode issued in
-  // a non-static context to an InstanceSetterNode. This occurs when no field
-  // and no setter are declared.
+  // The receiver is required
+  // 1) for a super getter (an instance method that is resolved at compile
+  //    time rather than at runtime).
+  // 2) when transforming this StaticGetterNode issued in a non-static
+  //    context to an InstanceSetterNode. This may occurs when we find a
+  //    static getter, but no field and no static setter are declared.
   AstNode* receiver() const { return receiver_; }
   const Class& cls() const { return cls_; }
   const String& field_name() const { return field_name_; }
+  bool is_super_getter() const { return is_super_getter_; }
 
   virtual void VisitChildren(AstNodeVisitor* visitor) const { }
 
   virtual AstNode* MakeAssignmentNode(AstNode* rhs);
 
   virtual const Instance* EvalConstExpr() const;
 
   DECLARE_COMMON_NODE_FUNCTIONS(StaticGetterNode);
 
  private:
   AstNode* receiver_;
   const Class& cls_;
   const String& field_name_;
+  const bool is_super_getter_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticGetterNode);
 };
 
 
 class StaticSetterNode : public AstNode {
  public:
   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) {
     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_; }
   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_;
   AstNode* value_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticSetterNode);
 };
 
 
 class StaticCallNode : public AstNode {
  public:
@@ skipping 323 matching lines @@
   const LocalVariable& context_var_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(InlinedFinallyNode);
 };
 
 }  // namespace dart
 
 #undef DECLARE_COMMON_NODE_FUNCTIONS
 
 #endif  // VM_AST_H_