From 00bb9c84217b03d8df0d939028999cc8b98eca1d Mon Sep 17 00:00:00 2001 From: stepan Date: Fri, 2 Feb 2024 14:47:38 +0100 Subject: [PATCH] Native image opts: remove unnecessary, lock experimental opts again after using -H:-TruffleCheckFrameImplementation --- .../native-image/org.graalvm.r/native-image.properties | 5 +++-- mx.fastr/native-image.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/com.oracle.truffle.r.engine/src/META-INF/native-image/org.graalvm.r/native-image.properties b/com.oracle.truffle.r.engine/src/META-INF/native-image/org.graalvm.r/native-image.properties index 97e0a24ddd..8787d521c8 100644 --- a/com.oracle.truffle.r.engine/src/META-INF/native-image/org.graalvm.r/native-image.properties +++ b/com.oracle.truffle.r.engine/src/META-INF/native-image/org.graalvm.r/native-image.properties @@ -1,6 +1,7 @@ -Args = -H:+UnlockExperimentalVMOptions \ - -H:MaxRuntimeCompileMethods=20000 \ +Args = -H:MaxRuntimeCompileMethods=20000 \ --initialize-at-build-time=com.oracle.truffle.r \ + -H:+UnlockExperimentalVMOptions \ -H:-TruffleCheckFrameImplementation \ -H:EnableURLProtocols=http,ftp,https \ + -H:-UnlockExperimentalVMOptions \ --initialize-at-run-time=java.awt,sun.awt,javax.imageio,com.sun.imageio,sun.java2d,sun.font,org.apache.batik,org.ietf.jgss,org.rosuda.javaGD diff --git a/mx.fastr/native-image.properties b/mx.fastr/native-image.properties index ef2e3156b5..2eee7dee28 100644 --- a/mx.fastr/native-image.properties +++ b/mx.fastr/native-image.properties @@ -1,4 +1,4 @@ # This file contains native-image arguments needed to build fastr Requires = language:nfi language:llvm language:antlr4 language:xz -Args = -H:+UnlockExperimentalVMOptions -H:-UseServiceLoaderFeature +Args = -H:+UnlockExperimentalVMOptions -H:-UseServiceLoaderFeature -H:-UnlockExperimentalVMOptions ExcludeFromAll=true