force immediate materialization of strings in HPyUnicode_FromString

Author: timfel

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

@@ -129,6 +129,8 @@
 import com.oracle.graal.python.builtins.objects.method.PBuiltinMethod;
 import com.oracle.graal.python.builtins.objects.module.PythonModule;
 import com.oracle.graal.python.builtins.objects.object.PythonObject;
+import com.oracle.graal.python.builtins.objects.str.PString;
+import com.oracle.graal.python.builtins.objects.str.StringNodes.StringMaterializeNode;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.builtins.objects.type.PythonClass;
 import com.oracle.graal.python.builtins.objects.type.SpecialMethodSlot;
@@ -1303,13 +1305,17 @@ public static final class GraalHPyUnicodeFromString extends GraalHPyContextFunct
         Object execute(Object[] arguments,
                         @Cached HPyAsContextNode asContextNode,
                         @Cached FromCharPointerNode fromCharPointerNode,
+                        @Cached StringMaterializeNode stringMaterializeNode,
                         @Cached HPyTransformExceptionToNativeNode transformExceptionToNativeNode,
                         @Cached HPyAsHandleNode asHandleNode) throws ArityException {
             checkArity(arguments, 2);
             GraalHPyContext context = asContextNode.execute(arguments[0]);
             try {
                 // TODO(fa) provide encoding (utf8)
                 Object str = fromCharPointerNode.execute(arguments[1]);
+                if (str instanceof PString) {
+                    str = stringMaterializeNode.execute((PString) str);
+                }
                 return asHandleNode.execute(context, str);
             } catch (PException e) {
                 transformExceptionToNativeNode.execute(context, e);

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

@@ -73,7 +73,7 @@ public static CharSequence createChecked(CharSequence left, CharSequence right,
 
     private static boolean assertChecked(PythonContext context, CharSequence left, CharSequence right, int length) {
         assert context.getOption(PythonOptions.LazyStrings);
-        assert (PGuards.isString(left) || left instanceof LazyString || left instanceof NativeCharSequence) && (PGuards.isString(right) || right instanceof LazyString || right instanceof NativeCharSequence);
+        assert (PGuards.isString(left) || left instanceof LazyString) && (PGuards.isString(right) || right instanceof LazyString);
         assert length == left.length() + right.length();
         assert left.length() > 0 && right.length() > 0;
         assert length >= context.getOption(PythonOptions.MinLazyStringLength);
@@ -191,9 +191,6 @@ private static void flatten(CharSequence src, int srcBegin, int srcEnd, char[] d
             } else if (str instanceof String) {
                 ((String) str).getChars(from, to, dst, dstFrom);
                 return;
-            } else if (str instanceof NativeCharSequence) {
-                ((NativeCharSequence) str).materialize().getChars(from, to, dst, dstFrom);
-                return;
             }
         }
     }