RFR: 8258857: Zero: non-PCH release build fails after JDK-8258074 [v2]

Hao Sun github.com+16932759+shqking at openjdk.java.net
Tue Jan 5 12:06:18 UTC 2021


> From the error log we can see the root cause is that, develop_pd flag
> 'pd_CICompileOSR' is undeclared in zero build.
> 
> Where this flag is used?
> Flag 'pd_CICompileOSR' is assigned to flag 'CICompileOSR'. See line 77
> of 'compiler_globals.hpp' and further line 86 of 'globals_shared.hpp'.
> 
> Where this flag can be declared?
> Header files 'c1_globals.hpp' or 'c2_globals.hpp' would be included if
> VM is built with compiler1 or compiler2. See lines 30 to 38 of
> 'complier_globals.hpp'. And further, flag 'pd_CICompileOSR' may get
> declared in the header files for specific arch, e.g.,
> 'c1_globals_aarch64.hpp', 'c2_globals_aarch64.hpp'.
> However, regarding zero build (without compiler1 and compiler2 and
> jvmci) , this flag is undelcared. Hence, this patch gets header file
> 'compiler/compiler_globals_pd.hpp' included where this flag is declared
> for the case when neither COMPILER1 nor COMPILER2 are defined and
> INCLUDE_JVMCI is inactive.
> 
> Note that 'compiler/compiler_globals_pd.hpp' already includes
> 'runtime/globals_shared.hpp'.
> 
> Note that zero build with PCH succeeds because 'runtime/globals.hpp' is
> included in 'precompiled.hpp', and further 'compiler_globals_pd.hpp' is
> included in 'runtime/globals.hpp'.

Hao Sun has updated the pull request incrementally with one additional commit since the last revision:

  Header 'runtime/globals_shared.hpp' should be kept
  
  Header 'runtime/globals_shared.hpp' is kept even though
  'compiler/compiler_globals_pd.hpp' already includes it, because
  'compiler_globals.hpp' uses the DECLARE_FLAGS macro, which is defined by
  'runtime/globals_shared.hpp', and it should be included directly.
  
  Besides, update the copyright year to 2021.
  
  Change-Id: Ia355f3b6e98b495dc265093e71b2d1fec1ca45ca
  CustomizedGitHooks: yes

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

Changes:
  - all: https://git.openjdk.java.net/jdk/pull/1894/files
  - new: https://git.openjdk.java.net/jdk/pull/1894/files/0cc564bd..f3cd5181

Webrevs:
 - full: https://webrevs.openjdk.java.net/?repo=jdk&pr=1894&range=01
 - incr: https://webrevs.openjdk.java.net/?repo=jdk&pr=1894&range=00-01

  Stats: 2 lines in 1 file changed: 1 ins; 0 del; 1 mod
  Patch: https://git.openjdk.java.net/jdk/pull/1894.diff
  Fetch: git fetch https://git.openjdk.java.net/jdk pull/1894/head:pull/1894

PR: https://git.openjdk.java.net/jdk/pull/1894



More information about the build-dev mailing list