migrate hpy j.l.String usages to TruffleString

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextTypeBuiltins.java

@@ -67,6 +67,7 @@
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.strings.TruffleString;
 
 @CoreFunctions(extendsModule = PythonCextBuiltins.PYTHON_CEXT)
 @GenerateNodeFactory
@@ -147,7 +148,7 @@ static int doSlow(VirtualFrame frame, Object derived, Object cls) {
     @GenerateNodeFactory
     abstract static class PyTruffleCreateType extends PythonQuaternaryBuiltinNode {
         @Specialization
-        static PythonClass createType(VirtualFrame frame, String name, PTuple bases, PDict namespaceOrig, Object metaclass,
+        static PythonClass createType(VirtualFrame frame, TruffleString name, PTuple bases, PDict namespaceOrig, Object metaclass,
                         @Cached CreateTypeNode createType) {
             return createType.execute(frame, namespaceOrig, name, bases, metaclass, PKeyword.EMPTY_KEYWORDS);
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/capsule/PyCapsule.java

@@ -45,11 +45,12 @@
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import com.oracle.truffle.api.strings.TruffleString;
 
 @ExportLibrary(InteropLibrary.class)
 public final class PyCapsule implements TruffleObject {
     private Object pointer;
-    private String name;
+    private TruffleString name;
     private Object context;
     private Object destructor;
 
@@ -61,11 +62,11 @@ public void setPointer(Object pointer) {
         this.pointer = pointer;
     }
 
-    public String getName() {
+    public TruffleString getName() {
         return name;
     }
 
-    public void setName(String name) {
+    public void setName(TruffleString name) {
         this.name = name;
     }
 
@@ -91,7 +92,7 @@ public String toDisplayString(@SuppressWarnings("unused") boolean allowSideEffec
         String quote, n;
         if (name != null) {
             quote = "\"";
-            n = name;
+            n = name.toJavaStringUncached();
         } else {
             quote = "";
             n = "NULL";

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

@@ -970,7 +970,7 @@ public static CApiContext ensureCapiWasLoaded(Node node, PythonContext context,
 
                 String libpython = System.getProperty("LibPythonNativeLibrary");
                 if (libpython != null) {
-                    SourceBuilder nfiSrcBuilder = Source.newBuilder("nfi", "load(RTLD_GLOBAL) \"" + libpython + "\"", libPythonName);
+                    SourceBuilder nfiSrcBuilder = Source.newBuilder("nfi", "load(RTLD_GLOBAL) \"" + libpython + "\"", "<libpython-native>");
                     nativeLibpython = context.getEnv().parseInternal(nfiSrcBuilder.build()).call();
                 }
 

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

@@ -3988,7 +3988,7 @@ static PBuiltinFunction doIt(CApiContext context, Object methodDef,
 
                 mlMethObj = interopLibrary.readMember(methodDef, J_ML_METH);
                 if (!resultLib.isExecutable(mlMethObj)) {
-                    LOGGER.warning(() -> String.format(ErrorMessages.ML_METH_IS_NOT_CALLABLE, methodName));
+                    LOGGER.warning(() -> String.format("ml_meth of %s is not callable", methodName));
                 }
             } catch (UnknownIdentifierException e) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();

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

@@ -57,6 +57,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___ADD__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___AND__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___BOOL__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.T___CALL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___CONTAINS__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DELITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T___DIVMOD__;
@@ -366,9 +367,9 @@ enum HPySlot {
         HPY_SQ_ITEM(44, HPySlotWrapper.SQ_ITEM, T___GETITEM__),
         HPY_SQ_LENGTH(45, HPySlotWrapper.LENFUNC, T___LEN__),
         HPY_SQ_REPEAT(46, HPySlotWrapper.INDEXARGFUNC, T___MUL__, T___RMUL__),
-        HPY_TP_CALL(50, HPySlotWrapper.NULL, __CALL__),
+        HPY_TP_CALL(50, HPySlotWrapper.NULL, T___CALL__),
         HPY_TP_INIT(60, HPySlotWrapper.INIT, T___INIT__),
-        HPY_TP_ITER(62, HPySlotWrapper.UNARYFUNC, __ITER__),
+        HPY_TP_ITER(62, HPySlotWrapper.UNARYFUNC, T___ITER__),
         HPY_TP_NEW(65, HPySlotWrapper.NULL, T___NEW__),
         HPY_TP_REPR(66, HPySlotWrapper.UNARYFUNC, T___REPR__),
         HPY_TP_RICHCOMPARE(67, w(RICHCMP_LT, RICHCMP_LE, RICHCMP_EQ, RICHCMP_NE, RICHCMP_GT, RICHCMP_GE), k(T___LT__, T___LE__, T___EQ__, T___NE__, T___GT__, T___GE__)),

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

@@ -430,11 +430,11 @@ static GetSetDescriptor doGeneric(GraalHPyContext context, Object owner, Object
             try {
                 getterFunPtr = interopLibrary.readMember(legacyGetSetDef, "get");
                 if (!(resultLib.isNull(getterFunPtr) || resultLib.isExecutable(getterFunPtr))) {
-                    LOGGER.warning(() -> String.format(ErrorMessages.GET_OF_S_IS_NOT_CALLABLE, getSetDescrName));
+                    LOGGER.warning(() -> String.format("get of %s is not callable", getSetDescrName));
                 }
                 setterFunPtr = interopLibrary.readMember(legacyGetSetDef, "set");
                 if (!(resultLib.isNull(setterFunPtr) || resultLib.isExecutable(setterFunPtr))) {
-                    LOGGER.warning(() -> String.format(ErrorMessages.SET_OF_S_IS_NOT_CALLABLE, getSetDescrName));
+                    LOGGER.warning(() -> String.format("set of %s is not callable", getSetDescrName));
                 }
                 readOnly = resultLib.isNull(setterFunPtr);
                 closurePtr = interopLibrary.readMember(legacyGetSetDef, "closure");
@@ -2046,7 +2046,7 @@ Object doGeneric(GraalHPyContext context, Object typeSpec, Object typeSpecParamA
 
                 // create the type object
                 Object metatype = getMetatype(context, typeSpecParamArray, ptrLib, castToJavaIntNode, callHelperFunctionNode, hPyAsPythonObjectNode);
-                PythonModule pythonCextModule = PythonContext.get(this).lookupBuiltinModule(PythonCextBuiltins.PYTHON_CEXT);
+                PythonModule pythonCextModule = PythonContext.get(this).lookupBuiltinModule(PythonCextBuiltins.T_PYTHON_CEXT);
                 PythonClass newType = (PythonClass) callCreateTypeNode.execute(null, pythonCextModule, T_PYTRUFFLE_CREATETYPE,
                                 names[1], bases, namespace, metatype != null ? metatype : PythonBuiltinClassType.PythonClass);
                 // allocate additional memory for the metatype and set it

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

@@ -983,8 +983,6 @@ public abstract class ErrorMessages {
     public static final TruffleString EXPECTING_COLON_DELIMITER = tsLiteral("Expecting ':' delimiter");
     public static final TruffleString EXPECTING_COMMA_DELIMITER = tsLiteral("Expecting ',' delimiter");
     public static final TruffleString EXPECTING_VALUE = tsLiteral("Expecting value");
-    public static final TruffleString GET_OF_S_IS_NOT_CALLABLE = tsLiteral("get of %s is not callable");
-    public static final TruffleString SET_OF_S_IS_NOT_CALLABLE = tsLiteral("set of %s is not callable");
 
     // SSL errors
     public static final TruffleString SSL_SESSION_CLOSED = tsLiteral("SSL/TLS session closed cleanly.");
@@ -1381,7 +1379,6 @@ public abstract class ErrorMessages {
     public static final TruffleString MODULE_HAS_MULTIPLE_CREATE_SLOTS = tsLiteral("module %s has multiple create slots");
     public static final TruffleString MODULE_USES_UNKNOW_SLOT_ID = tsLiteral("module %s uses unknown slot ID %i");
     public static final TruffleString ML_FLAGS_IS_NOT_INTEGER = tsLiteral("ml_flags of %s is not an integer");
-    public static final TruffleString ML_METH_IS_NOT_CALLABLE = tsLiteral("ml_meth of %s is not callable");
     public static final TruffleString INVALID_STRUCT_MEMBER = tsLiteral("Invalid struct member '%s'");
     public static final TruffleString CANNOT_ACCESS_STRUCT_MEMBER_FLAGS_OR_METH = tsLiteral("Cannot access struct member 'ml_flags' or 'ml_meth'.");
     public static final TruffleString FIELD_DID_NOT_RETURN_ARRAY = tsLiteral("field '%s' did not return an array");
@@ -1434,4 +1431,13 @@ public abstract class ErrorMessages {
 
     public static final TruffleString ATTEMPTING_GETTER_NO_NATIVE_SPACE = tsLiteral("Attempting to getter function but object has no associated native space.");
     public static final TruffleString ATTEMPTING_SETTER_NO_NATIVE_SPACE = tsLiteral("Attempting to setter function but object has no associated native space.");
+
+    public static final TruffleString INSTANCE_OF_CONTEXTVAR_EXPECTED = tsLiteral("an instance of ContextVar was expected");
+    public static final TruffleString CAPSULE_SETPOINTER_CALLED_WITH_NULL_POINTER = tsLiteral("PyCapsule_SetPointer called with null pointer");
+    public static final TruffleString CAPSULE_GETPOINTER_WITH_INVALID_CAPSULE = tsLiteral("HPyCapsule_GetPointer called with invalid PyCapsule object");
+    public static final TruffleString CAPSULE_GETCONTEXT_WITH_INVALID_CAPSULE = tsLiteral("HPyCapsule_GetContext called with invalid PyCapsule object");
+    public static final TruffleString CAPSULE_GETNAME_WITH_INVALID_CAPSULE = tsLiteral("HPyCapsule_GetName called with invalid PyCapsule object");
+    public static final TruffleString CAPSULE_GETDESTRUCTOR_WITH_INVALID_CAPSULE = tsLiteral("HPyCapsule_GetDestructor called with invalid PyCapsule object");
+    public static final TruffleString MSG_NOT_SET = tsLiteral("<message not set>");
+
 }