diff options
| author | Vladimir Marko <vmarko@google.com> | 2015-06-16 11:32:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-16 11:32:25 +0000 |
| commit | db40ea768bd914125c3754dacb9b6f534a2e2399 (patch) | |
| tree | af87ccb86c7e0622912bf088a464716166ea450a /compiler/optimizing/code_generator.h | |
| parent | e4394f7de28ae0b517daa033749979e46ff676ab (diff) | |
| parent | fbeb4aede0ddc5b1e6a5a3a40cc6266fe8518c98 (diff) | |
Merge "Revert "ART: Implement literal pool for arm, fix branch fixup.""
Diffstat (limited to 'compiler/optimizing/code_generator.h')
| -rw-r--r-- | compiler/optimizing/code_generator.h | 8 |
1 files changed, 4 insertions, 4 deletions
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); |