Skip to content

Merging: Treat inlines as if they were static when mergeInlines is off #86

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Mar 28, 2022
Merged

Merging: Treat inlines as if they were static when mergeInlines is off #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e3c2b38
Mnaul formatting
michael-schwarz Mar 27, 2022
f3c9437
Rewrite some convoluted logic
michael-schwarz Mar 27, 2022
756c763
Pull out priuntout madness
michael-schwarz Mar 27, 2022
4719bab
Force rename of inline things when not merging inlines
michael-schwarz Mar 27, 2022
d835fa7
Undo some questionable ocamlformat things
michael-schwarz Mar 27, 2022
d8822fb
Add check for multiple fundecs for same global
michael-schwarz Mar 27, 2022
84eebec
Fix error message text
michael-schwarz Mar 27, 2022
78fbc13
Clarify condition
michael-schwarz Mar 28, 2022
bc9a707
Fix indentation
michael-schwarz Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/check.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ let varIdsEnv: (int, varinfo) H.t = H.create 117
* identifiers *)
let allVarIds: (int, varinfo) H.t = H.create 117

let fundecForVarIds: (int,unit) H.t = H.create 117

(* Also keep a list of environments. We place an empty string in the list to
* mark the start of a local environment (i.e. a function) *)
let varNamesList : (string * int) list ref = ref []
Expand Down Expand Up @@ -961,6 +963,9 @@ let rec checkGlobal = function
(* Check if this is the first occurrence *)
let vi = fd.svar in
let fname = vi.vname in
if H.mem fundecForVarIds vi.vid then
ignore (warn "There already is a different fundec for vid %d (%s)" vi.vid vi.vname);

E.withContext (fun _ -> dprintf "GFun(%s)" fname)
(fun _ ->
checkGlobal (GVarDecl (vi, l));
Expand Down Expand Up @@ -1072,6 +1077,7 @@ let checkFile flags fl =
H.clear varNamesEnv;
H.clear varIdsEnv;
H.clear allVarIds;
H.clear fundecForVarIds;
H.clear compNames;
H.clear compUsed;
H.clear enumUsed;
Expand Down
Loading