Skip to content

Handle full-width operands in the None-return scanner - #9347

Merged
youknowone merged 1 commit into
RustPython:mainfrom
youknowdot:fix/none-return-full-operands
Oct 25, 2026
Merged

youknowone merged 1 commit into
RustPython:mainfrom
youknowdot:fix/none-return-full-operands

Conversation

@youknowdot

Copy link
Copy Markdown
Contributor

Extract the None-return scanner fix from #8954, without capsule hooks or interpreter lifecycle changes.

The scanner now uses decoded logical instructions and full-width constant indices. Static example: EXTENDED_ARG 1; LOAD_CONST 0 addresses constant256, not constant0. If constant0 is None and constant256 is True, the old scanner incorrectly accepts the return; reversing those constants causes a false rejection.

The split also corrects two issues found during review of the original mega implementation: common-constant decoding is fallible, and loaded constants are checked by None identity rather than converting arbitrary co_consts objects. This avoids new panic paths and unnecessary conversion allocations.

Validation:

  • cargo check -p rustpython-vm --lib --locked, with and without --features threading: passed.
  • cargo clippy -p rustpython-vm --lib --locked, with and without --features threading, using -D warnings: passed.
  • Fresh release build with threading, without capi/JIT/frozen Lib: passed.
  • Existing canonical test.test_code.CodeTest.test_returns_only_none: exactly one test passed, no skips.
  • Normal commit hooks: merge-conflict check, rustfmt and cspell passed.

The canonical test covers ordinary returns; it does not distinguish the extended-operand case. That correction is supported by source-level operand analysis, not an added runtime probe. CPython3.15 explicitly leaves EXTENDED_ARG handling out of its equivalent scanner, so this is RustPython full-width operand correctness rather than a CPython boundary-parity claim. No Python tests or assertions were changed. Full workspace/C-API suites and capsule lifecycle execution were not run.

AI assistance is disclosed in the commit trailer; the exact model identifier was unavailable.

Use decoded logical instructions rather than the preceding raw operand byte. Check referenced constants by None identity and decode common constants without panicking.

Assisted-by: OpenAI Codex:model unavailable
@coderabbitai

coderabbitai Bot commented Oct 25, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Caution

Review failed

The pull request is closed.

Finishing Touches
🧪 Generate unit tests (beta)
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@youknowone
youknowone marked this pull request as ready for review October 25, 2026 06:12
@youknowone
youknowone merged commit 9bd84b2 into RustPython:main Oct 25, 2026
21 checks passed
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 25, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ⚠️ Failed 2026-10-25T06:14:00.699805Z
We couldn’t complete this review. Comment @codex review to try again.
77239e2 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

youknowdot added a commit to youknowdot/RustPython that referenced this pull request Oct 25, 2026
Integrate main at 9bd84b2 while preserving the published mega history.
Keep the authentic profiler locator and capabilities from RustPython#9340, set-cycle
GC from RustPython#9343, backward-compatible bytecode tooling from RustPython#9344, package
paths from RustPython#9345, canonical Levenshtein coverage from RustPython#9346, and the safe
full-width None-return scanner from RustPython#9347.

Regenerate support helpers through the official updater from unchanged
CPython d220409a13b7, preserving four exact existing-main neighborhoods.
Retain the newer main specialization/C-stack helpers, Cargo environment
adaptation, prior isolation checks and remaining Python 3.15 updates.
The obsolete manual capability guard is superseded by the genuine API.

Preserve unlanded explicit sharing modes and opcode override support.
Ruff and XML vendor sources remain unchanged.

Validation: normal hooks, locked host_env/VM/stdlib library check and
strict Clippy, and the default CLI build. No target-runtime or full-suite
pass is claimed for this composition.

Assisted-by: OpenAI Codex:model version unavailable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants