| Index: runtime/vm/code_generator_test.cc
|
| ===================================================================
|
| --- runtime/vm/code_generator_test.cc (revision 12282)
|
| +++ runtime/vm/code_generator_test.cc (working copy)
|
| @@ -206,17 +206,21 @@
|
| // 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;
|
| + const int num_opt_pos_params = 1;
|
| + const int num_opt_named_params = 0;
|
| + const int num_params =
|
| + num_fixed_params + num_opt_pos_params + num_opt_named_params;
|
| LocalScope* local_scope = node_seq->scope();
|
| local_scope->AddVariable(NewTestLocalVariable("a"));
|
| local_scope->AddVariable(NewTestLocalVariable("b"));
|
| ASSERT(local_scope->num_variables() == num_params);
|
| - const Array& default_values = Array::ZoneHandle(Array::New(num_opt_params));
|
| + const Array& default_values =
|
| + Array::ZoneHandle(Array::New(num_opt_pos_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.SetNumberOfParameters(num_fixed_params, num_opt_params, true);
|
| + function.set_num_fixed_parameters(num_fixed_params);
|
| + function.SetNumOptionalParameters(num_opt_pos_params, num_opt_named_params);
|
| const bool has_opt_params = true;
|
| const String& native_name =
|
| String::ZoneHandle(Symbols::New("TestSmiSub"));
|
| @@ -371,8 +375,10 @@
|
| 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;
|
| + const int num_opt_pos_params = 3;
|
| + const int num_opt_named_params = 0;
|
| + const int num_params =
|
| + num_fixed_params + num_opt_pos_params + num_opt_named_params;
|
| LocalScope* local_scope = node_seq->scope();
|
| local_scope->AddVariable(NewTestLocalVariable("a"));
|
| local_scope->AddVariable(NewTestLocalVariable("b"));
|
| @@ -380,13 +386,15 @@
|
| local_scope->AddVariable(NewTestLocalVariable("d"));
|
| local_scope->AddVariable(NewTestLocalVariable("e"));
|
| ASSERT(local_scope->num_variables() == num_params);
|
| - const Array& default_values = Array::ZoneHandle(Array::New(num_opt_params));
|
| + const Array& default_values =
|
| + Array::ZoneHandle(Array::New(num_opt_pos_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.SetNumberOfParameters(num_fixed_params, num_opt_params, true);
|
| + function.set_num_fixed_parameters(num_fixed_params);
|
| + function.SetNumOptionalParameters(num_opt_pos_params, num_opt_named_params);
|
| 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());
|
|
|