Remove global state from Pretty
#187
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since all of these refs have local scope.
michael-schwarz
approved these changes
Jul 25, 2025
|
Anything still blocking the merge? Would be good to get this also into Goblint soon. |
1 task
|
I would like to run this with the parallel solver (planned for today) |
sim642
added a commit
to sim642/opam-repository
that referenced
this pull request
Sep 2, 2025
CHANGES: * Add `_Float16` type support (goblint/cil#190, goblint/cil#193). * Add C23 `alignof` and `alignas` support (goblint/cil#189, goblint/cil#191). * Add initializer support for anonymous struct in union (goblint/cil#176, goblint/cil#184). * Fix enumerator printing (goblint/cil#185). * Remove global state from `Pretty` (goblint/cil#187). * Remove OCaml <4.12 support (goblint/cil#180, goblint/cil#181). * Use `gnu11` standard in most tests (goblint/cil#188, goblint/cil#192).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
All global state is replaced by a record which is passed around. The global state was there just due to laziness:
cil/src/ocamlutil/pretty.ml
Line 270 in d1db705
The record is fresh for each call to
Pretty, so there should be no races between domains or with signal handlers.This also simplifies the handling of nested calls to
Pretty, which have previously been buggy: PR #133.The only global state I kept is
countNewLines, although nothing actually uses it. It's madeAtomic.t(which also exists on OCaml 4 for compatibility, without domain_shims or anything). But we could also just remove it.As far as I can immediately tell, there should be no regressions from this: all CIL and Goblint tests pass. The latter cram tests have output entirely based on
Pretty(including transformation tests pretty-printing C code) and nothing changed.TODO