runtime/vm/flow_graph_compiler.cc - Issue 2859673002: Pass type argument vector to generic functions (if --reify-generic-functions is

Unified Diff: runtime/vm/flow_graph_compiler.cc

Issue 2859673002: Pass type argument vector to generic functions (if --reify-generic-functions is (Closed)

Patch Set: sync and work in progress Created 3 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: runtime/vm/flow_graph_compiler.cc

diff --git a/runtime/vm/flow_graph_compiler.cc b/runtime/vm/flow_graph_compiler.cc

index 3fbeb86ece5f866050f9c32d51969abdfe0c183b..0c865534c6130ad52b01760ad466a098884e250b 100644

--- a/runtime/vm/flow_graph_compiler.cc

+++ b/runtime/vm/flow_graph_compiler.cc

@@ -1197,20 +1197,19 @@ void FlowGraphCompiler::GenerateInstanceCall(intptr_t deopt_id,

void FlowGraphCompiler::GenerateStaticCall(intptr_t deopt_id,

TokenPosition token_pos,

const Function& function,

- intptr_t argument_count,

- const Array& argument_names,

+ ArgumentsInfo args_info,

LocationSummary* locs,

const ICData& ic_data_in) {

const ICData& ic_data = ICData::ZoneHandle(ic_data_in.Original());

const Array& arguments_descriptor =

- Array::ZoneHandle(ic_data.IsNull() ? ArgumentsDescriptor::New(

- argument_count, argument_names)

- : ic_data.arguments_descriptor());

+ ic_data.IsNull()

+ ? args_info.ToArgumentsDescriptor(zone())

+ : Array::ZoneHandle(zone(), ic_data.arguments_descriptor());

if (is_optimizing()) {

- EmitOptimizedStaticCall(function, arguments_descriptor, argument_count,

- deopt_id, token_pos, locs);

+ EmitOptimizedStaticCall(function, arguments_descriptor,

+ args_info.pushed_argc, deopt_id, token_pos, locs);

} else {

- ICData& call_ic_data = ICData::ZoneHandle(ic_data.raw());

+ ICData& call_ic_data = ICData::ZoneHandle(zone(), ic_data.raw());

if (call_ic_data.IsNull()) {

const intptr_t kNumArgsChecked = 0;

call_ic_data =

@@ -1219,7 +1218,7 @@ void FlowGraphCompiler::GenerateStaticCall(intptr_t deopt_id,

->raw();

}

AddCurrentDescriptor(RawPcDescriptors::kRewind, deopt_id, token_pos);

- EmitUnoptimizedStaticCall(argument_count, deopt_id, token_pos, locs,

+ EmitUnoptimizedStaticCall(args_info.pushed_argc, deopt_id, token_pos, locs,

call_ic_data);

}

@@ -1843,8 +1842,7 @@ bool FlowGraphCompiler::LookupMethodFor(int class_id,

void FlowGraphCompiler::EmitPolymorphicInstanceCall(

const CallTargets& targets,

const InstanceCallInstr& original_call,

- intptr_t argument_count,

- const Array& argument_names,

+ ArgumentsInfo args_info,

intptr_t deopt_id,

TokenPosition token_pos,

LocationSummary* locs,

@@ -1854,8 +1852,7 @@ void FlowGraphCompiler::EmitPolymorphicInstanceCall(

Label* deopt =

AddDeoptStub(deopt_id, ICData::kDeoptPolymorphicInstanceCallTestFail);

Label ok;

- EmitTestAndCall(targets, original_call.function_name(), argument_count,

- argument_names,

+ EmitTestAndCall(targets, original_call.function_name(), args_info,

deopt, // No cid match.

&ok, // Found cid.

deopt_id, token_pos, locs, complete, total_ic_calls);

@@ -1863,8 +1860,7 @@ void FlowGraphCompiler::EmitPolymorphicInstanceCall(

} else {

if (complete) {

Label ok;

- EmitTestAndCall(targets, original_call.function_name(), argument_count,

- argument_names,

+ EmitTestAndCall(targets, original_call.function_name(), args_info,

NULL, // No cid match.

&ok, // Found cid.

deopt_id, token_pos, locs, true, total_ic_calls);

@@ -1872,7 +1868,7 @@ void FlowGraphCompiler::EmitPolymorphicInstanceCall(

} else {

const ICData& unary_checks = ICData::ZoneHandle(

zone(), original_call.ic_data()->AsUnaryClassChecks());

- EmitSwitchableInstanceCall(unary_checks, argument_count, deopt_id,

+ EmitSwitchableInstanceCall(unary_checks, args_info.pushed_argc, deopt_id,

token_pos, locs);

}

@@ -1882,8 +1878,7 @@ void FlowGraphCompiler::EmitPolymorphicInstanceCall(

#define __ assembler()->

void FlowGraphCompiler::EmitTestAndCall(const CallTargets& targets,

const String& function_name,

- intptr_t argument_count,

- const Array& argument_names,

+ ArgumentsInfo args_info,

Label* failed,

Label* match_found,

intptr_t deopt_id,

@@ -1893,10 +1888,8 @@ void FlowGraphCompiler::EmitTestAndCall(const CallTargets& targets,

intptr_t total_ic_calls) {

ASSERT(is_optimizing());

- const Array& arguments_descriptor = Array::ZoneHandle(

- zone(), ArgumentsDescriptor::New(argument_count, argument_names));

- EmitTestAndCallLoadReceiver(argument_count, arguments_descriptor);

+ const Array& arguments_descriptor = args_info.ToArgumentsDescriptor(zone());

+ EmitTestAndCallLoadReceiver(args_info.pushed_argc, arguments_descriptor);

static const int kNoCase = -1;

int smi_case = kNoCase;

@@ -1935,7 +1928,7 @@ void FlowGraphCompiler::EmitTestAndCall(const CallTargets& targets,

GenerateStaticDartCall(deopt_id, token_index,

*StubCode::CallStaticFunction_entry(),

RawPcDescriptors::kOther, locs, function);

- __ Drop(argument_count);

+ __ Drop(args_info.pushed_argc);

if (match_found != NULL) {

__ Jump(match_found);

}

@@ -1984,7 +1977,7 @@ void FlowGraphCompiler::EmitTestAndCall(const CallTargets& targets,

GenerateStaticDartCall(deopt_id, token_index,

*StubCode::CallStaticFunction_entry(),

RawPcDescriptors::kOther, locs, function);

- __ Drop(argument_count);

+ __ Drop(args_info.pushed_argc);

if (!is_last_check || add_megamorphic_call) {

__ Jump(match_found);

}

@@ -1993,8 +1986,8 @@ void FlowGraphCompiler::EmitTestAndCall(const CallTargets& targets,

if (add_megamorphic_call) {

int try_index = CatchClauseNode::kInvalidTryIndex;

EmitMegamorphicInstanceCall(function_name, arguments_descriptor,

- argument_count, deopt_id, token_index, locs,

- try_index);

+ args_info.pushed_argc, deopt_id, token_index,

+ locs, try_index);

}

#undef __

« no previous file with comments | « runtime/vm/flow_graph_compiler.h ('k') | runtime/vm/flow_graph_inliner.cc » ('j') | runtime/vm/intermediate_language.h » ('J')