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

Unified Diff: runtime/vm/intermediate_language_x64.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
Download patch
Index: runtime/vm/intermediate_language_x64.cc
diff --git a/runtime/vm/intermediate_language_x64.cc b/runtime/vm/intermediate_language_x64.cc
index 644e8b2e9d12f8b49d6835765cb11ef9061f1571..198b614b848b0691669e8d2027254eadb4211da0 100644
--- a/runtime/vm/intermediate_language_x64.cc
+++ b/runtime/vm/intermediate_language_x64.cc
@@ -910,11 +910,12 @@ LocationSummary* StringInterpolateInstr::MakeLocationSummary(Zone* zone,
void StringInterpolateInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
Register array = locs()->in(0).reg();
__ pushq(array);
+ const int kTypeArgsLen = 0;
const int kNumberOfArguments = 1;
const Array& kNoArgumentNames = Object::null_array();
+ ArgumentsInfo args_info(kTypeArgsLen, kNumberOfArguments, kNoArgumentNames);
compiler->GenerateStaticCall(deopt_id(), token_pos(), CallFunction(),
- kNumberOfArguments, kNoArgumentNames, locs(),
- ICData::Handle());
+ args_info, locs(), ICData::Handle());
ASSERT(locs()->out(0).reg() == RAX);
}
@@ -5325,17 +5326,17 @@ void DoubleToIntegerInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
__ SmiTag(result);
__ jmp(&done);
__ Bind(&do_call);
+ __ pushq(value_obj);
ASSERT(instance_call()->HasICData());
const ICData& ic_data = *instance_call()->ic_data();
ASSERT(ic_data.NumberOfChecksIs(1));
const Function& target = Function::ZoneHandle(ic_data.GetTargetAt(0));
-
- const intptr_t kNumberOfArguments = 1;
- __ pushq(value_obj);
+ const int kTypeArgsLen = 0;
+ const int kNumberOfArguments = 1;
+ const Array& kNoArgumentNames = Object::null_array();
+ ArgumentsInfo args_info(kTypeArgsLen, kNumberOfArguments, kNoArgumentNames);
compiler->GenerateStaticCall(deopt_id(), instance_call()->token_pos(), target,
- kNumberOfArguments,
- Object::null_array(), // No argument names.
- locs(), ICData::Handle());
+ args_info, locs(), ICData::Handle());
__ Bind(&done);
}
@@ -6711,9 +6712,8 @@ LocationSummary* ClosureCallInstr::MakeLocationSummary(Zone* zone,
void ClosureCallInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
// Arguments descriptor is expected in R10.
- intptr_t argument_count = ArgumentCount();
- const Array& arguments_descriptor = Array::ZoneHandle(
- ArgumentsDescriptor::New(argument_count, argument_names()));
+ const intptr_t argument_count = ArgumentCount(); // Includes type args.
+ const Array& arguments_descriptor = GetArgumentsDescriptor(Z);
__ LoadObject(R10, arguments_descriptor);
// Function in RAX.

Powered by Google App Engine
This is Rietveld 408576698