diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-07-25 08:23:46 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-25 08:23:46 +0000 |
commit | ff80dfc82a3e5177d45099c090e33f1a060f9152 (patch) | |
tree | 9ee750c2766161d310a625450ada830bc91230b2 /compiler/optimizing/optimizing_compiler.cc | |
parent | 9710fbaea9022149887da4459b47011a803c76fb (diff) | |
parent | 56fe32eecd4f25237e66811fd766355a07908d22 (diff) |
Merge "Jit Code Cache instruction pipeline flushing"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 51101f104a..76a243f793 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1210,14 +1210,14 @@ bool OptimizingCompiler::JitCompile(Thread* self, uint8_t* stack_map_data = nullptr; uint8_t* method_info_data = nullptr; uint8_t* roots_data = nullptr; - uint32_t data_size = code_cache->ReserveData(self, - stack_map_size, - method_info_size, - number_of_roots, - method, - &stack_map_data, - &method_info_data, - &roots_data); + code_cache->ReserveData(self, + stack_map_size, + method_info_size, + number_of_roots, + method, + &stack_map_data, + &method_info_data, + &roots_data); if (stack_map_data == nullptr || roots_data == nullptr) { return false; } @@ -1238,7 +1238,6 @@ bool OptimizingCompiler::JitCompile(Thread* self, codegen->GetFpuSpillMask(), code_allocator.GetMemory().data(), code_allocator.GetSize(), - data_size, osr, roots, codegen->GetGraph()->HasShouldDeoptimizeFlag(), |