Skip to content

Commit 96de868

Browse files
zapsterzapster
committed
Merge remote-tracking branch 'upstream/master' into je/llvm/split-core-native-graalvm
2 parents 0f9de4c + 31a7278 commit 96de868

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3125
-1452
lines changed

‎graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/advance/LeakTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,11 @@ private MBeanServer doFullGC() {
185185
// do this a few times to dump a small heap if we can
186186
MBeanServer server = null;
187187
for (int i = 0; i < 10; i++) {
188+
try {
189+
Thread.sleep(1000);
190+
} catch (InterruptedException e1) {
191+
// do nothing
192+
}
188193
System.gc();
189194
Runtime.getRuntime().freeMemory();
190195
server = ManagementFactory.getPlatformMBeanServer();

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_array.txt

Lines changed: 756 additions & 0 deletions
Large diffs are not rendered by default.

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_memoryview.txt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,70 @@
11
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_attributes_readonly
2+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_attributes_writable
3+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_compare
4+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_contextmanager
5+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_delitem
26
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_gc
37
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_getbuf_fail
48
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_getbuffer
9+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_getitem
510
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_hash
11+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_hash_writable
12+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_issue22668
13+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_iter
14+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_release
15+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_reversed
616
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_setitem_readonly
17+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_setitem_writable
18+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_tobytes
719
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_tolist
20+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_toreadonly
21+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_weakref
822
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceSliceTest.test_writable_readonly
923
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_attributes_readonly
24+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_attributes_writable
25+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_compare
26+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_contextmanager
27+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_delitem
1028
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_gc
1129
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_getbuf_fail
1230
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_getbuffer
31+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_getitem
1332
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_hash
33+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_hash_writable
34+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_issue22668
35+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_iter
1436
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_refs
37+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_release
38+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_reversed
1539
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_setitem_readonly
40+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_setitem_writable
41+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_tobytes
1642
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_tolist
43+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_toreadonly
44+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_weakref
1745
*graalpython.lib-python.3.test.test_memoryview.ArrayMemorySliceTest.test_writable_readonly
46+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_array_assign
1847
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_attributes_readonly
48+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_attributes_writable
49+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_compare
50+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_contextmanager
51+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_delitem
1952
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_gc
2053
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_getbuf_fail
2154
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_getbuffer
55+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_getitem
2256
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_hash
57+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_hash_writable
58+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_issue22668
59+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_iter
60+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_release
61+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_reversed
2362
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_setitem_readonly
63+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_setitem_writable
64+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_tobytes
2465
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_tolist
66+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_toreadonly
67+
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_weakref
2568
*graalpython.lib-python.3.test.test_memoryview.ArrayMemoryviewTest.test_writable_readonly
2669
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_attributes_readonly
2770
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_attributes_writable
@@ -34,6 +77,7 @@
3477
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_getitem
3578
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_hash
3679
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_hash_writable
80+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_issue22668
3781
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_iter
3882
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_release
3983
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_reversed
@@ -55,6 +99,7 @@
5599
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_getitem
56100
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_hash
57101
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_hash_writable
102+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_issue22668
58103
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_iter
59104
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_refs
60105
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_release
@@ -78,6 +123,7 @@
78123
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_getitem
79124
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_hash
80125
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_hash_writable
126+
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_issue22668
81127
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_iter
82128
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_release
83129
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_reversed

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_userstring.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_count
88
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_encode_default_args
99
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_encode_explicit_none_args
10+
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_endswith
1011
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_expandtabs
1112
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_extended_getslice
1213
*graalpython.lib-python.3.test.test_userstring.UserStringTest.test_find

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ private static String[] initializeCoreFiles() {
224224
"str",
225225
"type",
226226
"_imp",
227-
"array",
228227
"_thread",
229228
"function",
230229
"_functools",

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/PythonBuiltinClassType.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,9 @@ public enum PythonBuiltinClassType implements TruffleObject {
219219

220220
private final String name;
221221
private final String publicInModule;
222-
private final String qualifiedName;
222+
// This is the name qualified by module used for printing. But the actual __qualname__ is just
223+
// plain name without module
224+
private final String printName;
223225
private final boolean basetype;
224226

225227
// initialized in static constructor
@@ -229,9 +231,9 @@ public enum PythonBuiltinClassType implements TruffleObject {
229231
this.name = name;
230232
this.publicInModule = publicInModule;
231233
if (publicInModule != null && publicInModule != BuiltinNames.BUILTINS) {
232-
qualifiedName = publicInModule + "." + name;
234+
printName = publicInModule + "." + name;
233235
} else {
234-
qualifiedName = name;
236+
printName = name;
235237
}
236238
this.basetype = basetype;
237239
}
@@ -256,8 +258,8 @@ public String getName() {
256258
return name;
257259
}
258260

259-
public String getQualifiedName() {
260-
return qualifiedName;
261+
public String getPrintName() {
262+
return printName;
261263
}
262264

263265
public PythonBuiltinClassType getBase() {
@@ -612,7 +614,7 @@ static String getMetaSimpleName(PythonBuiltinClassType self) {
612614

613615
@ExportMessage
614616
static String getMetaQualifiedName(PythonBuiltinClassType self) {
615-
return self.getQualifiedName();
617+
return self.getPrintName();
616618
}
617619

618620
@ExplodeLoop
@@ -632,6 +634,6 @@ public static boolean isExceptionType(PythonBuiltinClassType type) {
632634
*/
633635
@ExportMessage
634636
String asPStringWithState(@SuppressWarnings("unused") ThreadState state) {
635-
return getQualifiedName();
637+
return getPrintName();
636638
}
637639
}

0 commit comments

Comments
 (0)