[GR-28986] Fix ClassCastException caused by specialization arg eval order

PullRequest: graalpython/1566

Author: fangerer

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -573,6 +573,24 @@ def test_str_subclass(self):
         assert tester.replace("o", "uff") == "helluff\nwuffrld"
         assert tester.replace("o", "uff", 1) == "helluff\nworld"
 
+    def test_doc(self):
+        TestDoc = CPyExtType("TestDoc",
+                                         '''
+                                             Py_ssize_t global_basicsize = -1;
+   
+                                             static PyObject* some_member(PyObject* self) {
+                                                 return PyLong_FromLong(42);
+                                             }
+                                         ''',
+                                         tp_methods='{"some_member", (PyCFunction)some_member, METH_NOARGS, "This is some member that returns some value."}',
+                                         )
+        obj = TestDoc()
+        expected_doc = "This is some member that returns some value."
+        assert obj.some_member() == 42
+        assert len(obj.some_member.__doc__) == len(expected_doc)
+        assert obj.some_member.__doc__ == expected_doc
+
+
 class TestObjectFunctions(CPyExtTestCase):
     def compile_module(self, name):
         type(self).mro()[1].__dict__["test_%s" % name].create_module(name)

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/str/PString.java

@@ -47,7 +47,6 @@
 import com.oracle.graal.python.runtime.sequence.storage.SequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
-import com.oracle.truffle.api.dsl.Bind;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
 import com.oracle.truffle.api.dsl.Cached.Shared;
@@ -152,15 +151,16 @@ static int nativeString(PString self, @SuppressWarnings("unused") ThreadState st
                         "isBuiltin(self, profile) || hasBuiltinLen(self, lookupSelf, lookupString)"
         }, replaces = "nativeString", limit = "1")
         static int nativeStringMat(PString self, @SuppressWarnings("unused") ThreadState state,
-                        @Bind("getNativeCharSequence(self)") NativeCharSequence nativeCharSequence,
                         @SuppressWarnings("unused") @Shared("builtinProfile") @Cached IsBuiltinClassProfile profile,
                         @SuppressWarnings("unused") @Shared("lookupSelf") @Cached LookupInheritedAttributeNode.Dynamic lookupSelf,
                         @SuppressWarnings("unused") @Shared("lookupString") @Cached LookupAttributeInMRONode.Dynamic lookupString,
-                        @CachedLibrary("nativeCharSequence.getPtr()") InteropLibrary lib,
+                        @CachedLibrary(limit = "1") InteropLibrary lib,
                         @Cached CastToJavaIntExactNode castToJavaIntNode,
                         @Shared("stringMaterializeNode") @Cached StringMaterializeNode materializeNode) {
-            if (lib.hasArrayElements(nativeCharSequence.getPtr())) {
-                return nativeCharSequence.length(lib, castToJavaIntNode);
+            // this cast is guaranteed by cast 'isNativeString(self.getCharSequence())'
+            NativeCharSequence value = (NativeCharSequence) self.value;
+            if (lib.hasArrayElements(value.getPtr())) {
+                return value.length(lib, castToJavaIntNode);
             } else {
                 return materializeNode.execute(self).length();
             }
@@ -180,10 +180,6 @@ static int subclassedString(PString self, ThreadState state,
             // call the generic implementation in the superclass
             return self.lengthWithState(state, plib, methodLib, hasLen, ltZero, raiseNode, lib, toLong, ignoreOverflow, overflow);
         }
-
-        static NativeCharSequence getNativeCharSequence(PString self) {
-            return (NativeCharSequence) self.value;
-        }
     }
 
     @ExportMessage