stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8132875: AArch64: Fix error introduced into AArch64 CodeCache by commit for 8130309

Browse Source 
The fix for issue 8130309 introduced several errors into the AArch64 codecache routines

Reviewed-by: aph, thartmann, kvn
This commit is contained in:
Andrew Dinn 2015-08-03 05:05:40 -04:00
parent 26cd440c55
commit bdc4e4d045
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp
View File

@ -334,7 +334,7 @@ void ArrayCopyStub::emit_code(LIR_Assembler* ce) {
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());

3
hotspot/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.hpp
View File

@ -26,6 +26,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;

3
hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp
View File

@ -685,7 +685,8 @@ address MacroAssembler::trampoline_call(Address entry, CodeBuffer *cbuf) {
} else {
bl(pc());
}
return start_offset;
// just need to return a non-null address
return pc();
}