Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
frama-c
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pub
frama-c
Commits
e687dc19
Commit
e687dc19
authored
3 years ago
by
Andre Maroneze
Browse files
Options
Downloads
Patches
Plain Diff
[Eva] prevent crash with -audit-prepare before -then
parent
54e6af01
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/kernel_services/ast_queries/file.ml
+8
-1
8 additions, 1 deletion
src/kernel_services/ast_queries/file.ml
src/plugins/value/engine/analysis.ml
+8
-1
8 additions, 1 deletion
src/plugins/value/engine/analysis.ml
with
16 additions
and
2 deletions
src/kernel_services/ast_queries/file.ml
+
8
−
1
View file @
e687dc19
...
...
@@ -1766,7 +1766,14 @@ let prepare_from_c_files () =
let
audit_path
=
Kernel
.
AuditPrepare
.
get
()
in
if
not
(
Filepath
.
Normalized
.
is_empty
audit_path
)
then
begin
let
all_sources_tbl
=
compute_sources_table
cpp_commands
in
print_all_sources
audit_path
all_sources_tbl
;
begin
try
print_all_sources
audit_path
all_sources_tbl
with
Json
.
CannotMerge
_
->
Kernel
.
abort
"%s already computed; it should be set by itself, \
after the last '-then' in the command line."
Kernel
.
AuditPrepare
.
option_name
end
;
if
not
(
Filepath
.
Normalized
.
is_special_stdout
audit_path
)
then
Kernel
.
feedback
"Audit: sources list written to: %a@."
Filepath
.
Normalized
.
pretty
audit_path
;
...
...
This diff is collapsed.
Click to expand it.
src/plugins/value/engine/analysis.ml
+
8
−
1
View file @
e687dc19
...
...
@@ -176,7 +176,14 @@ let force_compute () =
if
not
(
Kernel
.
AuditCheck
.
is_empty
()
)
then
Eva_audit
.
check_configuration
(
Kernel
.
AuditCheck
.
get
()
);
if
not
(
Kernel
.
AuditPrepare
.
is_empty
()
)
then
Eva_audit
.
print_configuration
(
Kernel
.
AuditPrepare
.
get
()
);
begin
try
Eva_audit
.
print_configuration
(
Kernel
.
AuditPrepare
.
get
()
);
with
Json
.
CannotMerge
_
->
Kernel
.
abort
"%s already computed; it should be set by itself, \
after the last '-then' in the command line."
Kernel
.
AuditPrepare
.
option_name
end
;
let
kf
,
lib_entry
=
Globals
.
entry_point
()
in
reset_analyzer
()
;
let
module
Analyzer
=
(
val
snd
!
ref_analyzer
)
in
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment