authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-03-02 14:51:29-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-03-02 14:51:29-05:00
log446324a1d82514157f5a11a6ca775711bc48c419
tree3a6c1fb0fe76ff999cc89a03aa7f09fdc8cf5c5b
parent7fc8dd66427dd0abed5ca9195e6afdbb687bd5f5
parent403a1fe5d767e801b58fc706eaa54f1171ae27de
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #11025 from Vexu/stage2

stage2: implement `@extern`

6 files changed, 178 insertions(+), 31 deletions(-)

lib/std/special/test_runner.zig+2-3
......@@ -46,10 +46,9 @@ pub fn main() void {
4646
4747 var leaks: usize = 0;
4848 for (test_fn_list) |test_fn, i| {
49 const gpa_works = builtin.zig_backend == .stage1 or builtin.os.tag != .macos;
50 if (gpa_works) std.testing.allocator_instance = .{};
49 std.testing.allocator_instance = .{};
5150 defer {
52 if (gpa_works and std.testing.allocator_instance.deinit()) {
51 if (std.testing.allocator_instance.deinit()) {
5352 leaks += 1;
5453 }
5554 }
src/Module.zig+1
......@@ -1529,6 +1529,7 @@ pub const Var = struct {
15291529 is_extern: bool,
15301530 is_mutable: bool,
15311531 is_threadlocal: bool,
1532 is_weak_linkage: bool,
15321533
15331534 pub fn deinit(variable: *Var, gpa: Allocator) void {
15341535 if (variable.lib_name) |lib_name| {
src/Sema.zig+134-23
......@@ -12371,7 +12371,7 @@ fn zirIntToPtr(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Ai
1237112371 const type_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = inst_data.src_node };
1237212372 const type_res = try sema.resolveType(block, src, extra.lhs);
1237312373 try sema.checkPtrType(block, type_src, type_res);
12374 _ = try sema.resolveTypeLayout(block, src, type_res.childType());
12374 try sema.resolveTypeLayout(block, src, type_res.elemType2());
1237512375 const ptr_align = type_res.ptrAlignment(sema.mod.getTarget());
1237612376
1237712377 if (try sema.resolveDefinedValue(block, operand_src, operand_coerced)) |val| {
......@@ -13019,20 +13019,24 @@ fn resolveExportOptions(
1301913019) CompileError!std.builtin.ExportOptions {
1302013020 const export_options_ty = try sema.getBuiltinType(block, src, "ExportOptions");
1302113021 const air_ref = sema.resolveInst(zir_ref);
13022 const coerced = try sema.coerce(block, export_options_ty, air_ref, src);
13023 const val = try sema.resolveConstValue(block, src, coerced);
13024 const fields = val.castTag(.@"struct").?.data;
13025 const struct_obj = export_options_ty.castTag(.@"struct").?.data;
13026 const name_index = struct_obj.fields.getIndex("name").?;
13027 const linkage_index = struct_obj.fields.getIndex("linkage").?;
13028 const section_index = struct_obj.fields.getIndex("section").?;
13029 if (!fields[section_index].isNull()) {
13022 const options = try sema.coerce(block, export_options_ty, air_ref, src);
13023
13024 const name = try sema.fieldVal(block, src, options, "name", src);
13025 const name_val = try sema.resolveConstValue(block, src, name);
13026
13027 const linkage = try sema.fieldVal(block, src, options, "linkage", src);
13028 const linkage_val = try sema.resolveConstValue(block, src, linkage);
13029
13030 const section = try sema.fieldVal(block, src, options, "section", src);
13031 const section_val = try sema.resolveConstValue(block, src, section);
13032
13033 if (!section_val.isNull()) {
1303013034 return sema.fail(block, src, "TODO: implement exporting with linksection", .{});
1303113035 }
1303213036 const name_ty = Type.initTag(.const_slice_u8);
1303313037 return std.builtin.ExportOptions{
13034 .name = try fields[name_index].toAllocatedBytes(name_ty, sema.arena),
13035 .linkage = fields[linkage_index].toEnum(std.builtin.GlobalLinkage),
13038 .name = try name_val.toAllocatedBytes(name_ty, sema.arena),
13039 .linkage = linkage_val.toEnum(std.builtin.GlobalLinkage),
1303613040 .section = null, // TODO
1303713041 };
1303813042}
......@@ -13384,17 +13388,19 @@ fn zirBuiltinCall(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError
1338413388 const args = sema.resolveInst(extra.data.args);
1338513389
1338613390 const modifier: std.builtin.CallOptions.Modifier = modifier: {
13387 const export_options_ty = try sema.getBuiltinType(block, options_src, "CallOptions");
13388 const coerced_options = try sema.coerce(block, export_options_ty, options, options_src);
13389 const options_val = try sema.resolveConstValue(block, options_src, coerced_options);
13390 const fields = options_val.castTag(.@"struct").?.data;
13391 const struct_obj = export_options_ty.castTag(.@"struct").?.data;
13392 const modifier_index = struct_obj.fields.getIndex("modifier").?;
13393 const stack_index = struct_obj.fields.getIndex("stack").?;
13394 if (!fields[stack_index].isNull()) {
13391 const call_options_ty = try sema.getBuiltinType(block, options_src, "CallOptions");
13392 const coerced_options = try sema.coerce(block, call_options_ty, options, options_src);
13393
13394 const modifier = try sema.fieldVal(block, options_src, coerced_options, "modifier", options_src);
13395 const modifier_val = try sema.resolveConstValue(block, options_src, modifier);
13396
13397 const stack = try sema.fieldVal(block, options_src, coerced_options, "stack", options_src);
13398 const stack_val = try sema.resolveConstValue(block, options_src, stack);
13399
13400 if (!stack_val.isNull()) {
1339513401 return sema.fail(block, options_src, "TODO: implement @call with stack", .{});
1339613402 }
13397 break :modifier fields[modifier_index].toEnum(std.builtin.CallOptions.Modifier);
13403 break :modifier modifier_val.toEnum(std.builtin.CallOptions.Modifier);
1339813404 };
1339913405
1340013406 const args_ty = sema.typeOf(args);
......@@ -13743,6 +13749,7 @@ fn zirVarExtended(
1374313749 .is_extern = small.is_extern,
1374413750 .is_mutable = true, // TODO get rid of this unused field
1374513751 .is_threadlocal = small.is_threadlocal,
13752 .is_weak_linkage = false,
1374613753 .lib_name = null,
1374713754 };
1374813755
......@@ -13937,7 +13944,103 @@ fn zirBuiltinExtern(
1393713944) CompileError!Air.Inst.Ref {
1393813945 const extra = sema.code.extraData(Zir.Inst.BinNode, extended.operand).data;
1393913946 const src: LazySrcLoc = .{ .node_offset = extra.node };
13940 return sema.fail(block, src, "TODO: implement Sema.zirBuiltinExtern", .{});
13947 const ty_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = extra.node };
13948 const options_src: LazySrcLoc = .{ .node_offset_builtin_call_arg1 = extra.node };
13949
13950 var ty = try sema.resolveType(block, ty_src, extra.lhs);
13951 const options_inst = sema.resolveInst(extra.rhs);
13952
13953 const options = options: {
13954 const extern_options_ty = try sema.getBuiltinType(block, options_src, "ExternOptions");
13955 const options = try sema.coerce(block, extern_options_ty, options_inst, options_src);
13956
13957 const name = try sema.fieldVal(block, options_src, options, "name", options_src);
13958 const name_val = try sema.resolveConstValue(block, options_src, name);
13959
13960 const library_name_inst = try sema.fieldVal(block, options_src, options, "library_name", options_src);
13961 const library_name_val = try sema.resolveConstValue(block, options_src, library_name_inst);
13962
13963 const linkage = try sema.fieldVal(block, options_src, options, "linkage", options_src);
13964 const linkage_val = try sema.resolveConstValue(block, options_src, linkage);
13965
13966 const is_thread_local = try sema.fieldVal(block, options_src, options, "is_thread_local", options_src);
13967 const is_thread_local_val = try sema.resolveConstValue(block, options_src, is_thread_local);
13968
13969 var library_name: ?[]const u8 = null;
13970 if (!library_name_val.isNull()) {
13971 const payload = library_name_val.castTag(.opt_payload).?.data;
13972 library_name = try payload.toAllocatedBytes(Type.initTag(.const_slice_u8), sema.arena);
13973 }
13974
13975 break :options std.builtin.ExternOptions{
13976 .name = try name_val.toAllocatedBytes(Type.initTag(.const_slice_u8), sema.arena),
13977 .library_name = library_name,
13978 .linkage = linkage_val.toEnum(std.builtin.GlobalLinkage),
13979 .is_thread_local = is_thread_local_val.toBool(),
13980 };
13981 };
13982
13983 if (!ty.isPtrAtRuntime()) {
13984 return sema.fail(block, options_src, "expected (optional) pointer", .{});
13985 }
13986
13987 if (options.name.len == 0) {
13988 return sema.fail(block, options_src, "extern symbol name cannot be empty", .{});
13989 }
13990
13991 if (options.linkage != .Weak and options.linkage != .Strong) {
13992 return sema.fail(block, options_src, "extern symbol must use strong or weak linkage", .{});
13993 }
13994
13995 if (options.linkage == .Weak and !ty.ptrAllowsZero()) {
13996 ty = try Type.optional(sema.arena, ty);
13997 }
13998
13999 // TODO check duplicate extern
14000
14001 const new_decl = try sema.mod.allocateNewDecl(try sema.gpa.dupeZ(u8, options.name), sema.owner_decl.src_namespace, sema.owner_decl.src_node, null);
14002 errdefer new_decl.destroy(sema.mod);
14003
14004 var new_decl_arena = std.heap.ArenaAllocator.init(sema.gpa);
14005 errdefer new_decl_arena.deinit();
14006 const new_decl_arena_allocator = new_decl_arena.allocator();
14007
14008 const new_var = try new_decl_arena_allocator.create(Module.Var);
14009 errdefer new_decl_arena_allocator.destroy(new_var);
14010
14011 new_var.* = .{
14012 .owner_decl = sema.owner_decl,
14013 .init = Value.initTag(.unreachable_value),
14014 .is_extern = true,
14015 .is_mutable = false, // TODO get rid of this unused field
14016 .is_threadlocal = options.is_thread_local,
14017 .is_weak_linkage = options.linkage == .Weak,
14018 .lib_name = null,
14019 };
14020
14021 if (options.library_name) |library_name| {
14022 if (library_name.len == 0) {
14023 return sema.fail(block, options_src, "library name name cannot be empty", .{});
14024 }
14025 new_var.lib_name = try sema.handleExternLibName(block, options_src, library_name);
14026 }
14027
14028 new_decl.src_line = sema.owner_decl.src_line;
14029 new_decl.ty = try ty.copy(new_decl_arena_allocator);
14030 new_decl.val = try Value.Tag.variable.create(new_decl_arena_allocator, new_var);
14031 new_decl.align_val = Value.@"null";
14032 new_decl.linksection_val = Value.@"null";
14033 new_decl.has_tv = true;
14034 new_decl.analysis = .complete;
14035 new_decl.generation = sema.mod.generation;
14036
14037 const arena_state = try new_decl_arena_allocator.create(std.heap.ArenaAllocator.State);
14038 arena_state.* = new_decl_arena.state;
14039 new_decl.value_arena = arena_state;
14040
14041 const ref = try sema.analyzeDeclRef(new_decl);
14042 try sema.requireRuntimeBlock(block, src);
14043 return block.addBitCast(ty, ref);
1394114044}
1394214045
1394314046fn requireFunctionBlock(sema: *Sema, block: *Block, src: LazySrcLoc) !void {
......@@ -15409,6 +15512,14 @@ fn coerce(
1540915512 return sema.addConstant(dest_ty, Value.@"null");
1541015513 }
1541115514
15515 // cast from ?*T and ?[*]T to ?*anyopaque
15516 // but don't do it if the source type is a double pointer
15517 if (dest_ty.isPtrLikeOptional() and dest_ty.elemType2().tag() == .anyopaque and
15518 inst_ty.isPtrLikeOptional() and inst_ty.elemType2().zigTypeTag() != .Pointer)
15519 {
15520 return sema.coerceCompatiblePtrs(block, dest_ty, inst, inst_src);
15521 }
15522
1541215523 // T to ?T
1541315524 const child_type = try dest_ty.optionalChildAlloc(sema.arena);
1541415525 const intermediate = try sema.coerce(block, child_type, inst, inst_src);
......@@ -16688,6 +16799,7 @@ fn coerceCompatiblePtrs(
1668816799 inst: Air.Inst.Ref,
1668916800 inst_src: LazySrcLoc,
1669016801) !Air.Inst.Ref {
16802 // TODO check const/volatile/alignment
1669116803 if (try sema.resolveMaybeUndefVal(block, inst_src, inst)) |val| {
1669216804 // The comptime Value representation is compatible with both types.
1669316805 return sema.addConstant(dest_ty, val);
......@@ -18403,6 +18515,7 @@ fn resolveInferredErrorSet(sema: *Sema, inferred_error_set: *Module.Fn.InferredE
1840318515 if (inferred_error_set.is_resolved) {
1840418516 return;
1840518517 }
18518 inferred_error_set.is_resolved = true;
1840618519
1840718520 var it = inferred_error_set.inferred_error_sets.keyIterator();
1840818521 while (it.next()) |other_error_set_ptr| {
......@@ -18423,8 +18536,6 @@ fn resolveInferredErrorSet(sema: *Sema, inferred_error_set: *Module.Fn.InferredE
1842318536 if (other_error_set_ptr.*.is_anyerror)
1842418537 inferred_error_set.is_anyerror = true;
1842518538 }
18426
18427 inferred_error_set.is_resolved = true;
1842818539}
1842918540
1843018541fn resolveInferredErrorSetTy(sema: *Sema, ty: Type) CompileError!void {
src/codegen/llvm.zig+16-2
......@@ -548,6 +548,10 @@ pub const Object = struct {
548548 llvm_global.setValueName(decl.name);
549549 llvm_global.setUnnamedAddr(.False);
550550 llvm_global.setLinkage(.External);
551 if (decl.val.castTag(.variable)) |variable| {
552 if (variable.data.is_threadlocal) llvm_global.setThreadLocalMode(.GeneralDynamicTLSModel);
553 if (variable.data.is_weak_linkage) llvm_global.setLinkage(.ExternalWeak);
554 }
551555 } else if (exports.len != 0) {
552556 const exp_name = exports[0].options.name;
553557 llvm_global.setValueName2(exp_name.ptr, exp_name.len);
......@@ -558,6 +562,9 @@ pub const Object = struct {
558562 .Weak => llvm_global.setLinkage(.WeakODR),
559563 .LinkOnce => llvm_global.setLinkage(.LinkOnceODR),
560564 }
565 if (decl.val.castTag(.variable)) |variable| {
566 if (variable.data.is_threadlocal) llvm_global.setThreadLocalMode(.GeneralDynamicTLSModel);
567 }
561568 // If a Decl is exported more than one time (which is rare),
562569 // we add aliases for all but the first export.
563570 // TODO LLVM C API does not support deleting aliases. We need to
......@@ -788,8 +795,15 @@ pub const DeclGen = struct {
788795 const llvm_global = dg.object.llvm_module.addGlobalInAddressSpace(llvm_type, fqn, llvm_addrspace);
789796 gop.value_ptr.* = llvm_global;
790797
791 const is_extern = decl.val.tag() == .unreachable_value;
792 if (!is_extern) {
798 if (decl.isExtern()) {
799 llvm_global.setValueName(decl.name);
800 llvm_global.setUnnamedAddr(.False);
801 llvm_global.setLinkage(.External);
802 if (decl.val.castTag(.variable)) |variable| {
803 if (variable.data.is_threadlocal) llvm_global.setThreadLocalMode(.GeneralDynamicTLSModel);
804 if (variable.data.is_weak_linkage) llvm_global.setLinkage(.ExternalWeak);
805 }
806 } else {
793807 llvm_global.setLinkage(.Internal);
794808 llvm_global.setUnnamedAddr(.True);
795809 }
src/codegen/llvm/bindings.zig+11
......@@ -120,6 +120,9 @@ pub const Value = opaque {
120120 pub const setUnnamedAddr = LLVMSetUnnamedAddr;
121121 extern fn LLVMSetUnnamedAddr(Global: *const Value, HasUnnamedAddr: Bool) void;
122122
123 pub const setThreadLocalMode = LLVMSetThreadLocalMode;
124 extern fn LLVMSetThreadLocalMode(Global: *const Value, Mode: ThreadLocalMode) void;
125
123126 pub const deleteGlobal = LLVMDeleteGlobal;
124127 extern fn LLVMDeleteGlobal(GlobalVar: *const Value) void;
125128
......@@ -1230,6 +1233,14 @@ pub const Linkage = enum(c_uint) {
12301233 LinkerPrivateWeak,
12311234};
12321235
1236pub const ThreadLocalMode = enum(c_uint) {
1237 NotThreadLocal,
1238 GeneralDynamicTLSModel,
1239 LocalDynamicTLSModel,
1240 InitialExecTLSModel,
1241 LocalExecTLSModel,
1242};
1243
12331244pub const AtomicOrdering = enum(c_uint) {
12341245 NotAtomic = 0,
12351246 Unordered = 1,
src/type.zig+14-3
......@@ -2168,7 +2168,14 @@ pub const Type = extern union {
21682168 .mut_slice,
21692169 .optional_single_const_pointer,
21702170 .optional_single_mut_pointer,
2171 => return self.cast(Payload.ElemType).?.data.abiAlignment(target),
2171 => {
2172 const child_type = self.cast(Payload.ElemType).?.data;
2173 if (child_type.zigTypeTag() == .Opaque) {
2174 return 1;
2175 } else {
2176 return child_type.abiAlignment(target);
2177 }
2178 },
21722179
21732180 .manyptr_u8,
21742181 .manyptr_const_u8,
......@@ -2181,10 +2188,13 @@ pub const Type = extern union {
21812188 const ptr_info = self.castTag(.pointer).?.data;
21822189 if (ptr_info.@"align" != 0) {
21832190 return ptr_info.@"align";
2191 } else if (ptr_info.pointee_type.zigTypeTag() == .Opaque) {
2192 return 1;
21842193 } else {
21852194 return ptr_info.pointee_type.abiAlignment(target);
21862195 }
21872196 },
2197 .optional => return self.castTag(.optional).?.data.ptrAlignment(target),
21882198
21892199 else => unreachable,
21902200 }
......@@ -3235,8 +3245,9 @@ pub const Type = extern union {
32353245 return child_ty;
32363246 }
32373247 },
3238
3239 // TODO handle optionals
3248 .optional => ty.castTag(.optional).?.data.childType(),
3249 .optional_single_mut_pointer => ty.castPointer().?.data,
3250 .optional_single_const_pointer => ty.castPointer().?.data,
32403251
32413252 else => unreachable,
32423253 };