Fix two bugs in the Dart VM's super-noSuchMethod invocation.

runtime/vm/flow_graph_builder.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_FLOW_GRAPH_BUILDER_H_
 #define VM_FLOW_GRAPH_BUILDER_H_
 
 #include "vm/allocation.h"
 #include "vm/ast.h"
 #include "vm/growable_array.h"
@@ skipping 83 matching lines @@
   FlowGraph* caller_graph_;
   Definition* call_;
   GrowableArray<Data> exits_;
 };
 
 
 // Build a flow graph from a parsed function's AST.
 class FlowGraphBuilder: public ValueObject {
  public:
   // The inlining context is NULL if not inlining.
-  FlowGraphBuilder(const ParsedFunction& parsed_function,
+  FlowGraphBuilder(ParsedFunction* parsed_function,
                    const Array& ic_data_array,
                    InlineExitCollector* exit_collector);
 
   FlowGraph* BuildGraph();
 
-  const ParsedFunction& parsed_function() const { return parsed_function_; }
+  ParsedFunction* parsed_function() const { return parsed_function_; }
   const Array& ic_data_array() const { return ic_data_array_; }
 
   void Bailout(const char* reason);
 
   intptr_t AllocateBlockId() { return ++last_used_block_id_; }
   void SetInitialBlockId(intptr_t id) { last_used_block_id_ = id; }
 
   void set_context_level(intptr_t value) { context_level_ = value; }
   intptr_t context_level() const { return context_level_; }
 
@@ skipping 23 matching lines @@
   void add_args_pushed(intptr_t n) { args_pushed_ += n; }
 
  private:
   intptr_t parameter_count() const {
     return num_copied_params_ + num_non_copied_params_;
   }
   intptr_t variable_count() const {
     return parameter_count() + num_stack_locals_;
   }
 
-  const ParsedFunction& parsed_function_;
+  ParsedFunction* parsed_function_;
   const Array& ic_data_array_;
 
   const intptr_t num_copied_params_;
   const intptr_t num_non_copied_params_;
   const intptr_t num_stack_locals_;  // Does not include any parameters.
   InlineExitCollector* const exit_collector_;
 
   intptr_t last_used_block_id_;
   intptr_t context_level_;
   intptr_t last_used_try_index_;
@@ skipping 169 matching lines @@
 
   void BuildStoreContext(const LocalVariable& variable);
   void BuildLoadContext(const LocalVariable& variable);
 
   void BuildThrowNode(ThrowNode* node);
 
   StaticCallInstr* BuildStaticNoSuchMethodCall(
       const Class& target_class,
       AstNode* receiver,
       const String& method_name,
-      ArgumentListNode* method_arguments);
+      ArgumentListNode* method_arguments,
+      bool save_last_arg);
 
   StaticCallInstr* BuildThrowNoSuchMethodError(intptr_t token_pos,
                                                const Class& function_class,
                                                const String& function_name,
                                                int invocation_type);
 
   void BuildStaticSetter(StaticSetterNode* node, bool result_is_needed);
   Definition* BuildStoreStaticField(StoreStaticFieldNode* node,
                                     bool result_is_needed);
 
   ClosureCallInstr* BuildClosureCall(ClosureCallNode* node);
 
   Value* BuildNullValue();
 
   // Returns true if the run-time type check can be eliminated.
   bool CanSkipTypeCheck(intptr_t token_pos,
                         Value* value,
                         const AbstractType& dst_type,
                         const String& dst_name);
 
+  // Helpers for allocating and deallocating temporary locals on top of the
+  // expression stack.
+  LocalVariable* EnterTempLocalScope(Value* value);
+  Definition* ExitTempLocalScope(LocalVariable* var);
+
   void BuildLetTempExpressions(LetNode* node);
 
  private:
   friend class TempLocalScope;  // For ReturnDefinition.
 
   // Specify a definition of the final result.  Adds the definition to
   // the graph, but normally overridden in subclasses.
   virtual void ReturnDefinition(Definition* definition) {
     Do(definition);
   }
@@ skipping 121 matching lines @@
   // Output parameters.
   GrowableArray<TargetEntryInstr**> true_successor_addresses_;
   GrowableArray<TargetEntryInstr**> false_successor_addresses_;
 
   intptr_t condition_token_pos_;
 };
 
 }  // namespace dart
 
 #endif  // VM_FLOW_GRAPH_BUILDER_H_