Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(800)

Unified Diff: runtime/vm/intermediate_language_arm64.cc

Issue 2859673002: Pass type argument vector to generic functions (if --reify-generic-functions is (Closed)
Patch Set: Created 3 years, 8 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
Download patch
Index: runtime/vm/intermediate_language_arm64.cc
diff --git a/runtime/vm/intermediate_language_arm64.cc b/runtime/vm/intermediate_language_arm64.cc
index 0091d4e4bf3c5b23e7fad6be886c6ed4ebe6d26d..095412cf71fc85d12e8304e2ea6cbc020c3588d7 100644
--- a/runtime/vm/intermediate_language_arm64.cc
+++ b/runtime/vm/intermediate_language_arm64.cc
@@ -220,9 +220,11 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
// Load arguments descriptor in R4.
- int argument_count = ArgumentCount();
- const Array& arguments_descriptor = Array::ZoneHandle(
- ArgumentsDescriptor::New(argument_count, argument_names()));
+ const intptr_t ta_len = type_args_len();
+ const intptr_t argument_count = ArgumentCount(); // Includes type args.
+ const Array& arguments_descriptor =
+ Array::ZoneHandle(ArgumentsDescriptor::New(
+ ta_len, argument_count - (ta_len > 0 ? 1 : 0), argument_names()));
__ LoadObject(R4, arguments_descriptor);
// R4: Arguments descriptor.
@@ -915,11 +917,12 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
const Register array = locs()->in(0).reg();
__ Push(array);
+ const int kTypeArgsLen = 0;
const int kNumberOfArguments = 1;
const Array& kNoArgumentNames = Object::null_array();
compiler->GenerateStaticCall(deopt_id(), token_pos(), CallFunction(),
- kNumberOfArguments, kNoArgumentNames, locs(),
- ICData::Handle());
+ kTypeArgsLen, kNumberOfArguments,
+ kNoArgumentNames, locs(), ICData::Handle());
ASSERT(locs()->out(0).reg() == R0);
}
@@ -5103,9 +5106,10 @@ void DoubleToIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
ASSERT(ic_data.NumberOfChecksIs(1));
const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(0));
+ const intptr_t kTypeArgsLen = 0;
const intptr_t kNumberOfArguments = 1;
compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target,
- kNumberOfArguments,
+ kTypeArgsLen, kNumberOfArguments,
Object::null_array(), // No argument names.,
locs(), ICData::Handle());
__ Bind(&done);

Powered by Google App Engine
This is Rietveld 408576698