# HG changeset patch
# User Mick Jordan <mick.jordan@oracle.com>
# Date 1446697991 28800
# Node ID 7d3d77397010dc97967f685fd0c531727cdb1205
# Parent  ed3b78bbfa8104c316c78064a3ae84a0364ca116# Parent  a1b3b789461153b6fd31b83b353d7c8c9d64aa1b
Merge

diff -r a1b3b7894611 -r 7d3d77397010 truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Wed Nov 04 11:03:08 2015 +0100
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Wed Nov 04 20:33:11 2015 -0800
@@ -292,7 +292,7 @@
          */
         public Builder globalSymbol(String name, Object obj) {
             final Object truffleReady;
-            if (obj instanceof Number || obj instanceof String || obj instanceof Character || obj instanceof Boolean) {
+            if (obj instanceof TruffleObject || obj instanceof Number || obj instanceof String || obj instanceof Character || obj instanceof Boolean) {
                 truffleReady = obj;
             } else {
                 if (JAVA_INTEROP_ENABLED) {