Native image opts: remove unnecessary, lock experimental opts again a…

…fter using -H:-TruffleCheckFrameImplementation
ConnectionMaster · Feb 11, 2024 · 00bb9c8 · 00bb9c8
1 parent 62981ca
commit 00bb9c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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