diff options
author | 2018-07-27 15:58:15 +0000 | |
---|---|---|
committer | 2018-07-27 15:58:15 +0000 | |
commit | 9acb522e35e3302786a338c7f50585dd412d68d3 (patch) | |
tree | f665fa233579d933da378299c20e65ed6e317012 /runtime/jit/jit_code_cache.cc | |
parent | 921702dfd9d857aef1331f653ec7b656e0b080e8 (diff) | |
parent | 8808756b8fba036a9c73a45c800a56be09872364 (diff) |
Merge changes I07fcf6f2,I01074aee
* changes:
Remove frame info from OatQuickMethodHeader.
ARM64: Fix the CallOtherJustTooFarAfter test.
Diffstat (limited to 'runtime/jit/jit_code_cache.cc')
-rw-r--r-- | runtime/jit/jit_code_cache.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/runtime/jit/jit_code_cache.cc b/runtime/jit/jit_code_cache.cc index 17561d2864..9aa05561f0 100644 --- a/runtime/jit/jit_code_cache.cc +++ b/runtime/jit/jit_code_cache.cc @@ -413,9 +413,6 @@ uint8_t* JitCodeCache::CommitCode(Thread* self, uint8_t* stack_map, uint8_t* method_info, uint8_t* roots_data, - size_t frame_size_in_bytes, - size_t core_spill_mask, - size_t fp_spill_mask, const uint8_t* code, size_t code_size, size_t data_size, @@ -428,9 +425,6 @@ uint8_t* JitCodeCache::CommitCode(Thread* self, stack_map, method_info, roots_data, - frame_size_in_bytes, - core_spill_mask, - fp_spill_mask, code, code_size, data_size, @@ -446,9 +440,6 @@ uint8_t* JitCodeCache::CommitCode(Thread* self, stack_map, method_info, roots_data, - frame_size_in_bytes, - core_spill_mask, - fp_spill_mask, code, code_size, data_size, @@ -759,9 +750,6 @@ uint8_t* JitCodeCache::CommitCodeInternal(Thread* self, uint8_t* stack_map, uint8_t* method_info, uint8_t* roots_data, - size_t frame_size_in_bytes, - size_t core_spill_mask, - size_t fp_spill_mask, const uint8_t* code, size_t code_size, size_t data_size, @@ -796,9 +784,6 @@ uint8_t* JitCodeCache::CommitCodeInternal(Thread* self, new (method_header) OatQuickMethodHeader( (stack_map != nullptr) ? code_ptr - stack_map : 0u, (method_info != nullptr) ? code_ptr - method_info : 0u, - frame_size_in_bytes, - core_spill_mask, - fp_spill_mask, code_size); // Flush caches before we remove write permission because some ARMv8 Qualcomm kernels may // trigger a segfault if a page fault occurs when requesting a cache maintenance operation. |