[GR-14422] Misc interop fixes.

PullRequest: truffleruby/693

Author: rschatz

spec/truffle/interop/boxed_spec.rb

@@ -1,19 +1,19 @@
 # Copyright (c) 2016, 2017 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
-# 
+#
 # Eclipse Public License version 1.0, or
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
 require_relative '../../ruby/spec_helper'
 
 describe "Truffle::Interop.boxed?" do
-  
+
   it "returns true for strings" do
     Truffle::Interop.boxed?('test').should be_true
   end
-  
+
   it "returns true for symbols" do
     Truffle::Interop.boxed?(:test).should be_true
   end
@@ -25,10 +25,11 @@
   it "returns true for objects that respond to #unbox" do
     unboxable = Object.new
     def unboxable.unbox
+      1
     end
     Truffle::Interop.boxed?(unboxable).should be_true
   end
-  
+
   it "returns false for other objects" do
     Truffle::Interop.boxed?(Object.new).should be_false
   end

spec/truffle/interop/remove_spec.rb

@@ -57,24 +57,24 @@
       before :each do
         @object = TruffleInteropSpecs::InteropKeysClass.new
       end
-      
+
       it "removes an instance variable that exists" do
         Truffle::Interop.remove(@object, :@a).should == true
         @object.instance_variable_defined?(:@a).should be_false
       end
-      
+
       it "raises an error when the instance variable doesn't exist" do
         lambda {
           Truffle::Interop.remove(@object, :@foo)
         }.should raise_error(NameError)
       end
     end
-    
+
     describe "with a name that doesn't start with @" do
       it "raises an unsupported message error" do
         lambda {
           Truffle::Interop.remove("abc", 1)
-        }.should raise_error(RuntimeError, /Message not supported: REMOVE/)
+        }.should raise_error(RuntimeError, /Message not supported/)
       end
     end
   end

src/main/c/cext/ruby.c

@@ -495,7 +495,7 @@ int rb_obj_method_arity(VALUE object, ID id) {
 }
 
 int rb_obj_respond_to(VALUE object, ID id, int priv) {
-  return polyglot_as_i32(polyglot_invoke(RUBY_CEXT, "rb_obj_respond_to", rb_tr_unwrap(object), rb_tr_unwrap(id), priv));
+  return polyglot_as_boolean(polyglot_invoke(RUBY_CEXT, "rb_obj_respond_to", rb_tr_unwrap(object), rb_tr_unwrap(id), priv));
 }
 
 int rb_special_const_p(VALUE object) {
@@ -2640,11 +2640,11 @@ VALUE rb_get_path(VALUE object) {
 }
 
 int rb_tr_readable(int mode) {
-  return polyglot_as_i32(polyglot_invoke(RUBY_CEXT, "rb_tr_readable", mode));
+  return polyglot_as_boolean(polyglot_invoke(RUBY_CEXT, "rb_tr_readable", mode));
 }
 
 int rb_tr_writable(int mode) {
-  return polyglot_as_i32(polyglot_invoke(RUBY_CEXT, "rb_tr_writable", mode));
+  return polyglot_as_boolean(polyglot_invoke(RUBY_CEXT, "rb_tr_writable", mode));
 }
 
 MUST_INLINE

src/main/java/org/truffleruby/interop/OutgoingForeignCallNode.java

@@ -10,16 +10,7 @@
 package org.truffleruby.interop;
 
 import java.util.Arrays;
-
-import com.oracle.truffle.api.object.DynamicObject;
-
-import org.truffleruby.language.RubyBaseNode;
-import org.truffleruby.language.control.JavaException;
-import org.truffleruby.language.control.RaiseException;
-import org.truffleruby.language.dispatch.CallDispatchHeadNode;
-import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.methods.ExceptionTranslatingNode;
-import org.truffleruby.language.methods.UnsupportedOperationBehavior;
+import java.util.stream.Collectors;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
@@ -33,7 +24,15 @@
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import com.oracle.truffle.api.interop.UnsupportedTypeException;
 import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
+import org.truffleruby.language.RubyBaseNode;
+import org.truffleruby.language.control.JavaException;
+import org.truffleruby.language.control.RaiseException;
+import org.truffleruby.language.dispatch.CallDispatchHeadNode;
+import org.truffleruby.language.dispatch.DispatchNode;
+import org.truffleruby.language.methods.ExceptionTranslatingNode;
+import org.truffleruby.language.methods.UnsupportedOperationBehavior;
 
 public abstract class OutgoingForeignCallNode extends RubyBaseNode {
 
@@ -224,14 +223,24 @@ public Object executeCall(TruffleObject receiver, Object[] args) {
                         node,
                         receiver,
                         rubyToForeignArgumentsNode.executeConvert(args));
-            } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
+            } catch (UnsupportedTypeException e) {
+                exceptionProfile.enter();
+                throw new RaiseException(getContext(), translate(e));
+            } catch (ArityException | UnsupportedMessageException e) {
                 exceptionProfile.enter();
                 throw new JavaException(e);
             }
 
             return foreignToRubyNode.executeConvert(foreign);
         }
 
+        @TruffleBoundary
+        private DynamicObject translate(UnsupportedTypeException e) {
+            return coreExceptions().typeError(
+                    "Wrong arguments: " + Arrays.stream(e.getSuppliedValues()).map(Object::toString).collect(Collectors.joining(", ")),
+                    this);
+        }
+
     }
 
     protected class SendOutgoingNode extends OutgoingNode {