Use primitives for string_pointer* calls in cext.rb

* Removes the overhead of an extra call.

(cherry picked from commit 82178d9)

Author: eregon

lib/truffle/truffle/cext.rb

@@ -149,31 +149,31 @@ def initialize(string)
     end
 
     def size
-      Truffle::CExt.string_pointer_size(@string)
+      TrufflePrimitive.string_pointer_size(@string)
     end
 
     def polyglot_pointer?
       true
     end
 
     def polyglot_address
-      @address ||= Truffle::CExt.string_pointer_to_native(@string)
+      @address ||= TrufflePrimitive.string_pointer_to_native(@string)
     end
 
     # Every IS_POINTER object should also have TO_NATIVE
     def polyglot_to_native
     end
 
     def [](index)
-      Truffle::CExt.string_pointer_read(@string, index)
+      TrufflePrimitive.string_pointer_read(@string, index)
     end
 
     def []=(index, value)
-      Truffle::CExt.string_pointer_write(@string, index, value)
+      TrufflePrimitive.string_pointer_write(@string, index, value)
     end
 
     def native?
-      Truffle::CExt.string_pointer_is_native?(@string)
+      TrufflePrimitive.string_pointer_is_native?(@string)
     end
 
     alias_method :to_str, :string
@@ -231,7 +231,7 @@ def polyglot_pointer?
     end
 
     def polyglot_address
-      @address ||= Truffle::CExt.string_pointer_to_native(@string) + @string.bytesize
+      @address ||= TrufflePrimitive.string_pointer_to_native(@string) + @string.bytesize
     end
 
     # Every IS_POINTER object should also have TO_NATIVE
@@ -1846,6 +1846,10 @@ def rb_enc_from_native_encoding(rb_encoding)
     RbEncoding.get_encoding_from_native(rb_encoding)
   end
 
+  def native_string?(string)
+    TrufflePrimitive.string_pointer_is_native?(string)
+  end
+
   def RSTRING_PTR(string)
     RStringPtr.new(string)
   end

spec/truffle/capi/string_spec.rb

@@ -18,13 +18,13 @@
   it "does not store the String to native memory if not needed" do
     str = "foobar"
     @s.string_ptr(str).should == "f"
-    Truffle::CExt.string_pointer_is_native?(str).should == false
+    Truffle::CExt.native_string?(str).should == false
   end
 
   it "stores the String to native memory if the address is returned" do
     str = "foobar"
     @s.string_ptr_return_address(str).should be_kind_of(Integer)
-    Truffle::CExt.string_pointer_is_native?(str).should == true
+    Truffle::CExt.native_string?(str).should == true
   end
 end
 
@@ -35,8 +35,8 @@
 
   it "ensures the String is stored in native memory" do
     str = "foobar"
-    Truffle::CExt.string_pointer_is_native?(str).should == false
+    Truffle::CExt.native_string?(str).should == false
     @s.NATIVE_RSTRING_PTR(str)
-    Truffle::CExt.string_pointer_is_native?(str).should == true
+    Truffle::CExt.native_string?(str).should == true
   end
 end

src/main/java/org/truffleruby/cext/CExtNodes.java

@@ -957,8 +957,8 @@ protected Object rbHash(Object object) {
         }
     }
 
-    @CoreMethod(names = "string_pointer_size", onSingleton = true, required = 1)
-    public abstract static class StringPointerSizeNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "string_pointer_size")
+    public abstract static class StringPointerSizeNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "isRubyString(string)")
         protected int size(DynamicObject string) {
@@ -1010,8 +1010,8 @@ protected NativeRope toNative(DynamicObject string,
 
     }
 
-    @CoreMethod(names = "string_pointer_to_native", onSingleton = true, required = 1)
-    public abstract static class StringPointerToNativeNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "string_pointer_to_native")
+    public abstract static class StringPointerToNativeNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "isRubyString(string)")
         protected long toNative(DynamicObject string,
@@ -1038,8 +1038,8 @@ protected DynamicObject toNative(DynamicObject string,
 
     }
 
-    @CoreMethod(names = "string_pointer_is_native?", onSingleton = true, required = 1)
-    public abstract static class StringPointerIsNativeNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "string_pointer_is_native?")
+    public abstract static class StringPointerIsNativeNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "isRubyString(string)")
         protected boolean isNative(DynamicObject string) {
@@ -1048,8 +1048,8 @@ protected boolean isNative(DynamicObject string) {
 
     }
 
-    @CoreMethod(names = "string_pointer_read", onSingleton = true, required = 2, lowerFixnum = 2)
-    public abstract static class StringPointerReadNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "string_pointer_read", lowerFixnum = 1)
+    public abstract static class StringPointerReadNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "isRubyString(string)")
         protected Object read(DynamicObject string, int index,
@@ -1068,8 +1068,8 @@ protected Object read(DynamicObject string, int index,
 
     }
 
-    @CoreMethod(names = "string_pointer_write", onSingleton = true, required = 3, lowerFixnum = { 2, 3 })
-    public abstract static class StringPointerWriteNode extends CoreMethodArrayArgumentsNode {
+    @Primitive(name = "string_pointer_write", lowerFixnum = { 1, 2 })
+    public abstract static class StringPointerWriteNode extends PrimitiveArrayArgumentsNode {
 
         @Specialization(guards = "isRubyString(string)")
         protected int write(DynamicObject string, int index, int value,