Skip to content

code object linetable #6150

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 2 commits into from
Sep 16, 2025
Merged

code object linetable #6150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a4fb2f
Code.replace
youknowone Sep 15, 2025
1d63075
implement linetable
youknowone Sep 15, 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
Next Next commit
Code.replace
  • Loading branch information
@youknowone
youknowone committed Sep 15, 2025
commit 4a4fb2fdeaa408d75178cc54865cdb95542cdc8a
14 changes: 0 additions & 14 deletions Lib/test/test_code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,6 @@ def func(arg):
newcode = code.replace(co_name="func") # Should not raise SystemError
self.assertEqual(code, newcode)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_empty_linetable(self):
def func():
pass
Expand Down Expand Up @@ -433,7 +431,6 @@ def test_co_positions_artificial_instructions(self):
]
)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_endline_and_columntable_none_when_no_debug_ranges(self):
# Make sure that if `-X no_debug_ranges` is used, there is
Expand All @@ -450,7 +447,6 @@ def f():
""")
assert_python_ok('-X', 'no_debug_ranges', '-c', code)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_endline_and_columntable_none_when_no_debug_ranges_env(self):
# Same as above but using the environment variable opt out.
Expand All @@ -468,8 +464,6 @@ def f():

# co_positions behavior when info is missing.

# TODO: RUSTPYTHON
@unittest.expectedFailure
# @requires_debug_ranges()
def test_co_positions_empty_linetable(self):
def func():
Expand All @@ -480,8 +474,6 @@ def func():
self.assertIsNone(line)
self.assertEqual(end_line, new_code.co_firstlineno + 1)

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_code_equality(self):
def f():
try:
Expand Down Expand Up @@ -522,8 +514,6 @@ def test_code_hash_uses_order(self):
self.assertNotEqual(c, swapped)
self.assertNotEqual(hash(c), hash(swapped))

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_code_hash_uses_bytecode(self):
c = (lambda x, y: x + y).__code__
d = (lambda x, y: x * y).__code__
Expand Down Expand Up @@ -735,8 +725,6 @@ def check_positions(self, func):
self.assertEqual(l1, l2)
self.assertEqual(len(pos1), len(pos2))

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_positions(self):
self.check_positions(parse_location_table)
self.check_positions(misshappen)
Expand All @@ -751,8 +739,6 @@ def check_lines(self, func):
self.assertEqual(l1, l2)
self.assertEqual(len(lines1), len(lines2))

# TODO: RUSTPYTHON
@unittest.expectedFailure
def test_lines(self):
self.check_lines(parse_location_table)
self.check_lines(misshappen)
Expand Down
111 changes: 106 additions & 5 deletions vm/src/builtins/code.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,22 @@ pub struct ReplaceArgs {
co_flags: OptionalArg<u16>,
#[pyarg(named, optional)]
co_varnames: OptionalArg<Vec<PyObjectRef>>,
#[pyarg(named, optional)]
co_nlocals: OptionalArg<u32>,
#[pyarg(named, optional)]
co_stacksize: OptionalArg<u32>,
#[pyarg(named, optional)]
co_code: OptionalArg<crate::builtins::PyBytesRef>,
#[pyarg(named, optional)]
co_linetable: OptionalArg<crate::builtins::PyBytesRef>,
#[pyarg(named, optional)]
co_exceptiontable: OptionalArg<crate::builtins::PyBytesRef>,
#[pyarg(named, optional)]
co_freevars: OptionalArg<Vec<PyObjectRef>>,
#[pyarg(named, optional)]
co_cellvars: OptionalArg<Vec<PyObjectRef>>,
#[pyarg(named, optional)]
co_qualname: OptionalArg<PyStrRef>,
}

#[derive(Clone)]
Expand Down Expand Up @@ -350,6 +366,34 @@ impl PyCode {
vm.ctx.new_tuple(names)
}

#[pygetset]
pub fn co_linetable(&self, vm: &VirtualMachine) -> crate::builtins::PyBytesRef {
// Return empty bytes for now - this should be the new line table format
vm.ctx.new_bytes(vec![])
}

#[pygetset]
pub fn co_exceptiontable(&self, vm: &VirtualMachine) -> crate::builtins::PyBytesRef {
// Return empty bytes for now - this should be exception table
vm.ctx.new_bytes(vec![])
}

#[pymethod]
pub fn co_lines(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
// Return an iterator over (start_offset, end_offset, lineno) tuples
// For now, return an empty iterator
let empty_list = vm.ctx.new_list(vec![]);
vm.call_method(empty_list.as_object(), "__iter__", ())
}

#[pymethod]
pub fn co_positions(&self, vm: &VirtualMachine) -> PyResult<PyObjectRef> {
// Return an iterator over (line, end_line, column, end_column) tuples
// For now, return an iterator that yields None tuples
let empty_list = vm.ctx.new_list(vec![]);
vm.call_method(empty_list.as_object(), "__iter__", ())
}

#[pymethod]
pub fn replace(&self, args: ReplaceArgs, vm: &VirtualMachine) -> PyResult<Self> {
let posonlyarg_count = match args.co_posonlyargcount {
Expand Down Expand Up @@ -408,6 +452,63 @@ impl PyCode {
OptionalArg::Missing => self.code.varnames.iter().map(|s| s.to_object()).collect(),
};

let qualname = match args.co_qualname {
OptionalArg::Present(qualname) => qualname,
OptionalArg::Missing => self.code.qualname.to_owned(),
};

let max_stackdepth = match args.co_stacksize {
OptionalArg::Present(stacksize) => stacksize,
OptionalArg::Missing => self.code.max_stackdepth,
};

let instructions = match args.co_code {
OptionalArg::Present(_code_bytes) => {
// Convert bytes back to instructions
// For now, keep the original instructions
// TODO: Properly parse bytecode from bytes
self.code.instructions.clone()
}
OptionalArg::Missing => self.code.instructions.clone(),
};
Comment on lines +759 to +767
Copy link
Contributor

@coderabbitai coderabbitai bot Sep 15, 2025

Choose a reason for hiding this comment

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

⚠️ Potential issue

co_code parsing TODO leaves API partially inert.

When users pass co_code, it’s ignored. Either parse now or reject with a clear error to avoid surprising behavior.

Apply one of:

-            OptionalArg::Present(_code_bytes) => {
-                // Convert bytes back to instructions
-                // For now, keep the original instructions
-                // TODO: Properly parse bytecode from bytes
-                self.code.instructions.clone()
-            }
+            OptionalArg::Present(_code_bytes) => {
+                return Err(vm.new_not_implemented_error("co_code replacement is not yet supported".to_string()));
+            }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
let instructions = match args.co_code {
OptionalArg::Present(_code_bytes) => {
// Convert bytes back to instructions
// For now, keep the original instructions
// TODO: Properly parse bytecode from bytes
self.code.instructions.clone()
}
OptionalArg::Missing => self.code.instructions.clone(),
};
let instructions = match args.co_code {
OptionalArg::Present(_code_bytes) => {
return Err(vm.new_not_implemented_error("co_code replacement is not yet supported".to_string()));
}
OptionalArg::Missing => self.code.instructions.clone(),
};
🤖 Prompt for AI Agents 
In vm/src/builtins/code.rs around lines 759-767, the code currently ignores
OptionalArg::Present(_code_bytes) for co_code; either implement parsing or
explicitly reject input — update the match so that OptionalArg::Present(_)
returns an immediate error (with a clear message like "co_code is not supported
yet; parsing bytecode is not implemented") instead of silently using
self.code.instructions.clone(), and ensure the function returns the appropriate
error type per surrounding code paths and add/update a unit test asserting that
passing co_code yields the expected error.


let cellvars = match args.co_cellvars {
OptionalArg::Present(cellvars) => cellvars
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
OptionalArg::Missing => self.code.cellvars.clone(),
};

let freevars = match args.co_freevars {
OptionalArg::Present(freevars) => freevars
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
OptionalArg::Missing => self.code.freevars.clone(),
};

// Validate co_nlocals if provided
if let OptionalArg::Present(nlocals) = args.co_nlocals {
if nlocals as usize != varnames.len() {
return Err(vm.new_value_error(format!(
"co_nlocals ({}) != len(co_varnames) ({})",
nlocals,
varnames.len()
)));
}
}

// Note: co_linetable and co_exceptiontable are not stored in CodeObject yet
// They would need to be added to the CodeObject structure
// For now, just validate they are bytes if provided
if let OptionalArg::Present(_linetable) = args.co_linetable {
// Would store linetable if CodeObject supported it
}
if let OptionalArg::Present(_exceptiontable) = args.co_exceptiontable {
// Would store exceptiontable if CodeObject supported it
}

Ok(Self {
code: CodeObject {
flags: CodeFlags::from_bits_truncate(flags),
Expand All @@ -417,10 +518,10 @@ impl PyCode {
source_path: source_path.as_object().as_interned_str(vm).unwrap(),
first_line_number,
obj_name: obj_name.as_object().as_interned_str(vm).unwrap(),
qualname: self.code.qualname,
qualname: qualname.as_object().as_interned_str(vm).unwrap(),

max_stackdepth: self.code.max_stackdepth,
instructions: self.code.instructions.clone(),
max_stackdepth,
instructions,
locations: self.code.locations.clone(),
constants: constants.into_iter().map(Literal).collect(),
names: names
Expand All @@ -431,8 +532,8 @@ impl PyCode {
.into_iter()
.map(|o| o.as_interned_str(vm).unwrap())
.collect(),
cellvars: self.code.cellvars.clone(),
freevars: self.code.freevars.clone(),
cellvars,
freevars,
cell2arg: self.code.cell2arg.clone(),
},
})
Expand Down