[WIP] Model unsafe functions as noncomputable #2978
Conversation
gherrit-pr-id: G8b674511787c67f5fdb20d28e10d9387316037ae
Summary of ChangesHello @joshlf, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request fundamentally changes how Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Changelog
Activity
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request refactors the handling of unsafe functions marked as lean model. Instead of generating a Rust shim that panics, their bodies are now replaced with loop {} in a shadow crate. This change allows them to be modeled as noncomputable functions in Lean. The implementation involves updating the shadow crate generation, passing opaque function information to Charon, and generating noncomputable defs in a new FunsExternal.lean file. The changes are well-aligned with the goal of the PR. My review includes suggestions to address some code duplication and remove leftover development artifacts for better code clarity and maintainability.
| let (predicate, binders) = if let Some(ens) = &ensures_clause { | ||
| let (binders, logic) = parse_binders(ens)?; | ||
| let mut full = logic; | ||
| if !logic_lines.is_empty() { | ||
| for l in &logic_lines { | ||
| full.push_str("\n "); | ||
| full.push_str(l); | ||
| } | ||
| } | ||
| (Some(full), binders) | ||
| } else { | ||
| (None, Vec::new()) | ||
| }; |
There was a problem hiding this comment.
This block of code duplicates the logic from lines 55-70 for parsing the ensures clause and concatenating logic lines. To improve maintainability and avoid redundancy, this logic should be computed once and the result reused.
| if !funs_external_content.is_empty() { | ||
| fs::write(dest.join("FunsExternal.lean"), funs_external_content)?; | ||
| } |
There was a problem hiding this comment.
The condition !funs_external_content.is_empty() will always evaluate to true because funs_external_content is initialized with import statements and namespace declarations. This results in an empty FunsExternal.lean file being created even when there are no model functions. It would be more precise to only create this file if there are actual models to write.
| if !funs_external_content.is_empty() { | |
| fs::write(dest.join("FunsExternal.lean"), funs_external_content)?; | |
| } | |
| if functions.iter().any(|f| f.is_model) { | |
| fs::write(dest.join("FunsExternal.lean"), funs_external_content)?; | |
| } |
| // mod charon { pub use charon_macros::opaque; } | ||
| // We need `charon_macros` to exist or be faked. | ||
| // Actually, since we rewrite the crate, we can just define a dummy `opaque` attribute logic? | ||
| // Rustc allows custom attributes if they are mapped to a tool or via `register_tool` (nightly). | ||
| // For stable, we might need a dummy macro or just `allow` it? | ||
| // But `#[charon::opaque]` looks like a path attribute. | ||
| // Let's define: `pub mod charon { pub use crate::hermes_std::opaque; }` | ||
| // and in `hermes_std` define `pub use ...`? | ||
| // Simpler: define `mod charon` right here which exports a dummy `opaque` attribute macro? | ||
| // Attributes must be macros. |
There was a problem hiding this comment.
These comments appear to be development notes or thoughts about implementation details. They should be removed to keep the code clean and focused on the implementation itself.
| // Debugging loop | ||
| /* | ||
| for attr in attrs { | ||
| if attr.path().is_ident("doc") { | ||
| println!("Found doc attr: {:?}", attr); | ||
| } | ||
| } | ||
| */ |
There was a problem hiding this comment.
This commented-out debugging loop should be removed from the final code.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## G0b9216c6738c722e3424be5ee5e085157b5813f9 #2978 +/- ##
==========================================================================
Coverage 92.02% 92.02%
==========================================================================
Files 19 19
Lines 6029 6029
==========================================================================
Hits 5548 5548
Misses 481 481 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
2 participants
⬇️ Download this PR
Branch
git fetch origin refs/heads/G8b674511787c67f5fdb20d28e10d9387316037ae && git checkout -b pr-G8b674511787c67f5fdb20d28e10d9387316037ae FETCH_HEADCheckout
git fetch origin refs/heads/G8b674511787c67f5fdb20d28e10d9387316037ae && git checkout FETCH_HEADCherry Pick
git fetch origin refs/heads/G8b674511787c67f5fdb20d28e10d9387316037ae && git cherry-pick FETCH_HEADPull
Stacked PRs enabled by GHerrit.