[Logic] include both locations in merge warnings (9f8d84d3) · Commits · pub / frama-c · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frama-c
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

9f8d84d3

Commit 9f8d84d3 authored 5 years ago by Andre Maroneze Committed by Virgile Prevosto 5 years ago

Downloads
- Patches
- Plain Diff

[Logic] include both locations in merge warnings

parent 2f040e96

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/kernel_internals/typing/cabs2cil.ml 6 additions, 4 deletions

src/kernel_internals/typing/cabs2cil.ml
src/kernel_services/ast_data/globals.ml 2 additions, 1 deletion

src/kernel_services/ast_data/globals.ml
src/kernel_services/ast_queries/logic_utils.ml 30 additions, 14 deletions

src/kernel_services/ast_queries/logic_utils.ml
src/kernel_services/ast_queries/logic_utils.mli 7 additions, 4 deletions

src/kernel_services/ast_queries/logic_utils.mli
tests/spec/oracle/merge_1.res.oracle 2 additions, 1 deletion

tests/spec/oracle/merge_1.res.oracle
tests/spec/oracle/merge_bts938.res.oracle 6 additions, 3 deletions

tests/spec/oracle/merge_bts938.res.oracle
tests/spec/oracle/multiple_spec.res.oracle 2 additions, 2 deletions

tests/spec/oracle/multiple_spec.res.oracle
tests/syntax/oracle/attributes-declarations-definitions.res.oracle 2 additions, 2 deletions

...tax/oracle/attributes-declarations-definitions.res.oracle
tests/syntax/oracle/rettype.res.oracle 2 additions, 1 deletion

tests/syntax/oracle/rettype.res.oracle

with 59 additions and 32 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment