few fixes

Author: qunaibit

graalpython/com.oracle.graal.python.cext/src/unicodeobject.c

@@ -222,8 +222,6 @@ void PyUnicode_AppendAndDel(PyObject **pleft, PyObject *right) {
     Py_XDECREF(right);
 }
 
-static PyObject *interned = NULL;
-
 void PyUnicode_InternInPlace(PyObject **p) {
     PyObject *s = *p;
     if (s == NULL) {

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

@@ -134,6 +134,7 @@
 import com.oracle.graal.python.nodes.attributes.ReadAttributeFromDynamicObjectNode;
 import com.oracle.graal.python.nodes.call.CallNode;
 import com.oracle.graal.python.nodes.classes.IsSubtypeNode;
+import com.oracle.graal.python.nodes.object.BuiltinClassProfiles.IsBuiltinObjectProfile;
 import com.oracle.graal.python.nodes.object.GetClassNode;
 import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.graal.python.nodes.truffle.PythonTypes;
@@ -302,10 +303,15 @@ Object withTS(TruffleString str,
 
         @Specialization
         Object withPString(PString str,
+                        @Bind("this") Node inliningTarget,
+                        @Cached IsBuiltinObjectProfile isBuiltinClassProfile,
                         @Cached ReadAttributeFromDynamicObjectNode readNode,
                         @Shared @Cached StringNodes.InternStringNode internNode,
                         @Shared @Cached HashingStorageGetItem getItem,
                         @Shared @Cached HashingStorageSetItem setItem) {
+            if (!isBuiltinClassProfile.profileObject(inliningTarget, str, PythonBuiltinClassType.PString)) {
+                return getNativeNull();
+            }
             boolean isInterned = readNode.execute(str, PString.INTERNED) != PNone.NO_VALUE;
             if (isInterned) {
                 return str;
@@ -319,7 +325,7 @@ Object nil(@SuppressWarnings("unused") Object obj) {
              * If it's a subclass, we don't really know what putting it in the interned dict might
              * do.
              */
-            return PNone.NONE;
+            return getNativeNull();
         }
     }