diff options
| author | David Srbecky <dsrbecky@google.com> | 2019-08-20 10:34:02 +0100 |
|---|---|---|
| committer | David Srbecky <dsrbecky@google.com> | 2019-09-01 21:08:43 +0000 |
| commit | 87fb032ee1e7ae98df26c646c450ef44e23fc805 (patch) | |
| tree | 6754b2d2a0e38277885a691d1be6f0d796478cc7 /compiler/optimizing/optimizing_compiler.cc | |
| parent | a86a5d162e6b59a32e8ea7991e6c8a157aca5a0a (diff) | |
Fix JIT data dual mapping for apps.
We don't use it now, but it would be nice to make it functional.
Mark the read-only memory as const, and fix the compile errors.
Test: test.py -b --host --jit
Bug: 119800099
Change-Id: Ic1c45072f3c97f560e843f95fb87b95f754c6e03
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 8ef1b5516c..c55fc8ad72 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1290,11 +1290,8 @@ bool OptimizingCompiler::JitCompile(Thread* self, ScopedArenaAllocator stack_map_allocator(&arena_stack); // Will hold the stack map. ScopedArenaVector<uint8_t> stack_map = CreateJniStackMap(&stack_map_allocator, jni_compiled_method); - uint8_t* roots_data = code_cache->ReserveData(self, - region, - stack_map.size(), - /* number_of_roots= */ 0, - method); + const uint8_t* roots_data = code_cache->ReserveData( + self, region, stack_map.size(), /* number_of_roots= */ 0, method); if (roots_data == nullptr) { MaybeRecordStat(compilation_stats_.get(), MethodCompilationStat::kJitOutOfMemoryForCommit); return false; @@ -1386,11 +1383,8 @@ bool OptimizingCompiler::JitCompile(Thread* self, ScopedArenaVector<uint8_t> stack_map = codegen->BuildStackMaps(code_item); size_t number_of_roots = codegen->GetNumberOfJitRoots(); - uint8_t* roots_data = code_cache->ReserveData(self, - region, - stack_map.size(), - number_of_roots, - method); + const uint8_t* roots_data = code_cache->ReserveData( + self, region, stack_map.size(), number_of_roots, method); if (roots_data == nullptr) { MaybeRecordStat(compilation_stats_.get(), MethodCompilationStat::kJitOutOfMemoryForCommit); return false; |