Mercurial > hg > icedtea8-forest > hotspot
changeset 9402:510bf6178ea4 icedtea-3.3.0pre01
8132875, PR3280: AArch64: Fix error introduced into AArch64 CodeCache by commit for 8130309
Summary: The fix for issue 8130309 introduced several errors into the AArch64 codecache routines
Reviewed-by: aph, thartmann, kvn
| author | adinn |
|---|---|
| date | Thu, 12 Jan 2017 19:02:07 +0000 |
| parents | 7fc218dce059 |
| children | f73f57792257 |
| files | src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp src/cpu/aarch64/vm/macroAssembler_aarch64.cpp |
| diffstat | 3 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Thu Jan 12 18:58:53 2017 +0000 +++ b/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Thu Jan 12 19:02:07 2017 +0000 @@ -406,7 +406,7 @@ relocInfo::static_call_type); address call = __ trampoline_call(resolve); if (call == NULL) { - bailout("trampoline stub overflow"); + ce->bailout("trampoline stub overflow"); return; } ce->add_call_info_here(info());
--- a/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp Thu Jan 12 18:58:53 2017 +0000 +++ b/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp Thu Jan 12 19:02:07 2017 +0000 @@ -27,6 +27,9 @@ #ifndef CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP #define CPU_X86_VM_C1_LIRASSEMBLER_X86_HPP +// ArrayCopyStub needs access to bailout +friend class ArrayCopyStub; + private: int array_element_size(BasicType type) const;
--- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Thu Jan 12 18:58:53 2017 +0000 +++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Thu Jan 12 19:02:07 2017 +0000 @@ -703,7 +703,8 @@ #else bl(entry.target()); #endif - return start_offset; + // just need to return a non-null address + return pc(); }