Index: runtime/vm/flow_graph_compiler.h |
diff --git a/runtime/vm/flow_graph_compiler.h b/runtime/vm/flow_graph_compiler.h |
index b6d4c4c13ae061d5167d0ce4aad177a25a398b51..57bff29d91349c322f3ffc231880248170defa5f 100644 |
--- a/runtime/vm/flow_graph_compiler.h |
+++ b/runtime/vm/flow_graph_compiler.h |
@@ -219,7 +219,7 @@ class MegamorphicSlowPath : public SlowPathCode { |
MegamorphicSlowPath(const ICData& ic_data, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs, |
intptr_t try_index) |
: SlowPathCode(), |
@@ -237,7 +237,7 @@ class MegamorphicSlowPath : public SlowPathCode { |
const ICData& ic_data_; |
intptr_t argument_count_; |
intptr_t deopt_id_; |
- intptr_t token_pos_; |
+ TokenPosition token_pos_; |
LocationSummary* locs_; |
const intptr_t try_index_; // For try/catch ranges. |
@@ -365,43 +365,43 @@ class FlowGraphCompiler : public ValueObject { |
// Returns 'true' if regular code generation should be skipped. |
bool TryIntrinsify(); |
- void GenerateRuntimeCall(intptr_t token_pos, |
+ void GenerateRuntimeCall(TokenPosition token_pos, |
intptr_t deopt_id, |
const RuntimeEntry& entry, |
intptr_t argument_count, |
LocationSummary* locs); |
- void GenerateCall(intptr_t token_pos, |
+ void GenerateCall(TokenPosition token_pos, |
const StubEntry& stub_entry, |
RawPcDescriptors::Kind kind, |
LocationSummary* locs); |
void GenerateDartCall(intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
const StubEntry& stub_entry, |
RawPcDescriptors::Kind kind, |
LocationSummary* locs); |
- void GenerateAssertAssignable(intptr_t token_pos, |
+ void GenerateAssertAssignable(TokenPosition token_pos, |
intptr_t deopt_id, |
const AbstractType& dst_type, |
const String& dst_name, |
LocationSummary* locs); |
- void GenerateInstanceOf(intptr_t token_pos, |
+ void GenerateInstanceOf(TokenPosition token_pos, |
intptr_t deopt_id, |
const AbstractType& type, |
bool negate_result, |
LocationSummary* locs); |
void GenerateInstanceCall(intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
intptr_t argument_count, |
LocationSummary* locs, |
const ICData& ic_data); |
void GenerateStaticCall(intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
const Function& function, |
intptr_t argument_count, |
const Array& argument_names, |
@@ -428,21 +428,21 @@ class FlowGraphCompiler : public ValueObject { |
const ICData& ic_data, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs); |
void EmitInstanceCall(const StubEntry& stub_entry, |
const ICData& ic_data, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs); |
void EmitPolymorphicInstanceCall(const ICData& ic_data, |
intptr_t argument_count, |
const Array& argument_names, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs); |
// Pass a value for try-index where block is not available (e.g. slow path). |
@@ -450,14 +450,14 @@ class FlowGraphCompiler : public ValueObject { |
const ICData& ic_data, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs, |
intptr_t try_index = CatchClauseNode::kInvalidTryIndex); |
void EmitSwitchableInstanceCall(const ICData& ic_data, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs); |
void EmitTestAndCall(const ICData& ic_data, |
@@ -466,17 +466,17 @@ class FlowGraphCompiler : public ValueObject { |
Label* failed, |
Label* match_found, |
intptr_t deopt_id, |
- intptr_t token_index, |
+ TokenPosition token_index, |
LocationSummary* locs); |
Condition EmitEqualityRegConstCompare(Register reg, |
const Object& obj, |
bool needs_number_check, |
- intptr_t token_pos); |
+ TokenPosition token_pos); |
Condition EmitEqualityRegRegCompare(Register left, |
Register right, |
bool needs_number_check, |
- intptr_t token_pos); |
+ TokenPosition token_pos); |
void EmitTrySync(Instruction* instr, intptr_t try_index); |
@@ -504,7 +504,7 @@ class FlowGraphCompiler : public ValueObject { |
void SetNeedsStacktrace(intptr_t try_index); |
void AddCurrentDescriptor(RawPcDescriptors::Kind kind, |
intptr_t deopt_id, |
- intptr_t token_pos); |
+ TokenPosition token_pos); |
void RecordSafepoint(LocationSummary* locs); |
@@ -512,7 +512,7 @@ class FlowGraphCompiler : public ValueObject { |
ICData::DeoptReasonId reason, |
uint32_t flags = 0); |
- void AddDeoptIndexAtCall(intptr_t deopt_id, intptr_t token_pos); |
+ void AddDeoptIndexAtCall(intptr_t deopt_id, TokenPosition token_pos); |
void AddSlowPathCode(SlowPathCode* slow_path); |
@@ -605,12 +605,12 @@ class FlowGraphCompiler : public ValueObject { |
const Array& arguments_descriptor, |
intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs); |
void EmitUnoptimizedStaticCall(intptr_t argument_count, |
intptr_t deopt_id, |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
LocationSummary* locs, |
const ICData& ic_data); |
@@ -620,30 +620,30 @@ class FlowGraphCompiler : public ValueObject { |
Label* is_instance_lbl, |
Label* is_not_instance_lbl); |
- RawSubtypeTestCache* GenerateInlineInstanceof(intptr_t token_pos, |
+ RawSubtypeTestCache* GenerateInlineInstanceof(TokenPosition token_pos, |
const AbstractType& type, |
Label* is_instance_lbl, |
Label* is_not_instance_lbl); |
RawSubtypeTestCache* GenerateInstantiatedTypeWithArgumentsTest( |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
const AbstractType& dst_type, |
Label* is_instance_lbl, |
Label* is_not_instance_lbl); |
- bool GenerateInstantiatedTypeNoArgumentsTest(intptr_t token_pos, |
+ bool GenerateInstantiatedTypeNoArgumentsTest(TokenPosition token_pos, |
const AbstractType& dst_type, |
Label* is_instance_lbl, |
Label* is_not_instance_lbl); |
RawSubtypeTestCache* GenerateUninstantiatedTypeTest( |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
const AbstractType& dst_type, |
Label* is_instance_lbl, |
Label* is_not_instance_label); |
RawSubtypeTestCache* GenerateSubtype1TestCacheLookup( |
- intptr_t token_pos, |
+ TokenPosition token_pos, |
const Class& type_class, |
Label* is_instance_lbl, |
Label* is_not_instance_lbl); |