Use 'polyglot_as_string' for 'PyTruffle_StringToCstr'.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -147,27 +147,18 @@ Object run(Object object,
     @Builtin(name = "to_char_pointer", fixedNumOfArguments = 1)
     @GenerateNodeFactory
     abstract static class TruffleString_AsString extends NativeBuiltin {
-        @Child private CExtNodes.AsCharPointer asCharPointerNode;
 
         @Specialization
-        Object run(PString str) {
-            return run(str.getValue());
-        }
-
-        @Specialization
-        Object run(String str) {
-            if (asCharPointerNode == null) {
-                CompilerDirectives.transferToInterpreterAndInvalidate();
-                asCharPointerNode = insert(CExtNodes.AsCharPointer.create());
-            }
-            return asCharPointerNode.execute(str);
+        Object run(PythonObjectNativeWrapper str,
+                        @Cached("create()") CExtNodes.AsCharPointer asCharPointerNode,
+                        @Cached("create()") CExtNodes.ToJavaNode toJavaNode) {
+            return asCharPointerNode.execute(toJavaNode.execute(str));
         }
 
         @Fallback
         Object run(Object o) {
             return raiseNative(PNone.NO_VALUE, PythonErrorType.SystemError, "Cannot convert object of type %p to C string.", o);
         }
-
     }
 
     /**

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -49,6 +49,7 @@
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.PythonObjectNativeWrapper;
 import com.oracle.graal.python.builtins.objects.cext.NativeWrappers.TruffleObjectNativeWrapper;
+import com.oracle.graal.python.builtins.objects.str.PString;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.nodes.PBaseNode;
 import com.oracle.graal.python.nodes.PGuards;
@@ -287,11 +288,17 @@ public abstract static class AsCharPointer extends PBaseNode {
 
         public abstract Object execute(Object obj);
 
+        @Specialization
+        Object doPString(PString str,
+                        @Cached("createExecute(1)") Node executeNode) {
+            return doString(str.getValue(), executeNode);
+        }
+
         @Specialization
         Object doString(String str,
                         @Cached("createExecute(1)") Node executeNode) {
             try {
-                return ForeignAccess.sendExecute(executeNode, getTruffleStringToCstr(), str);
+                return ForeignAccess.sendExecute(executeNode, getTruffleStringToCstr(), str, str.length());
             } catch (UnsupportedTypeException | ArityException | UnsupportedMessageException e) {
                 throw e.raise();
             }