allow loading marshalled data from memoryview

timfel · timfel · commit 95a80d197fd1 · 2019-03-09T12:44:32.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/MarshalModuleBuiltins.java
@@ -156,6 +156,13 @@ Object doit(PByteArray bytes,
                         @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
             return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);
         }
+
+        @SuppressWarnings("unused")
+        @Specialization
+        Object doit(PMemoryView bytes,
+                        @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
+            return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);
+        }
     }
 
     private static final char TYPE_NULL = '0';

Original file line number	Diff line number	Diff line change
`@@ -156,6 +156,13 @@ Object doit(PByteArray bytes,`
`156`	`156`	`@Cached("create()") BytesNodes.ToBytesNode toBytesNode) {`
`157`	`157`	`return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+ @SuppressWarnings("unused")`
	`161`	`+ @Specialization`
	`162`	`+ Object doit(PMemoryView bytes,`
	`163`	`+ @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {`
	`164`	`+ return marshaller.execute(toBytesNode.execute(bytes), CURRENT_VERSION);`
	`165`	`+ }`
`159`	`166`	`}`
`160`	`167`
`161`	`168`	`private static final char TYPE_NULL = '0';`