@@ -122,7 +122,7 @@ private static Constructor<AbstractLanguageLauncher> getLauncherCtor() {
122
122
protected final void launch (String [] args ) {
123
123
try {
124
124
try {
125
- launch (new ArrayList <>(Arrays .asList (args )), null , true );
125
+ launch (new ArrayList <>(Arrays .asList (args )));
126
126
} catch (AbortException e ) {
127
127
throw e ;
128
128
} catch (PolyglotException e ) {
@@ -260,15 +260,12 @@ protected long getNativeArgv() {
260
260
261
261
protected static final boolean IS_LIBPOLYGLOT = Boolean .getBoolean ("graalvm.libpolyglot" );
262
262
263
- final void launch (List <String > args , Map < String , String > defaultOptions , boolean doNativeSetup ) {
263
+ final void launch (List <String > args ) {
264
264
List <String > originalArgs = Collections .unmodifiableList (new ArrayList <>(args ));
265
265
266
- Map <String , String > polyglotOptions = defaultOptions ;
267
- if (polyglotOptions == null ) {
268
- polyglotOptions = new HashMap <>();
269
- }
266
+ Map <String , String > polyglotOptions = new HashMap <>();
270
267
271
- if (isAOT () && doNativeSetup ) {
268
+ if (isAOT ()) {
272
269
System .setProperty ("org.graalvm.launcher.languageId" , getLanguageId ());
273
270
}
274
271
@@ -278,7 +275,7 @@ final void launch(List<String> args, Map<String, String> defaultOptions, boolean
278
275
validateVmArguments (originalArgs , unrecognizedArgs );
279
276
}
280
277
281
- if (isAOT () && doNativeSetup && !IS_LIBPOLYGLOT ) {
278
+ if (isAOT () && !IS_LIBPOLYGLOT ) {
282
279
assert nativeAccess != null ;
283
280
maybeExec (originalArgs , unrecognizedArgs , getDefaultVMType (), jniLaunch );
284
281
}
0 commit comments