make/test/BuildMicrobenchmark.gmk

*** 76,33 ***
  # sun.security.util is required to compile Cache benchmark.
  # jmh uses annotation processors to generate the benchmark jar and thus
  # requires the use of -processor option during benchmark compilation.
  
  # Build microbenchmark suite for the current JDK
  $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SMALL_JAVA := false, \
      CLASSPATH := $(JMH_COMPILE_JARS), \
      CREATE_API_DIGEST := true, \
!     DISABLED_WARNINGS := restricted this-escape rawtypes removal cast \
!         serial preview, \
      SRC := $(MICROBENCHMARK_SRC), \
      BIN := $(MICROBENCHMARK_CLASSES), \
      JAVAC_FLAGS := \
          --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.jimage=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.util=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
          --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
          --add-exports java.base/sun.security.util=ALL-UNNAMED \
          --add-exports java.base/sun.security.util.math=ALL-UNNAMED \
          --add-exports java.base/sun.security.util.math.intpoly=ALL-UNNAMED \
          --enable-preview \
          -XDsuppressNotes \
          -processor org.openjdk.jmh.generators.BenchmarkProcessor \
          -s $(MICROBENCHMARK_GENSRC), \
      JAVA_FLAGS := \
          --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
--- 76,37 ---
  # sun.security.util is required to compile Cache benchmark.
  # jmh uses annotation processors to generate the benchmark jar and thus
  # requires the use of -processor option during benchmark compilation.
  
  # Build microbenchmark suite for the current JDK
+ # Need to patch java.base to include preview classes not found in interim javac
  $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SMALL_JAVA := false, \
      CLASSPATH := $(JMH_COMPILE_JARS), \
      CREATE_API_DIGEST := true, \
!     DISABLED_WARNINGS := restricted this-escape processing rawtypes removal cast \
!         serial preview unchecked deprecation dangling-doc-comments, \
      SRC := $(MICROBENCHMARK_SRC), \
      BIN := $(MICROBENCHMARK_CLASSES), \
      JAVAC_FLAGS := \
          --add-exports java.base/jdk.internal.classfile.components=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.classfile.impl=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.event=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.foreign=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.jimage=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.misc=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.util=ALL-UNNAMED \
+         --add-exports java.base/jdk.internal.value=ALL-UNNAMED \
          --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \
+         --add-exports java.base/jdk.internal.vm.annotation=ALL-UNNAMED \
          --add-exports java.base/sun.invoke.util=ALL-UNNAMED \
          --add-exports java.base/sun.security.util=ALL-UNNAMED \
          --add-exports java.base/sun.security.util.math=ALL-UNNAMED \
          --add-exports java.base/sun.security.util.math.intpoly=ALL-UNNAMED \
          --enable-preview \
+         --patch-module java.base=$(SUPPORT_OUTPUTDIR)/preview/java.base \
          -XDsuppressNotes \
          -processor org.openjdk.jmh.generators.BenchmarkProcessor \
          -s $(MICROBENCHMARK_GENSRC), \
      JAVA_FLAGS := \
          --add-exports java.base/jdk.internal.vm=ALL-UNNAMED \