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

8334695: Fix build failure without zgc after JDK-8333300

Browse Source 
Reviewed-by: dnsimon, chagedorn
This commit is contained in:
Jie Fu 2024-06-21 14:23:38 +00:00
parent 75bea280b9
commit c41293a708
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/cpu/x86/jvmciCodeInstaller_x86.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -220,6 +220,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
// see comment above for POLL_FAR // see comment above for POLL_FAR
_instructions->relocate(pc, relocInfo::poll_return_type, Assembler::imm_operand); _instructions->relocate(pc, relocInfo::poll_return_type, Assembler::imm_operand);
return true; return true;
#if INCLUDE_ZGC
case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL: case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_SHL:
_instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl); _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeShl);
return true; return true;
@ -241,6 +242,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
case Z_BARRIER_RELOCATION_FORMAT_STORE_GOOD_AFTER_MOV: case Z_BARRIER_RELOCATION_FORMAT_STORE_GOOD_AFTER_MOV:
_instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterMov); _instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatStoreGoodAfterMov);
return true; return true;
#endif
default: default:
return false; return false;
} }

4
src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -104,7 +104,9 @@ class CompilerToVM {
static int sizeof_narrowKlass; static int sizeof_narrowKlass;
static int sizeof_arrayOopDesc; static int sizeof_arrayOopDesc;
static int sizeof_BasicLock; static int sizeof_BasicLock;
#if INCLUDE_ZGC
static int sizeof_ZStoreBarrierEntry; static int sizeof_ZStoreBarrierEntry;
#endif
static address dsin; static address dsin;
static address dcos; static address dcos;

4
src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -123,7 +123,9 @@ int CompilerToVM::Data::sizeof_ConstantPool = sizeof(ConstantPool);
int CompilerToVM::Data::sizeof_narrowKlass = sizeof(narrowKlass); int CompilerToVM::Data::sizeof_narrowKlass = sizeof(narrowKlass);
int CompilerToVM::Data::sizeof_arrayOopDesc = sizeof(arrayOopDesc); int CompilerToVM::Data::sizeof_arrayOopDesc = sizeof(arrayOopDesc);
int CompilerToVM::Data::sizeof_BasicLock = sizeof(BasicLock); int CompilerToVM::Data::sizeof_BasicLock = sizeof(BasicLock);
#if INCLUDE_ZGC
int CompilerToVM::Data::sizeof_ZStoreBarrierEntry = sizeof(ZStoreBarrierEntry); int CompilerToVM::Data::sizeof_ZStoreBarrierEntry = sizeof(ZStoreBarrierEntry);
#endif
address CompilerToVM::Data::dsin; address CompilerToVM::Data::dsin;
address CompilerToVM::Data::dcos; address CompilerToVM::Data::dcos;

2
src/hotspot/share/jvmci/vmStructs_jvmci.cpp
View File

@ -121,7 +121,7 @@
static_field(CompilerToVM::Data, sizeof_narrowKlass, int) \ static_field(CompilerToVM::Data, sizeof_narrowKlass, int) \
static_field(CompilerToVM::Data, sizeof_arrayOopDesc, int) \ static_field(CompilerToVM::Data, sizeof_arrayOopDesc, int) \
static_field(CompilerToVM::Data, sizeof_BasicLock, int) \ static_field(CompilerToVM::Data, sizeof_BasicLock, int) \
static_field(CompilerToVM::Data, sizeof_ZStoreBarrierEntry, int) \ ZGC_ONLY(static_field(CompilerToVM::Data, sizeof_ZStoreBarrierEntry, int)) \
\ \
static_field(CompilerToVM::Data, dsin, address) \ static_field(CompilerToVM::Data, dsin, address) \
static_field(CompilerToVM::Data, dcos, address) \ static_field(CompilerToVM::Data, dcos, address) \