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

8223645: AArch64 build broken by fix for 8223136

Browse Source 
Reviewed-by: stefank
This commit is contained in:
Andrew Haley 2019-05-09 12:52:05 -04:00
parent d8f7a41216
commit e034f80482
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/hotspot/cpu/aarch64/compiledIC_aot_aarch64.cpp
View File

@ -25,6 +25,7 @@
#include "aot/compiledIC_aot.hpp"
#include "code/codeCache.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
void CompiledDirectStaticCall::set_to_far(const methodHandle& callee, address entry) {
if (TraceICs) {

9
src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
View File

@ -27,6 +27,7 @@
#define CPU_AARCH64_MACROASSEMBLER_AARCH64_HPP
#include "asm/assembler.hpp"
#include "oops/compressedOops.hpp"
// MacroAssembler extends Assembler by frequently used macros.
//
@ -85,10 +86,10 @@ class MacroAssembler: public Assembler {
public:
MacroAssembler(CodeBuffer* code) : Assembler(code) {
use_XOR_for_compressed_class_base
= (operand_valid_for_logical_immediate(false /*is32*/,
(uint64_t)Universe::narrow_klass_base())
&& ((uint64_t)Universe::narrow_klass_base()
> (1UL << log2_intptr(Universe::narrow_klass_range()))));
= operand_valid_for_logical_immediate
(/*is32*/false, (uint64_t)CompressedKlassPointers::base())
&& ((uint64_t)CompressedKlassPointers::base()
> (1UL << log2_intptr(CompressedKlassPointers::range())));
}
// These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.