Index: runtime/vm/flow_graph_compiler_ia32.cc |
=================================================================== |
--- runtime/vm/flow_graph_compiler_ia32.cc (revision 24207) |
+++ runtime/vm/flow_graph_compiler_ia32.cc (working copy) |
@@ -1008,7 +1008,8 @@ |
function.IsClosureFunction() ? Symbols::Call().raw() : function.name()); |
const int kNumArgsChecked = 1; |
const ICData& ic_data = ICData::ZoneHandle( |
- ICData::New(function, name, Isolate::kNoDeoptId, kNumArgsChecked)); |
+ ICData::New(function, name, Object::null_array(), |
+ Isolate::kNoDeoptId, kNumArgsChecked)); |
__ LoadObject(ECX, ic_data); |
// EBP - 4 : PC marker, allows easy identification of RawInstruction obj. |
// EBP : points to previous frame pointer. |
@@ -1178,7 +1179,7 @@ |
// Invoke noSuchMethod function passing "call" as the function name. |
const int kNumArgsChecked = 1; |
const ICData& ic_data = ICData::ZoneHandle( |
- ICData::New(function, Symbols::Call(), |
+ ICData::New(function, Symbols::Call(), Object::null_array(), |
Isolate::kNoDeoptId, kNumArgsChecked)); |
__ LoadObject(ECX, ic_data); |
// EBP - 4 : PC marker, for easy identification of RawInstruction obj. |
@@ -1320,7 +1321,6 @@ |
void FlowGraphCompiler::EmitOptimizedInstanceCall( |
ExternalLabel* target_label, |
const ICData& ic_data, |
- const Array& arguments_descriptor, |
intptr_t argument_count, |
intptr_t deopt_id, |
intptr_t token_pos, |
@@ -1333,7 +1333,6 @@ |
// Pass the function explicitly, it is used in IC stub. |
__ LoadObject(EDI, parsed_function().function()); |
__ LoadObject(ECX, ic_data); |
- __ LoadObject(EDX, arguments_descriptor); |
GenerateDartCall(deopt_id, |
token_pos, |
target_label, |
@@ -1345,13 +1344,11 @@ |
void FlowGraphCompiler::EmitInstanceCall(ExternalLabel* target_label, |
const ICData& ic_data, |
- const Array& arguments_descriptor, |
intptr_t argument_count, |
intptr_t deopt_id, |
intptr_t token_pos, |
LocationSummary* locs) { |
__ LoadObject(ECX, ic_data); |
- __ LoadObject(EDX, arguments_descriptor); |
GenerateDartCall(deopt_id, |
token_pos, |
target_label, |
@@ -1363,13 +1360,15 @@ |
void FlowGraphCompiler::EmitMegamorphicInstanceCall( |
const ICData& ic_data, |
- const Array& arguments_descriptor, |
intptr_t argument_count, |
intptr_t deopt_id, |
intptr_t token_pos, |
LocationSummary* locs) { |
MegamorphicCacheTable* table = Isolate::Current()->megamorphic_cache_table(); |
const String& name = String::Handle(ic_data.target_name()); |
+ const Array& arguments_descriptor = |
+ Array::ZoneHandle(ic_data.arguments_descriptor()); |
+ ASSERT(!arguments_descriptor.IsNull()); |
const MegamorphicCache& cache = |
MegamorphicCache::ZoneHandle(table->Lookup(name, arguments_descriptor)); |
Label not_smi, load_cache; |