[GR-24822] Use Context.parse to implement ScriptEngine.compile.

PullRequest: js/1578

Author: woess

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

@@ -48,7 +48,6 @@
 
 import org.graalvm.polyglot.Engine;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.oracle.truffle.js.scriptengine.GraalJSScriptEngine;
@@ -99,7 +98,6 @@ interface TestInterface {
 
     }
 
-    @Ignore("GR-21918")
     @Test
     public void testClose() throws ScriptException {
         GraalJSScriptEngine engine = GraalJSScriptEngine.create();

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

@@ -239,7 +239,6 @@ public Builder setOption(Builder builder, Object value) {
     private final GraalJSEngineFactory factory;
     private final Context.Builder contextConfig;
 
-    private volatile boolean closed;
     private boolean evalCalled;
 
     GraalJSScriptEngine(GraalJSEngineFactory factory) {
@@ -292,7 +291,6 @@ static Context createDefaultContext(Context.Builder builder) {
     @Override
     public void close() {
         getPolyglotContext().close();
-        closed = true;
     }
 
     /**
@@ -388,12 +386,17 @@ private static Source createSource(String script, ScriptContext ctxt) throws Scr
         }
     }
 
+    private static void updateDelegatingIOStreams(Context polyglotContext, ScriptContext scriptContext) {
+        Value polyglotBindings = polyglotContext.getPolyglotBindings();
+        ((DelegatingOutputStream) polyglotBindings.getMember(OUT_SYMBOL).asProxyObject()).setWriter(scriptContext.getWriter());
+        ((DelegatingOutputStream) polyglotBindings.getMember(ERR_SYMBOL).asProxyObject()).setWriter(scriptContext.getErrorWriter());
+        ((DelegatingInputStream) polyglotBindings.getMember(IN_SYMBOL).asProxyObject()).setReader(scriptContext.getReader());
+    }
+
     private Object eval(Source source, ScriptContext scriptContext) throws ScriptException {
         GraalJSBindings engineBindings = getOrCreateGraalJSBindings(scriptContext);
         Context polyglotContext = engineBindings.getContext();
-        ((DelegatingOutputStream) polyglotContext.getPolyglotBindings().getMember(OUT_SYMBOL).asProxyObject()).setWriter(scriptContext.getWriter());
-        ((DelegatingOutputStream) polyglotContext.getPolyglotBindings().getMember(ERR_SYMBOL).asProxyObject()).setWriter(scriptContext.getErrorWriter());
-        ((DelegatingInputStream) polyglotContext.getPolyglotBindings().getMember(IN_SYMBOL).asProxyObject()).setReader(scriptContext.getReader());
+        updateDelegatingIOStreams(polyglotContext, scriptContext);
         try {
             if (!evalCalled) {
                 jrunscriptInitWorkaround(source, polyglotContext);
@@ -527,18 +530,12 @@ private static <T> T getInterfaceInner(Value thiz, Class<T> iface) {
 
     @Override
     public CompiledScript compile(String script) throws ScriptException {
-        if (closed) {
-            throw new IllegalStateException("Context already closed.");
-        }
         Source source = createSource(script, getContext());
         return compile(source);
     }
 
     @Override
     public CompiledScript compile(Reader reader) throws ScriptException {
-        if (closed) {
-            throw new IllegalStateException("Context already closed.");
-        }
         Source source = createSource(read(reader), getContext());
         return compile(source);
     }
@@ -559,11 +556,8 @@ public Object eval(ScriptContext ctx) throws ScriptException {
     }
 
     private void checkSyntax(Source source) throws ScriptException {
-        GraalJSBindings engineBindings = getOrCreateGraalJSBindings(context);
-        Context polyglotContext = engineBindings.getContext();
-        Value syntaxChecker = polyglotContext.getBindings("js").getMember("checkSyntaxForScriptEngine");
         try {
-            syntaxChecker.execute(source.getCharacters());
+            getPolyglotContext().parse(source);
         } catch (PolyglotException pex) {
             throw new ScriptException(pex);
         }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/builtins/GlobalBuiltins.java

@@ -85,7 +85,6 @@
 import com.oracle.truffle.api.source.SourceSection;
 import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.GlobalNashornExtensionParseToJSONNodeGen;
 import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.GlobalScriptingEXECNodeGen;
-import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.GlobalSyntaxCheckForScriptEngineNodeGen;
 import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.JSGlobalDecodeURINodeGen;
 import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.JSGlobalEncodeURINodeGen;
 import com.oracle.truffle.js.builtins.GlobalBuiltinsFactory.JSGlobalExitNodeGen;
@@ -354,7 +353,6 @@ public enum GlobalNashornScripting implements BuiltinEnum<GlobalNashornScripting
             readFully(1),
             exec(1), // $EXEC
             parseToJSON(3),
-            checkSyntaxForScriptEngine(1),
             importScriptEngineGlobalBindings(1);
 
             private final int length;
@@ -383,8 +381,6 @@ protected Object createNode(JSContext context, JSBuiltin builtin, boolean constr
                     return GlobalNashornExtensionParseToJSONNodeGen.create(context, builtin, args().fixedArgs(3).createArgumentNodes(context));
                 case exec:
                     return GlobalScriptingEXECNodeGen.create(context, builtin, args().fixedArgs(2).createArgumentNodes(context));
-                case checkSyntaxForScriptEngine:
-                    return GlobalSyntaxCheckForScriptEngineNodeGen.create(context, builtin, args().fixedArgs(1).createArgumentNodes(context));
                 case importScriptEngineGlobalBindings:
                     return JSGlobalImportScriptEngineGlobalBindingsNodeGen.create(context, builtin, args().fixedArgs(1).varArgs().createArgumentNodes(context));
             }
@@ -1616,18 +1612,4 @@ public boolean set(DynamicObject store, Object value) {
             }
         }
     }
-
-    public abstract static class GlobalSyntaxCheckForScriptEngineNode extends JSBuiltinNode {
-
-        public GlobalSyntaxCheckForScriptEngineNode(JSContext context, JSBuiltin builtin) {
-            super(context, builtin);
-        }
-
-        @Specialization
-        @TruffleBoundary(transferToInterpreterOnException = false)
-        protected final boolean checkSyntax(Object code) {
-            getContext().getEvaluator().parseScript(getContext(), code.toString());
-            return true;
-        }
-    }
 }

graal-js/src/com.oracle.truffle.js/src/com/oracle/truffle/js/runtime/JSRealm.java

@@ -1178,10 +1178,9 @@ public void setupGlobals() {
             removeNashornIncompatibleBuiltins();
         }
         if (context.getContextOptions().isScriptEngineGlobalScopeImport()) {
-            for (String builtin : new String[]{"importScriptEngineGlobalBindings", "checkSyntaxForScriptEngine"}) {
-                JSObjectUtil.putDataProperty(context, getScriptEngineImportScope(), builtin,
-                                lookupFunction(GlobalBuiltins.GLOBAL_NASHORN_EXTENSIONS, builtin), JSAttributes.notConfigurableNotEnumerableNotWritable());
-            }
+            String builtin = "importScriptEngineGlobalBindings";
+            JSObjectUtil.putDataProperty(context, getScriptEngineImportScope(), builtin,
+                            lookupFunction(GlobalBuiltins.GLOBAL_NASHORN_EXTENSIONS, builtin), JSAttributes.notConfigurableNotEnumerableNotWritable());
         }
         if (context.getContextOptions().isPolyglotBuiltin() && (getEnv().isPolyglotEvalAllowed() || getEnv().isPolyglotBindingsAccessAllowed())) {
             setupPolyglot();