Index: runtime/vm/flow_graph_compiler_x64.h |
diff --git a/runtime/vm/flow_graph_compiler_x64.h b/runtime/vm/flow_graph_compiler_x64.h |
index fc2ea307b3d9f04a2b52fbdc8fdb598b85803362..a9d1785c643aa9dc52eac892610637be7bbe5301 100644 |
--- a/runtime/vm/flow_graph_compiler_x64.h |
+++ b/runtime/vm/flow_graph_compiler_x64.h |
@@ -79,33 +79,28 @@ class FlowGraphCompiler : public ValueObject { |
void GenerateCallRuntime(intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
const RuntimeEntry& entry, |
LocationSummary* locs); |
void GenerateCall(intptr_t token_pos, |
- intptr_t try_index, |
const ExternalLabel* label, |
PcDescriptors::Kind kind, |
LocationSummary* locs); |
void GenerateAssertAssignable(intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
const AbstractType& dst_type, |
const String& dst_name, |
LocationSummary* locs); |
void GenerateInstanceOf(intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
const AbstractType& type, |
bool negate_result, |
LocationSummary* locs); |
void GenerateInstanceCall(intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
const String& function_name, |
intptr_t argument_count, |
const Array& argument_names, |
@@ -114,7 +109,6 @@ class FlowGraphCompiler : public ValueObject { |
void GenerateStaticCall(intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
const Function& function, |
intptr_t argument_count, |
const Array& argument_names, |
@@ -145,7 +139,6 @@ class FlowGraphCompiler : public ValueObject { |
intptr_t argument_count, |
intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
LocationSummary* locs); |
void EmitTestAndCall(const ICData& ic_data, |
@@ -155,7 +148,6 @@ class FlowGraphCompiler : public ValueObject { |
Label* deopt, |
intptr_t deopt_id, |
intptr_t token_index, |
- intptr_t try_index, |
LocationSummary* locs); |
void EmitDoubleCompareBranch(Condition true_condition, |
@@ -179,8 +171,7 @@ class FlowGraphCompiler : public ValueObject { |
void AddExceptionHandler(intptr_t try_index, intptr_t pc_offset); |
void AddCurrentDescriptor(PcDescriptors::Kind kind, |
intptr_t deopt_id, |
- intptr_t token_pos, |
- intptr_t try_index); |
+ intptr_t token_pos); |
void RecordSafepoint(LocationSummary* locs); |
@@ -209,6 +200,13 @@ class FlowGraphCompiler : public ValueObject { |
void SaveLiveRegisters(LocationSummary* locs); |
void RestoreLiveRegisters(LocationSummary* locs); |
+ intptr_t CurrentTryIndex() const { |
+ if (current_block_ == NULL) { |
+ return CatchClauseNode::kInvalidTryIndex; |
+ } |
+ return current_block_->try_index(); |
+ } |
+ |
private: |
friend class DeoptimizationStub; |
@@ -224,7 +222,6 @@ class FlowGraphCompiler : public ValueObject { |
intptr_t argument_count, |
intptr_t deopt_id, |
intptr_t token_pos, |
- intptr_t try_index, |
LocationSummary* locs); |
// Type checking helper methods. |