Mercurial > hg > truffle

changeset 22346:d099f8650cfb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Mick Jordan <mick.jordan@oracle.com>
date Wed, 04 Nov 2015 20:55:06 -0800
parents 7d3d77397010 (diff) 76f80b4b48bc (current diff)
children 6546703e0c76
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Wed Nov 04 20:32:52 2015 -0800
+++ b/truffle/com.oracle.truffle.api.vm/src/com/oracle/truffle/api/vm/PolyglotEngine.java	Wed Nov 04 20:55:06 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) {