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
Snippets
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
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
Charles Southerland
frama-c
Commits
e76a0b77
Commit
e76a0b77
authored
5 years ago
by
Julien Signoles
Browse files
Options
Downloads
Patches
Plain Diff
[e-acsl:archi] fix bug with constinit
parent
d44a1535
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/plugins/e-acsl/src/code_generator/injector.ml
+4
-6
4 additions, 6 deletions
src/plugins/e-acsl/src/code_generator/injector.ml
src/plugins/e-acsl/src/project_initializer/dup_functions.ml
+1
-1
1 addition, 1 deletion
src/plugins/e-acsl/src/project_initializer/dup_functions.ml
with
5 additions
and
7 deletions
src/plugins/e-acsl/src/code_generator/injector.ml
+
4
−
6
View file @
e76a0b77
...
@@ -59,8 +59,6 @@ let rec inject_in_init env kf_opt vi off = function
...
@@ -59,8 +59,6 @@ let rec inject_in_init env kf_opt vi off = function
if
vi
.
vglob
then
Global_observer
.
add_initializer
vi
off
init
;
if
vi
.
vglob
then
Global_observer
.
add_initializer
vi
off
init
;
let
e
,
env
=
replace_literal_string_in_exp
env
kf_opt
e
in
let
e
,
env
=
replace_literal_string_in_exp
env
kf_opt
e
in
SingleInit
e
,
env
SingleInit
e
,
env
|
CompoundInit
(
_
,
[]
)
as
init
->
init
,
env
|
CompoundInit
(
typ
,
l
)
->
|
CompoundInit
(
typ
,
l
)
->
let
l
,
env
=
let
l
,
env
=
List
.
fold_left
List
.
fold_left
...
@@ -115,12 +113,12 @@ let inject_in_local_init loc env kf vi = function
...
@@ -115,12 +113,12 @@ let inject_in_local_init loc env kf vi = function
|
ConsInit
(
vi
,
l
,
ck
)
->
|
ConsInit
(
vi
,
l
,
ck
)
->
let
l
,
env
=
let
l
,
env
=
List
.
fold_
lef
t
List
.
fold_
righ
t
(
fun
(
l
,
env
)
e
->
(
fun
e
(
l
,
env
)
->
let
e
,
env
=
replace_literal_string_in_exp
env
(
Some
kf
)
e
in
let
e
,
env
=
replace_literal_string_in_exp
env
(
Some
kf
)
e
in
e
::
l
,
env
)
e
::
l
,
env
)
([]
,
env
)
l
l
([]
,
env
)
in
in
ConsInit
(
vi
,
l
,
ck
)
,
env
ConsInit
(
vi
,
l
,
ck
)
,
env
...
@@ -768,7 +766,7 @@ let reset_all ast =
...
@@ -768,7 +766,7 @@ let reset_all ast =
Typing
.
clear
()
;
Typing
.
clear
()
;
Cfg
.
clearFileCFG
~
clear_id
:
false
ast
;
Cfg
.
clearFileCFG
~
clear_id
:
false
ast
;
Cfg
.
computeFileCFG
ast
;
Cfg
.
computeFileCFG
ast
;
Kernel_function
.
clear_sid_info
()
;
Kernel_function
.
clear_sid_info
()
;
(* [ARCHI] is it really useful? *)
Ast
.
mark_as_grown
()
Ast
.
mark_as_grown
()
let
inject
()
=
let
inject
()
=
...
...
This diff is collapsed.
Click to expand it.
src/plugins/e-acsl/src/project_initializer/dup_functions.ml
+
1
−
1
View file @
e76a0b77
...
@@ -415,7 +415,7 @@ let dup () =
...
@@ -415,7 +415,7 @@ let dup () =
Options
.
feedback
~
level
:
2
"duplicating annotated functions"
;
Options
.
feedback
~
level
:
2
"duplicating annotated functions"
;
let
prj
=
let
prj
=
File
.
create_project_from_visitor
File
.
create_project_from_visitor
"e_acsl_dup_functions"
"e_acsl_dup_functions"
(
new
dup_functions_visitor
)
(
new
dup_functions_visitor
)
in
in
Queue
.
iter
(
fun
f
->
f
()
)
actions
;
Queue
.
iter
(
fun
f
->
f
()
)
actions
;
...
...
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