From 8541a3da997c5e50aa297d76e57030527737960b Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Tue, 19 Feb 2019 10:50:39 +0100
Subject: [PATCH] [kernel] fix initialization of built-ins in a visitor-created
project
Actually `create_from_visitor` was correct, but its sibling
`init_project_from_visitor` wasn't if not called from `create_from_visitor` and
is (erroneously?) exported in `file.mli`
---
src/kernel_services/ast_queries/file.ml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index 7621c2488ce..3e49d89eeee 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -1600,7 +1600,7 @@ let init_project_from_visitor ?(reorder=false) prj
then
Kernel.fatal
"Visitor does not copy or does not operate on correct project.";
- Project.on prj (fun () -> Cil.initCIL (fun () -> ()) (get_machdep ())) ();
+ Project.on prj init_cil ();
let old_ast = Ast.get () in
let ast = visitFramacFileCopy vis old_ast in
let finalize ast =
@@ -1637,7 +1637,6 @@ let create_project_from_visitor ?reorder ?(last=true) prj_name visitor =
Project.copy
~selection:(Parameter_state.get_reset_selection ()) ~src:temp prj;
Project.remove ~project:temp ();
- Project.on prj init_cil ();
prepare_from_visitor ?reorder prj visitor;
prj
--
GitLab