Visitar URL original
Bytecode parity by youknowone · Pull Request #7475 · RustPython/RustPython · GitHub
Skip to content

Bytecode parity #7475

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 34 commits into from
Mar 23, 2026
Merged

Bytecode parity #7475

Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
40cbc39
Emit TO_BOOL before conditional jumps, fix class/module prologue
youknowone Mar 20, 2026
f52276e
Emit MAKE_CELL and COPY_FREE_VARS before RESUME
youknowone Mar 20, 2026
7a9c29d
Emit __static_attributes__ at end of class bodies
youknowone Mar 20, 2026
f8f7fbf
Remove expectedFailure from DictProxyTests iter tests
youknowone Mar 20, 2026
e3fa83e
Use 1-based stack indexing for LIST_EXTEND, SET_UPDATE, etc.
youknowone Mar 20, 2026
18c23e5
Use plain LOAD_ATTR + PUSH_NULL for calls on imported names
youknowone Mar 20, 2026
b2995bc
Duplicate return-None epilogue for fall-through blocks
youknowone Mar 20, 2026
35ac45d
Run cargo fmt on ir.rs
youknowone Mar 20, 2026
1092110
Remove expectedFailure from test_intrinsic_1 in test_dis
youknowone Mar 20, 2026
cc23051
Emit TO_BOOL before conditional jumps for all expressions including C…
youknowone Mar 20, 2026
643861b
Add __classdict__ cell for classes with function definitions
youknowone Mar 21, 2026
a4753e8
Emit __classdictcell__ store in class body epilogue
youknowone Mar 21, 2026
50eaae4
Always run DCE to remove dead code after terminal instructions
youknowone Mar 21, 2026
fdcccad
Restrict LOAD_ATTR plain mode to module/class scope imports
youknowone Mar 21, 2026
83a548e
Eliminate unreachable blocks after jump normalization
youknowone Mar 21, 2026
6a592dd
Fold BUILD_TUPLE 0 into LOAD_CONST empty tuple
youknowone Mar 21, 2026
1d83df2
Handle __classcell__ and __classdictcell__ in type.__new__
youknowone Mar 21, 2026
e1bf8d1
Revert __classdict__ cell and __classdictcell__ changes
youknowone Mar 21, 2026
add881c
Fix unreachable block elimination with fixpoint reachability
youknowone Mar 21, 2026
3181725
Check enclosing scopes for IMPORTED flag in LOAD_ATTR mode
youknowone Mar 22, 2026
c345999
Add __classdict__ cell for classes with function definitions
youknowone Mar 22, 2026
11b4b18
Store __classdictcell__ in class body epilogue
youknowone Mar 22, 2026
0793cb2
Fix clippy collapsible_if warnings and cargo fmt
youknowone Mar 22, 2026
d29b2a9
Revert __classdict__ and __classdictcell__ changes (cause import fail…
youknowone Mar 22, 2026
d5afad9
Revert type.__new__ __classcell__ removal and __classdictcell__ handling
youknowone Mar 22, 2026
c921c8b
Re-add __classdict__ cell and __classdictcell__ store
youknowone Mar 22, 2026
60103dc
Reorder MakeFunctionFlag to match CPython's SET_FUNCTION_ATTRIBUTE
youknowone Mar 22, 2026
560d8ae
Use CPython-compatible power-of-two encoding for SET_FUNCTION_ATTRIBUTE
youknowone Mar 22, 2026
16ce7fb
Remove expectedFailure from test_elim_jump_after_return1 and test_no_…
youknowone Mar 22, 2026
9820993
Remove __classcell__ and __classdictcell__ from class dict in type.__…
youknowone Mar 22, 2026
35a8f7e
Remove expectedFailure from test___classcell___expected_behaviour, ca…
youknowone Mar 22, 2026
e0c7326
Handle MakeCell and CopyFreeVars as no-ops in JIT
youknowone Mar 22, 2026
c958739
Remove expectedFailure from test_load_fast_known_simple
youknowone Mar 23, 2026
926a984
Restore expectedFailure for test_load_fast_known_simple
youknowone Mar 23, 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
Prev Previous commit
Next Next commit
Emit __static_attributes__ at end of class bodies 
Store a tuple of attribute names (currently always empty) as
__static_attributes__ in the class namespace, matching CPython
3.14's class body epilogue. Attribute name collection from
self.xxx accesses is a follow-up task.
  • Loading branch information
@youknowone
youknowone committed Mar 22, 2026
commit 7a9c29db2e5a0b9726f8faed6e394a3db6aaf975
25 changes: 25 additions & 0 deletions crates/codegen/src/compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4665,6 +4665,31 @@ impl Compiler {
.iter()
.position(|var| *var == "__class__");

// Emit __static_attributes__ tuple
{
let attrs: Vec<String> = self
.code_stack
.last()
.unwrap()
.static_attributes
.as_ref()
.map(|s| s.iter().cloned().collect())
.unwrap_or_default();
self.emit_load_const(ConstantData::Tuple {
elements: attrs
.into_iter()
.map(|s| ConstantData::Str { value: s.into() })
.collect(),
});
let static_attrs_name = self.name("__static_attributes__");
emit!(
self,
Instruction::StoreName {
namei: static_attrs_name
}
);
}
Comment on lines +4685 to +4708

@coderabbitai coderabbitai Bot Mar 20, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

__static_attributes__ is always serialized as () here.

enter_scope() initializes every class with Some(IndexSet::default()) on Line 1120, but this file never inserts into that set before reaching this block. The new store therefore overwrites every class body’s __static_attributes__ with an empty tuple, including any explicit assignment made in body. Either populate static_attributes before this point or skip the store until the set is non-empty.

Minimal guard to avoid clobbering classes until the collector exists 
-        // Emit __static_attributes__ tuple
-        {
-            let attrs: Vec<String> = self
-                .code_stack
-                .last()
-                .unwrap()
-                .static_attributes
-                .as_ref()
-                .map(|s| s.iter().cloned().collect())
-                .unwrap_or_default();
-            self.emit_load_const(ConstantData::Tuple {
-                elements: attrs
-                    .into_iter()
-                    .map(|s| ConstantData::Str { value: s.into() })
-                    .collect(),
-            });
-            let static_attrs_name = self.name("__static_attributes__");
-            emit!(
-                self,
-                Instruction::StoreName {
-                    namei: static_attrs_name
-                }
-            );
-        }
+        if let Some(attrs) = self
+            .code_stack
+            .last()
+            .and_then(|info| info.static_attributes.as_ref())
+            .filter(|attrs| !attrs.is_empty())
+        {
+            self.emit_load_const(ConstantData::Tuple {
+                elements: attrs
+                    .iter()
+                    .cloned()
+                    .map(|s| ConstantData::Str { value: s.into() })
+                    .collect(),
+            });
+            let static_attrs_name = self.name("__static_attributes__");
+            emit!(self, Instruction::StoreName { namei: static_attrs_name });
+        }
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@crates/codegen/src/compile.rs` around lines 4626 - 4649, The current block
always emits and stores an empty tuple to __static_attributes__ because
enter_scope() initializes static_attributes to Some(empty) but nothing is added
before this emit; update compile.rs to skip emitting/storing
__static_attributes__ when the collected attrs vector is empty (i.e., check the
code_stack.last().unwrap().static_attributes contents and only call
emit_load_const/Instruction::StoreName/name("__static_attributes__") if attrs is
non-empty), or alternatively change enter_scope() to initialize
static_attributes as None and only create/populate it when the collector runs;
target the symbols static_attributes, enter_scope, emit_load_const,
Instruction::StoreName and name("__static_attributes__") when making the change.


if let Some(classcell_idx) = classcell_idx {
emit!(
self,
Expand Down