Skip to content

make_closure #5955

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.

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
merged 1 commit into from
Jul 12, 2025
Merged

make_closure #5955

merged 1 commit into from
Jul 12, 2025

Conversation

youknowone
Copy link
Member

@youknowone youknowone commented Jul 12, 2025

Summary by CodeRabbit

  • Refactor
    • Improved and unified the handling of function and class code object creation for more consistent closure handling across the app.
  • Bug Fixes
    • Enhanced error handling for closure variable resolution in functions, classes, lambdas, and comprehensions.

Copy link
Contributor

coderabbitai bot commented Jul 12, 2025

Walkthrough

The update refactors function and class code object creation by introducing a unified make_closure method, replacing manual bytecode emission and closure handling. The new method centralizes closure variable loading, code object and qualified name handling, and error checking, consolidating logic previously spread across multiple constructs and methods.

Changes

File(s) Change Summary
compiler/codegen/src/compile.rs Removed build_closure; added make_closure method; replaced manual closure and function/class code object handling with unified helper; improved error handling for closure variables.

Poem

A hop, a skip, refactoring’s delight,
Closures now bundled, code shining bright.
No more scattered steps, just one rabbit’s leap,
Functions and classes, their secrets we keep.
With make_closure’s magic, the bytecode will flow—
Hopping through logic, together we grow!
🐇✨


📜 Recent review details

Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 1630c71 and 5d149b7.

