Skip to content

[FIX] do not hold the borrow onf ile_info for recursive evaluations #462

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

[FIX] do not hold the borrow onf ile_info for recursive evaluations #462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions server/src/core/python_arch_eval.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,20 +87,22 @@ impl PythonArchEval {
file_info_rc.borrow_mut().prepare_ast(session);
}
let file_info = (*file_info_rc).borrow();
if file_info.file_info_ast.borrow().indexed_module.is_some() {
let file_info_ast = file_info.file_info_ast.clone();
drop(file_info);
if file_info_ast.borrow().indexed_module.is_some() {
let old_noqa = session.current_noqa.clone();
session.current_noqa = symbol.borrow().get_noqas();
let file_info_ast = file_info.file_info_ast.borrow();
let file_info_ast_bw = file_info_ast.borrow();
let (ast, maybe_func_stmt) = match self.file_mode {
true => {
if file_info_ast.text_hash != symbol.borrow().get_processed_text_hash(){
if file_info_ast_bw.text_hash != symbol.borrow().get_processed_text_hash(){
symbol.borrow_mut().set_build_status(BuildSteps::ARCH_EVAL, BuildStatus::INVALID);
return;
}
(file_info_ast.get_stmts().unwrap(), None)
(file_info_ast_bw.get_stmts().unwrap(), None)
},
false => {
let func_stmt = file_info_ast.indexed_module.as_ref().unwrap().get_by_index(self.sym_stack[0].borrow().node_index().unwrap().load());
let func_stmt = file_info_ast_bw.indexed_module.as_ref().unwrap().get_by_index(self.sym_stack[0].borrow().node_index().unwrap().load());
match func_stmt {
AnyRootNodeRef::Stmt(Stmt::FunctionDef(func_stmt)) => {
(&func_stmt.body, Some(func_stmt))
Expand All @@ -120,7 +122,6 @@ impl PythonArchEval {
}
session.current_noqa = old_noqa;
}
drop(file_info);
if self.file_mode {
file_info_rc.borrow_mut().replace_diagnostics(BuildSteps::ARCH_EVAL, self.diagnostics.clone());
PythonArchEvalHooks::on_file_eval(session, &self.entry_point, symbol.clone());
Expand Down