From a7595b2a61db6c06662ee76c23473544ff7d4188 Mon Sep 17 00:00:00 2001 From: Claes Redestad Date: Wed, 28 Oct 2020 22:36:43 +0000 Subject: [PATCH] 8250669: Running JMH micros is broken after JDK-8248135 Reviewed-by: ecaspole, erikj --- make/test/BuildMicrobenchmark.gmk | 3 +-- .../micro/org/openjdk/bench/java/io/RecordDeserialization.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/make/test/BuildMicrobenchmark.gmk b/make/test/BuildMicrobenchmark.gmk index 3bbbea47b8e..55e5026eb38 100644 --- a/make/test/BuildMicrobenchmark.gmk +++ b/make/test/BuildMicrobenchmark.gmk @@ -90,11 +90,10 @@ $(eval $(call SetupJavaCompilation, BUILD_JDK_MICROBENCHMARK, \ TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \ SMALL_JAVA := false, \ CLASSPATH := $(MICROBENCHMARK_CLASSPATH), \ - DISABLED_WARNINGS := processing rawtypes cast serial preview, \ + DISABLED_WARNINGS := processing rawtypes cast serial, \ SRC := $(MICROBENCHMARK_SRC), \ BIN := $(MICROBENCHMARK_CLASSES), \ JAVA_FLAGS := --add-modules jdk.unsupported --limit-modules java.management, \ - JAVAC_FLAGS := --enable-preview, \ )) $(BUILD_JDK_MICROBENCHMARK): $(JMH_COMPILE_JARS) diff --git a/test/micro/org/openjdk/bench/java/io/RecordDeserialization.java b/test/micro/org/openjdk/bench/java/io/RecordDeserialization.java index b2dbefe3c05..f119ce37b2b 100644 --- a/test/micro/org/openjdk/bench/java/io/RecordDeserialization.java +++ b/test/micro/org/openjdk/bench/java/io/RecordDeserialization.java @@ -82,7 +82,7 @@ import java.util.stream.IntStream; @Measurement(iterations = 10, time = 1) @OutputTimeUnit(TimeUnit.MICROSECONDS) @State(Scope.Thread) -@Fork(value = 1, warmups = 0, jvmArgsAppend = "--enable-preview") +@Fork(value = 1, warmups = 0) public class RecordDeserialization { public record PointR(int x, int y) implements Serializable {}