📒 Files selected for processing (1)
  • compiler/codegen/src/compile.rs (7 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • compiler/codegen/src/compile.rs
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (11)
  • GitHub Check: Run snippets and cpython tests on wasm-wasi
  • GitHub Check: Check the WASM package and demo
  • GitHub Check: Run tests under miri
  • GitHub Check: Run snippets and cpython tests (windows-latest)
  • GitHub Check: Run snippets and cpython tests (macos-latest)
  • GitHub Check: Run snippets and cpython tests (ubuntu-latest)
  • GitHub Check: Check Rust code with rustfmt and clippy
  • GitHub Check: Run rust tests (windows-latest)
  • GitHub Check: Run rust tests (macos-latest)
  • GitHub Check: Run rust tests (ubuntu-latest)
  • GitHub Check: Ensure compilation on various targets
✨ Finishing Touches
  • 📝 Generate Docstrings

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
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🔭 Outside diff range comments (2)
compiler/codegen/src/compile.rs (2)

4040-4062: Use qualified name for lambda closures.

The lambda compilation is passing the simple name "<lambda>" instead of using the qualified name that was already set.

Store and use the qualified name:

 let name = "<lambda>".to_owned();
 let func_flags = self
     .enter_function(&name, parameters.as_deref().unwrap_or(&Default::default()))?;
 
 // Set qualname for lambda
-self.set_qualname();
+let qualname = self.set_qualname();
 
 self.ctx = CompileContext {
     loop_data: Option::None,
     in_class: prev_ctx.in_class,
     func: FunctionContext::Function,
 };
 
 self.current_code_info()
     .metadata
     .consts
     .insert_full(ConstantData::None);
 
 self.compile_expression(body)?;
 self.emit_return_value();
 let code = self.exit_scope();
 
 // Create lambda function with closure
-self.make_closure(code, &name, func_flags)?;
+self.make_closure(code, &qualname, func_flags)?;

4512-4607: Use qualified name for comprehension closures.

The comprehension is passing the simple name instead of the qualified name.

 // Set qualname for comprehension
-self.set_qualname();
+let qualname = self.set_qualname();
 
 // ... rest of comprehension compilation ...
 
 // Create comprehension function with closure
-self.make_closure(code, &name, bytecode::MakeFunctionFlags::empty())?;
+self.make_closure(code, &qualname, bytecode::MakeFunctionFlags::empty())?;
🧹 Nitpick comments (2)
compiler/codegen/src/compile.rs (2)

1996-1996: Simplify the iterator by removing unnecessary dereferencing.

The &* dereferencing is unnecessary here.

-        for var in &*code.freevars {
+        for var in &code.freevars {

2034-2037: Avoid unnecessary variable shadowing.

The mutable variable shadowing is unnecessary here. You can modify the existing binding directly.

-            let mut idx = idx;
-            if let SymbolScope::Free = symbol.scope {
+            let idx = if let SymbolScope::Free = symbol.scope {
-                idx += parent_code.metadata.cellvars.len();
+                idx + parent_code.metadata.cellvars.len()
+            } else {
+                idx
-            }
+            };
📜 Review details

Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between ac20b00 and acbea17.

📒 Files selected for processing (1)
  • compiler/codegen/src/compile.rs (7 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

Instructions used from:

Sources:
📄 CodeRabbit Inference Engine

  • .github/copilot-instructions.md
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (10)
  • GitHub Check: Run snippets and cpython tests on wasm-wasi
  • GitHub Check: Check the WASM package and demo
  • GitHub Check: Run tests under miri
  • GitHub Check: Run rust tests (windows-latest)
  • GitHub Check: Run rust tests (macos-latest)
  • GitHub Check: Check Rust code with rustfmt and clippy
  • GitHub Check: Ensure compilation on various targets
  • GitHub Check: Run snippets and cpython tests (ubuntu-latest)
  • GitHub Check: Run snippets and cpython tests (windows-latest)
  • GitHub Check: Run snippets and cpython tests (macos-latest)
🔇 Additional comments (1)
compiler/codegen/src/compile.rs (1)

1985-2067: Well-structured refactoring that consolidates closure handling.

The introduction of make_closure successfully centralizes the complex logic of loading closure variables, handling different symbol scopes, and creating function objects. The error handling is comprehensive and the implementation correctly handles all the edge cases including FREE_CLASS symbols.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

♻️ Duplicate comments (1)
compiler/codegen/src/compile.rs (1)

2263-2264: Use qualified name instead of simple name for class closures.

The make_closure calls for class definitions are passing the simple class name instead of the qualified name. This is inconsistent with how functions handle it and could lead to incorrect qualified names in the bytecode.

Consider modifying compile_class_body to return both the code object and the qualified name, then use the qualified name in the make_closure calls.

Also applies to: 2324-2325

🧹 Nitpick comments (2)
compiler/codegen/src/compile.rs (2)

4041-4041: Capture and use the qualified name for lambda closures.

The lambda compilation sets the qualified name but doesn't capture it. Consider storing the result of self.set_qualname() and passing it to make_closure for consistency:

-// Set qualname for lambda
-self.set_qualname();
+// Set qualname for lambda
+let qualname = self.set_qualname();

Then use it in the make_closure call:

-self.make_closure(code, &name, func_flags)?;
+self.make_closure(code, &qualname, func_flags)?;

Also applies to: 4058-4059


4510-4510: Capture and use the qualified name for comprehension closures.

Similar to lambdas, comprehensions compute but don't use their qualified names. Consider capturing and using the qualified name:

-// Set qualname for comprehension
-self.set_qualname();
+// Set qualname for comprehension
+let qualname = self.set_qualname();

Then use it in the make_closure call:

-self.make_closure(code, name, bytecode::MakeFunctionFlags::empty())?;
+self.make_closure(code, &qualname, bytecode::MakeFunctionFlags::empty())?;

Also applies to: 4603-4604

📜 Review details

Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between acbea17 and 1630c71.

📒 Files selected for processing (1)
  • compiler/codegen/src/compile.rs (7 hunks)
🧰 Additional context used
📓 Path-based instructions (1)
**/*.rs

Instructions used from:

Sources:
📄 CodeRabbit Inference Engine

  • .github/copilot-instructions.md
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (11)
  • GitHub Check: Run snippets and cpython tests (ubuntu-latest)
  • GitHub Check: Run snippets and cpython tests (macos-latest)
  • GitHub Check: Run rust tests (windows-latest)
  • GitHub Check: Run snippets and cpython tests (windows-latest)
  • GitHub Check: Run tests under miri
  • GitHub Check: Check the WASM package and demo
  • GitHub Check: Run snippets and cpython tests on wasm-wasi
  • GitHub Check: Check Rust code with rustfmt and clippy
  • GitHub Check: Run rust tests (macos-latest)
  • GitHub Check: Run rust tests (ubuntu-latest)
  • GitHub Check: Ensure compilation on various targets

@youknowone youknowone merged commit 52d4632 into RustPython:main Jul 12, 2025
12 checks passed
@youknowone youknowone deleted the make-closure branch July 12, 2025 16:00
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.

1 participant
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy