On Thu, 22 Apr 2021 04:16:57 GMT, David Holmes <dhol...@openjdk.org> wrote:
>> Ioi Lam has updated the pull request incrementally with two additional >> commits since the last revision: >> >> - exclude all files under shared/cds if CDS is disabled; >> compactHashtable.cpp cannot be excluded since a bit of it is used even when >> CDS is disabled >> - fixed include guards -> #ifndef SHARE_CDS_xxxxx > > src/hotspot/share/cds/archiveUtils.inline.hpp line 25: > >> 23: */ >> 24: >> 25: #ifndef SHARE_MEMORY_ARCHIVEUTILS_INLINE_HPP > > The header file include guards all need updating for the new path. Fixed. > src/hotspot/share/cds/dynamicArchive.hpp line 38: > >> 36: #include "utilities/resourceHash.hpp" >> 37: >> 38: #if INCLUDE_CDS > > I have to wonder who is including this file and why, if CDS is not enabled. E.g., jvm.cpp includes dynamicArchive.hpp, but only uses its declarations inside INCLUDE_CDS blocks. It would be too verbose to do this in jvm.cpp #if INCLUDE_CDS #include "cds/dynamicArchive.hpp" #endif ------------- PR: https://git.openjdk.java.net/jdk/pull/3610
