Merge branch 'bug/polyglot-access-global-object'

Author: smarr

truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java

@@ -795,11 +795,15 @@ public Value eval(Source source) throws IOException {
          * @return the global object or <code>null</code> if the language does not support such
          *         concept
          */
+        @SuppressWarnings("try")
         public Value getGlobalObject() {
             checkThread();
-
-            Object res = SPI.languageGlobal(getEnv(true));
-            return res == null ? null : new Value(new TruffleLanguage[]{info.getImpl(true)}, res);
+            try (Closeable d = SPI.executionStart(PolyglotEngine.this, -1, debugger, null)) {
+                Object res = SPI.languageGlobal(getEnv(true));
+                return res == null ? null : new Value(new TruffleLanguage[]{info.getImpl(true)}, res);
+            } catch (IOException ex) {
+                throw new IllegalStateException(ex);
+            }
         }
 
         TruffleLanguage<?> getImpl(boolean create) {

truffle/com.oracle.truffle.sl.test/src/com/oracle/truffle/sl/test/SLPolyglotTest.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * The Universal Permissive License (UPL), Version 1.0
+ *
+ * Subject to the condition set forth below, permission is hereby granted to any
+ * person obtaining a copy of this software, associated documentation and/or
+ * data (collectively the "Software"), free of charge and under any and all
+ * copyright rights in the Software, and any and all patent rights owned or
+ * freely licensable by each licensor hereunder covering either (i) the
+ * unmodified Software as contributed to or provided by such licensor, or (ii)
+ * the Larger Works (as defined below), to deal in both
+ *
+ * (a) the Software, and
+ *
+ * (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+ * one is included with the Software each a "Larger Work" to which the Software
+ * is contributed by such licensors),
+ *
+ * without restriction, including without limitation the rights to copy, create
+ * derivative works of, display, perform, and distribute the Software and make,
+ * use, sell, offer for sale, import, export, have made, and have sold the
+ * Software and the Larger Work(s), and to sublicense the foregoing rights on
+ * either these or other terms.
+ *
+ * This license is subject to the following condition:
+ *
+ * The above copyright notice and either this complete permission notice or at a
+ * minimum a reference to the UPL must be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package com.oracle.truffle.sl.test;
+
+import org.junit.Test;
+
+import com.oracle.truffle.api.vm.PolyglotEngine;
+import com.oracle.truffle.api.vm.PolyglotEngine.Language;
+import java.io.IOException;
+import static org.junit.Assert.assertNotNull;
+
+public class SLPolyglotTest {
+    @Test
+    public void accessGlobalObject() throws IOException {
+        PolyglotEngine vm = PolyglotEngine.newBuilder().build();
+        Language lang = vm.getLanguages().get("application/x-sl");
+        PolyglotEngine.Value global = lang.getGlobalObject();
+        Object globalValue = global.get();
+        assertNotNull("There is global context in SL", globalValue);
+    }
+}