From fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Tue, 16 Jun 2015 11:32:01 +0000 Subject: Revert "ART: Implement literal pool for arm, fix branch fixup." This reverts commit f38caa68cce551fb153dff37d01db518e58ed00f. Change-Id: Id88b82cc949d288cfcdb3c401b96f884b777fc40 Reason: broke the tests. --- compiler/optimizing/code_generator.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/optimizing/code_generator.h') diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index a82b08afe9..e6b1f7c6aa 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -358,7 +358,6 @@ 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()), is_baseline_(false), graph_(graph), compiler_options_(compiler_options), @@ -366,7 +365,8 @@ class CodeGenerator { block_order_(nullptr), current_block_index_(0), is_leaf_(true), - requires_current_method_(false) {} + requires_current_method_(false), + stack_map_stream_(graph->GetArena()) {} // Register allocation logic. void AllocateRegistersLocally(HInstruction* instruction) const; @@ -436,8 +436,6 @@ class CodeGenerator { const uint32_t core_callee_save_mask_; const uint32_t fpu_callee_save_mask_; - StackMapStream stack_map_stream_; - // Whether we are using baseline. bool is_baseline_; @@ -466,6 +464,8 @@ 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