RFR: 8358722: [leyden] Revert whitespace/comment diffs against mainline
Vladimir Kozlov
kvn at openjdk.org
Thu Jun 5 18:45:08 UTC 2025
On Thu, 5 Jun 2025 17:53:24 GMT, Aleksey Shipilev <shade at openjdk.org> wrote:
> Not having extra whitespace/comments hunks against mainline makes merges simpler. These are the extra hunks I notices when looking through Leyden-vs-mainline webrev.
>
> Additional testing:
> - [x] Linux x86_64 server fastdebug, `runtime/cds`
I marked places with `No` which I think we should not fix in `premain`.
Copyright years should stay since we modified some files which we did not push into mainline yet. (Except AOTCodeCache.* files which should be fixed in mainline to include original year)
Some code alignments are wrong in mainline and should be fixed there instead.
src/hotspot/share/cds/dynamicArchive.cpp line 36:
> 34: #include "cds/dynamicArchive.hpp"
> 35: #include "cds/lambdaProxyClassDictionary.hpp"
> 36: #include "cds/lambdaFormInvokers.hpp"
No
src/hotspot/share/cds/filemap.cpp line 930:
> 928: region_name(region), region, size, p2i(requested_base), _file_offset, crc);
> 929: } else {
> 930: aot_log_info(aot)("Shared file region (%s) %d: %8zu"
No
src/hotspot/share/ci/ciEnv.hpp line 2:
> 1: /*
> 2: * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
No
src/hotspot/share/code/aotCodeCache.hpp line 2:
> 1: /*
> 2: * Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
No
src/hotspot/share/compiler/compiler_globals.hpp line 2:
> 1: /*
> 2: * Copyright (c) 1997, 2024, Oracle and/or its affiliates. All rights reserved.
No
src/hotspot/share/oops/compressedKlass.hpp line 217:
> 215: // Can only be used after initialization
> 216: static address base() { check_init(_base); return _base; }
> 217: static address base_addr() { return (address)&_base; }
No
src/hotspot/share/oops/trainingData.cpp line 226:
> 224: } else {
> 225: last_ctd = ctd;
> 226: mtd->notice_toplevel_compilation(level);
No
src/hotspot/share/opto/compile.cpp line 4569:
> 4567: void Compile::log_late_inline(CallGenerator* cg) {
> 4568: if (log() != nullptr) {
> 4569: log()->head("late_inline method='%d' inline_id='" JLONG_FORMAT "'", log()->identify(cg->method()),
No
src/hotspot/share/runtime/perfData.inline.hpp line 2:
> 1: /*
> 2: * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
No.
src/java.base/share/classes/java/lang/ClassLoader.java line 2:
> 1: /*
> 2: * Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
No
src/java.base/share/classes/jdk/internal/loader/BootLoader.java line 2:
> 1: /*
> 2: * Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
No
src/java.base/share/classes/jdk/internal/loader/NativeLibraries.java line 2:
> 1: /*
> 2: * Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
No
src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotVMConfigAccess.java line 2:
> 1: /*
> 2: * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
No
-------------
PR Review: https://git.openjdk.org/leyden/pull/77#pullrequestreview-2901611950
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129751101
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129751804
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129742641
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129747354
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129757460
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129763894
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129765359
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129766249
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129772284
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129778060
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129778568
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129779326
PR Review Comment: https://git.openjdk.org/leyden/pull/77#discussion_r2129786855
More information about the leyden-dev
mailing list