diff options
| author | 2017-08-10 13:31:16 +0000 | |
|---|---|---|
| committer | 2017-08-10 13:31:16 +0000 | |
| commit | 461ec567f16039374dff35e2f3b808986c100249 (patch) | |
| tree | 81968f4f0a16cb37b57933be5cea6542795488a1 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 1d2d8b1b6b359f5f476ef78662baa4b8782be530 (diff) | |
| parent | dbd05fe1a6ed2c3e23c9f6b372dd439ad59e777b (diff) | |
Merge "Revert recent JIT code cache changes"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 76a243f793..51101f104a 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; - code_cache->ReserveData(self, - stack_map_size, - method_info_size, - number_of_roots, - method, - &stack_map_data, - &method_info_data, - &roots_data); + 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); if (stack_map_data == nullptr || roots_data == nullptr) { return false; } @@ -1238,6 +1238,7 @@ bool OptimizingCompiler::JitCompile(Thread* self, codegen->GetFpuSpillMask(), code_allocator.GetMemory().data(), code_allocator.GetSize(), + data_size, osr, roots, codegen->GetGraph()->HasShouldDeoptimizeFlag(), |