Fix issue 18435 (2nd attempt).

runtime/vm/code_generator_test.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 "platform/globals.h"
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/ast.h"
 #include "vm/assembler.h"
@@ skipping 40 matching lines @@
   const Type& variable_type = Type::ZoneHandle(Type::DynamicType());
   return new LocalVariable(kPos, variable_name, variable_type);
 }
 
 
 CODEGEN_TEST_GENERATE(ReturnParameterCodegen, test) {
   SequenceNode* node_seq = test->node_sequence();
   const int num_params = 1;
   LocalVariable* parameter = NewTestLocalVariable("parameter");
   LocalScope* local_scope = node_seq->scope();
-  local_scope->AddVariable(parameter);
+  local_scope->InsertParameterAt(0, parameter);
   ASSERT(local_scope->num_variables() == num_params);
   const Function& function = test->function();
   function.set_num_fixed_parameters(num_params);
   ASSERT(!function.HasOptionalParameters());
   node_seq->Add(new ReturnNode(kPos, new LoadLocalNode(kPos, parameter)));
 }
 
 
 CODEGEN_TEST2_GENERATE(StaticCallReturnParameterCodegen, function, test) {
   // Wrap and call the ReturnParameterCodegen test above as a static function.
   SequenceNode* node_seq = test->node_sequence();
   ArgumentListNode* arguments = new ArgumentListNode(kPos);
   arguments->Add(new LiteralNode(kPos, Smi::ZoneHandle(Smi::New(3))));
   node_seq->Add(new ReturnNode(kPos,
                                new StaticCallNode(kPos, function, arguments)));
 }
 CODEGEN_TEST2_RUN(StaticCallReturnParameterCodegen,
                   ReturnParameterCodegen,
                   Smi::New(3))
 
 
 CODEGEN_TEST_GENERATE(SmiParamSumCodegen, test) {
   SequenceNode* node_seq = test->node_sequence();
   const int num_params = 2;
   LocalVariable* param1 = NewTestLocalVariable("param1");
   LocalVariable* param2 = NewTestLocalVariable("param2");
   const int num_locals = 1;
   LocalVariable* sum = NewTestLocalVariable("sum");
   LocalScope* local_scope = node_seq->scope();
-  local_scope->AddVariable(param1);
-  local_scope->AddVariable(param2);
+  local_scope->InsertParameterAt(0, param1);
+  local_scope->InsertParameterAt(1, param2);
   local_scope->AddVariable(sum);
   ASSERT(local_scope->num_variables() == num_params + num_locals);
   const Function& function = test->function();
   function.set_num_fixed_parameters(num_params);
   ASSERT(!function.HasOptionalParameters());
   BinaryOpNode* add = new BinaryOpNode(kPos,
                                        Token::kADD,
                                        new LoadLocalNode(kPos, param1),
                                        new LoadLocalNode(kPos, param2));
   node_seq->Add(new StoreLocalNode(kPos, sum, add));
@@ skipping 96 matching lines @@
   // A NativeBodyNode, preceded by an EnterNode and followed by a ReturnNode,
   // implements the body of a native Dart function. Let's take this native
   // function as an example: int dec(int a, int b = 1) native;
   // Since this function has an optional parameter, its prologue will copy
   // incoming parameters to locals.
   SequenceNode* node_seq = test->node_sequence();
   const int num_fixed_params = 1;
   const int num_opt_params = 1;
   const int num_params = num_fixed_params + num_opt_params;
   LocalScope* local_scope = node_seq->scope();
-  local_scope->AddVariable(NewTestLocalVariable("a"));
-  local_scope->AddVariable(NewTestLocalVariable("b"));
+  local_scope->InsertParameterAt(0, NewTestLocalVariable("a"));
+  local_scope->InsertParameterAt(1, NewTestLocalVariable("b"));
   ASSERT(local_scope->num_variables() == num_params);
   const Array& default_values = Array::ZoneHandle(Array::New(num_opt_params));
   default_values.SetAt(0, Smi::ZoneHandle(Smi::New(1)));  // b = 1.
   test->set_default_parameter_values(default_values);
   const Function& function = test->function();
   function.set_is_native(true);
   function.set_num_fixed_parameters(num_fixed_params);
   function.SetNumOptionalParameters(num_opt_params, true);
   const String& native_name =
       String::ZoneHandle(Symbols::New("TestSmiSub"));
@@ skipping 149 matching lines @@
 // Tested Dart code:
 //   int sum(int a, int b,
 //           [int c = 10, int d = 21, int e = -32]) native: "TestSmiSum";
 // The native entry TestSmiSum implements sum natively.
 CODEGEN_TEST_GENERATE(NativeSumCodegen, test) {
   SequenceNode* node_seq = test->node_sequence();
   const int num_fixed_params = 2;
   const int num_opt_params = 3;
   const int num_params = num_fixed_params + num_opt_params;
   LocalScope* local_scope = node_seq->scope();
-  local_scope->AddVariable(NewTestLocalVariable("a"));
-  local_scope->AddVariable(NewTestLocalVariable("b"));
-  local_scope->AddVariable(NewTestLocalVariable("c"));
-  local_scope->AddVariable(NewTestLocalVariable("d"));
-  local_scope->AddVariable(NewTestLocalVariable("e"));
+  local_scope->InsertParameterAt(0, NewTestLocalVariable("a"));
+  local_scope->InsertParameterAt(1, NewTestLocalVariable("b"));
+  local_scope->InsertParameterAt(2, NewTestLocalVariable("c"));
+  local_scope->InsertParameterAt(3, NewTestLocalVariable("d"));
+  local_scope->InsertParameterAt(4, NewTestLocalVariable("e"));
   ASSERT(local_scope->num_variables() == num_params);
   const Array& default_values = Array::ZoneHandle(Array::New(num_opt_params));
   default_values.SetAt(0, Smi::ZoneHandle(Smi::New(10)));
   default_values.SetAt(1, Smi::ZoneHandle(Smi::New(21)));
   default_values.SetAt(2, Smi::ZoneHandle(Smi::New(-32)));
   test->set_default_parameter_values(default_values);
   const Function& function = test->function();
   function.set_is_native(true);
   function.set_num_fixed_parameters(num_fixed_params);
   function.SetNumOptionalParameters(num_opt_params, true);
@@ skipping 72 matching lines @@
     Smi::New(0 + 1 + 1 + 2 + 3))
 
 
 // Tested Dart code:
 //   int sum(a, b, c) native: "TestNonNullSmiSum";
 // The native entry TestNonNullSmiSum implements sum natively.
 CODEGEN_TEST_GENERATE(NativeNonNullSumCodegen, test) {
   SequenceNode* node_seq = test->node_sequence();
   const int num_params = 3;
   LocalScope* local_scope = node_seq->scope();
-  local_scope->AddVariable(NewTestLocalVariable("a"));
-  local_scope->AddVariable(NewTestLocalVariable("b"));
-  local_scope->AddVariable(NewTestLocalVariable("c"));
+  local_scope->InsertParameterAt(0, NewTestLocalVariable("a"));
+  local_scope->InsertParameterAt(1, NewTestLocalVariable("b"));
+  local_scope->InsertParameterAt(2, NewTestLocalVariable("c"));
   ASSERT(local_scope->num_variables() == num_params);
   const Function& function = test->function();
   function.set_is_native(true);
   function.set_num_fixed_parameters(num_params);
   ASSERT(!function.HasOptionalParameters());
   function.set_parameter_types(Array::Handle(Array::New(num_params)));
   function.set_parameter_names(Array::Handle(Array::New(num_params)));
   const Type& param_type = Type::Handle(Type::DynamicType());
   for (int i = 0; i < num_params; i++) {
     function.SetParameterTypeAt(i, param_type);
@@ skipping 71 matching lines @@
   intptr_t num_libs = libs.Length();
   Library& app_lib = Library::Handle();
   app_lib ^= libs.At(num_libs - 1);
   ASSERT(!app_lib.IsNull());
   const Class& cls = Class::Handle(
       app_lib.LookupClass(String::Handle(Symbols::New("A"))));
   EXPECT_EQ(cls.raw(), result.clazz());
 }
 
 }  // namespace dart