mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ExternOptions.dll_storage_class to is_dll_import

Browse Source 
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.
This commit is contained in:
kcbanner 2024-10-20 18:20:08 -04:00
parent a4690ecb1f
commit b87fa93500
3 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/std/builtin.zig
View File

@ -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

19
src/Sema.zig
View File

@ -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 dll_storage_class_val = try sema.resolveConstDefinedValue(block, dll_storage_class_src, dll_storage_class_ref, .{
.needed_comptime_reason = "dll_storage_class of the extern symbol must be comptime-known",
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 is_dll_import_val = try sema.resolveConstDefinedValue(block, dll_import_src, is_dll_import_ref, .{
.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.

6
src/Zcu.zig
View File

@ -1522,7 +1522,7 @@ pub const SrcLoc = struct {
.init_field_cache,
.init_field_library,
.init_field_thread_local,
.init_field_dll_storage_class,
.init_field_dll_import,
=> |builtin_call_node| {
const wanted = switch (src_loc.lazy) {
.init_field_name => "name",
@ -1534,7 +1534,7 @@ pub const SrcLoc = struct {
.init_field_cache => "cache",
.init_field_library => "library",
.init_field_thread_local => "thread_local",
.init_field_dll_storage_class => "dll_storage_class",
.init_field_dll_import => "dll_import",
else => unreachable,
};
const tree = try src_loc.file_scope.getTree(gpa);
@ -1961,7 +1961,7 @@ pub const LazySrcLoc = struct {
init_field_cache: i32,
init_field_library: i32,
init_field_thread_local: i32,
init_field_dll_storage_class: i32,
init_field_dll_import: i32,
/// The source location points to the value of an item in a specific
/// case of a `switch`.
switch_case_item: SwitchItem,