Skip to content

Py 3.14 changes fix #6755

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
Jan 17, 2026
Merged

Py 3.14 changes fix #6755

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1af3c02
marshal v5
youknowone Jan 17, 2026
7c2e16e
conditional blclk
youknowone Jan 17, 2026
279282c
fix jit
youknowone Jan 17, 2026
d8acea3
add varname
youknowone Jan 17, 2026
0d8a372
symboltable takes responsibility of __debug__
youknowone Jan 17, 2026
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
Next Next commit
marshal v5
  • Loading branch information
@youknowone
youknowone committed Jan 17, 2026
commit 1af3c027b49a27036c37497892c0e49cf0d48b26
8 changes: 7 additions & 1 deletion crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4186,6 +4186,10 @@ impl Compiler {
firstlineno: u32,
) -> CompileResult<CodeObject> {
// 1. Enter class scope
// Reset conditional-annotation index for class scope (restore after)
let saved_conditional_index = self.next_conditional_annotation_index;
self.next_conditional_annotation_index = 0;

let key = self.symbol_table_stack.len();
self.push_symbol_table()?;
self.enter_scope(name, CompilerScope::Class, key, firstlineno)?;
Expand Down Expand Up @@ -4290,7 +4294,9 @@ impl Compiler {
self.emit_return_value();

// Exit scope and return the code object
Ok(self.exit_scope())
let code = self.exit_scope();
self.next_conditional_annotation_index = saved_conditional_index;
Ok(code)
}

fn compile_class_def(
Expand Down
10 changes: 9 additions & 1 deletion crates/compiler-core/src/marshal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use malachite_bigint::{BigInt, Sign};
use num_complex::Complex64;
use rustpython_wtf8::Wtf8;

pub const FORMAT_VERSION: u32 = 4;
pub const FORMAT_VERSION: u32 = 5;

#[derive(Debug)]
pub enum MarshalError {
Expand Down Expand Up @@ -65,6 +65,7 @@ enum Type {
// Unknown = b'?',
Set = b'<',
FrozenSet = b'>',
Slice = b':', // Added in version 5
Ascii = b'a',
// AsciiInterned = b'A',
// SmallTuple = b')',
Expand Down Expand Up @@ -101,6 +102,7 @@ impl TryFrom<u8> for Type {
// b'?' => Unknown,
b'<' => Set,
b'>' => FrozenSet,
b':' => Slice,
b'a' => Ascii,
// b'A' => AsciiInterned,
// b')' => SmallTuple,
Expand Down Expand Up @@ -466,6 +468,12 @@ pub fn deserialize_value<R: Read, Bag: MarshalBag>(rdr: &mut R, bag: Bag) -> Res
bag.make_bytes(value)
}
Type::Code => bag.make_code(deserialize_code(rdr, bag.constant_bag())?),
Type::Slice => {
// Slice constants are not yet supported in RustPython
// This would require adding a Slice variant to ConstantData enum
// For now, return an error if we encounter a slice in marshal data
return Err(MarshalError::BadType);
}
};
Ok(value)
}
Expand Down