Skip to content
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.

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

Adaptations to preprocessing #585

Merged
merged 9 commits into from
Feb 17, 2022
Merged

Adaptations to preprocessing #585

merged 9 commits into from
Feb 17, 2022

Conversation

stilscher
Copy link
Member

This PR includes

  • some fixes for the preprocessing with cilly make
  • some changes in the preprocessing using a compilation database that were required for goblint/bench@#17. In the compilation database of this project, sometimes the -o option was not included in the arguments explicitly and so the preprocessing in Goblint failed. Since the generated compilation database generally looked fine to me and I couldn't find anything about the option -o being a required option in the arguments, I decided to extend the preprocessing in Goblint to handle this case.

@stilscher stilscher requested a review from sim642 February 2, 2022 16:46
@stilscher stilscher marked this pull request as draft February 2, 2022 16:47
@stilscher stilscher mentioned this pull request Feb 2, 2022
@stilscher stilscher changed the title Preprocessing adaptations Adaptations to preprocessing Feb 2, 2022
@stilscher stilscher marked this pull request as ready for review February 3, 2022 16:15
src/util/compilationDatabase.ml Outdated Show resolved Hide resolved
src/util/compilationDatabase.ml Outdated Show resolved Hide resolved
src/util/compilationDatabase.ml Outdated Show resolved Hide resolved
@sim642 sim642 added the bug label Feb 4, 2022
@stilscher stilscher self-assigned this Feb 7, 2022
@stilscher stilscher force-pushed the preprocessing-adaptations branch from 93939a5 to 384b25c Compare February 8, 2022 17:17
Copy link
Member

@sim642 sim642 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will conflict with #587, so I don't know if there's any preference which one should be merged first.

@sim642 sim642 self-assigned this Feb 17, 2022
@sim642
Copy link
Member

sim642 commented Feb 17, 2022

I fixed the merge conflict myself.

@sim642 sim642 merged commit af707f0 into master Feb 17, 2022
@sim642 sim642 deleted the preprocessing-adaptations branch February 17, 2022 14:45
@sim642 sim642 added this to the v2.0.0 milestone Aug 12, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants