[11u] RFR: 8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled

[Langer, Christoph]

Hi Chris,

thanks for reposting. Looks good to me. Approving in JBS…

Cheers
Christoph

From: Christian Thalinger <cthalinger at twitter.com>
Sent: Montag, 18. Mai 2020 19:21
To: jdk-updates-dev <jdk-updates-dev at openjdk.java.net>
Cc: Langer, Christoph <christoph.langer at sap.com>
Subject: Re: [11u] RFR: 8217404: --with-jvm-features doesn't work when multiple features are explicitly disabled

Mailman issue bit me so I’m putting Christoph on CC.


On May 1, 2020, at 4:40 AM, Christian Thalinger <cthalinger at twitter.com<mailto:cthalinger at twitter.com>> wrote:

https://bugs.openjdk.java.net/browse/JDK-8217404
http://hg.openjdk.java.net/jdk/jdk/rev/ddfa4bfabdec
http://cr.openjdk.java.net/~twisti/8217404/webrev/

The patch applies cleanly (with some offset adjusting) except one hunk that affects CDS.  The rejected hunk is this:

$ cat make/autoconf/hotspot.m4.rej
***************
*** 494,501 ****
    fi

    # Disable CDS if user requested it with --with-jvm-features=-cds.
-   DISABLE_CDS=`$ECHO $DISABLED_JVM_FEATURES | $GREP cds`
-   if test "x$DISABLE_CDS" = "xcds"; then
      ENABLE_CDS="false"
      if test "x$enable_cds" = "xyes"; then
        AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.])
--- 505,511 ----
    fi

    # Disable CDS if user requested it with --with-jvm-features=-cds.
+   if HOTSPOT_IS_JVM_FEATURE_DISABLED(cds); then
      ENABLE_CDS="false"
      if test "x$enable_cds" = "xyes"; then
        AC_MSG_ERROR([CDS was disabled by --with-jvm-features=-cds. Remove --enable-cds.])