Skip to content

Commit 4b688cd

Browse files
committed
Fix swapped readonly check in hash
1 parent 31ca746 commit 4b688cd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_delitem
2929
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_gc
3030
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_getbuf_fail
31+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_hash_writable
3132
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_iter
3233
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_release
3334
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceSliceTest.test_reversed
@@ -42,6 +43,7 @@
4243
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_delitem
4344
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_gc
4445
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_getbuf_fail
46+
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_hash_writable
4547
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_iter
4648
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_release
4749
*graalpython.lib-python.3.test.test_memoryview.BytesMemorySliceTest.test_reversed
@@ -56,6 +58,7 @@
5658
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_delitem
5759
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_gc
5860
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_getbuf_fail
61+
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_hash_writable
5962
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_iter
6063
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_release
6164
*graalpython.lib-python.3.test.test_memoryview.BytesMemoryviewTest.test_reversed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/memoryview/MemoryViewBuiltins.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,10 @@ static String repr(IntrinsifiedPMemoryView self) {
551551
public static abstract class HashNode extends PythonUnaryBuiltinNode {
552552
@Specialization
553553
int hash(IntrinsifiedPMemoryView self,
554-
@Cached ConditionProfile readonlyProfile,
554+
@Cached ConditionProfile writableProfile,
555555
@Cached MemoryViewNodes.ToJavaBytesNode toJavaBytesNode) {
556556
self.checkReleased(this);
557-
if (readonlyProfile.profile(self.isReadOnly())) {
557+
if (writableProfile.profile(!self.isReadOnly())) {
558558
throw raise(ValueError, ErrorMessages.CANNOT_HASH_WRITEABLE_MEMORYVIEW);
559559
} else {
560560
// TODO avoid copying

0 commit comments

Comments
 (0)