Fix: charptr can be TruffleString

fangerer · fangerer · commit f9bd56005c3a · 2023-08-09T17:37:03.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/GraalHPyContextFunctions.java
@@ -1833,6 +1833,9 @@ public abstract static class GraalHPyUnicodeFromString extends HPyBinaryContextF
         @Specialization
         static TruffleString doGeneric(@SuppressWarnings("unused") Object hpyContext, Object charPtr,
                         @Cached FromCharPointerNode fromCharPointerNode) {
+            if (charPtr instanceof TruffleString ts) {
+                return ts;
+            }
             return fromCharPointerNode.execute(charPtr);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1833,6 +1833,9 @@ public abstract static class GraalHPyUnicodeFromString extends HPyBinaryContextF`
`1833`	`1833`	`@Specialization`
`1834`	`1834`	`static TruffleString doGeneric(@SuppressWarnings("unused") Object hpyContext, Object charPtr,`
`1835`	`1835`	`@Cached FromCharPointerNode fromCharPointerNode) {`
	`1836`	`+ if (charPtr instanceof TruffleString ts) {`
	`1837`	`+ return ts;`
	`1838`	`+ }`
`1836`	`1839`	`return fromCharPointerNode.execute(charPtr);`
`1837`	`1840`	`}`
`1838`	`1841`	`}`