RFR: 8355352: [premain] rename AOT Code classes and logging tags

Aleksey Shipilev shade at openjdk.org
Wed Apr 23 06:28:53 UTC 2025


On Wed, 23 Apr 2025 05:31:31 GMT, Vladimir Kozlov <kvn at openjdk.org> wrote:

> Rename AOT Code classes and logging tags to match changes for mainline: [#24740](https://github.com/openjdk/jdk/pull/24740)
> 
> This is first part of changes in premain branch.  AOT code flags renaming and more code changes will be done in separate PRs.
> 
> Tested with premain-tier1

Looks reasonable. Nits below. Please enable GHA for this PR and make sure it is green.

src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp line 31:

> 29: #include "ci/ciUtilities.hpp"
> 30: #include "code/compiledIC.hpp"
> 31: #if INCLUDE_CDS

Did you mean to only remove `INCLUDE_CDS` , and add the `#include` for `autoCodeCache.hpp`?

src/hotspot/cpu/x86/gc/g1/g1BarrierSetAssembler_x86.cpp line 27:

> 25: #include "asm/macroAssembler.inline.hpp"
> 26: #if INCLUDE_CDS
> 27: #include "code/SCCache.hpp"

While you are at it, remove `INCLUDE_CDS` guards around includes like these?

src/hotspot/share/code/aotCodeCache.cpp line 4602:

> 4600:   if (!_extrs_complete) {
> 4601:     fatal("AOT Code Cache VM runtime addresses table is not complete");
> 4602:   }

We sure this move makes sense?

src/hotspot/share/compiler/compilationPolicy.cpp line 1094:

> 1092: 
> 1093: bool CompilationPolicy::compare_tasks(CompileTask* x, CompileTask* y) {
> 1094:   assert(!x->is_aot() && !y->is_aot(), "SC tasks are not expected here");

"AOT tasks are not expected here"?

src/hotspot/share/compiler/compileBroker.cpp line 3201:

> 3199:   if (StoreCachedCode || LoadCachedCode) { // Check flags because SC cache could be closed already
> 3200:     tty->cr();
> 3201:     AOTCodeCache::print_timers_on(tty);

There is a mention of "SC cache" a few lines above.

src/hotspot/share/compiler/compileTask.cpp line 25:

> 23:  */
> 24: 
> 25: #include "code/SCCache.hpp"

This compilation unit uses `AOTCode*` stuff, so the include for `aotCodeCache.hpp` should be here?

-------------

PR Review: https://git.openjdk.org/leyden/pull/60#pullrequestreview-2786045447
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055317765
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055320090
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055327872
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055329823
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055330838
PR Review Comment: https://git.openjdk.org/leyden/pull/60#discussion_r2055332225


More information about the leyden-dev mailing list