From cf93a5cd9c978f59113d42f9f642fab5e2cc8877 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 16 Jun 2015 11:33:24 +0000 Subject: Revert "Revert "ART: Implement literal pool for arm, fix branch fixup."" This reverts commit fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98. Adjust block label positions. Bad catch block labels were the reason for the revert. Change-Id: Ia6950d639d46b9da6b07f3ade63ab46d03d63310 --- compiler/optimizing/code_generator.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index e6b1f7c6aa..5b0abd76b3 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -358,15 +358,15 @@ class CodeGenerator { number_of_register_pairs_(number_of_register_pairs), core_callee_save_mask_(core_callee_save_mask), fpu_callee_save_mask_(fpu_callee_save_mask), + stack_map_stream_(graph->GetArena()), + block_order_(nullptr), is_baseline_(false), graph_(graph), compiler_options_(compiler_options), slow_paths_(graph->GetArena(), 8), - block_order_(nullptr), current_block_index_(0), is_leaf_(true), - requires_current_method_(false), - stack_map_stream_(graph->GetArena()) {} + requires_current_method_(false) {} // Register allocation logic. void AllocateRegistersLocally(HInstruction* instruction) const; @@ -436,6 +436,11 @@ class CodeGenerator { const uint32_t core_callee_save_mask_; const uint32_t fpu_callee_save_mask_; + StackMapStream stack_map_stream_; + + // The order to use for code generation. + const GrowableArray* block_order_; + // Whether we are using baseline. bool is_baseline_; @@ -451,9 +456,6 @@ class CodeGenerator { GrowableArray slow_paths_; - // The order to use for code generation. - const GrowableArray* block_order_; - // The current block index in `block_order_` of the block // we are generating code for. size_t current_block_index_; @@ -464,8 +466,6 @@ class CodeGenerator { // Whether an instruction in the graph accesses the current method. bool requires_current_method_; - StackMapStream stack_map_stream_; - friend class OptimizingCFITest; DISALLOW_COPY_AND_ASSIGN(CodeGenerator); -- cgit v1.2.3-59-g8ed1b