Skip to content

Replace C2C.atom_is_extern by more robust criterion C2C.atom_is_external #538

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
xavierleroy merged 3 commits into from
Nov 22, 2024
Merged

Replace C2C.atom_is_extern by more robust criterion C2C.atom_is_external #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df2712
Replace `C2C.atom_is_extern` by more robust criterion `C2C.atom_is_ex…
xavierleroy Nov 19, 2024
70e85cc
Further refine the `C2C.atom_is_external` criterion in "no-common" mode
xavierleroy Nov 21, 2024
ff0875d
Regression test for #537
xavierleroy Nov 22, 2024
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
2 changes: 1 addition & 1 deletion aarch64/extractionMachdep.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Extract Constant Archi.abi =>

Extract Constant SelectOp.symbol_is_relocatable =>
"match Configuration.system with
| ""macos"" -> C2C.atom_is_extern
| ""macos"" -> C2C.atom_is_external
| _ -> (fun _ -> false)".

(* Asm *)
Expand Down
18 changes: 13 additions & 5 deletions cfrontend/C2C.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ type inline_status =

type atom_info =
{ a_storage: C.storage; (* storage class *)
a_defined: bool; (* defined in the current comp. unit? *)
a_size: int64 option; (* size in bytes *)
a_alignment: int option; (* alignment *)
a_sections: Sections.section_name list; (* in which section to put it *)
Expand All @@ -51,11 +52,14 @@ let atom_is_static a =
with Not_found ->
false

let atom_is_extern a =
try
(Hashtbl.find decl_atom a).a_storage = C.Storage_extern
with Not_found ->
false
(* Is it possible for symbol [a] to be defined in a DLL? *)
let atom_is_external a =
match Hashtbl.find decl_atom a with
| { a_defined = true } -> false
| { a_storage = C.Storage_static } -> false
| { a_storage = C.Storage_default; a_size = Some _ } -> !Clflags.option_fcommon
| _ -> true
| exception Not_found -> true

let atom_alignof a =
try
Expand Down Expand Up @@ -588,6 +592,7 @@ let name_for_string_literal s =
let mergeable = if is_C_string s then 1 else 0 in
Hashtbl.add decl_atom id
{ a_storage = C.Storage_static;
a_defined = true;
a_alignment = Some 1;
a_size = Some (Int64.of_int (String.length s + 1));
a_sections = [Sections.for_stringlit mergeable];
Expand Down Expand Up @@ -623,6 +628,7 @@ let name_for_wide_string_literal s ik =
let mergeable = if is_C_wide_string s then wchar_size else 0 in
Hashtbl.add decl_atom id
{ a_storage = C.Storage_static;
a_defined = true;
a_alignment = Some wchar_size;
a_size = Some (Int64.(mul (of_int (List.length s + 1))
(of_int wchar_size)));
Expand Down Expand Up @@ -1156,6 +1162,7 @@ let convertFundef loc env fd =
Debug.atom_global fd.fd_name id';
Hashtbl.add decl_atom id'
{ a_storage = fd.fd_storage;
a_defined = true;
a_alignment = None;
a_size = None;
a_sections = Sections.for_function env loc id' fd.fd_attrib;
Expand Down Expand Up @@ -1247,6 +1254,7 @@ let convertGlobvar loc env (sto, id, ty, optinit) =
error "'%s' has incomplete type" id.name;
Hashtbl.add decl_atom id'
{ a_storage = sto;
a_defined = optinit <> None;
a_alignment = Some (Z.to_int al);
a_size = Some (Z.to_int64 sz);
a_sections = [section];
Expand Down
2 changes: 1 addition & 1 deletion test
Open in desktop
Submodule test updated 5 files
+1 −1 regression/Makefile
+1 −0 regression/Results/alias
+1 −0 regression/Results/extern2
+14 −0 regression/alias.c
+16 −0 regression/extern2.c
4 changes: 2 additions & 2 deletions x86/extractionMachdep.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ Extract Constant Archi.win64 =>

Extract Constant SelectOp.symbol_is_external =>
"match Configuration.system with
| ""macos"" -> C2C.atom_is_extern
| ""cygwin"" when Archi.ptr64 -> C2C.atom_is_extern
| ""macos"" -> C2C.atom_is_external
| ""cygwin"" when Archi.ptr64 -> C2C.atom_is_external
| _ -> (fun _ -> false)".