| Index: runtime/vm/flow_graph_compiler_x64.h
|
| ===================================================================
|
| --- runtime/vm/flow_graph_compiler_x64.h (revision 10302)
|
| +++ runtime/vm/flow_graph_compiler_x64.h (working copy)
|
| @@ -77,7 +77,7 @@
|
| // no fall-through to regular code is needed.
|
| bool TryIntrinsify();
|
|
|
| - void GenerateCallRuntime(intptr_t cid,
|
| + void GenerateCallRuntime(intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index,
|
| const RuntimeEntry& entry);
|
| @@ -87,19 +87,19 @@
|
| const ExternalLabel* label,
|
| PcDescriptors::Kind kind);
|
|
|
| - void GenerateAssertAssignable(intptr_t cid,
|
| + void GenerateAssertAssignable(intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index,
|
| const AbstractType& dst_type,
|
| const String& dst_name);
|
|
|
| - void GenerateInstanceOf(intptr_t cid,
|
| + void GenerateInstanceOf(intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index,
|
| const AbstractType& type,
|
| bool negate_result);
|
|
|
| - void GenerateInstanceCall(intptr_t cid,
|
| + void GenerateInstanceCall(intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index,
|
| const String& function_name,
|
| @@ -107,7 +107,7 @@
|
| const Array& argument_names,
|
| intptr_t checked_argument_count);
|
|
|
| - void GenerateStaticCall(intptr_t cid,
|
| + void GenerateStaticCall(intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index,
|
| const Function& function,
|
| @@ -146,8 +146,8 @@
|
| intptr_t arg_count,
|
| const Array& arg_names,
|
| Label* deopt,
|
| - Label* done,
|
| - intptr_t cid,
|
| + Label* done, // Can be NULL, which means fallthrough.
|
| + intptr_t deopt_id,
|
| intptr_t token_index,
|
| intptr_t try_index);
|
|
|
| @@ -171,7 +171,7 @@
|
|
|
| void AddExceptionHandler(intptr_t try_index, intptr_t pc_offset);
|
| void AddCurrentDescriptor(PcDescriptors::Kind kind,
|
| - intptr_t cid,
|
| + intptr_t deopt_id,
|
| intptr_t token_pos,
|
| intptr_t try_index);
|
| Label* AddDeoptStub(intptr_t deopt_id,
|
| @@ -220,34 +220,29 @@
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_lbl);
|
|
|
| - RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t cid,
|
| - intptr_t token_pos,
|
| + RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t token_pos,
|
| const AbstractType& type,
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_lbl);
|
|
|
| RawSubtypeTestCache* GenerateInstantiatedTypeWithArgumentsTest(
|
| - intptr_t cid,
|
| intptr_t token_pos,
|
| const AbstractType& dst_type,
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_lbl);
|
|
|
| - bool GenerateInstantiatedTypeNoArgumentsTest(intptr_t cid,
|
| - intptr_t token_pos,
|
| + bool GenerateInstantiatedTypeNoArgumentsTest(intptr_t token_pos,
|
| const AbstractType& dst_type,
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_lbl);
|
|
|
| RawSubtypeTestCache* GenerateUninstantiatedTypeTest(
|
| - intptr_t cid,
|
| intptr_t token_pos,
|
| const AbstractType& dst_type,
|
| Label* is_instance_lbl,
|
| Label* is_not_instance_label);
|
|
|
| RawSubtypeTestCache* GenerateSubtype1TestCacheLookup(
|
| - intptr_t cid,
|
| intptr_t token_pos,
|
| const Class& type_class,
|
| Label* is_instance_lbl,
|
|
|