Only use Context.parse for syntax checking; CompiledScript may be evaluated in another Context.

Author: woess

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

@@ -412,18 +412,6 @@ private Object eval(Source source, ScriptContext scriptContext) throws ScriptExc
         }
     }
 
-    Object evalCompiledScript(Value compiledScript, ScriptContext scriptContext) throws ScriptException {
-        GraalJSBindings engineBindings = getOrCreateGraalJSBindings(scriptContext);
-        Context polyglotContext = engineBindings.getContext();
-        updateDelegatingIOStreams(polyglotContext, scriptContext);
-        try {
-            engineBindings.importGlobalBindings(scriptContext);
-            return compiledScript.execute().as(Object.class);
-        } catch (PolyglotException e) {
-            throw new ScriptException(e);
-        }
-    }
-
     private GraalJSBindings getOrCreateGraalJSBindings(ScriptContext scriptContext) {
         Bindings engineB = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
         if (engineB instanceof GraalJSBindings) {
@@ -561,12 +549,7 @@ public CompiledScript compile(Reader reader) throws ScriptException {
     }
 
     private CompiledScript compile(Source source) throws ScriptException {
-        final Value compiledScript;
-        try {
-            compiledScript = getPolyglotContext().parse(source);
-        } catch (PolyglotException e) {
-            throw new ScriptException(e);
-        }
+        checkSyntax(source);
         return new CompiledScript() {
             @Override
             public ScriptEngine getEngine() {
@@ -575,11 +558,19 @@ public ScriptEngine getEngine() {
 
             @Override
             public Object eval(ScriptContext ctx) throws ScriptException {
-                return GraalJSScriptEngine.this.evalCompiledScript(compiledScript, ctx);
+                return GraalJSScriptEngine.this.eval(source, ctx);
             }
         };
     }
 
+    private void checkSyntax(Source source) throws ScriptException {
+        try {
+            getPolyglotContext().parse(source);
+        } catch (PolyglotException pex) {
+            throw new ScriptException(pex);
+        }
+    }
+
     private static class DelegatingInputStream extends InputStream implements Proxy {
 
         private Reader reader;