From edc490ddb7f999630fcc38796780c9778a78fef4 Mon Sep 17 00:00:00 2001 From: Foivos Zakkak Date: Wed, 7 Sep 2022 15:57:12 +0300 Subject: [PATCH] Deprecate `inlineBeforeAnalysis` option `inlineBeforeAnalysis` is always enabled starting from GraalVM 21.3 (which is the minimum supported version) --- .../main/java/io/quarkus/deployment/pkg/NativeConfig.java | 3 +++ .../quarkus/deployment/pkg/steps/NativeImageBuildStep.java | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java index 587f7e8b1a0ee..2341571b02ecd 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/NativeConfig.java @@ -49,7 +49,10 @@ public class NativeConfig { /** * If {@code -H:+InlineBeforeAnalysis} flag will be added to the native-image run + * + * @deprecated inlineBeforeAnalysis is always enabled starting from GraalVM 21.3. */ + @Deprecated @ConfigItem(defaultValue = "true") public boolean inlineBeforeAnalysis; diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java index 19563e335b3de..c286ec65d2c6b 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java @@ -798,12 +798,7 @@ public NativeImageInvokerInfo build() { if (!protocols.isEmpty()) { nativeImageArgs.add("-H:EnableURLProtocols=" + String.join(",", protocols)); } - if (inlineBeforeAnalysis) { - if (graalVMVersion.isOlderThan(GraalVM.Version.VERSION_21_3)) { - // Enabled by default in GraalVM >= 21.3 - nativeImageArgs.add("-H:+InlineBeforeAnalysis"); - } - } else { + if (!inlineBeforeAnalysis) { nativeImageArgs.add("-H:-InlineBeforeAnalysis"); } if (!noPIE.isEmpty()) {