[GR-24957] Allow Engine to be reclaimed in GraalJSEngineFactory.

PullRequest: js/1726

Author: wirthi

graal-js/src/com.oracle.truffle.js.scriptengine.test/src/com/oracle/truffle/js/scriptengine/test/TestEngineNashorn.java

@@ -138,7 +138,7 @@ public void factoryTests() {
 
         invertedAssertEquals(fac.getLanguageName(), "ECMAScript");
         invertedAssertEquals(fac.getParameter(ScriptEngine.NAME), "javascript");
-        invertedAssertEquals(fac.getLanguageVersion(), "ECMA - 262 Edition 9");
+        invertedAssertEquals(fac.getLanguageVersion(), "ECMAScript 262 Edition 11");
         invertedAssertEquals(fac.getEngineName(), "Graal.js");
         invertedAssertEquals(fac.getOutputStatement("context"), "print(context)");
         invertedAssertEquals(fac.getProgram("print('hello')", "print('world')"), "print('hello');print('world');");

graal-js/src/com.oracle.truffle.js.scriptengine/src/com/oracle/truffle/js/scriptengine/GraalJSEngineFactory.java

@@ -40,6 +40,7 @@
  */
 package com.oracle.truffle.js.scriptengine;
 
+import java.lang.ref.WeakReference;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -58,7 +59,7 @@ public final class GraalJSEngineFactory implements ScriptEngineFactory {
     private static final String ENGINE_NAME = "Graal.js";
     private static final String NAME = "javascript";
     private static final String LANGUAGE = "ECMAScript";
-    private static final String LANGUAGE_VERSION = "ECMA - 262 Edition 9";
+    private static final String LANGUAGE_VERSION = "ECMAScript 262 Edition 11";
 
     private static final String NASHORN_ENGINE_NAME = "Oracle Nashorn";
     private static final List<String> names;
@@ -89,21 +90,36 @@ public final class GraalJSEngineFactory implements ScriptEngineFactory {
         extensions = Collections.unmodifiableList(extensionList);
     }
 
-    private final Engine engine;
+    private WeakReference<Engine> defaultEngine;
+    private final Engine userDefinedEngine;
 
     public GraalJSEngineFactory() {
-        this.engine = Engine.newBuilder().allowExperimentalOptions(true).build();
+        this.defaultEngine = null; // lazy
+        this.userDefinedEngine = null;
     }
 
     GraalJSEngineFactory(Engine engine) {
-        this.engine = engine;
+        this.userDefinedEngine = engine;
+    }
+
+    private static Engine createDefaultEngine() {
+        return Engine.newBuilder().allowExperimentalOptions(true).build();
     }
 
     /**
      * Returns the underlying polyglot engine.
      */
     public Engine getPolyglotEngine() {
-        return engine;
+        if (userDefinedEngine != null) {
+            return userDefinedEngine;
+        } else {
+            Engine engine = defaultEngine == null ? null : defaultEngine.get();
+            if (engine == null) {
+                engine = createDefaultEngine();
+                defaultEngine = new WeakReference<>(engine);
+            }
+            return engine;
+        }
     }
 
     @Override
@@ -113,7 +129,7 @@ public String getEngineName() {
 
     @Override
     public String getEngineVersion() {
-        return engine.getVersion();
+        return getPolyglotEngine().getVersion();
     }
 
     @Override