Commit b87fa93500380068b0fd1db6cd73623f3fbfa284 | zig

author	Casey Banner <kcbanner@gmail.com> 2024-10-20 18:20:08-04:00
committer	Casey Banner <kcbanner@gmail.com> 2024-10-22 12:41:35-04:00
log	b87fa93500380068b0fd1db6cd73623f3fbfa284
tree	c777094804204382d741b7e5e03c038d363651de
parent	a4690ecb1fc8a9ac5f7dfccfdf9f67c7a74e1569

Change `ExternOptions.dll_storage_class` to `is_dll_import`

It wouldn't make sense to have passe `.export` here, and that was
in fact a compile error - so simply make this a bool instead.

3 files changed, 11 insertions(+), 24 deletions(-)

lib
- std
  - builtin.zig
src
- Sema.zig
- Zcu.zig

lib/std/builtin.zig+1-9

 @@ -68,14 +68,6 @@ pub const GlobalLinkage = enum {
     link_once,
 };
-/// This data structure is used by the Zig language code generation and
-/// therefore must be kept in sync with the compiler implementation.
-pub const DllStorageClass = enum {
-    default,
-    import,
-    @"export",
-};
 /// This data structure is used by the Zig language code generation and
 /// therefore must be kept in sync with the compiler implementation.
 pub const SymbolVisibility = enum {
 @@ -691,7 +683,7 @@ pub const ExternOptions = struct {
     library_name: ?[]const u8 = null,
     linkage: GlobalLinkage = .strong,
     is_thread_local: bool = false,
-    dll_storage_class: DllStorageClass = .default,
+    is_dll_import: bool = false,
 };
 /// This data structure is used by the Zig language code generation and

src/Sema.zig+7-12

 @@ -26970,7 +26970,7 @@ fn resolveExternOptions(
     library_name: InternPool.OptionalNullTerminatedString = .none,
     linkage: std.builtin.GlobalLinkage = .strong,
     is_thread_local: bool = false,
-    dll_storage_class: std.builtin.DllStorageClass = .default,
+    is_dll_import: bool = false,
 } {
     const pt = sema.pt;
     const zcu = pt.zcu;
 @@ -26984,7 +26984,7 @@ fn resolveExternOptions(
     const library_src = block.src(.{ .init_field_library = src.offset.node_offset_builtin_call_arg.builtin_call_node });
     const linkage_src = block.src(.{ .init_field_linkage = src.offset.node_offset_builtin_call_arg.builtin_call_node });
     const thread_local_src = block.src(.{ .init_field_thread_local = src.offset.node_offset_builtin_call_arg.builtin_call_node });
-    const dll_storage_class_src = block.src(.{ .init_field_dll_storage_class = src.offset.node_offset_builtin_call_arg.builtin_call_node });
+    const dll_import_src = block.src(.{ .init_field_dll_import = src.offset.node_offset_builtin_call_arg.builtin_call_node });
     const name_ref = try sema.fieldVal(block, src, options, try ip.getOrPutString(gpa, pt.tid, "name", .no_embedded_nulls), name_src);
     const name = try sema.toConstString(block, name_src, name_ref, .{
 @@ -27018,11 +27018,10 @@ fn resolveExternOptions(
         break :library_name library_name;
     } else null;
-    const dll_storage_class_ref = try sema.fieldVal(block, src, options, try ip.getOrPutString(gpa, pt.tid, "dll_storage_class", .no_embedded_nulls), dll_storage_class_src);
+    const is_dll_import_ref = try sema.fieldVal(block, src, options, try ip.getOrPutString(gpa, pt.tid, "is_dll_import", .no_embedded_nulls), dll_import_src);
-    const dll_storage_class_val = try sema.resolveConstDefinedValue(block, dll_storage_class_src, dll_storage_class_ref, .{
+    const is_dll_import_val = try sema.resolveConstDefinedValue(block, dll_import_src, is_dll_import_ref, .{
-        .needed_comptime_reason = "dll_storage_class of the extern symbol must be comptime-known",
+        .needed_comptime_reason = "it must be comptime-known if the symbol is imported from a dll",
     });
-    const dll_storage_class = zcu.toEnum(std.builtin.DllStorageClass, dll_storage_class_val);
     if (name.len == 0) {
         return sema.fail(block, name_src, "extern symbol name cannot be empty", .{});
 @@ -27032,16 +27031,12 @@ fn resolveExternOptions(
         return sema.fail(block, linkage_src, "extern symbol must use strong or weak linkage", .{});
     }
-    if (dll_storage_class == .@"export") {
-        return sema.fail(block, dll_storage_class_src, "extern symbol cannot have export dll storage class", .{});
-    }
     return .{
         .name = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls),
         .library_name = try ip.getOrPutStringOpt(gpa, pt.tid, library_name, .no_embedded_nulls),
         .linkage = linkage,
         .is_thread_local = is_thread_local_val.toBool(),
-        .dll_storage_class = dll_storage_class,
+        .is_dll_import = is_dll_import_val.toBool(),
     };
 }
 @@ -27087,7 +27082,7 @@ fn zirBuiltinExtern(
         .is_const = ptr_info.flags.is_const,
         .is_threadlocal = options.is_thread_local,
         .is_weak_linkage = options.linkage == .weak,
-        .is_dll_import = options.dll_storage_class == .import,
+        .is_dll_import = options.is_dll_import,
         .alignment = ptr_info.flags.alignment,
         .@"addrspace" = ptr_info.flags.address_space,
         // This instruction is just for source locations.

src/Zcu.zig+3-3

...	@@ -1522,7 +1522,7 @@ pub const SrcLoc = struct {	...	@@ -1522,7 +1522,7 @@ pub const SrcLoc = struct {
1522	.init_field_cache,	1522	.init_field_cache,
1523	.init_field_library,	1523	.init_field_library,
1524	.init_field_thread_local,	1524	.init_field_thread_local,
1525	.init_field_dll_storage_class,	1525	.init_field_dll_import,
1526	=> \|builtin_call_node\| {	1526	=> \|builtin_call_node\| {
1527	const wanted = switch (src_loc.lazy) {	1527	const wanted = switch (src_loc.lazy) {
1528	.init_field_name => "name",	1528	.init_field_name => "name",
...	@@ -1534,7 +1534,7 @@ pub const SrcLoc = struct {	...	@@ -1534,7 +1534,7 @@ pub const SrcLoc = struct {
1534	.init_field_cache => "cache",	1534	.init_field_cache => "cache",
1535	.init_field_library => "library",	1535	.init_field_library => "library",
1536	.init_field_thread_local => "thread_local",	1536	.init_field_thread_local => "thread_local",
1537	.init_field_dll_storage_class => "dll_storage_class",	1537	.init_field_dll_import => "dll_import",
1538	else => unreachable,	1538	else => unreachable,
1539	};	1539	};
1540	const tree = try src_loc.file_scope.getTree(gpa);	1540	const tree = try src_loc.file_scope.getTree(gpa);
...	@@ -1961,7 +1961,7 @@ pub const LazySrcLoc = struct {	...	@@ -1961,7 +1961,7 @@ pub const LazySrcLoc = struct {
1961	init_field_cache: i32,	1961	init_field_cache: i32,
1962	init_field_library: i32,	1962	init_field_library: i32,
1963	init_field_thread_local: i32,	1963	init_field_thread_local: i32,
1964	init_field_dll_storage_class: i32,	1964	init_field_dll_import: i32,
1965	/// The source location points to the value of an item in a specific	1965	/// The source location points to the value of an item in a specific
1966	/// case of a `switch`.	1966	/// case of a `switch`.
1967	switch_case_item: SwitchItem,	1967	switch_case_item: SwitchItem,