jruby · Apr 6, 2016 · Apr 6, 2016 · Apr 6, 2016
Showing with 20 additions and 9 deletions.

+3 −3 lib/ruby/truffle/truffle/truffle/execjs.rb

+12 −1 tool/jt.rb

+5 −5 truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java
diff --git a/lib/ruby/truffle/truffle/truffle/execjs.rb b/lib/ruby/truffle/truffle/truffle/execjs.rb
@@ -43,15 +43,15 @@ def call(identifier, *args)
       private
 
       def unbox(value)
-        if Truffle::Interop.boxed_primitive?(value)
-          Truffle::Interop.unbox_value(value)
+        if Truffle::Interop.boxed?(value)
+          value
         else
           JSON.parse(Truffle::Interop.unbox(STRINGIFY.call(STRINGIFY, value)))
         end
       end
 
       def box(value)
-        if Truffle::Interop.boxed_primitive?(value) || value.is_a?(String)
+        if Truffle::Interop.boxed?(value) || value.is_a?(String)
           value
         else
           PARSE.call(PARSE, JSON.generate(value))

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -466,7 +466,18 @@ def test_integration(*args)
         !long # fast is the default
 
     env_vars               = {}
-    env_vars["JRUBY_OPTS"] = '-Xtruffle.graal.warn_unless=false'
+
+    jruby_opts = []
+
+    jruby_opts << '-Xtruffle.graal.warn_unless=false'
+
+    if ENV['GRAAL_JS_JAR']
+      jruby_opts << '-J-classpath'
+      jruby_opts << Utilities.find_graal_js
+    end
+
+    env_vars["JRUBY_OPTS"] = jruby_opts.join(' ')
+
     env_vars["PATH"]       = "#{Utilities.find_jruby_bin_dir}:#{ENV["PATH"]}"
     integration_path       = "#{JRUBY_DIR}/test/truffle/integration"
     long_tests             = File.read(File.join(integration_path, 'long-tests.txt')).lines.map(&:chomp)

diff --git a/truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java b/truffle/src/main/java/org/jruby/truffle/interop/TruffleInteropNodes.java
@@ -195,7 +195,7 @@ protected int getCacheLimit() {
 
     }
 
-    @CoreMethod(names = {"size?", "has_size_property?"}, isModuleFunction = true, needsSelf = false, required = 1)
+    @CoreMethod(names = "size?", isModuleFunction = true, needsSelf = false, required = 1)
     public abstract static class HasSizeNode extends CoreMethodArrayArgumentsNode {
 
         public HasSizeNode(RubyContext context, SourceSection sourceSection) {
@@ -248,7 +248,7 @@ protected Node createGetSizeNode() {
 
     }
 
-    @CoreMethod(names = {"boxed?", "boxed_primitive?"}, isModuleFunction = true, needsSelf = false, required = 1)
+    @CoreMethod(names = "boxed?", isModuleFunction = true, needsSelf = false, required = 1)
     public abstract static class BoxedNode extends CoreMethodArrayArgumentsNode {
 
         public BoxedNode(RubyContext context, SourceSection sourceSection) {
@@ -315,7 +315,7 @@ public boolean isBoxed(Object receiver) {
 
     }
 
-    @CoreMethod(names = {"unbox", "unbox_value"}, isModuleFunction = true, needsSelf = false, required = 1)
+    @CoreMethod(names = "unbox", isModuleFunction = true, needsSelf = false, required = 1)
     public abstract static class UnboxNode extends CoreMethodArrayArgumentsNode {
 
         public UnboxNode(RubyContext context, SourceSection sourceSection) {
@@ -406,7 +406,7 @@ protected Node createIsNullNode() {
 
     }
 
-    @CoreMethod(names = {"read", "read_property"}, isModuleFunction = true, needsSelf = false, required = 2)
+    @CoreMethod(names = "read", isModuleFunction = true, needsSelf = false, required = 2)
     @ImportStatic(StringCachingGuards.class)
     public abstract static class ReadNode extends CoreMethodArrayArgumentsNode {
 
@@ -502,7 +502,7 @@ protected int getCacheLimit() {
 
     }
 
-    @CoreMethod(names = {"write", "write_property"}, isModuleFunction = true, needsSelf = false, required = 3)
+    @CoreMethod(names = "write", isModuleFunction = true, needsSelf = false, required = 3)
     @ImportStatic(StringCachingGuards.class)
     public abstract static class WriteNode extends CoreMethodArrayArgumentsNode {