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

runtime/vm/parser.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_PARSER_H_
 #define VM_PARSER_H_
 
 #include "include/dart_api.h"
 
 #include "lib/invocation_mirror.h"
@@ skipping 83 matching lines @@
     return expression_temp_var_;
   }
   void set_expression_temp_var(LocalVariable* value) {
     ASSERT(!has_expression_temp_var());
     expression_temp_var_ = value;
   }
   bool has_expression_temp_var() const {
     return expression_temp_var_ != NULL;
   }
   static LocalVariable* CreateExpressionTempVar(intptr_t token_pos);
+  LocalVariable* EnsureExpressionTemp();
 
   int first_parameter_index() const { return first_parameter_index_; }
   int first_stack_local_index() const { return first_stack_local_index_; }
   int num_copied_params() const { return num_copied_params_; }
   int num_stack_locals() const { return num_stack_locals_; }
 
   void AllocateVariables();
 
  private:
   const Function& function_;
@@ skipping 47 matching lines @@
 
   // Same as FormatError, but appends the new error to the 'prev_error'.
   static RawError* FormatErrorWithAppend(const Error& prev_error,
                                          const Script& script,
                                          intptr_t token_pos,
                                          const char* message_header,
                                          const char* format,
                                          va_list args);
 
  private:
+  friend class EffectGraphVisitor;  // For BuildNoSuchMethodArguments.
+
   struct Block;
   class TryBlocks;
 
   Parser(const Script& script, const Library& library, intptr_t token_pos);
   Parser(const Script& script, ParsedFunction* function, intptr_t token_pos);
 
   // The function for which we will generate code.
   const Function& current_function() const;
 
   // The innermost function being parsed.
@@ skipping 197 matching lines @@
   AstNode* ParseInitializer(const Class& cls,
                             LocalVariable* receiver,
                             GrowableArray<Field*>* initialized_fields);
   void ParseConstructorRedirection(const Class& cls, LocalVariable* receiver);
   void ParseInitializers(const Class& cls,
                          LocalVariable* receiver,
                          GrowableArray<Field*>* initialized_fields);
   String& ParseNativeDeclaration();
   void ParseInterfaceList(const Class& cls);
   RawAbstractType* ParseMixins(const AbstractType& super_type);
-  StaticCallNode* BuildInvocationMirrorAllocation(
+  static StaticCallNode* BuildInvocationMirrorAllocation(
       intptr_t call_pos,
       const String& function_name,
-      const ArgumentListNode& function_args);
-  ArgumentListNode* BuildNoSuchMethodArguments(
+      const ArgumentListNode& function_args,
+      const LocalVariable* temp = NULL);
+  // Build arguments for a NoSuchMethodCall. If LocalVariable temp is not NULL,
+  // the last argument is stored in temp.
+  static ArgumentListNode* BuildNoSuchMethodArguments(
       intptr_t call_pos,
       const String& function_name,
-      const ArgumentListNode& function_args);
+      const ArgumentListNode& function_args,
+      const LocalVariable* temp = NULL);
   RawFunction* GetSuperFunction(intptr_t token_pos,
                                 const String& name,
                                 ArgumentListNode* arguments,
                                 bool resolve_getter,
                                 bool* is_no_such_method);
   AstNode* ParseSuperCall(const String& function_name);
   AstNode* ParseSuperFieldAccess(const String& field_name);
   AstNode* ParseSuperOperator();
   AstNode* BuildUnarySuperOperator(Token::Kind op, PrimaryNode* super);
 
@@ skipping 197 matching lines @@
   AstNode* MakeAssertCall(intptr_t begin, intptr_t end);
   AstNode* ThrowTypeError(intptr_t type_pos, const AbstractType& type);
   AstNode* ThrowNoSuchMethodError(intptr_t call_pos,
                                   const Class& cls,
                                   const String& function_name,
                                   InvocationMirror::Call call,
                                   InvocationMirror::Type type);
 
   void CheckOperatorArity(const MemberDesc& member);
 
-  const LocalVariable* GetIncrementTempLocal();
   void EnsureExpressionTemp();
   void EnsureSavedCurrentContext();
   AstNode* CreateAssignmentNode(AstNode* original, AstNode* rhs);
   AstNode* InsertClosureCallNodes(AstNode* condition);
 
   ConstructorCallNode* CreateConstructorCallNode(
       intptr_t token_pos,
       const AbstractTypeArguments& type_arguments,
       const Function& constructor,
       ArgumentListNode* arguments);
@@ skipping 39 matching lines @@
   // code at all points in the try block where an exit from the block is
   // done using 'return', 'break' or 'continue' statements.
   TryBlocks* try_blocks_list_;
 
   DISALLOW_COPY_AND_ASSIGN(Parser);
 };
 
 }  // namespace dart
 
 #endif  // VM_PARSER_H_