Fix super getter/setter

runtime/vm/flow_graph_builder.cc

 // 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.
 
 #include "vm/flow_graph_builder.h"
 
 #include "vm/ast_printer.h"
 #include "vm/bit_vector.h"
 #include "vm/code_descriptors.h"
 #include "vm/dart_entry.h"
@@ skipping 1773 matching lines @@
                           Array::ZoneHandle(),
                           1));  // Checked argument count.
   ReturnComputation(
        BuildLoadLocal(*owner()->parsed_function().expression_temp_var()));
 }
 
 
 void EffectGraphVisitor::VisitStaticGetterNode(StaticGetterNode* node) {
   const String& getter_name =
       String::Handle(Field::GetterName(node->field_name()));
-  const Function& getter_function =
-      Function::ZoneHandle(node->cls().LookupStaticFunction(getter_name));
-  ASSERT(!getter_function.IsNull());
   ZoneGrowableArray<PushArgumentInstr*>* arguments =
       new ZoneGrowableArray<PushArgumentInstr*>();
+  Function& getter_function = Function::ZoneHandle();
+  if (!node->is_super_getter()) {

[srdjan, 2012/08/08 16:44:34]

Revert, use first the positive clause, is_super_getter.

[hausner, 2012/08/08 17:42:02]

Done.

+    getter_function = node->cls().LookupStaticFunction(getter_name);
+    ASSERT(!getter_function.IsNull());
+  } else {
+    // Statically resolved instance getter, i.e. "super getter".
+    getter_function =
+        Resolver::ResolveDynamicAnyParams(node->cls(), getter_name);
+    ASSERT(!getter_function.IsNull());
+    ASSERT(node->receiver() != NULL);
+    ValueGraphVisitor receiver_value(owner(), temp_index());
+    node->receiver()->Visit(&receiver_value);
+    Append(receiver_value);
+    arguments->Add(PushArgument(receiver_value.value()));
+  }
   StaticCallComp* call = new StaticCallComp(node->token_pos(),
                                             owner()->try_index(),
                                             getter_function,
                                             Array::ZoneHandle(),  // No names.
                                             arguments);
   ReturnComputation(call);
 }
 
 
 void EffectGraphVisitor::BuildStaticSetter(StaticSetterNode* node,
                                            bool result_is_needed) {
   const String& setter_name =
       String::Handle(Field::SetterName(node->field_name()));
+  // A super setter is an instance setter whose setter function is
+  // resolved at compile time (in the caller instance getter's super class).
+  // Unlike a static getter, a super getter has a receiver parameter.
+  const bool is_super_setter = (node->receiver() != NULL);
   const Function& setter_function =
-      Function::ZoneHandle(node->cls().LookupStaticFunction(setter_name));
+      Function::ZoneHandle(is_super_setter
+          ? Resolver::ResolveDynamicAnyParams(node->cls(), setter_name)
+          : node->cls().LookupStaticFunction(setter_name));
   ASSERT(!setter_function.IsNull());
+
+  ZoneGrowableArray<PushArgumentInstr*>* arguments =
+      new ZoneGrowableArray<PushArgumentInstr*>(1);
+  if (is_super_setter) {
+    // Add receiver of instance getter.
+    ValueGraphVisitor for_receiver(owner(), temp_index());
+    node->receiver()->Visit(&for_receiver);
+    Append(for_receiver);
+    arguments->Add(PushArgument(for_receiver.value()));
+  }
   ValueGraphVisitor for_value(owner(), temp_index());
   node->value()->Visit(&for_value);
   Append(for_value);
   Value* value = NULL;
   if (result_is_needed) {
     value = Bind(
         BuildStoreLocal(*owner()->parsed_function().expression_temp_var(),
                         for_value.value()));
   } else {
     value = for_value.value();
   }
-  ZoneGrowableArray<PushArgumentInstr*>* arguments =
-      new ZoneGrowableArray<PushArgumentInstr*>(1);
   arguments->Add(PushArgument(value));
+
   StaticCallComp* call = new StaticCallComp(node->token_pos(),
                                             owner()->try_index(),
                                             setter_function,
                                             Array::ZoneHandle(),  // No names.
                                             arguments);
   if (result_is_needed) {
     Do(call);
     ReturnComputation(
          BuildLoadLocal(*owner()->parsed_function().expression_temp_var()));
   } else {
@@ skipping 877 matching lines @@
   intptr_t len = OS::SNPrint(NULL, 0, kFormat, function_name, reason) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, function_name, reason);
   const Error& error = Error::Handle(
       LanguageError::New(String::Handle(String::New(chars))));
   Isolate::Current()->long_jump_base()->Jump(1, error);
 }
 
 
 }  // namespace dart