[GR-15084] Add gates for sandboxed svm, shared-object, and jvm unittests

timfel · timfel · commit b4eae98f9376 · 2019-04-15T06:37:25.000-07:00
PullRequest: graalpython/485
diff --git a/graalpython/com.oracle.graal.python.cext/src/bytesobject.c b/graalpython/com.oracle.graal.python.cext/src/bytesobject.c
@@ -52,14 +52,14 @@ UPCALL_ID(PyBytes_FromStringAndSize);
 UPCALL_ID(PyTruffle_Bytes_EmptyWithCapacity);
 PyObject* PyBytes_FromStringAndSize(const char* str, Py_ssize_t sz) {
 	if (str != NULL) {
-		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, sz));
+		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, sz), sz);
 	}
 	return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, sz);
 }
 
 PyObject * PyBytes_FromString(const char *str) {
 	if (str != NULL) {
-		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, strlen(str)));
+		return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, strlen(str)), strlen(str));
 	}
 	return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, 0);
 }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/PythonTests.java
@@ -99,7 +99,7 @@ public static void enterContext(String... newArgs) {
         PythonTests.outArray.reset();
         PythonTests.errArray.reset();
         Context prevContext = context;
-        context = Context.newBuilder().engine(engine).allowAllAccess(true).arguments("python", newArgs).option("python.Executable", executable).build();
+        context = Context.newBuilder().engine(engine).allowExperimentalOptions(true).allowAllAccess(true).arguments("python", newArgs).option("python.Executable", executable).build();
         context.initialize("python");
         if (prevContext != null) {
             closeContext(prevContext);
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/MultiContextTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/MultiContextTest.java
@@ -69,6 +69,6 @@ public void testSharingWithStruct() {
     }
 
     private static Context newContext(Engine engine) {
-        return Context.newBuilder().allowAllAccess(true).engine(engine).build();
+        return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();
     }
 }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/debug/PythonDebugTest.java
@@ -78,6 +78,7 @@ public class PythonDebugTest {
     @Before
     public void before() {
         Builder newBuilder = Context.newBuilder();
+        newBuilder.allowExperimentalOptions(true);
         newBuilder.allowAllAccess(true);
         PythonTests.closeContext();
         tester = new DebuggerTester(newBuilder);
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/InteropLibraryTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/InteropLibraryTest.java
@@ -59,6 +59,7 @@ public class InteropLibraryTest extends PythonTests {
     @Before
     public void setUpTest() {
         Builder builder = Context.newBuilder();
+        builder.allowExperimentalOptions(true);
         builder.allowAllAccess(true);
         context = builder.build();
     }
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/interop/JavaInteropTest.java
@@ -52,15 +52,6 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.oracle.graal.python.runtime.interop.InteropArray;
-import com.oracle.graal.python.test.PythonTests;
-import com.oracle.truffle.api.interop.ArityException;
-import com.oracle.truffle.api.interop.InteropLibrary;
-import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.api.interop.UnknownIdentifierException;
-import com.oracle.truffle.api.library.ExportLibrary;
-import com.oracle.truffle.api.library.ExportMessage;
-
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Context.Builder;
 import org.graalvm.polyglot.Engine;
@@ -76,6 +67,15 @@
 import org.junit.runners.Parameterized.Parameter;
 import org.junit.runners.Parameterized.Parameters;
 
+import com.oracle.graal.python.runtime.interop.InteropArray;
+import com.oracle.graal.python.test.PythonTests;
+import com.oracle.truffle.api.interop.ArityException;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnknownIdentifierException;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+
 @RunWith(Enclosed.class)
 public class JavaInteropTest {
     public static class GeneralInterop extends PythonTests {
@@ -89,6 +89,7 @@ public void setUpTest() {
             out = new ByteArrayOutputStream();
             err = new ByteArrayOutputStream();
             Builder builder = Context.newBuilder();
+            builder.allowExperimentalOptions(true);
             builder.allowAllAccess(true);
             builder.out(out);
             builder.err(err);
@@ -113,7 +114,7 @@ public void evalFailsOnError() {
 
         @Test
         public void evalNonInteractiveThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+            try (Context c = Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -125,7 +126,7 @@ public void evalNonInteractiveThrowsSyntaxError() throws IOException {
 
         @Test
         public void evalNonInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+            try (Context c = Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(false).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -137,7 +138,7 @@ public void evalNonInteractiveInInteractiveTerminalThrowsSyntaxError() throws IO
 
         @Test
         public void evalInteractiveInNonInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
+            try (Context c = Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "false").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -149,7 +150,7 @@ public void evalInteractiveInNonInteractiveTerminalThrowsSyntaxError() throws IO
 
         @Test
         public void evalInteractiveInInteractiveTerminalThrowsSyntaxError() throws IOException {
-            try (Context c = Context.newBuilder().allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
+            try (Context c = Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).option("python.TerminalIsInteractive", "true").build()) {
                 c.eval(Source.newBuilder("python", INCOMPLETE_SOURCE, "eval").interactive(true).build());
             } catch (PolyglotException t) {
                 assertTrue(t.isSyntaxError());
@@ -513,7 +514,7 @@ static class OptionsChecker {
             private Builder builder;
 
             OptionsChecker(String option, String code, String... values) {
-                this.builder = Context.newBuilder("python").engine(engine).allowAllAccess(true);
+                this.builder = Context.newBuilder("python").engine(engine).allowExperimentalOptions(true).allowAllAccess(true);
                 this.option = "python." + option;
                 this.source = Source.create("python", code);
                 this.values = values;
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/MemoryviewTest.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/module/MemoryviewTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -56,6 +56,6 @@ public void testContextReuse() {
     }
 
     private static Context newContext(Engine engine) {
-        return Context.newBuilder().allowAllAccess(true).engine(engine).build();
+        return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();
     }
 }
diff --git a/graalpython/com.oracle.graal.python.test/src/tests/cpyext/demo.c b/graalpython/com.oracle.graal.python.test/src/tests/cpyext/demo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * The Universal Permissive License (UPL), Version 1.0
@@ -49,7 +49,11 @@ static PyObject* demo_system(PyObject *self, PyObject *args)
 
     if (!PyArg_ParseTuple(args, "s", &command))
         return NULL;
-    sts = system(command);
+    if (!strcmp("echo 1", command)) {
+        sts = 0;
+    } else {
+        sts = 1;
+    }
     return Py_BuildValue("i", sts);
 }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java
@@ -55,6 +55,7 @@
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.CodingErrorAction;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.List;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -71,6 +72,7 @@
 import com.oracle.graal.python.builtins.objects.bytes.BytesBuiltins;
 import com.oracle.graal.python.builtins.objects.bytes.BytesNodes;
 import com.oracle.graal.python.builtins.objects.bytes.PBytes;
+import com.oracle.graal.python.builtins.objects.bytes.PIBytesLike;
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CByteArrayWrapper;
 import com.oracle.graal.python.builtins.objects.cext.CArrayWrappers.CStringWrapper;
 import com.oracle.graal.python.builtins.objects.cext.CExtNodes;
@@ -1158,15 +1160,23 @@ public static GetByteArrayNode create() {
             return GetByteArrayNodeGen.create();
         }
 
+        private static byte[] subRangeIfNeeded(byte[] ary, long n) {
+            if (ary.length > n && n >= 0 && n < Integer.MAX_VALUE) {
+                return Arrays.copyOf(ary, (int) n);
+            } else {
+                return ary;
+            }
+        }
+
         @Specialization
-        byte[] doCArrayWrapper(CByteArrayWrapper o, @SuppressWarnings("unused") long n) {
-            return o.getByteArray();
+        byte[] doCArrayWrapper(CByteArrayWrapper o, long n) {
+            return subRangeIfNeeded(o.getByteArray(), n);
         }
 
         @Specialization
-        byte[] doSequenceArrayWrapper(PySequenceArrayWrapper obj, @SuppressWarnings("unused") long n,
+        byte[] doSequenceArrayWrapper(PySequenceArrayWrapper obj, long n,
                         @Cached("create()") BytesNodes.ToBytesNode toBytesNode) {
-            return toBytesNode.execute(obj.getDelegate());
+            return subRangeIfNeeded(toBytesNode.execute(obj.getDelegate()), n);
         }
 
         @Specialization(guards = "n < 0")
@@ -2135,16 +2145,32 @@ protected static boolean isPSequence(Object object) {
         }
     }
 
-    @Builtin(name = "PyBytes_FromStringAndSize", minNumOfPositionalArgs = 2, declaresExplicitSelf = true)
+    @Builtin(name = "PyBytes_FromStringAndSize", minNumOfPositionalArgs = 3, declaresExplicitSelf = true)
     @GenerateNodeFactory
     abstract static class PyBytes_FromStringAndSize extends NativeBuiltin {
+        // n.b.: the specializations for PIBytesLike are quite common on
+        // managed, when the PySequenceArrayWrapper that we used never went
+        // native, and during the upcall to here it was simply unwrapped again
+        // with the ToJava (rather than mapped from a native pointer back into a
+        // PythonNativeObject)
+
+        @Specialization
+        Object doGeneric(@SuppressWarnings("unused") Object module, PIBytesLike object, long size,
+                        @Exclusive @Cached BytesNodes.ToBytesNode getByteArrayNode) {
+            byte[] ary = getByteArrayNode.execute(object);
+            if (size < Integer.MAX_VALUE && size >= 0 && size < ary.length) {
+                return factory().createBytes(Arrays.copyOf(ary, (int) size));
+            } else {
+                return factory().createBytes(ary);
+            }
+        }
 
         @Specialization
-        Object doGeneric(Object module, PythonNativeObject object,
+        Object doGeneric(Object module, PythonNativeObject object, long size,
                         @Exclusive @Cached CExtNodes.GetNativeNullNode getNativeNullNode,
                         @Exclusive @Cached GetByteArrayNode getByteArrayNode) {
             try {
-                return factory().createBytes(getByteArrayNode.execute(object.getPtr(), -1));
+                return factory().createBytes(getByteArrayNode.execute(object.getPtr(), size));
             } catch (InteropException e) {
                 return raiseNative(getNativeNullNode.execute(module), PythonErrorType.TypeError, "%m", e);
             }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/DynamicObjectNativeWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/DynamicObjectNativeWrapper.java
@@ -1177,7 +1177,7 @@ public boolean isMemberModifiable(String member) {
         }
     }
 
-    public static class PrimitiveNativeWrapper extends DynamicObjectNativeWrapper {
+    public static final class PrimitiveNativeWrapper extends DynamicObjectNativeWrapper {
 
         public static final byte PRIMITIVE_STATE_BOOL = 1 << 0;
         public static final byte PRIMITIVE_STATE_BYTE = 1 << 1;
@@ -1260,6 +1260,17 @@ public void setMaterializedObject(Object materializedPrimitive) {
             setDelegate(materializedPrimitive);
         }
 
+        @Override
+        public boolean equals(Object obj) {
+            return obj instanceof PrimitiveNativeWrapper && ((PrimitiveNativeWrapper) obj).state == state && ((PrimitiveNativeWrapper) obj).value == value &&
+                            ((PrimitiveNativeWrapper) obj).dvalue == dvalue;
+        }
+
+        @Override
+        public int hashCode() {
+            return (int) (value ^ Double.doubleToRawLongBits(dvalue) ^ state);
+        }
+
         public static PrimitiveNativeWrapper createBool(boolean val) {
             return new PrimitiveNativeWrapper(PRIMITIVE_STATE_BOOL, PInt.intValue(val));
         }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapper.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapper.java
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
diff --git a/mx.graalpython/mx_graalpython_benchmark.py b/mx.graalpython/mx_graalpython_benchmark.py
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py

Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,14 @@ UPCALL_ID(PyBytes_FromStringAndSize);`
`52`	`52`	`UPCALL_ID(PyTruffle_Bytes_EmptyWithCapacity);`
`53`	`53`	`PyObject* PyBytes_FromStringAndSize(const char* str, Py_ssize_t sz) {`
`54`	`54`	`if (str != NULL) {`
`55`		`- return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, sz));`
	`55`	`+ return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, sz), sz);`
`56`	`56`	`}`
`57`	`57`	`return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, sz);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`PyObject * PyBytes_FromString(const char *str) {`
`61`	`61`	`if (str != NULL) {`
`62`		`- return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, strlen(str)));`
	`62`	`+ return UPCALL_CEXT_O(_jls_PyBytes_FromStringAndSize, polyglot_from_i8_array(str, strlen(str)), strlen(str));`
`63`	`63`	`}`
`64`	`64`	`return UPCALL_CEXT_O(_jls_PyTruffle_Bytes_EmptyWithCapacity, 0);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ public void testSharingWithStruct() {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`private static Context newContext(Engine engine) {`
`72`		`- return Context.newBuilder().allowAllAccess(true).engine(engine).build();`
	`72`	`+ return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public class InteropLibraryTest extends PythonTests {`
`59`	`59`	`@Before`
`60`	`60`	`public void setUpTest() {`
`61`	`61`	`Builder builder = Context.newBuilder();`
	`62`	`+ builder.allowExperimentalOptions(true);`
`62`	`63`	`builder.allowAllAccess(true);`
`63`	`64`	`context = builder.build();`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.`
	`2`	`+ * Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.`
`3`	`3`	`* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.`
`4`	`4`	`*`
`5`	`5`	`* The Universal Permissive License (UPL), Version 1.0`
`@@ -56,6 +56,6 @@ public void testContextReuse() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private static Context newContext(Engine engine) {`
`59`		`- return Context.newBuilder().allowAllAccess(true).engine(engine).build();`
	`59`	`+ return Context.newBuilder().allowExperimentalOptions(true).allowAllAccess(true).engine(engine).build();`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1177,7 +1177,7 @@ public boolean isMemberModifiable(String member) {`
`1177`	`1177`	`}`
`1178`	`1178`	`}`
`1179`	`1179`
`1180`		`- public static class PrimitiveNativeWrapper extends DynamicObjectNativeWrapper {`
	`1180`	`+ public static final class PrimitiveNativeWrapper extends DynamicObjectNativeWrapper {`
`1181`	`1181`
`1182`	`1182`	`public static final byte PRIMITIVE_STATE_BOOL = 1 << 0;`
`1183`	`1183`	`public static final byte PRIMITIVE_STATE_BYTE = 1 << 1;`
`@@ -1260,6 +1260,17 @@ public void setMaterializedObject(Object materializedPrimitive) {`
`1260`	`1260`	`setDelegate(materializedPrimitive);`
`1261`	`1261`	`}`
`1262`	`1262`
	`1263`	`+ @Override`
	`1264`	`+ public boolean equals(Object obj) {`
	`1265`	`+ return obj instanceof PrimitiveNativeWrapper && ((PrimitiveNativeWrapper) obj).state == state && ((PrimitiveNativeWrapper) obj).value == value &&`
	`1266`	`+ ((PrimitiveNativeWrapper) obj).dvalue == dvalue;`
	`1267`	`+ }`
	`1268`	`+`
	`1269`	`+ @Override`
	`1270`	`+ public int hashCode() {`
	`1271`	`+ return (int) (value ^ Double.doubleToRawLongBits(dvalue) ^ state);`
	`1272`	`+ }`
	`1273`	`+`
`1263`	`1274`	`public static PrimitiveNativeWrapper createBool(boolean val) {`
`1264`	`1275`	`return new PrimitiveNativeWrapper(PRIMITIVE_STATE_BOOL, PInt.intValue(val));`
`1265`	`1276`	`}`