OpenJDK / amber / amber
changeset 49449:f7caa2aecc86
8198341: Build failures after 8194084 (Obsolete FastTLABRefill and remove the related code)
Reviewed-by: mdoerr, dholmes
| author | shade |
|---|---|
| date | Mon, 19 Feb 2018 15:07:21 +0100 |
| parents | e6a79c032ac6 |
| children | 68b283918441 |
| files | src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp src/hotspot/cpu/x86/c1_Runtime1_x86.cpp |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Mon Feb 19 04:50:50 2018 +0100 +++ b/src/hotspot/cpu/aarch64/c1_Runtime1_aarch64.cpp Mon Feb 19 15:07:21 2018 +0100 @@ -821,7 +821,7 @@ __ andr(arr_size, arr_size, ~MinObjAlignmentInBytesMask); __ eden_allocate(obj, arr_size, 0, t1, slow_path); // preserves arr_size - __ incr_allocated_bytes(thread, arr_size, 0, rscratch1); + __ incr_allocated_bytes(rthread, arr_size, 0, rscratch1); __ initialize_header(obj, klass, length, t1, t2); __ ldrb(t1, Address(klass, in_bytes(Klass::layout_helper_offset()) + (Klass::_lh_header_size_shift / BitsPerByte)));
--- a/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Mon Feb 19 04:50:50 2018 +0100 +++ b/src/hotspot/cpu/x86/c1_Runtime1_x86.cpp Mon Feb 19 15:07:21 2018 +0100 @@ -1031,7 +1031,7 @@ // refilling the TLAB or allocating directly from eden. Label retry_tlab, try_eden; const Register thread = NOT_LP64(rdi) LP64_ONLY(r15_thread); - NOT_LP64(get_thread(thread_reg)); + NOT_LP64(__ get_thread(thread)); __ bind(try_eden); // get the instance size (size is postive so movl is fine for 64bit) @@ -1140,7 +1140,7 @@ // Using t2 for non 64-bit. const Register thread = NOT_LP64(t2) LP64_ONLY(r15_thread); - NOT_LP64(get_thread(thread_reg)); + NOT_LP64(__ get_thread(thread)); __ incr_allocated_bytes(thread, arr_size, 0); __ initialize_header(obj, klass, length, t1, t2);