Skip to content

Handle oversized __hash__ results without panicking #6561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 5 commits into from
Dec 28, 2025
Merged

Handle oversized __hash__ results without panicking #6561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
264bc43
Initial plan
Copilot Dec 28, 2025
fa233e2
Fix hash wrapper overflow handling
Copilot Dec 28, 2025
2767232
Auto-format: cargo fmt --all
github-actions[bot] Dec 28, 2025
7fb03b2
Adjust __hash__ wrapper conversion
Copilot Dec 28, 2025
a14d5c1
Auto-format: cargo fmt --all
github-actions[bot] Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions crates/vm/src/types/slot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
AsObject, Py, PyObject, PyObjectRef, PyPayload, PyRef, PyResult, VirtualMachine,
builtins::{PyInt, PyStr, PyStrInterned, PyStrRef, PyType, PyTypeRef},
bytecode::ComparisonOperator,
common::hash::PyHash,
common::hash::{PyHash, fix_sentinel, hash_bigint},
convert::ToPyObject,
function::{
Either, FromArgs, FuncArgs, OptionalArg, PyComparisonValue, PyMethodDef, PySetterValue,
Expand All @@ -18,7 +18,6 @@ use crate::{
vm::Context,
};
use crossbeam_utils::atomic::AtomicCell;
use malachite_bigint::BigInt;
use num_traits::{Signed, ToPrimitive};
use std::{any::Any, any::TypeId, borrow::Borrow, cmp::Ordering, ops::Deref};

Expand Down Expand Up @@ -412,9 +411,10 @@ fn hash_wrapper(zelf: &PyObject, vm: &VirtualMachine) -> PyResult<PyHash> {
.downcast_ref::<PyInt>()
.ok_or_else(|| vm.new_type_error("__hash__ method should return an integer"))?;
let big_int = py_int.as_bigint();
let hash: PyHash = big_int
let hash = big_int
.to_i64()
.unwrap_or_else(|| (big_int % BigInt::from(u64::MAX)).to_i64().unwrap());
.map(fix_sentinel)
.unwrap_or_else(|| hash_bigint(big_int));
Ok(hash)
}

Expand Down
8 changes: 8 additions & 0 deletions extra_tests/snippets/builtin_hash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ class A:
assert type(hash(1.1)) is int
assert type(hash("")) is int


class Evil:
def __hash__(self):
return 1 << 63


assert hash(Evil()) == 4

with assert_raises(TypeError):
hash({})

Expand Down
Loading