From 76fcb95bdf5509f6b02ca8c68af2b8f630a6cfe0 Mon Sep 17 00:00:00 2001 From: Krzysztof Wolicki Der Teufel Date: Sun, 29 Jan 2023 14:42:18 +0100 Subject: [PATCH 01/65] autodoc: Implemented struct_init_empty for walkInstruction, fixed variable type with has_init but no type before = --- src/Autodoc.zig | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Autodoc.zig b/src/Autodoc.zig index 8afc9c859b..e51d4a3ca9 100644 --- a/src/Autodoc.zig +++ b/src/Autodoc.zig @@ -2200,17 +2200,10 @@ fn walkInstruction( false, ); - _ = operand; - - // WIP - - printWithContext( - file, - inst_index, - "TODO: implement `{s}` for walkInstruction\n\n", - .{@tagName(tags[inst_index])}, - ); - return self.cteTodo(@tagName(tags[inst_index])); + return DocData.WalkResult{ + .typeRef = operand.expr, + .expr = .{ .@"struct" = &.{} }, + }; }, .struct_init_anon => { const pl_node = data[inst_index].pl_node; @@ -2537,6 +2530,7 @@ fn walkInstruction( const var_init_ref = @intToEnum(Ref, file.zir.extra[extra_index]); const var_init = try self.walkRef(file, parent_scope, parent_src, var_init_ref, need_type); value.expr = var_init.expr; + value.typeRef = var_init.typeRef; } return value; From 92dfc07489c3f8514792434e2857b419ebf1f208 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sun, 22 Jan 2023 13:29:05 +0200 Subject: [PATCH 02/65] TypedValue: fix crash when string-like aggregate has undefined element Closes #6334 --- src/TypedValue.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/TypedValue.zig b/src/TypedValue.zig index 6e096ee90a..cb28274f10 100644 --- a/src/TypedValue.zig +++ b/src/TypedValue.zig @@ -176,7 +176,9 @@ pub fn print( var i: u32 = 0; while (i < max_len) : (i += 1) { - buf[i] = std.math.cast(u8, val.fieldValue(ty, i).toUnsignedInt(target)) orelse break :str; + const elem = val.fieldValue(ty, i); + if (elem.isUndef()) break :str; + buf[i] = std.math.cast(u8, elem.toUnsignedInt(target)) orelse break :str; } const truncated = if (len > max_string_len) " (truncated)" else ""; @@ -390,6 +392,7 @@ pub fn print( while (i < max_len) : (i += 1) { var elem_buf: Value.ElemValueBuffer = undefined; const elem_val = payload.ptr.elemValueBuffer(mod, i, &elem_buf); + if (elem_val.isUndef()) break :str; buf[i] = std.math.cast(u8, elem_val.toUnsignedInt(target)) orelse break :str; } From 720d82721fa6013b2e7e7ff2866db9404bfd2901 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sun, 22 Jan 2023 17:26:32 +0200 Subject: [PATCH 03/65] Sema: ensure args to inline comptime args are comptime-known Closes #14413 --- src/Sema.zig | 5 +++++ ...ine_call_runtime_value_to_comptime_param.zig | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 test/cases/compile_errors/inline_call_runtime_value_to_comptime_param.zig diff --git a/src/Sema.zig b/src/Sema.zig index 9c553a0092..3b744a4f78 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -6879,6 +6879,8 @@ fn analyzeInlineCallArg( if (err == error.AnalysisFail and param_block.comptime_reason != null) try param_block.comptime_reason.?.explain(sema, sema.err); return err; }; + } else if (!is_comptime_call and zir_tags[inst] == .param_comptime) { + _ = try sema.resolveConstMaybeUndefVal(arg_block, arg_src, uncasted_arg, "parameter is comptime"); } const casted_arg = sema.coerceExtra(arg_block, param_ty, uncasted_arg, arg_src, .{ .param_src = .{ .func_inst = func_inst, @@ -6952,6 +6954,9 @@ fn analyzeInlineCallArg( .val = arg_val, }; } else { + if (zir_tags[inst] == .param_anytype_comptime) { + _ = try sema.resolveConstMaybeUndefVal(arg_block, arg_src, uncasted_arg, "parameter is comptime"); + } sema.inst_map.putAssumeCapacityNoClobber(inst, uncasted_arg); } diff --git a/test/cases/compile_errors/inline_call_runtime_value_to_comptime_param.zig b/test/cases/compile_errors/inline_call_runtime_value_to_comptime_param.zig new file mode 100644 index 0000000000..cddd91384b --- /dev/null +++ b/test/cases/compile_errors/inline_call_runtime_value_to_comptime_param.zig @@ -0,0 +1,17 @@ +inline fn needComptime(comptime a: u64) void { + if (a != 0) @compileError("foo"); +} +fn acceptRuntime(value: u64) void { + needComptime(value); +} +pub export fn entry() void { + var value: u64 = 0; + acceptRuntime(value); +} + +// error +// backend=stage2 +// target=native +// +// :5:18: error: unable to resolve comptime value +// :5:18: note: parameter is comptime From dd300d47b22c740ab75ace54057a3831606f7952 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Mon, 23 Jan 2023 20:23:12 +0200 Subject: [PATCH 04/65] add test for already implemented proposal Closes #1564 --- test/behavior/sizeof_and_typeof.zig | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/behavior/sizeof_and_typeof.zig b/test/behavior/sizeof_and_typeof.zig index ef4487d9b9..cfe948ac02 100644 --- a/test/behavior/sizeof_and_typeof.zig +++ b/test/behavior/sizeof_and_typeof.zig @@ -292,3 +292,12 @@ test "@sizeOf optional of previously unresolved union" { const Node = union { a: usize }; try expect(@sizeOf(?Node) == @sizeOf(Node) + @alignOf(Node)); } + +test "@offsetOf zero-bit field" { + const S = packed struct { + a: u32, + b: u0, + c: u32, + }; + try expect(@offsetOf(S, "b") == @offsetOf(S, "c")); +} From b129350cb5de2251d50b142a50d8d74ccd92ae73 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Fri, 27 Jan 2023 15:54:11 +0200 Subject: [PATCH 05/65] AstGen: fix crash on invalid decltest Closes #14476 --- src/AstGen.zig | 29 ++++++++++++++++++- .../cases/compile_errors/invalid_decltest.zig | 13 +++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/cases/compile_errors/invalid_decltest.zig diff --git a/src/AstGen.zig b/src/AstGen.zig index 15b3611a1e..df111906e6 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -4278,7 +4278,34 @@ fn testDecl( var num_namespaces_out: u32 = 0; var capturing_namespace: ?*Scope.Namespace = null; while (true) switch (s.tag) { - .local_val, .local_ptr => unreachable, // a test cannot be in a local scope + .local_val => { + const local_val = s.cast(Scope.LocalVal).?; + if (local_val.name == name_str_index) { + local_val.used = test_name_token; + return astgen.failTokNotes(test_name_token, "cannot test a {s}", .{ + @tagName(local_val.id_cat), + }, &[_]u32{ + try astgen.errNoteTok(local_val.token_src, "{s} declared here", .{ + @tagName(local_val.id_cat), + }), + }); + } + s = local_val.parent; + }, + .local_ptr => { + const local_ptr = s.cast(Scope.LocalPtr).?; + if (local_ptr.name == name_str_index) { + local_ptr.used = test_name_token; + return astgen.failTokNotes(test_name_token, "cannot test a {s}", .{ + @tagName(local_ptr.id_cat), + }, &[_]u32{ + try astgen.errNoteTok(local_ptr.token_src, "{s} declared here", .{ + @tagName(local_ptr.id_cat), + }), + }); + } + s = local_ptr.parent; + }, .gen_zir => s = s.cast(GenZir).?.parent, .defer_normal, .defer_error => s = s.cast(Scope.Defer).?.parent, .namespace, .enum_namespace => { diff --git a/test/cases/compile_errors/invalid_decltest.zig b/test/cases/compile_errors/invalid_decltest.zig new file mode 100644 index 0000000000..cde984f366 --- /dev/null +++ b/test/cases/compile_errors/invalid_decltest.zig @@ -0,0 +1,13 @@ +export fn foo() void { + const a = 1; + struct { + test a {} + }; +} + +// error +// backend=stage2 +// target=native +// +// :4:14: error: cannot test a local constant +// :2:11: note: local constant declared here From a9785fe8eef564011b4266e8a1b9aa15b7e37189 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Fri, 27 Jan 2023 16:03:51 +0200 Subject: [PATCH 06/65] Sema: add helpful notes to invalid `@ptrCast` operations Closes #14474 --- doc/langref.html.in | 9 +++++++++ src/Sema.zig | 11 ++++++++++- .../increase_pointer_alignment_in_ptrCast.zig | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/doc/langref.html.in b/doc/langref.html.in index fd4aa8ae76..e1521795ca 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -8799,6 +8799,15 @@ pub const PrefetchOptions = struct { {#link|Optional Pointers#} are allowed. Casting an optional pointer which is {#link|null#} to a non-optional pointer invokes safety-checked {#link|Undefined Behavior#}.

+

+ {#syntax#}@ptrCast{#endsyntax#} cannot be used for: +

+
    +
  • Removing {#syntax#}const{#endsyntax#} or {#syntax#}volatile{#endsyntax#} qualifier. TODO add a {#syntax#}@qualCast{#endsyntax#} builtin.
    • +
  • Changing pointer address space, use {#link|@addrSpaceCast#}
    • +
  • Increasing pointer alignment, use {#link|@alignCast#}
    • +
  • Casting a non-slice pointer to a slice, use slicing syntax {#syntax#}ptr[start..end]{#endsyntax#}
    • +
{#header_close#} {#header_open|@ptrToInt#} diff --git a/src/Sema.zig b/src/Sema.zig index 3b744a4f78..712a684bf8 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -19535,7 +19535,14 @@ fn zirPtrCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air return sema.fail(block, src, "cast discards volatile qualifier", .{}); } if (operand_info.@"addrspace" != dest_info.@"addrspace") { - return sema.fail(block, src, "cast changes pointer address space", .{}); + const msg = msg: { + const msg = try sema.errMsg(block, src, "cast changes pointer address space", .{}); + errdefer msg.destroy(sema.gpa); + + try sema.errNote(block, src, msg, "consider using '@addrSpaceCast'", .{}); + break :msg msg; + }; + return sema.failWithOwnedErrorMsg(msg); } const dest_is_slice = dest_ty.isSlice(); @@ -19590,6 +19597,8 @@ fn zirPtrCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air try sema.errNote(block, dest_ty_src, msg, "'{}' has alignment '{d}'", .{ dest_ty.fmt(sema.mod), dest_align, }); + + try sema.errNote(block, src, msg, "consider using '@alignCast'", .{}); break :msg msg; }; return sema.failWithOwnedErrorMsg(msg); diff --git a/test/cases/compile_errors/increase_pointer_alignment_in_ptrCast.zig b/test/cases/compile_errors/increase_pointer_alignment_in_ptrCast.zig index 9cc5ed3a42..242454e859 100644 --- a/test/cases/compile_errors/increase_pointer_alignment_in_ptrCast.zig +++ b/test/cases/compile_errors/increase_pointer_alignment_in_ptrCast.zig @@ -11,3 +11,4 @@ export fn entry() u32 { // :3:17: error: cast increases pointer alignment // :3:32: note: '*u8' has alignment '1' // :3:26: note: '*u32' has alignment '4' +// :3:17: note: consider using '@alignCast' From fe4ea31f7e9e1c8caea6a1df107b91e8ea1a7b8a Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Fri, 27 Jan 2023 16:04:58 +0200 Subject: [PATCH 07/65] Sema: replace backticks with single quotes Most error messages already use single quotes for everything so this makes the remaining ones consistent. --- src/Sema.zig | 10 +++++----- ...ionals_with_a_function_that_returns_an_optional.zig | 2 +- test/cases/compile_errors/discarding_error_value.zig | 2 +- .../helpful_return_type_error_message.zig | 4 ++-- .../compile_errors/ignored_deferred_function_call.zig | 2 +- .../ignored_expression_in_while_continuation.zig | 6 +++--- ...on_of_optional_anyopaque_to_anyopaque_must_fail.zig | 2 +- ...properly_when_assigning_a_value_within_a_struct.zig | 2 +- ...ation_incompatibility_mismatching_handle_is_ptr.zig | 2 +- ...tibility_mismatching_handle_is_ptr_generic_call.zig | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Sema.zig b/src/Sema.zig index 712a684bf8..b4731d9509 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -3294,7 +3294,7 @@ fn ensureResultUsed( const msg = msg: { const msg = try sema.errMsg(block, src, "error is ignored", .{}); errdefer msg.destroy(sema.gpa); - try sema.errNote(block, src, msg, "consider using `try`, `catch`, or `if`", .{}); + try sema.errNote(block, src, msg, "consider using 'try', 'catch', or 'if'", .{}); break :msg msg; }; return sema.failWithOwnedErrorMsg(msg); @@ -3325,7 +3325,7 @@ fn zirEnsureResultNonError(sema: *Sema, block: *Block, inst: Zir.Inst.Index) Com const msg = msg: { const msg = try sema.errMsg(block, src, "error is discarded", .{}); errdefer msg.destroy(sema.gpa); - try sema.errNote(block, src, msg, "consider using `try`, `catch`, or `if`", .{}); + try sema.errNote(block, src, msg, "consider using 'try', 'catch', or 'if'", .{}); break :msg msg; }; return sema.failWithOwnedErrorMsg(msg); @@ -8477,7 +8477,7 @@ fn handleExternLibName( return sema.fail( block, src_loc, - "dependency on dynamic library '{s}' requires enabling Position Independent Code. Fixed by `-l{s}` or `-fPIC`.", + "dependency on dynamic library '{s}' requires enabling Position Independent Code. Fixed by '-l{s}' or '-fPIC'.", .{ lib_name, lib_name }, ); } @@ -25150,7 +25150,7 @@ fn coerceExtra( (try sema.coerceInMemoryAllowed(block, inst_ty.errorUnionPayload(), dest_ty, false, target, dest_ty_src, inst_src)) == .ok) { try sema.errNote(block, inst_src, msg, "cannot convert error union to payload type", .{}); - try sema.errNote(block, inst_src, msg, "consider using `try`, `catch`, or `if`", .{}); + try sema.errNote(block, inst_src, msg, "consider using 'try', 'catch', or 'if'", .{}); } // ?T to T @@ -25159,7 +25159,7 @@ fn coerceExtra( (try sema.coerceInMemoryAllowed(block, inst_ty.optionalChild(&buf), dest_ty, false, target, dest_ty_src, inst_src)) == .ok) { try sema.errNote(block, inst_src, msg, "cannot convert optional to payload type", .{}); - try sema.errNote(block, inst_src, msg, "consider using `.?`, `orelse`, or `if`", .{}); + try sema.errNote(block, inst_src, msg, "consider using '.?', 'orelse', or 'if'", .{}); } try in_memory_result.report(sema, block, inst_src, msg); diff --git a/test/cases/compile_errors/assigning_to_struct_or_union_fields_that_are_not_optionals_with_a_function_that_returns_an_optional.zig b/test/cases/compile_errors/assigning_to_struct_or_union_fields_that_are_not_optionals_with_a_function_that_returns_an_optional.zig index 762eb284f2..530e5ffb74 100644 --- a/test/cases/compile_errors/assigning_to_struct_or_union_fields_that_are_not_optionals_with_a_function_that_returns_an_optional.zig +++ b/test/cases/compile_errors/assigning_to_struct_or_union_fields_that_are_not_optionals_with_a_function_that_returns_an_optional.zig @@ -20,4 +20,4 @@ export fn entry() void { // // :11:27: error: expected type 'u8', found '?u8' // :11:27: note: cannot convert optional to payload type -// :11:27: note: consider using `.?`, `orelse`, or `if` +// :11:27: note: consider using '.?', 'orelse', or 'if' diff --git a/test/cases/compile_errors/discarding_error_value.zig b/test/cases/compile_errors/discarding_error_value.zig index 6dfe0be231..c24d517d3e 100644 --- a/test/cases/compile_errors/discarding_error_value.zig +++ b/test/cases/compile_errors/discarding_error_value.zig @@ -10,4 +10,4 @@ fn foo() !void { // target=native // // :2:12: error: error is discarded -// :2:12: note: consider using `try`, `catch`, or `if` +// :2:12: note: consider using 'try', 'catch', or 'if' diff --git a/test/cases/compile_errors/helpful_return_type_error_message.zig b/test/cases/compile_errors/helpful_return_type_error_message.zig index b8e48036de..871e948537 100644 --- a/test/cases/compile_errors/helpful_return_type_error_message.zig +++ b/test/cases/compile_errors/helpful_return_type_error_message.zig @@ -26,7 +26,7 @@ export fn quux() u32 { // :11:15: error: expected type 'u32', found '@typeInfo(@typeInfo(@TypeOf(tmp.bar)).Fn.return_type.?).ErrorUnion.error_set!u32' // :10:17: note: function cannot return an error // :11:15: note: cannot convert error union to payload type -// :11:15: note: consider using `try`, `catch`, or `if` +// :11:15: note: consider using 'try', 'catch', or 'if' // :15:14: error: expected type 'u32', found '@typeInfo(@typeInfo(@TypeOf(tmp.bar)).Fn.return_type.?).ErrorUnion.error_set!u32' // :15:14: note: cannot convert error union to payload type -// :15:14: note: consider using `try`, `catch`, or `if` +// :15:14: note: consider using 'try', 'catch', or 'if' diff --git a/test/cases/compile_errors/ignored_deferred_function_call.zig b/test/cases/compile_errors/ignored_deferred_function_call.zig index 05c4373705..b318baa16c 100644 --- a/test/cases/compile_errors/ignored_deferred_function_call.zig +++ b/test/cases/compile_errors/ignored_deferred_function_call.zig @@ -8,4 +8,4 @@ fn bar() anyerror!i32 { return 0; } // target=native // // :2:14: error: error is ignored -// :2:14: note: consider using `try`, `catch`, or `if` +// :2:14: note: consider using 'try', 'catch', or 'if' diff --git a/test/cases/compile_errors/ignored_expression_in_while_continuation.zig b/test/cases/compile_errors/ignored_expression_in_while_continuation.zig index d7de0aac57..d108903c82 100644 --- a/test/cases/compile_errors/ignored_expression_in_while_continuation.zig +++ b/test/cases/compile_errors/ignored_expression_in_while_continuation.zig @@ -18,8 +18,8 @@ fn bad() anyerror!void { // target=native // // :2:24: error: error is ignored -// :2:24: note: consider using `try`, `catch`, or `if` +// :2:24: note: consider using 'try', 'catch', or 'if' // :6:25: error: error is ignored -// :6:25: note: consider using `try`, `catch`, or `if` +// :6:25: note: consider using 'try', 'catch', or 'if' // :10:25: error: error is ignored -// :10:25: note: consider using `try`, `catch`, or `if` +// :10:25: note: consider using 'try', 'catch', or 'if' diff --git a/test/cases/compile_errors/issue_5618_coercion_of_optional_anyopaque_to_anyopaque_must_fail.zig b/test/cases/compile_errors/issue_5618_coercion_of_optional_anyopaque_to_anyopaque_must_fail.zig index f4716bc24d..95bba054b3 100644 --- a/test/cases/compile_errors/issue_5618_coercion_of_optional_anyopaque_to_anyopaque_must_fail.zig +++ b/test/cases/compile_errors/issue_5618_coercion_of_optional_anyopaque_to_anyopaque_must_fail.zig @@ -10,5 +10,5 @@ export fn foo() void { // // :4:9: error: expected type '*anyopaque', found '?*anyopaque' // :4:9: note: cannot convert optional to payload type -// :4:9: note: consider using `.?`, `orelse`, or `if` +// :4:9: note: consider using '.?', 'orelse', or 'if' // :4:9: note: '?*anyopaque' could have null values which are illegal in type '*anyopaque' diff --git a/test/cases/compile_errors/regression_test_2980_base_type_u32_is_not_type_checked_properly_when_assigning_a_value_within_a_struct.zig b/test/cases/compile_errors/regression_test_2980_base_type_u32_is_not_type_checked_properly_when_assigning_a_value_within_a_struct.zig index 09c496211a..1b951528bb 100644 --- a/test/cases/compile_errors/regression_test_2980_base_type_u32_is_not_type_checked_properly_when_assigning_a_value_within_a_struct.zig +++ b/test/cases/compile_errors/regression_test_2980_base_type_u32_is_not_type_checked_properly_when_assigning_a_value_within_a_struct.zig @@ -20,4 +20,4 @@ export fn entry() void { // // :12:25: error: expected type 'u32', found '@typeInfo(@typeInfo(@TypeOf(tmp.get_uval)).Fn.return_type.?).ErrorUnion.error_set!u32' // :12:25: note: cannot convert error union to payload type -// :12:25: note: consider using `try`, `catch`, or `if` +// :12:25: note: consider using 'try', 'catch', or 'if' diff --git a/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr.zig b/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr.zig index cc1d2c976a..26c1a8d9cf 100644 --- a/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr.zig +++ b/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr.zig @@ -17,4 +17,4 @@ pub const Container = struct { // // :3:36: error: expected type 'i32', found '?i32' // :3:36: note: cannot convert optional to payload type -// :3:36: note: consider using `.?`, `orelse`, or `if` +// :3:36: note: consider using '.?', 'orelse', or 'if' diff --git a/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr_generic_call.zig b/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr_generic_call.zig index 897675d448..471f9cca04 100644 --- a/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr_generic_call.zig +++ b/test/cases/compile_errors/result_location_incompatibility_mismatching_handle_is_ptr_generic_call.zig @@ -17,4 +17,4 @@ pub const Container = struct { // // :3:36: error: expected type 'i32', found '?i32' // :3:36: note: cannot convert optional to payload type -// :3:36: note: consider using `.?`, `orelse`, or `if` +// :3:36: note: consider using '.?', 'orelse', or 'if' From f16c10a86b7183e99e54a70344f4681211cd52bb Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Fri, 27 Jan 2023 20:25:48 +0200 Subject: [PATCH 08/65] implement `@qualCast` --- doc/langref.html.in | 15 +++-- lib/std/child_process.zig | 4 +- lib/std/fs.zig | 2 +- lib/std/os.zig | 2 +- lib/std/os/windows.zig | 14 ++--- lib/std/zig/c_translation.zig | 2 +- src/AstGen.zig | 2 + src/BuiltinFn.zig | 8 +++ src/Sema.zig | 62 ++++++++++++++++++- src/Zir.zig | 6 ++ src/print_zir.zig | 1 + .../cases/compile_errors/invalid_qualcast.zig | 12 ++++ .../ptrCast_discards_const_qualifier.zig | 1 + 13 files changed, 113 insertions(+), 18 deletions(-) create mode 100644 test/cases/compile_errors/invalid_qualcast.zig diff --git a/doc/langref.html.in b/doc/langref.html.in index e1521795ca..8c7781ee42 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -8803,10 +8803,10 @@ pub const PrefetchOptions = struct { {#syntax#}@ptrCast{#endsyntax#} cannot be used for:

    -
  • Removing {#syntax#}const{#endsyntax#} or {#syntax#}volatile{#endsyntax#} qualifier. TODO add a {#syntax#}@qualCast{#endsyntax#} builtin.
    • -
  • Changing pointer address space, use {#link|@addrSpaceCast#}
    • -
  • Increasing pointer alignment, use {#link|@alignCast#}
    • -
  • Casting a non-slice pointer to a slice, use slicing syntax {#syntax#}ptr[start..end]{#endsyntax#}
    • +
  • Removing {#syntax#}const{#endsyntax#} or {#syntax#}volatile{#endsyntax#} qualifier, use {#link|@qualCast#}.
    • +
  • Changing pointer address space, use {#link|@addrSpaceCast#}.
    • +
  • Increasing pointer alignment, use {#link|@alignCast#}.
    • +
  • Casting a non-slice pointer to a slice, use slicing syntax {#syntax#}ptr[start..end]{#endsyntax#}.
{#header_close#} @@ -8820,6 +8820,13 @@ pub const PrefetchOptions = struct { {#header_close#} + {#header_open|@qualCast#} + 
{#syntax#}@qualCast(comptime DestType: type, value: anytype) DestType{#endsyntax#}
+

+ Remove {#syntax#}const{#endsyntax#} or {#syntax#}volatile{#endsyntax#} qualifier from a pointer. +

+ {#header_close#} + {#header_open|@rem#} 
{#syntax#}@rem(numerator: T, denominator: T) T{#endsyntax#}

diff --git a/lib/std/child_process.zig b/lib/std/child_process.zig index 4a816c8318..21d7b4fe3e 100644 --- a/lib/std/child_process.zig +++ b/lib/std/child_process.zig @@ -1164,7 +1164,7 @@ fn windowsCreateProcessPathExt( var app_name_unicode_string = windows.UNICODE_STRING{ .Length = app_name_len_bytes, .MaximumLength = app_name_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(app_name_wildcard.ptr)), + .Buffer = @qualCast([*:0]u16, app_name_wildcard.ptr), }; const rc = windows.ntdll.NtQueryDirectoryFile( dir.fd, @@ -1261,7 +1261,7 @@ fn windowsCreateProcessPathExt( var app_name_unicode_string = windows.UNICODE_STRING{ .Length = app_name_len_bytes, .MaximumLength = app_name_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(app_name_appended.ptr)), + .Buffer = @qualCast([*:0]u16, app_name_appended.ptr), }; // Re-use the directory handle but this time we call with the appended app name diff --git a/lib/std/fs.zig b/lib/std/fs.zig index 244f3a38ce..2300ad044a 100644 --- a/lib/std/fs.zig +++ b/lib/std/fs.zig @@ -1763,7 +1763,7 @@ pub const Dir = struct { var nt_name = w.UNICODE_STRING{ .Length = path_len_bytes, .MaximumLength = path_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(sub_path_w)), + .Buffer = @qualCast([*:0]u16, sub_path_w), }; var attr = w.OBJECT_ATTRIBUTES{ .Length = @sizeOf(w.OBJECT_ATTRIBUTES), diff --git a/lib/std/os.zig b/lib/std/os.zig index 32463aa30e..3cee30c32d 100644 --- a/lib/std/os.zig +++ b/lib/std/os.zig @@ -4513,7 +4513,7 @@ pub fn faccessatW(dirfd: fd_t, sub_path_w: [*:0]const u16, mode: u32, flags: u32 var nt_name = windows.UNICODE_STRING{ .Length = path_len_bytes, .MaximumLength = path_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(sub_path_w)), + .Buffer = @qualCast([*:0]u16, sub_path_w), }; var attr = windows.OBJECT_ATTRIBUTES{ .Length = @sizeOf(windows.OBJECT_ATTRIBUTES), diff --git a/lib/std/os/windows.zig b/lib/std/os/windows.zig index e53387b27c..93e762827b 100644 --- a/lib/std/os/windows.zig +++ b/lib/std/os/windows.zig @@ -85,7 +85,7 @@ pub fn OpenFile(sub_path_w: []const u16, options: OpenFileOptions) OpenError!HAN var nt_name = UNICODE_STRING{ .Length = path_len_bytes, .MaximumLength = path_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(sub_path_w.ptr)), + .Buffer = @qualCast([*]u16, sub_path_w.ptr), }; var attr = OBJECT_ATTRIBUTES{ .Length = @sizeOf(OBJECT_ATTRIBUTES), @@ -634,7 +634,7 @@ pub fn SetCurrentDirectory(path_name: []const u16) SetCurrentDirectoryError!void var nt_name = UNICODE_STRING{ .Length = path_len_bytes, .MaximumLength = path_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(path_name.ptr)), + .Buffer = @qualCast([*]u16, path_name.ptr), }; const rc = ntdll.RtlSetCurrentDirectory_U(&nt_name); @@ -766,7 +766,7 @@ pub fn ReadLink(dir: ?HANDLE, sub_path_w: []const u16, out_buffer: []u8) ReadLin var nt_name = UNICODE_STRING{ .Length = path_len_bytes, .MaximumLength = path_len_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(sub_path_w.ptr)), + .Buffer = @qualCast([*]u16, sub_path_w.ptr), }; var attr = OBJECT_ATTRIBUTES{ .Length = @sizeOf(OBJECT_ATTRIBUTES), @@ -876,7 +876,7 @@ pub fn DeleteFile(sub_path_w: []const u16, options: DeleteFileOptions) DeleteFil .Length = path_len_bytes, .MaximumLength = path_len_bytes, // The Windows API makes this mutable, but it will not mutate here. - .Buffer = @intToPtr([*]u16, @ptrToInt(sub_path_w.ptr)), + .Buffer = @qualCast([*]u16, sub_path_w.ptr), }; if (sub_path_w[0] == '.' and sub_path_w[1] == 0) { @@ -1414,7 +1414,7 @@ pub fn sendmsg( } pub fn sendto(s: ws2_32.SOCKET, buf: [*]const u8, len: usize, flags: u32, to: ?*const ws2_32.sockaddr, to_len: ws2_32.socklen_t) i32 { - var buffer = ws2_32.WSABUF{ .len = @truncate(u31, len), .buf = @intToPtr([*]u8, @ptrToInt(buf)) }; + var buffer = ws2_32.WSABUF{ .len = @truncate(u31, len), .buf = @qualCast([*]u8, buf) }; var bytes_send: DWORD = undefined; if (ws2_32.WSASendTo(s, @ptrCast([*]ws2_32.WSABUF, &buffer), 1, &bytes_send, flags, to, @intCast(i32, to_len), null, null) == ws2_32.SOCKET_ERROR) { return ws2_32.SOCKET_ERROR; @@ -1876,13 +1876,13 @@ pub fn eqlIgnoreCaseWTF16(a: []const u16, b: []const u16) bool { const a_string = UNICODE_STRING{ .Length = a_bytes, .MaximumLength = a_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(a.ptr)), + .Buffer = @qualCast([*]u16, a.ptr), }; const b_bytes = @intCast(u16, b.len * 2); const b_string = UNICODE_STRING{ .Length = b_bytes, .MaximumLength = b_bytes, - .Buffer = @intToPtr([*]u16, @ptrToInt(b.ptr)), + .Buffer = @qualCast([*]u16, b.ptr), }; return ntdll.RtlEqualUnicodeString(&a_string, &b_string, TRUE) == TRUE; } diff --git a/lib/std/zig/c_translation.zig b/lib/std/zig/c_translation.zig index a050e592a2..d33c74d777 100644 --- a/lib/std/zig/c_translation.zig +++ b/lib/std/zig/c_translation.zig @@ -75,7 +75,7 @@ fn castPtr(comptime DestType: type, target: anytype) DestType { const source = ptrInfo(@TypeOf(target)); if (source.is_const and !dest.is_const or source.is_volatile and !dest.is_volatile) - return @intToPtr(DestType, @ptrToInt(target)) + return @qualCast(DestType, target) else if (@typeInfo(dest.child) == .Opaque) // dest.alignment would error out return @ptrCast(DestType, target) diff --git a/src/AstGen.zig b/src/AstGen.zig index df111906e6..a5667ce9e8 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -2530,6 +2530,7 @@ fn addEnsureResult(gz: *GenZir, maybe_unused_result: Zir.Inst.Ref, statement: As .bit_size_of, .typeof_log2_int_type, .ptr_to_int, + .qual_cast, .align_of, .bool_to_int, .embed_file, @@ -8037,6 +8038,7 @@ fn builtinCall( .float_cast => return typeCast(gz, scope, ri, node, params[0], params[1], .float_cast), .int_cast => return typeCast(gz, scope, ri, node, params[0], params[1], .int_cast), .ptr_cast => return typeCast(gz, scope, ri, node, params[0], params[1], .ptr_cast), + .qual_cast => return typeCast(gz, scope, ri, node, params[0], params[1], .qual_cast), .truncate => return typeCast(gz, scope, ri, node, params[0], params[1], .truncate), // zig fmt: on diff --git a/src/BuiltinFn.zig b/src/BuiltinFn.zig index b71d96c3dd..80eb739185 100644 --- a/src/BuiltinFn.zig +++ b/src/BuiltinFn.zig @@ -75,6 +75,7 @@ pub const Tag = enum { prefetch, ptr_cast, ptr_to_int, + qual_cast, rem, return_address, select, @@ -674,6 +675,13 @@ pub const list = list: { .param_count = 1, }, }, + .{ + "@qualCast", + .{ + .tag = .qual_cast, + .param_count = 2, + }, + }, .{ "@rem", .{ diff --git a/src/Sema.zig b/src/Sema.zig index b4731d9509..d306c68e08 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -1015,6 +1015,7 @@ fn analyzeBodyInner( .float_cast => try sema.zirFloatCast(block, inst), .int_cast => try sema.zirIntCast(block, inst), .ptr_cast => try sema.zirPtrCast(block, inst), + .qual_cast => try sema.zirQualCast(block, inst), .truncate => try sema.zirTruncate(block, inst), .align_cast => try sema.zirAlignCast(block, inst), .has_decl => try sema.zirHasDecl(block, inst), @@ -19529,10 +19530,24 @@ fn zirPtrCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air const operand_info = operand_ty.ptrInfo().data; const dest_info = dest_ty.ptrInfo().data; if (!operand_info.mutable and dest_info.mutable) { - return sema.fail(block, src, "cast discards const qualifier", .{}); + const msg = msg: { + const msg = try sema.errMsg(block, src, "cast discards const qualifier", .{}); + errdefer msg.destroy(sema.gpa); + + try sema.errNote(block, src, msg, "consider using '@qualCast'", .{}); + break :msg msg; + }; + return sema.failWithOwnedErrorMsg(msg); } if (operand_info.@"volatile" and !dest_info.@"volatile") { - return sema.fail(block, src, "cast discards volatile qualifier", .{}); + const msg = msg: { + const msg = try sema.errMsg(block, src, "cast discards volatile qualifier", .{}); + errdefer msg.destroy(sema.gpa); + + try sema.errNote(block, src, msg, "consider using '@qualCast'", .{}); + break :msg msg; + }; + return sema.failWithOwnedErrorMsg(msg); } if (operand_info.@"addrspace" != dest_info.@"addrspace") { const msg = msg: { @@ -19634,6 +19649,49 @@ fn zirPtrCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air return block.addBitCast(aligned_dest_ty, ptr); } +fn zirQualCast(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref { + const inst_data = sema.code.instructions.items(.data)[inst].pl_node; + const src = inst_data.src(); + const dest_ty_src: LazySrcLoc = .{ .node_offset_builtin_call_arg0 = inst_data.src_node }; + const operand_src: LazySrcLoc = .{ .node_offset_builtin_call_arg1 = inst_data.src_node }; + const extra = sema.code.extraData(Zir.Inst.Bin, inst_data.payload_index).data; + const dest_ty = try sema.resolveType(block, dest_ty_src, extra.lhs); + const operand = try sema.resolveInst(extra.rhs); + const operand_ty = sema.typeOf(operand); + + try sema.checkPtrType(block, dest_ty_src, dest_ty); + try sema.checkPtrOperand(block, operand_src, operand_ty); + + var operand_payload = operand_ty.ptrInfo(); + var dest_info = dest_ty.ptrInfo(); + + operand_payload.data.mutable = dest_info.data.mutable; + operand_payload.data.@"volatile" = dest_info.data.@"volatile"; + + const altered_operand_ty = Type.initPayload(&operand_payload.base); + if (!altered_operand_ty.eql(dest_ty, sema.mod)) { + const msg = msg: { + const msg = try sema.errMsg(block, src, "'@qualCast' can only modify 'const' and 'volatile' qualifiers", .{}); + errdefer msg.destroy(sema.gpa); + + dest_info.data.mutable = !operand_ty.isConstPtr(); + dest_info.data.@"volatile" = operand_ty.isVolatilePtr(); + const altered_dest_ty = Type.initPayload(&dest_info.base); + try sema.errNote(block, src, msg, "expected type '{}'", .{altered_dest_ty.fmt(sema.mod)}); + try sema.errNote(block, src, msg, "got type '{}'", .{operand_ty.fmt(sema.mod)}); + break :msg msg; + }; + return sema.failWithOwnedErrorMsg(msg); + } + + if (try sema.resolveMaybeUndefVal(operand)) |operand_val| { + return sema.addConstant(dest_ty, operand_val); + } + + try sema.requireRuntimeBlock(block, src, null); + return block.addBitCast(dest_ty, operand); +} + fn zirTruncate(sema: *Sema, block: *Block, inst: Zir.Inst.Index) CompileError!Air.Inst.Ref { const inst_data = sema.code.instructions.items(.data)[inst].pl_node; const src = inst_data.src(); diff --git a/src/Zir.zig b/src/Zir.zig index 94e6a9a11a..b93422177e 100644 --- a/src/Zir.zig +++ b/src/Zir.zig @@ -857,6 +857,9 @@ pub const Inst = struct { /// Implements the `@ptrCast` builtin. /// Uses `pl_node` with payload `Bin`. `lhs` is dest type, `rhs` is operand. ptr_cast, + /// Implements the `@qualCast` builtin. + /// Uses `pl_node` with payload `Bin`. `lhs` is dest type, `rhs` is operand. + qual_cast, /// Implements the `@truncate` builtin. /// Uses `pl_node` with payload `Bin`. `lhs` is dest type, `rhs` is operand. truncate, @@ -1195,6 +1198,7 @@ pub const Inst = struct { .float_cast, .int_cast, .ptr_cast, + .qual_cast, .truncate, .align_cast, .has_field, @@ -1484,6 +1488,7 @@ pub const Inst = struct { .float_cast, .int_cast, .ptr_cast, + .qual_cast, .truncate, .align_cast, .has_field, @@ -1755,6 +1760,7 @@ pub const Inst = struct { .float_cast = .pl_node, .int_cast = .pl_node, .ptr_cast = .pl_node, + .qual_cast = .pl_node, .truncate = .pl_node, .align_cast = .pl_node, .typeof_builtin = .pl_node, diff --git a/src/print_zir.zig b/src/print_zir.zig index 6e8923bed9..e5fc8815ed 100644 --- a/src/print_zir.zig +++ b/src/print_zir.zig @@ -332,6 +332,7 @@ const Writer = struct { .float_cast, .int_cast, .ptr_cast, + .qual_cast, .truncate, .align_cast, .div_exact, diff --git a/test/cases/compile_errors/invalid_qualcast.zig b/test/cases/compile_errors/invalid_qualcast.zig new file mode 100644 index 0000000000..20b223b727 --- /dev/null +++ b/test/cases/compile_errors/invalid_qualcast.zig @@ -0,0 +1,12 @@ +pub export fn entry() void { + var a: [*:0]const volatile u16 = undefined; + _ = @qualCast([*]u16, a); +} + +// error +// backend=stage2 +// target=native +// +// :3:9: error: '@qualCast' can only modify 'const' and 'volatile' qualifiers +// :3:9: note: expected type '[*]const volatile u16' +// :3:9: note: got type '[*:0]const volatile u16' diff --git a/test/cases/compile_errors/ptrCast_discards_const_qualifier.zig b/test/cases/compile_errors/ptrCast_discards_const_qualifier.zig index a2fea4ff11..eedef01234 100644 --- a/test/cases/compile_errors/ptrCast_discards_const_qualifier.zig +++ b/test/cases/compile_errors/ptrCast_discards_const_qualifier.zig @@ -9,3 +9,4 @@ export fn entry() void { // target=native // // :3:15: error: cast discards const qualifier +// :3:15: note: consider using '@qualCast' From f3bb1957fa7f317873584cfc0ea8e3fd59283ec2 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Sun, 29 Jan 2023 23:39:03 +0200 Subject: [PATCH 09/65] update zig1.wasm to include `@qualCast` --- stage1/zig1.wasm | Bin 2369157 -> 2373912 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/stage1/zig1.wasm b/stage1/zig1.wasm index e64e05fa1300ae7254391cbb74786b55abd1e48b..ef7d7891c9aef6a9f65ea39fed25ecb815a38f9d 100644 GIT binary patch delta 437132 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

?dcdO zYFl9gPPPI-uyZy98qlUEaVKhU0bi{HJl}g7T)$>&-8 zDbj-!u;NoB9Gl-eABGg9UGrfT4e59JBv|vg{@^^{KTX=OQ~7X^uh7ikszqKHIm)u_j+pWzDdYCx5$vA%YQ$!EyNDB#=~O@MHg#2`H9EVl!u z0czP2b~sXD!kv?n$0pEF1Q+M3+uPGjX~=hVVG z@buJpyu?h%#hZ>W0mwxq%=aE?Ts`{?-zfx%_;ny>Ir9t~a*ur7qQWAn0yBU&m7|KS zgUne@&4WlKh8d$_ijZT0ye^MDy+?YHyK0B~&~4BHBOa2UYSf5^e4G_NrXa&fQf%?o zYc#r=E;Azmc4cgyp87hvz>Fg2WUx7UdMdn_6AWNS9I2QaUxDQI1t{GDEKVipJXrRwwKe|*sR)g**wBi_xGtv%*@?-H_CAy2kmK~hXMI#mQ zjjejslZHFd>@_SffL^7!%a~Z3uAy;-EVDL^1y~I?QH8*DA66JhufYvlRSlwtiG667 zK-`zbhCq3%Sid?{L1{PY(Ay~GL|ytl>=4t!>rsOEPW9;>#5WA3t?2wh^|Mg=w*U-m zSY!Gz5Y)`Z^nC$(w)(Isl_knz)Ml+|3!O3jJeVq%@JF3Qj;|I0wu-LA7DWigi|`~U;TpcRw`pM4fC~pz9~qD4Q2k8 z6MWVQ=%q59j{|H|XKG|IohkYw6#yB0c%J&K3#~)Q6Xx5E{tU_7ZnVff|ERftVPrY? zDEqNH)F^X}n%kYa<1J=(z6V{5>4ctigc%NGfA^%nq3H3wD4a^htbk~|$?y{^?Mc1Z z{N8jJjai{S>`l)*(p@vuqXXy=3N>TFpU^&ZXF2=v6WSCAEcFxm1I{g8gXlh-WZ3z^ z^aD)m4nYyS)G0$~IK?0PhtXhx7MG~EN6-Oo_@n)|)JH^p2K_)+V*2t2ItP}LGsn~4 z$q7~Zk^bmJPP2)V=qMu|h_t4OuF#3#Bqs;cQg(k5jrQVe5h5qffrT1{<%kokW+L2t}tv;LyZ>8x37&tKHb)zY?5jF}a_z$NeWV6`IYVI1l=BI!|Q zx-EunoJm{L9Wm_oO!_e?W$(|TzCIA0hNlDY(A6cv6lfx$g43UA__iXMeLstS0^5Q^ zvmg^xu+wbn&wOW7z2BY~(AoMX3BovXdNw#MypfAs^}Y62VQ`dj=fVD(O+&p7SD^`- zb#~9DVf0vx`Ve@ids&8E4=c@Jb>nDPTOSs{Q&{^j@8i*N6c=&oKXG)3h(_+O&_fip z_D-O9L6db$p!NU1B+N*lb2&ewINdUDMr*P0415s)^BJ9oN0N0C=_Tw)ViFzT3d^>^ ztEoSBwF#@CA0eZZPUA3Lm`Dys+JjWEzjx3GQlXCC zNhiW5*3=8Ts1qUos@HeJCURvsr!$@$cL|iu_MQ5M|6cw zd32a-I+zL8C^-bCsS@^m9_@{!oq2Q>jR&`R9OAa*GK)S%O|H;a9q~(dE+#j_Wwr@W zWR-gQ6kS7TY$5xrfcp5A!=}{m%0q92{VoRaz}<;5N4{1!7tl_Q

{aOha7?FqE#t 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%0Av^=yf0M;Zh#p|cff)%lLC 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%0A}zI)bo##2a;zTe!cUYoza|b&?YyEpF(9wX~X_ z?j(lmS=R8 z2g&Q;s?WoUSOSoPpOp`wx#Q2uLk)$Fr=OEe23YX~JP#9`x4X$R_21<%jn$u*d*Tdx z%JcHKhP93!-D$ud@Nq9-DmU>BFUW5pm)JvYVA$m7+e3y1bsuls3y8YU@lh|is^lv) zo~?LBB`f1OJ>^NhXLrDIMCHwT$+$S?IMWx@iD+(2fB6Yq&Fj}+PNVGk{_@w9ZhBE3 z@3%V}vkxFOA0QW!#v|b+`3R+k!7}3^FUyOm=K7cAc9hEfrZaJiO)`?if{INIqujt{R_c^@#aJjp*!NPlXm*e>N z!{v`b3MPz@%Nefn)g$DpuogKy0+aCz@9-AL=~X@kiM0F>@7F^Pb?kc!70r9*V7xSn z8$lHP@9x_&Bxgt6cjPh9rSMPRm4*AS;8AjS2-E{d$%#_dIX+{QTp8IfMq!&<$xn^~ zXs&V7X!%zp7e-^EuQ__XC*zFzARla(pQ9n~vda_9f}!`<3J_N$*m9S@kRmsrXR}g3 z*Y@&jDd-(quR2Dw{_Gf6>k6MXMmFnTQh3f7?E2UEdt>FVq%DP98z&Dz>iBq^{FDKH zZ|?>83*Por^$om zDN`Uslrg_@RGKbNHvpd;8FFhRe`d&&_~JP*D_J!|zUIx9x#-H4IRHLPjWXxRvAoV) zISm};=DBhuV)=fZE5A?aOI%(Cg5vO>C&LH$)Ia!?~V zDlY(CjJO^|E)sA%$cHpbJ}^QMyDXfuOj{_wrMiwigdK{Ic+VK4cwg74yyO zK=}^wj_a|#Acoj_xp(AY$a7F21S9%Mk&iy8Ck$RGc9>wa$N|C0*vF^mfYm(2+in0U zJY7m@d;KV(vzRaVU*tbL_BxIe@aXd3i>+Awz$uP7Ae5a zZj;{Pa);jHUWe=mq)#Ju5(R?cd7sFkfhi)g3l0p>RCccZja|9=8^7mbll|SX<}=U` zTyXvNbHM7NBl-*3*AVxqP~K{WHo;P)mV*otvyUl-l4jF4T-yw0XrH6!X7G}38@nT4 z%4@05>+qn+|3NNaU=$%E)}Y3438zmR{nOa9ck_oupe z07vj{`3fB{N_*uCU{Npa1rgcLJAES$!rk%5_RAIgV4*|$3|{n&oJBqpr|pvmqRO>> zARMB~bmaE$mq+M1TQE$ROj?0pX|ZFxaX?-}CtA_@atoM5_Q{t+$Ru*eL9jE0{L(== zD+)ZYDamWIH{Gr_X?YN_gKefnDc2i(aL#w~JE&Lrd$}cclfmE1(NHQ)`CguZ!k9zy zVc&TxLE9?xy@x@g!hVpSmgcQ=4E#avWstrs;JXgXZyF)kbb zzCf-UGlK+Cvg9@r_Y4hRsXh?=Ncp334Y1u^kIL@>Hs2iu0bcHi{Sky6f^*wrSUtPB z^|-tM1U~yX*t`t>&2hOK!M6MfxeGe__6hJ4xSDxF?kas8%+1H-XvZ@@$sG*kJnm2j zK=YA6t~qVV2|>^-&=wv98)(P&pJhdoX71w!C&BQ~+~;WXiyUT<)~EBnr%-_O+f(va zhFy-Cr?GL-iO1K!VSS(CH-D3#f!$_@Gw9PPKIn|R1B0$vge~X*f2Bz7C#3}OZ;HTm zAT27A*ZN&0H|XGH7Mzu*6TeXH93F01%AYzXSCsOW@}cK|Nhts6oLrvDjpyasRNnAB zK8!|QKQGUr)L1Mxr1bG(xieD7jACG(#E?<$u6^aDKcDzb-po2%HJaoTVdczB6VzAD?GfL?P|{*s`Rd<}y{I{TWO zKxytZc?zZW>ySeFUYCWLG%~_W`m^hxH~9L%8<0AG{F9q+0>ns1-IP~SdHGv%ElRuH zLa%X|{T3K8WC2lyzww*w<1pTq;nc}hRPhdQ#g(Dw{Fys|{U`jjJMtIkapGOMYSNcy zL0jqoq9&a6iz7i?(nDZ2oL8oRa|F|Gh{tiKmJ5dRGEcdSFR$ZQ@5&8Aoo~A3E4=|4 znaaEUi6woR5ByWEOFdZhr~Esm>G$MD&NQ6=d=IguQiA3fl$WTCMlolUGJ}4b4T_!8 z=>}z*>zSjrq&zMLx7Axw`9yC-$V3%nhDE2q*GmME3M0Hd9l%v=MS}+=r?Eo^qcVyd z@9#A#?*?b#Vvn}{7C8F^%a6RXk8&b-Hj1#Fli_LVXS|885-%MK;GK3te>lun`Oa|E z(aKM$4KZ#nA8ArzsHu4-*IL-JcB-&$yaf8!p zYmc6T)z)$SR}KnMed+(+605GFyvOjX%4;v zgDuLPSS(tp2P?2hWOwcp=NqutibihfGLfqjsKp|8Z=5*ifW;OWUVZk9c(Iml)U-WA zJgceO3N6r$vS6@9mP1p|2rDocY*B9eHzEgvEy_*I6*(AeDU|(UxyZs|i*osVvssCH zao#%7;Y7W|CAzI)r9e$Zl`}KNcVV?fyBlZ0kF@CLvEZ7CfH}uhqnD7`V0Fk zD{|L$+d|l9k(J!NL*g0ivuG^mp4AQDV4y|t{Xp+N476x4zv|cl`z*?F9RXpVMK7Mw zElHtAp=ZSzqNCVrDL4KX{>t6r#W6@)LwyM1DmhVlWN;JGIR0vfXL-6ezs;q%>At+4g zZWYp`pO#6EfyMa{e=AHWM*`)7FoguuZDGn(>^L36m5cB_(JVs2$<++9JivBaR&c|d*@gJ;gIl0J|RXK zMME%y`xHY6p&^)rJ3rSD;$oF&+(Q@{D~2#PRt(`_tnw0u&>&73t`EVa<&+L#bDTbe zlW|HN3_-OiS8(+tAYSUw3{OyArSOnHCxBdHIDaN6PeGP_ zvYb*8P85ceQ^tt{gew&ly2hJTNvR|On)@m%8HVGIUR9K0x-i}QGx>R+ux-uJYOsk<}f}yKXQ>l!8b+4(si`=1_N(1Et zEcV_=4KXbg5)DuU1Ey-MnPA)0d4n&hyer^JGOwM^dii zt5EI4b~>G4f#X7?P`mg0kTf%lyz@l4qN8G6#m6As$mL1(lwGRxI$J^nadL|W7gx!3kCr9LNnzh`S=8YA*>V(x_ZsV$2V6xVj_NM z4#45s|2++uTH>hCLU~2P_BO30p5Em@wZ!ZdaGzF6N##ES;-OVGfIEeOhg4Pu{__|* z6{Vd-0vR~AwW2}q*tfOPfm8$QTPs3EP@|2qG5FX_FmopDAQH0@2u^l9Hun2v+`L*7aRpgENQ9G1$)?%N#v4L%m1Fg*hMMVpg^}9LQG`D z5ol55*Fai}A8vCZ1WPW#($L%{XLl&K`+NRn7p03-^gXveqeMwCC9D370w zE`@bdaDDB2{z^BcQKK^5-wl6q9yU#qw$QhXNt8sPZIAn)pRjxTv6~VT>+by~Ds|h& zz4?(&cwA?P^PcBd|aO)>WXL72dY z_W&rs&Ft=>R6+J~52Y583O$v&=FcIj$1sJ|4GLz=DbUHt+RRs^NvzJ(ahS zB=iCqp1@z|g_Svh|IiD4!l!QZ!urQI;(LRmL%w@&r5zrB*jwpJ#kYGa^^mRAN7)Ti z*js&+N=Op=D$9`U?5j)(|JX_$5n=f-frBg}Z?JsKU+JgVQK_h(k}pjRt4iqn#i9YpbSIu%>d;OT$$POlG59ZXnt+ zGmtN~;E?eBmz55vzVBrv-Zp6-R82V2_E1;dAk6mDE(*-%!2^|_3}YR|1C`2jav7Se zG$MTNoUBx%)Sj$xH(ncvJ|HYjS-b{gpyPGZK}sE)%N~w3@XjOUm>UK5Q4R<^eUQ?{ z(;(8Du%%=Wb~|8m+-r)Tz~;o)m8x+rnbUg}`9NG{Oor_hwL-GGKXgaKURO?%6#496 zr3H>x=M7ednT3@i{L^RnCIkZK!-ptC@F;BvHk7UW!y(F8mp4)P8(%(LNr0Yx*KlPSbs%{J zw)?S;^&@cBLivy1QktUj#kZ92LdPQFi8wIx7T#Y015>hg!Exkm+Ko@@C$;_YZA%!=x41Wke1eXl|WG&+cpYyIV zBGmbgTkJuUY?4H6qm=SW26<|{&#a=`D1~FzFOE{G$fBc}P+{!EctM(2bM$#`saZqJDgZ@ zW9&n)r29C5B|L4Ma*Ie_YN}51Hl!+D!M6C0S8f`<{d9t&(iR;$5sT)aW70(B4)xVB zak3&CU^z5@iqaw^?6M-ZaV15N}e-ad5f}%8A^R*`(!9vpgN76p>#H!bG$JFB+H4M8p3ts z+

2HB)JX7z{D9fJ~Ek^I1w0Qrx{aONrL4G%()?lDCe3I7|5z-u|Y{1}-n>w`VKU zfH;%qD9b&=al(_fmVwLUsa%_@Y=wMl;L4lOsE**EYm+&gq|`=I$dzr-+%21jc|Xh> zf1vayk#X?{N^8Q~-#$>9=^cvX&F6zJy1*yT7w>&JU&#)cNf<;oas6TG3W$tcpv0K6 zb+meu$4^wE_-6~0uA$C)ZU8!~msgDs#P$@ga|D{(A0;zQ+ld^?5>51fko>X0<+(WMFTBW|Ha4xnl+@O4O ztpZCs&fm*^=ySd^TN#YUb=N61JYRS1b|cm)gJW@+5B{Ifk6g;)48czzBeoJT2E%%V zLSOK5>y-q(Ztf%NzPKLfzm%_Buf(b_r+_VOqLlALP(&DMvA_Pf9xMu4yN*_I5)+;S z4lWZ4e=H-EzLKMq3(16SXp&c|FT?=>>G?TOTAbx?Zcxf0;Ty1$0GAMkk9KUNwA z-9^mvF0R^dehg&hyxvA7mG2d;SsVi5t$@D~`TyM#cW+_;G65b|J+4;TIP3kE*EmUKSr zGo@3gx?E#rB6 zl>w&ZW}ANvLmnKhA5a)?{*5xnS#-l$bm<#qwkb>0%7N#0s90m_yYt6nX0v-anuW!nLGx2OyuKVo*L+bS%hM=25opcOtv}J4K@GuJ0k_Ep>D| zq_j0g=tu5Q+reR|P;%FVi2%G7E#;pVfU-V9JdLEv zX;6wKeBx<*Gm~#Rt)w8S_bc{8DDMaSs*Ldc1vlI*@TmQ(at6j6U;lZoH~k`O+|lzx=y$0m-u$01jNwxPbY- z!RuXAJ~rHR6kP=0XSn02dI>}oTVj_#lrEK1&158=V?=y5n5wLW=SfOe83PlnAnP6m z&AjtT9Koa%`vvlAe<;JGDNu-CR$iy{=w;}}yfH`5!Y2EN)V9P)sH2c0zHUohhJ zUA&@v4v!71uVQ1r%q`ad_U-(}HD$TsmSf>{C5(jCO*b%xn~q^O6`Ud6;bU)MEsWze zZYy2D@{PR>#lW{b><(myExhm!(C9Mnc2`KdEANuD`;p_|pUNkaVS!_!fekPizI7B! zEP`6{HL|W)Mm>z|J*sxphkc4_Jj29Z2Oj@vVxye+70OcrnGc`q&vufYr&j=Lh=npY zfZawbGXtp=ekPE`m0JZ%Mr|>fGhQikTK$-|@GBJJ2s@JxK4Pt6f*NZ#w9#;j8pO(j zF-{3$iPH4nc<~YIAm0Pz`9kHr3anM}s7)}dNsqoPux`e8mXg(LTQi~`FXHc+nQ)ms z-^`jjvwAEngJmG(C85XIE0KkJV7#Oib884|XFszXcXz#mpfdD9;qEO^V|r7FPRdOq z?Ws3{2I2apq%FdYBIKYl^ha*fLFj(HgP<~`XA|LQ3^}L_{gB&!T;!lKG$EIw=b$l! z5h02g>ofP-*vbYO z0}tT@+7)Z8e<*w3Tl#V>|0RNrG#(2KY=u*>m~wnqoJ^l+KG{F9&-ZFXFf@Fq%a{ZB;3nbqy^zK3Vk9=G!iq&JVCS{46<+ z8PTksw;{*zbsS6aQ$MAR3cDrlnuy_$EbQPtE3uV`m*Nx1ua0L5k56RndDjUnflp6l z)nN3sIgvGmwd2i1_AcDr53kI2;Bc@}71kO_N)=Ys_c)@J6@E;8i2mrsxwVGgfnm1*an>Qn(8cuA}8;y&LVw9@J=uOXEhc&w+2=y z+&q*J7h-oNvyy$k4F8d(OO}~1b(76Ye=rJ zriB?B`yN5O<)B#JIn)@-i^Gh8Jf)8Qslae!jAKI`Hq=1hSP)@s;J0b+Y>S2$k46|9 z!++kQdaNH{bgv%UB;88opVZg8(>V%#yjGum3Tl|$fK_zA_G1Iqm>@Jg+SrQsXvmUj zM9pK2@w})ZUd4!l8ZnB~(WVhwiS{oxViWcLMe6;V-HgNpEugXVG?;@BFA||DS&uGs)Lwg4Vv1rmf;1|J&O)+eGMY|oaICy zzfj#+EB04->d=gqKByA{%(6i*noDan*OIJ(CT(oXhPsw-A+9ir<-4_p@j2gbsadl= z>g;x6)Zeya{i=-{Uv{yQ4K=Cb^YON%;q;p*kxh!C@$#PSnN9j7mA~Jfg`1rVnm&VP zj;!|VC4>GM1dkx#COs`a)A4Ec8m*`=pJs7E9<2rPk#&r5rUOJR0x`!+>lnjBopyYJ z^k`?iT8r-jv~`RX`8VyEnH%dG+Yzuk*EM$IYA4nX^VY8u8%|}(^^6txoldN(bQ}SF zk--T-$IfiBRJex^u5XNz3ij|R^^Ga~oh~fYUvx#xVwDEKjodD5k7+9*Bq3Z(LkwW$ zGdlh0*bo?B@C=xeZ~5J4SiCeJXVzVH5_7bn(Z&aK1@*-g^=M?=$VWcQLNWgt&$72k zgSEJ^aWIhxa}!YcqkP+QY@y*t-n$!nQu-0Ycmdl~r=~`K=_p=rYOKv~bYlfrxCftS zN|4xGeYAN|$?&IM@;rjE{>a0-v#|mIFR(D)_Hm=acXemQRMM`Qu@|@YU=^K@72duF zTSB~D4+j6;haHW3v8N0~>7t*&fLHWpPg7C5siPmO0(ICg{n$>xVO4*23N5F< z$QtV87mBEFUSyBMU?^Y!+l7;sg98N3J3D|itx)J9p1~$yx4yM!GT>t-OV(UVlb?Ia z7>zauzQmeIg@L?nTg?0ZmskapyT+on#%_^W_YqLKR~QAp-|`Aefn8#=S6To2gIw=;m9@J+$aU>x*6yJ}t}~NaxBG)! zqpbYHgIq_8iTAP)SA{cGNZO%7(nc0xuh$L2X0wH#8N@1tBjUB7pt#{Ks0uA!FAL}$ z1-%8=^7w0rFulpl`@LvxZgNJu-pIdrjrDc~yWYs-UuRKOox!d*nq6^4gC7;_dLtkB zI!l0&{bamna)!Fz$g?TujC8$`=fBR9OwK^p8@bP5Ru?j3ke$YV3TAH7$3-jn|~rBfL()na6H%(GB4Qy~wN(;hI}u|PDz=hEcG1fc^2hJ4N8Tyf-Bf-|VBReB@ zu#->r(ROV0jO+|=_?_Nm<*0$0+Z5^={xjK0JB)AFM*!N5@i>(cjpPSM)TxBAH%z`@aooMb+;jaThJ6TrV zE)C(F(YaUC%u%MCooE;lnfTN+a~zefOEX7u-}hOS@God1p~zEZmcrMi@tE;Z&F8dkXzL$<7{+$iI(z-~u@iz|Vqcly>$aHu{z+Y%u0`V+!kr zBybGa^pE))V;IGUUOGn5w9m${XbKa3WDFpBn6t5>&d9N>*#q323%~LSrJ`Z?eqpR= zf)I>HjANb9c=9+F9ihjLE@cb#7pY&O>c^-W`?1-@G?D^VC!+`_jjhC+!b#gw*%QQ0 zy_Cw@;A|>8m8CpFplUImtpb9aAJ1MzGB}aNJKmbWo-=?a-anC5@Xw~JAHkO2C0_H3 z=xAtG!_!y=NaT;FvBZEen~4e0zc^(0>;b0@J{(uF|&n%NwKZJ_fc zv^NJH;4r^vFK2Uf3^Y-TsB{*bhl#Ju4Kc?^;}`RDD21VbWiqSie_;_&B9vYk8iFv) zCwXrwolXt;Q0bRc`UPK$Qk)TdKN&M|kz1y)^7QRqTcV@ z2&`ZpZ%<)K(&TZxN;<12{W6C4OGl`~JA6?(i<8d4&|_`@`VCIZB zw#L*?>1GMa7AP)#LN5`Ff@CBUcm3HT`ozYM8F*8{MnuX72LKMMd8D?SmoZ+#v zAOMx{H)gT#{GDt8=A`4-(T`K5DYIDzY4>>k<7~Zu_ae-lP`gv4xg}4Z1Lf5zesT_L zkEHrs)`mtfItqb!_wwwySkcISi)`%I#4dV5lmeI2AqZ_0=mKZ;?DQk6HlL#3{aQ0Wj$z{P;re!DccmH^rN4Lacx-eDFf-gje|oNc@k^ z73>25vpL?}8Fswp1ao)kQXub}AKjR5T*R1k3N$u9I*u1PGbi(-lTfkRV#rm%UcQ($ zk}gi*-z^5m2$FJZF_d<9C-Cx1ST+AW1Rq~?oi{IUE-%d<$L&j49sg9au@;Lwv%Fcw zTpe73Da6YGnJfuiYnX`%DCSc$Sxx_$lSv_?1j5UGQOrOb*;QZ4HU=)A?d*4gFAx4b zIEMQ#gLdF|K57|O_g0>}4E*Iqetj8R2F>UE%FyU&;TRhh(t~I1|atVjNIu z_#rzcU4^`$MD(FF=WRnI`Y>Y!rXATaEW#!&lli*QhKiKN*YJy>^5!-CD&l;>sz#Kj zV(mRc4BlF|lAQ=DAgn!vKTzHB;=`;iZ=P`*?NwN|FW;|4@O@|Zyv3vkSY6Wwe~>202s z&DxoSJSJIg^Xu7|;MgF!xh%c-tMHeac>-_ycS+gRR;`-gFBvE6ve!3mfl;1J7S}vijhW zBX+T#NZ#7T-T|q(xC_f~ha>1~HqKy}*BMd|v6j;AoqX>hEP?Ud@&kDJ*}UlwY@6?XGfvj_bMM3K6=}~-{`z51dQogXqZmamuf#Bzgkc?YwEKw-r|?L5KeK62^>i#`Ee(Z^ z*@bM7WJh;s86cd4Z#%;(Lx4JehAlG9qgd1w9Xg{33aCxEW5M2zJ&iMMdfnp_{_x-fo>qLK z?^%4}Ce@Mf;;gf5GP)Rh4gwhb0i9z{m>d`Ji~>m)o)?Wq6*C)ebsih!PyEI6tUBt= zJkMG`tlnd&(!H3?Hk@)?C}uIskq(r+!ri=MJtORg?ZBz+sW6uL&HE4-Yot!q) zef=H22_}SG1q+_%OM!VbFa3YZuQ(1ut(6px#L(F5syME%FTvp$jL=}D?_~5X3CN_0 zhlx_%`qCX(8YN0l_~5l2mSn^u7p9S!;-|Nl9mVsUzwxsKdL3c(2TT3ZQs`Xp9{Ix{ z|7AB2+k~3gjE|7Fnkyo0Vz@@B)Y$6=eH@)gM@p|{Q28M=>=74TJSe~eJB|dLcA)#H z-aMct)KDSx_X^%Qgr_!tiY*P;EHovUup0q3=@v+J_SV5T3JH{&ORh4B%FxY3Kmdcb zNg}5=hX^+&%WtH{CoMmG&BH**N3-Koi2fX)ZS%5Zi;wK{PcYFX2lrRn1P9_X&Rzvr z&X}D}%{_bKssr>gT8c1{+6^3dqY2TD(Q=lGa)RiKDS^q(0M(FQD#Jo4pn>-)a58wb z3KwzD!O9A+(VIwvguxx!xx?d{sFk?oGJ7EegExr5>jUK@FSA&<6L1>v_3o!d z)0s2NGyvYVLE5o29FE8z!S8L2*V0<9ernUD_WQ1nKg^W1j zHxN4h6J)gi18hVW{^Q694FB8M_}9n?JY4e#JoG2qOczc$QHsC@l(UzjRauNNk@bd- z>yN}LXB~=(ejj3qSqXYHV!81u4&V5Ph=p#^3gV-$u`2c=tVK@(RU85W1=LNHib7z< z_(%fvA>3_HsH#l>nTWDMDMUj{LI6|?l)-5>2-I4b_7Q=i6>=pg*+ro8#ZR3;?RNe~ zjf`NbL8M5VSNbzE*hRL8Kw&ir0#%HZ2+}HY{NdHautKDby|Soh=K9iRy`Fa-)k{Sa z_YcY^da7H@KK$nI(f447M>avA{F%12I)-Z9x%ngH^U? zzzFWBi+l)!3~~l0E)!UO@F++0O*7n-XmBJaj_%9DVg~UP6HK;%L0Ei?K`WBH(#=38 zDvlRMPr{vNF`f{ti-?*OLH0g$2U}Qq+5!=Xp(ULIpfZ8@5SF_QQ7H0h*@NQmqdcjI zDAoI42)hFcxqu3=i^X41Ov^_+^d^wvfe+oJ580d_`cHf(2sG|j2=hW47KIQIAZ)aU z2^iX4z#>BqLdDHg9kd_2JFc$=(MVw4pxJ4XDQKv0f8&P*yamOHQcZvoNnKn+%GYH+ zVsi>aAP*uOUv`3y~PB_Jcx#Pi$%UHAn2==Pu77*(9-7L z1ysTbD!NvWWU0Rke$1f@{Fq5M_&eWYVK4sc;gV4t4aNc7hNnTJYvcTvZ(>6-#s_*g z=k|BiFuR|ZL6W?^ePQz@Y0-lca5*^K7T5-t)3J@zmuSbv1%E&!#&QA+n1EWIG>!W( z5tOkJH?kY?IVwrTBuuNYiMzNEVH%EbSmSbkSD}D&Ack%!Rtd?j+ ziTfSoBB@Yn;O)lt*~Bk~cpxEOb0a&Lw3P`a zUil6Sw!2`40X~RaaQEwDOL|;d1>+jQzmi*7P+V)WrPzEQ4%7Rt#z0ygYz&NF88E|7 zkW1&5KqBB<0GFA% zd?5I?f{=d!U(Do#@C6$Olbk`ICPX&qoSfjDI0&maiyYxq!y}@thXQbzP7UPqIk#Dr zeuCT)>JrS0youiwcaW?FCf;a#J1;!CIEsJr5+;)eB zM!9f9khHQ?jCa1nSWnT9vR(L`x}f~4E&x0JWf!)g3orad7l_x!XsSOhr2@Ew^C?04 z22{G5OScgLBcg%ZXP|=&QdF(GtW(DnIF-Pm29TDdRss`&>!G_5Q4Rv1z8n1oIdsD< z;K4cP(x0rH{RXyEqK3a?3D+>BfP>LlG1q7xxov>)Hq-tJs)&OH>darzFWPh;N~G*M zm2#uaPlW(UZ0WXujl`4cxely|=;aG+e+bbNm_+csM~y*(b?q@Ey10p+zQb29-Qt}% z_^*NLUX{Sq2N#m=n$#(M`e<3fAnHN_McuVQLh8gfol>fJ-zk>5Wl;}4-zAG;xTO-R zT`QG3J!R2S3DqTw{#_ZAfFfkpN6Dh4oE}8c?qIEYV#;Zuf}u}9#HpUh1d{-cM-3sH zBdJSb6Af9guQ|b>(WvhhT!Wp0>!x6VaU$AWPd?+UTH&GKMOXz7Vb*k?Fl#C!%;p4p z3bTdyvO&9Z2KyiVv0M;{e%kZ1)K6VS6e=vrD;F+QmqcDe=;_!6qIf z-)^*A6zy)d>LT*r7!MlB2uvnYNZ33t(8Z@~t4d2ZqcmkK_G2A$z0-)ygaElH1@TOw z)Zbw6Qj9c;)(Z|7`#>hExKp|3Ipgs5~UPhr_KOQ%I|BY_M@ADFos);o@#`@ z2S+k|aS4GWsG|em3lb%!3xSzJbF$mlQ@bGL`8M#LhZ6ww8=93zDHkAuK`=7{zFxd? z6E((HgNtGt{Bs!9r=X`AZd7f2&RLZ~m4NTLMusVH6NaDw(hx(&vf)c9xYb5I-57*2 zsH&oozylPzU~utn!r{3%1BLN4X{5YJCkbZEK-ScvfVhqn5#|$Z1MFzjPRhG1{4iSf z5K}&Z#F8Yh_4o#1*H|H?I1I_qZRjO`qOOm&wX_7}-z(eD#E?p~9KS!o?-b|nFYz0f zQ_|XAbO(R^=b_i^M@A3o3t>-cp2kK^4ejDS8cvLGDnTEtF6fXBvC3h#4D5*kv9;e zrw#F8lolG|qX-@ahWI4PA2P%P&|pstkie1dGYIufJ^&!lHqVd{?PUEANeO;1eW1!x zd zY&@>b7~>=Gg|*(a;Au6}VV`U5<5`eq)z;?y%HRBs?{5=}Ms`jwCfP1%d+ z2e9`ykv8@^O)2>9JM;|<^#-NTWn7`uM?3C~?XHA=W8{J-Lw}2qr;CxUL8iHXQb`K6 zxJeW_$s8>DQM3bcT0|FJoI%evQ&}O*;GEzoa5tjmyMI!9yN$Mxct6c6-im(&^b#TP z;Z_e+d;zvV-ruBFx09NshT)1a!B6LR?s$`!O!Oc4fI$IE-6Iui`--H?(HINdp@J!K zSGXdP|9dJm##aPEG2xDpE!?FH^wE|G;)o^aUVJNk?6mr@234euNTjY_WIL+GM;m=+4hp(Nqc2j}_P;-V~Tjd>J%~l!I2^6jh60EjxT!6t;75KR}{&3poG1K{eu8kh3 zUfFv$+(vlW%DafPp278UPmL@svQ%`yhG5ibNa;iANU3}kmB&JvOeq#`rk@QDh6$)hzaa+NfIPr{ha`dPD zTzP+bA-QiRkeQLvsxu6}^^^d%j7ER@64c%h$@1ugyu z9cuD#EO6dBM2%NVM1OR(FrcHU8Uw#LIz)}IgWy=M2sFO(54!Yk^oXL-*XSFB7qYw$I0A2OE;< zEIf_Eh0foF_zj_{EXBj8%1}H!7ZeZU(5CuR7X+ax5MoS@zl+|1(utB){({~KDfo($ zuwnclT|}Oc9H);5g6&00h;kaKU@P!p3U{4KDJa_w{keA<<dkK#ErH6ER`6H1i!;Ss$ot#Dr_|B6TUz|SIq z9Ae@T^N$ddW;_k5XKaIo0i}qNLKXvBL4X@ksBR(636S`>m?m9g>Ox|nH3bd}B{NWg zw2VSyir@LLD!74n%Iw<6d*ZO2=%qknI$!uQKu2QYypYWbaPPhe;DVi-==X7V9L**cYnH&^v{mInnz@fc`rr2$+QOGU$!&2=uN_^9iO@Xve^mLWQFJF8U@&^da;_ zU^M0*Wby`@(Qb?0-3xS+NkZuz^kGPTc~k=^z1f)-QaMolG^N!Wco!fg7!*;SocTBQ zx{jYjU9VA*j?q`?Cop**rNHF7f%Ya|H;KeDefH-G^B^6K(+&WQnG=l{2D#8U9nP}c z@;hKvN}JN@Y$g%N>`}pm=Z`{=f0O?G1)k3f5;R0N9w2S2j^`U(q=%o zLpCV15XdHl7J@L4aV`X5L4$>mL(iNGfoxppcTO<@M#T z5yi*hMGwPJ0%d&g%_YJ_?E_e%YnfZUdGW89IB#)&LCG zO-MwI|2IhK#>t0JXCqm}=$0f=I*0AzpMeVx3IcFngxy3;rIT?Zs-ifl%D!M1RnZmt z9zz!+xBu@AUF=Jx@V}4mdgNGfYb}^q8glD_zc^=c(w+7~d!ywGP@q_BuR%_-a|m#7 zYIn*2f|RGF^mQ|7v~Ym-A0@z#B1{4Y>;e=2iZDHb0Bd_FGBy~9_$Zq-N~q#WB_`tZ z9)9$iD>OAFZc2sSF-H^?fmC@=Dl+G#t$DJnHxbahL+?G}-bMD+!<`%EWOqurY6QEQ#>B$X&RyZnk>4)B)?_Xj6&lZ?|Zuhsf3V$Kk+z2MFN^3rd#tjpkbwZh(D7Dmg_7vDz zhzDYYS)3~@)fZY+RPa3b{$GQ|b7CF;+pvhk@dsh6mM=`z3;Fc~wLVz`O4pbEz4lS6LitW9WS?)9HfLibnasd1rvr8Buz@EJWMLmC>2W*3NZaQHb5xAoaF)dovHtZ+zB0+ z{u>$;=)mw>D-cVX_y>!ym2?_T9LJLW|B<$N&I(4StJrCF5~Tt&os#$_d8HZR1E@gU zApxJ|OEZ*4C;MQ`aU=|VYEPWILt76cz@|7|)J=nAw`mXAS&bsoiunKSEuzEUSjqs2i{E?%>jBfkb8=M!Y zv;JF9^V!aFqUIU;@7?~@kV)4wf}E$}x3*hnS3u6ODVSYmaQi~|iOOo^f5o(E{|rwb zvSRs9Nou5dcZf^tNm|p9{+HqJ$hWY!EAP! zI2I75!qArfG}TQUOLXK7DP!VT5YnK6cM&e4(ISCJ@`wwRrzLKq8+hI(;~+`GKd^h+Y++57V8!+=V4cBh)KMdz zf-N_l+2Fn%8An13DefQXsxwW$>qDZyzm`fjmHk}GHMcc^>$0xIYn@Y-PU7MT6jgrE z%izQGk51b*d$vlU3k1uKR@3OL)zxa2`>eHWt4}&x&Ge5K7?J1M8eMX6wU!IpaI|(C zJ4_A3A@}K6+1BbfTgwlK$Dx9^EtD+%BxrJx;J({1qzPek0~n~3DT#~aS$s}iwXz*{ z#4e33>8D8pr|rE5@i*~4jV(>0=e?CA%$D?@pRT#THnr z==ltU)qz4!)WxYST^t2ku9cz!Ep%E?!+=``_l-nvK2fwo3JWo3Il%&v>58eq3k}xn z_$q8s`Ih>s?V+<+KzjFz_st^B8hx3TqBxrXKO<1!KQW8mVir5V=v2r|@xHW7#e{Cs zv0HLZsayNzukE14BDsXC2cTgTP4*FSi7}(W3C<>baq2;f&>PmLNQr`w`3G6dlTXfg zVSnzv5CL;NUz^qW5!{5h59E5kO-^IkT;92%8v686P!OV%IFS=Vq&T?`&`<6Odg3yV zZmCJcM4SOzh#!Q#tJ@aPg){mW?9MNw_|ohK&_M_h?7L3W8&_ozY7%6HCL4%Y27rWC zF4IvWVF2A4fk?Q{;8KaZ+7WxUs~s5c_`+4KYJK@(D}M2O*X<^!>7@A1{kQ@~_iy70 z-*7fU0fxFRu(Z|<+FjidcdpHiy(ZCaNEW!1;(Ou%87~$1U;{%Lseb7K2|c5OWV%a? zzdFR}lv0QIY>ZxCajwA&AXfGK9K!PWxY)~dUFP%XoxbesVx@}a#dQxI8f9CCQlWHu zFpuaB&MtyoJdn8fn<%|QwMOea5H5J27Ot6jIFW$uIZhDa>J?95jpt;6rfOJ3?rzX;VLD7M4#=Dr59j&D8@N?d zm4_bEr4zA$GZxp4G;v5rBwuJeK^)3xJh9sT_95K^YTL%{LpnMndT>*4=_>@B%UV|Q zsK->BoC)hqI_1>HA!s$YBdv&ccnsIGUV+^l2Kripx8+;mGX&4XVPpajH^qIZD5cV& zqJDjuFe+0VET&oA$GvpEkz&PRs8zq&rOm@B=7tM^si3AhPT<3E#)H>WaBKJ&&`Gm9 zy=&s!;ZZH(I1?KpTKkb&^C57%TN5Z==13G!7s_c69dVeNfo4g81+wP6^_*dK-g>51 z?B0lSPWbqs)fQR;qe+^x`_APAz{}3H~NJFezW{CFz>>t2u z8oBim7bYJKFFO&;e+{te;+nYL%zqGG)gNypZNlu(9ormVVmlJ`%csK0gXk7OnhTWD zXHZL}Gln>^;`lND&0{7RWTXAT&XA98jd_JOux)okh>ph{?fQR*$o=|JchlR%4X!FCJ z3aDNs%Mt$36KX5?)xY?J`WU=FC$&_kz+dubE!BEb@kU)F3!W8`Vy&h32!{l{Wu-JNn|>_9&U4 zf3SIb(T8U|ie~9WE845&UA4~WMYlYPnsg8^KHZ_Tt!aAE($XTOpV(euHV@Zo8m_b& zE%*49(&xPH)1s9&PnWhbQ7@YBQS_r;^t-#LI>yz!W9d679Yr(So>djTqN8eY_4|9h z{NON@-}ET2*h$oH)Ty+Ik$O>jC-pHt>^YV36P?s5^h@E9oz)09yRO?=t%{_to}}wZ zuAZFM6H6CSrKz60q9?PvsMYY^Ha+*doxhkY|}BH&q|>YaSB<|r^ah0k;&A3978|#Q4H)Y8>zwNE(X|AI!lyOfUzOZO^M#c7H?nywFms=hc_74%a@f z)-nA=JZ^P3H7FjbR_Awms8R48SF5{P9dYdYc2}caP0s7Cj*OkU0F{Lo7~Pu3G`1Ti6N9^Xm@%9m_Q{le1tMyb{S0V*4{J&Te ze1q%biz$jgeuMSh(rDV=tA! zG`N@AU78lcV|%GJ%alIF`}fAXQ}|oG0oF14dj7b#+8izcFZWjGnLb&A9>PCR8GxPW zqdsZ6Py$LwP67>bXbiveF3`PqU)2OBe$)L!*^t z9@T(pk+j_~lJaPY95djo&oaZ^HuxMZkJ0JRCHQEwnVgrlcCdIqU1fl2#lt_G4|!&P zwYuWjHD`nTWPdfX+Bh*m;$e)vt(PCtaW^Dr(-BwX!aUoR~c?tjkbi<+p_eX0faPR9FH6Vb?Zw^qC@X1Oq zsYyZ9Nqzn-7kJ;7u<+;dkuQlZEq@6c!8pGACDjJc|7TxPV=XubfxD*CLGw5LWsRe@;WBE50U%;j~$55j^oV+ zsv{87wq{T$$W<2De#R%1YGG+Xx-`*>!(-M5G9Mi<)XRZ6+v_7CWDSH;7Q49#Xv!MQEUV$ z?wyR)JVRfdYm>3S5Aw6g>S}m_-|~i<$Tttdc6E>MAEZ`@DATG=$%Sqpi;sCtjS0x~ z!3j9Lj9M1(+OMgP>tAsa{86u|wL|pJI@Khbd~|C6-D@gyec$_a@%`qntDif+Z>1QG z6eQ4J+XpF_Mp<_-HkF5Tg}*jfjPQfO>XZ7n$%i3ESUgy*Z`L;(=eG}u4)YE}R3$_J zH^lkixU*B^hm>~e(;=c$mxri(^-eVeJg&c?R?vB!(oF}SN*b!xGwI9sinFPdp@P6H z8j59lkLM3nD};G=UUX4FF`d6LObz4ZhN&tlHW~(Ux`rnYQ|kb|77r6|gHd=~->yvf zSlF9tRg-9oa&6yKt3@rK2{6FnQv#f-)YUyWkgv~%mKl7;o7jrR>09UbZ>sDsD+_Kf zb~tcw9IrK8e0;!gwI1TH&DWFs;bQUK(w~8+Qh4(bY7DyEdjzVF<1>)NVlOd3OY99R zx)g&AOfx)b(Y4N?3W3_fz5L_|btK%~_IOKehy)yn!dJefw$P*5FG7f6wVvyDmABQk zrTfB9Z>!||HT)e_Gp(35Ti@vVy(2b)8}FzM5WKJENcBayW1c+{OK=Hyj8v0MhiSus zj~&`@p2C(<|6O%yX`4U4E84^kqw?yb)M}>F)G*Z4y#FZCaP@7N9?NJo5v?~Gt+vA; z$B$O)`|93R__ooQ=xqMeXi%+89`v4C0iUn^p7{K;@8R=T>GSdW=d1JF_XLA*=sk6? zK8aZ1`Zhc8eRa5L3`Lis%GP_ z2?W)At+bmmI_uQKQW=}`e&azipG#9)W9ckPQ(s3Mz`#jrUE~BC*JF}82OzmL2}rw! zM@@#lE?+&-xSbenh(ZWI0`LdM5>QZq)VwDdyLK->flV8u3FKLX46GK z`b~$JvYg)sz-WBx_;f6Z5A}Y9W~h<+@A|GUj?Yk=nNkQ(p!nkZG6WipSr2Zn$_%wA z%EJw#uGcS82{z_z%SxU!6Px}T-esnk$=Q_L=7(p3jx6ILv(TS4yv{7NcMuV$)!Cri z@@#c%V961}JbhPKG8>!!st_JC7g%*|wp!kuX*frXkv?)hd2-YJ+i%ZBH&^k6b6syEh|^p(!udSPVdiR6$u#~7*xd+#pvwn> z1oc}CZe{5QAVEv$NflZ|3)RIg5g=_o=>Aj+@@>JBFXoGPiWaF2OpB=y&JKCq1+Io_ z0TP)D)Q-UZk_A{yd#ObT9{jO|t}4-d)4>v%@k6yg z5WmX`faEqGy+R$0PnELe%PA$?cGe_EwhmGX;t;78cUPdT)Y)W#Ah z#OO6@0iT|&*5c#Ws^i;$vTkCIZ4J1YSmGY5=HhfBbyCvNv{dCobH;(*!E+Du#e@<$*C8_YeAg#VHA;Zn?< z=ngU5&-Cl1a?ELu3U+|@r(;bs8^W(x-gO>0#)L)TeS(j4m_ILqi8j|fwJ7||82=d% z43^dL3=~hg-O67rU>1(a08-5fEiw&{g%8NSy#`kpJo~iy>M>yLVl#R%4DF6h7!X;| z*^9-{Zde>XvD>!^OWbe$%|lB>(|KVDjM>Lb=F;$aIZH){n-wyjE)VxNvzB6A9yi}E z1yMfvm^0mRj|&nU&=?+LnjVLu_y)fWM!)edIALBI+7M<#0u*5T-1tC9f-hUSB^z1Dt<1j61heayC z@}=r|C^?^h2A;V$zMT5JFhNls7d#KnedVpFLtS&@^P)UTotZC$N10KNhBMRo1p;rR znf#onf%v>PxW*wbh7aj++Y(e=$-%k=Qe-ZA39B^EY!ozDKIhXhoYjFNKHn zn*TWl2JzqpfO5)Xe;G<=t0x_ly%Wkezj*}!T4etA z3f5u1X?!KzKSx6U8n=1C#NRX7i&?|C(RDQ-i$sSV^X zdL`8N`R4SM;olTLPP8I<<qs|7%iP`&#e~>QkCb^d zw&-oBYir&JA6%4B2CF&v&G0XGv6}yQGki=C2FUwwhJPEx9ngoo6&|0zNSNOZ@IXPQ z-?Sde(|q&TTd?QeH(TCaqa0&90JyeNP{Ay&k!0-mwt zj4~LNQmk{%#_;ihRgF(=48I+4-6 )C!Fw>`}CehcJi# zhV@Q#yqca?$3wiin~rz+hakVFO#O%9qoD|V{b4xzA2f3AN79J-2zW5vy!%o3z#NGW z;GiZmv?F|Yt`RF|c?qs=n(#3aK<9K|Z8n?c4n)X4GT(QE{{Yo*+Q-nsZ`vOIrD^*Z za(=p5zb(9vd14C)|GX{WagFB6Em*%+vwcf=SnxBbMcc!B^Lv?@vK5ek)_Bj>@L({d z7q`ML#}#hd&~B@_XB(g_t^Llnv5(pKNjTqJxDEf@_({0jYYVR@In7jM_KJj|!yNH1 z80Z!eHk}zrurH`|IuDO3}@>hbL#khzvnB+aCTk=CN&icyR9~I*+XtW%UK< zllEBHC(Ovs@U_TNHx*xorSoebgNJZ^(`YbIrfQcLkSsn5u8Xm-Z6n0~jxSAPh0|gIV}30;o@!eZE5< zh;DuduK$#I`a5*>l*!r=-e4Vc0mz*#J3!`N8TCETai%%w`|zK0me+zOAZx)yGL9wcM`F>U1>-t$&j)tq;slL##KnZzOCZzjVBwo}rfIba2Lu?1Tp2lvuGal?)FnA937x)ZMS^P|Y*3rs?lUkvvXD7<7!^_T|`;~I;h4A&lK%K ztVe!S7dvbUCBDE*XaM%i8&=uomZELC`8CrsPmMwN<&Zo8eY2U7r}hNmHRY+kxz-ze zH~0PC99HFKX1*#k+4*XS4Ht~J@qy9i?tIk~goi*v*xVCF85Arq@8+vMz|e2=RbOCe zS%JC~Q@puA9SXp#D^Pz7uI(_B3)M*AUaU~5{I9HkiE%tHkl9?Q=H{$tNR7e73yTCy z^NIkbf87KyRpRAmMFOVlLaM^9qjxkd*YU}aItus2_2{Yk=HN72UIsqhjO+=N`N6z4 zKn*hI_f$9J%x4coQ3UOrh3Id7)k{_8%wso5MKN28r5l9m%FSNIYIsgF>(CVJR%Zq4 zFuWJ9qs<*9stn*=T%yKS$X*wuM~LZ1@kT+kJnUQ#MLCGW8h3|jx<8-}T0c1q6!=KA zzY4P;tQvAYXVMRq*Z)!OfWzi7rH19)#9{H4ugyx`1@x)bs-g$DZh%QAzc;TBPy@~D z8Wd%SmV2R~pk-Xd7n|Br;P6xC%~Ey!ff8cCh(x)W1M41nK~7lEdi$cT7hg(<%h2%? zR>-|=h^RbJrUvzF1=caIKb~B%z6^+Qv*{`W3d|5kn>dM)ghtoCUYNF=(r4*=R|X7&LKc+M>CqfGp|v*Y_J z>bp1fRTuSJ?ZDSl_7SjT9zA`Wh;jGrr$*&;vJCH9JHDTw#@2ocx4br<&|mEl2s~?Q zBI>ZdH?;YPZw7w2;(F8KPV>naN}cx)DZ!NZxU3n#xw5@eHNFVH5Lz1zYY|BA3)|jZ+M`m>>2adq3R)^ zLe(&k)idUVVd_^{p@w1V0=(=$Ts@4(%HirJJWksUWYcWE*-hPs$4w*D33z-kLjAd* z8E30dxwb7%87asW9HlPFl`qKbp0m|dk5Yd{g~;woo08G$GWYKXN2|;2-?zB0UfErp z6KHN6vxhn}5O})r&OOy0=|M!6UfWwOz^##&k5%6Uf?aFOANN%U2Rql8<@>6Of;DT+ z$Z=}-VD(z_+i_}S(A1cl$ElNYo?ijqPYH4Bl{Uxolr9XH2kr zU0SHC*laqj^kN{~rirR5>)N?j!b@PTIKA|Iy!vxg?OtqOB{nzujM8fx51gcm1K~~V zEi1Z?kC*UI=$qoa#iqHcPk(@-y{b&%Fl9PJ-{`4-F~EBYKB&?%2OMBNAM*nWt*9;(FUhpJk{Ch~rvTEQeX`~ny} z-Aq4B%`2Jn@@*lTFkPLFmT?q$Xh!42!_{vBaM;g2LcN5`*v~mq{SDWEet4vc2Is6b zGk5P*YNAI$7|t;_9iHZ6{Ns3~?2EqU^%Ft=|2!U0+h{&HUQNJb zw-eMfE#-S-*A90ZT!zONX;Y#gi6tk11V9oWouI}HYcHzIbT9}RBkAy!O$lu(%9m>R zyD}~G9=eUBg*KUkPgIl8cFl<@ipR?*szdPTd6L>APkK^FYm5ZV?3Fpi=C>z-U^W_q zk1To;An?BV;3V~YsT3`726Z#1e*=y`#;BT4#!gs_s_SI6-=ySGbz)x{My0rCp@1Hl zG@3NHi5MAtX(4}U`x2x5(@{NtJ|4O~Z zyJ_d1svgDTq|?;+AdHdvQ`KH(#c8TE_(74WJ41~&#iy&^LaX@W>EJjYHokqjQh^N4 z#@u(B8r<0DH)>h1sB4W+Vs)-*{NQ&GZeS&U{k@tV_~7<4)n-)v;7nB>3~YS-9O$wb zN1t;AI%Cg;X1LM(=3Ig9{dm~*?O_*u$GPAO8;zc#&c-7)MTN=TZl9v|4tJtcxhUZ~ z-2NKv;7-0!yV*2FjosT18NwVN2}hiAD1ZA_w}=`2P62cDR5hBtOqH=bJ5^Tk3p|u8 zAC!1uEC}#BAl>ggDRQBG+<%^`4X({MqgqM_-Tq{H#9V&9dV(*eWu=!j9({qjC!=TG zf{fq+u?*gUTHSkUW%>XUo8CKYdS0v|k-o@v?F#Ui^faE9UW&&;{2YrXE`+VV6dl;V2mQ1M_j_0d*?uI8MUPTq2Eu~W` z#^G75r&J8Yvj)G%<5^cWC7SUE#9q>)3(>_0Jlo2rRE)&46GisJ^Eo{C-5-D8B8q76 z4;7>MXSw`28h^ds2uvcY9!4u47r92l{ zI95w~Bpv6%_QDyPC0Mld=q%0eO(j#no!nazJ~F-k{L?1T^q)^as-~O(zU*uQUZv~jne~58HGz!F z)IoXPLd~9Mj=M}9JBcs2767ST!5f+YHC`(2f@Uda0w6~+Lmw9DA6BGd=`BA8;1p8Kidu*=5ZLR}Yjpn==O7+%q+w6VZg9IpbDf_H1wa^kY#AsuF z+?AU3Wjn!LAU|=p9#gdR>Bn8E+NGvMujlQJdA?P^7cRZ6hGB*3Jlw^nap_Uk8WQ@{ zTQg|l?BCRWfq$7x{-#blWV;LhC@x~DgaF0XpwFvu_k19F z-CDbD0(RWEl0mERQE21o+{^Ejz4->*;ofQV6>6W{7nVYK#2L)UfIQ_2wQuege2YS= zPJzRzs6jNU*Q9 zt^3X?xzAPj_1-Jax6AnJr5*T{iF(WU>jfDtetpYduM+_Lw%>I8`sN+9!jb)rzh0RM zVDQ`1{PkLk^XrG{>W|qD5twOLLpj=JX3tOqP6a3CVubD_yvYr5pOr%bb2Lccc9KAg z#WbBj0<$zW)(H{=PjTI+Q)^+FTdUK&cA+kffjlhnClQyl3{irwDTu4J+!9vvRF3=cojT0N2BYkzSBA)G#5R@mUpu7kiKYdBxkaYNx%%ve4K%%VEF7!vD z@Y9!6?SOQ<-SoUh=@V@!fYC=zUYYACKeBu@h%fP`DH#1EQ7P~*SgoJQ62piG z)Ik6?7cT|Fq*jB)FtSqO#x|#GV4TGfLJnPf44IXP8*MCzXEmN&=E@9K5E|gk;_bLP ziD)Dui`nH?s}PYO{aVa%u{MSkrCLFm;Gj;m5KJ=a*qLHXT|^5IjK^u^3xog$0;N-E z0;n5$5EdC;u(ga(T+{H{87j=$)L*X(Vzx^nfgfAFq6@DEvkfM8Nlg5ak*=SCY5=@{ zr15H`!GM(s<7Ahi*WF|Dpu{D0hgHS~-R{(GF8I6Jv!LO@YbXtNY_1N4zA%scUF}PtO(3j>F zzF)}q>Cwmee(`#g|I(-%)tF#wx!L_m)&F?PW=AE&+J)W=1}9RTyjxf1Gfy9=F-v2& zVY;N+Q0oy6BTPx;YV@{6;LHO<7e{f;59>nLG(DeE;lrt~3OZS2o-{Yqn=Ln&ROZui zBl1*CLJ{~?>)G%mzQi6NeSFOg~D?!Y4JxD90eqdGMO{BOcRy8wfRnNh@Do;K|^()#^ZaJ?sy&NV%eC9lCmTd_ z*lLE{ENaZuo1yDIVUe8-857-V7T>H!AL;43c|qVD_TQI6$9^I07+iP8Bu{KI&WrXv zlnCr_(yZt=tD(-MhrY7r5=Hh5E`3doc^xu49aoB*O{-L-G9osYtGspN>qM*@{*hXF zp3VjnIVD!g$0&ELJhM81EX>^nwu@Pqv0t1|kFhU{w<+W~6m{YVRto#oq?3zPhu^@rt6oO%dmS)*aTZA2m4gY%U;0*Y$c-NXqz3OUn-)$;< zf-UBO*k25#;sVC^0jH9n6<03%u&p*H|8G=q>rBN6-IucjP_Ci*BU{M?H==VIAss~4 zc}*q`S9CS+o2}GxjVo8}hl30LlK)pagmyB|g9|RpHxJ&f2K@*Ublk2+#;C)R2B@!i zYvI|anFW91ly+&J0!5(7SQMes>PHdQrq1C*5dtPN^biFbz#n5pPb=yubvPdI2j4+W zQc$E2K8ftaYK7j%K_k;3E~7aW&}M*QrSQ}KS)lL81vDL}UOS7FVj)IH4J0RlNy#Pb z%kp<;6*vX*W*5CgoAXh!Q|wY-6G?b?aKWGQFBMx8BIjLNq~h+8isqJCYPW%j28C#% zuKp^TDCLe-M1L*33c4>S%7UCCOF-`M2bOh7EYqP%Spleb1Ugxi1M^I8Qr7Kt(jBV5 zd1Hw6wTEDTV}rYwbzU zL@GN%oHgC3A-*&uHCHVVrr18r$GQajTtss5my%OJVKLwgU;u$eiEKr^UmKBvSpJ>D z+E$}Rk+PZvb-7t{p)T&z02xiZ1u+T7cF+kDvNF?L`GwLkWcY)}RgmRdRnM=Hi7`Wn zRqu>{fS?^p_Dv}z`fy5DQ!(>TmQ-U>aR?@N=g?1d^+TrLJ*qsD zJiCy*lKisxY))hCzyfW*l z0Q&vJoCd(2QXZM2d)1gM8X=)?%whM!zNVpqziarn^ZuW{_gVL;u{mPQq#>|(Fn@^& z!(TJJZvp&z-uuR1!8$c+tdFIL#BVLH1htVupu0!<}|tEGjI(&3&6gEM!t z5d;4t;q)V8EZylK_nqwx^34CnAb)QMc?kyz!4XL_&(^5E$AsR;%#mB7alJ4m9irI| zTTEk)!Aqv#)I#|Uvk`m8rc@TnOQ``q)jOJYG=yUZf^WFO*7Ej)?pKw+rU#DAwDaiO zGN(XrB6_X{7qU`SqI@)wh_~%HBEbrQFR-Qszs0Lg=KnCt;%9#y<>uM@)!5U(yd8PS zqHV}Jjq`lp2V6v4EvBa(3ii9PvsP&t`9+Xt-5UaDI^h9zV_=7Q{{eL(9^>Yys@--J z1t($x#S)wx5LGPuzp6qO%b3nn^C1b7K$Z#ep` zTt9AM@$W0I3!N72LDSL!#<^T|5WLJE^?<+CAtLh^?D`yhY>=)y6T9v}*Y)KxehV~q z2@EbbH$Dh6bk>#EnT7||9)0FMPA5fje|A~S_YbPxt@SWo6dKRL!TW^6C{3=F*myi}XJqUkCn?($?fFl%I z*F+1jx!_EkEGW4Af<_t@I&0Q)E@x(NV){gUh&Gwe9#R8)G?hofT*l=lGFJ`ny_T(G z8C#VF1GK^`Lu@G8V$PbY2FD`Nx6^2l;@syckq9r!E5ZG<5LKFw3@h210NpT_Fk@uqg*SIbx{(DOs#~k zdLRyyz?Igfq+Sg@aI-Vqc01g5-*C|zPMrviVVar+{w=LAy`ccQXd-5Hi>a(u3dVW)Rko1m;M>k&s13eJ$MmTJ=15E*l z;0G^cJ7_9rYvCQf;2s_hmAwGagXXDepu}18R3#oy&QsBtKTV6{<`}-<7;uwYC!WME z{M!itTorQ3U`k#jJR&VX;^kOdseJ__y|GjvpUO;J7q^^ry%2sjfSbRY_`6lGzDZ9B zO?R7$6`X5p3CwUBVF%kR9v^6T40P$e-Sy!(WH=>KjK!-cX7U!UgQKe3Djd+|1RKcx z&J`-P1c%R|uiZqBf^)sKGyk5CbekRKmkR_We_W6XBv_uc92Vx$%6V9jv|=7{kW2-j z!MiHp!;^4Y8m?8eX4w+52EwpQ=&2!*HPnMObh2^4v5jyH!~nA19w0Zc!xsriATI{c zCIb*aw)p`mJ#->aPt(ovW>j#v9CReY6#6vU$BB=n4*c-5x^xQ8OV9I}P-e+ORRfUh z|F9Z8VGctl@Rrp%A(SrX2~x92`Si_+NLeryAL@h&c9ok2533PD1RK^rtWJvU5P1i7 z$xE$^Nw6g#QxGBcI02!ihHQcSieliFWyHY!OpE5YYptCggg&DJI9Oh+Ul;-vd6q9g z3#p`%=vrYj$f>X-E-3P__$PVTixF6!>N*ZRv=Z=iko3xdg4WEm2n0*T2cu~MZin$^ zKdOF#EdY}rReu54UVT(m;nDf1nlQeG+!ok#gOy!1j_l$YVB#D9Q$DnbO!(yBW`kp< zSY{xOnObvhgX%My63EXz3Vw&8R6EnKf@zNIxtj>a4_#&E%00C1*;(d^8h|<4S!Uj8 zP^BVfx*Cv%GS>`Wr1l8Ht8&I7rS`1hnih+CP)$?FmF(3?vgUtWeg|Pwzerv1^ZCf{ z=>n6i`Y-y(@98pI9#i`!`^f*YSPe@wIYElnOb02^OgGOhR#js_Bz*1pJ*rE2i-{m1 zmDxDniSo&pM2{Qs$Z!6$u+`qIwMMe&5Pe+C%{nt}i8@6)t_~P- zaNJpS8TD$-rX{MlOd`51H(!nY`#kPA2rf?FNNBqWJgzFusHG~KMssKduaB+F=v|Q$ zH4UKJ8HiEaD$&enHrq=q)ZB?eYpN^w}A>ARY)nsvSLQn%j7T~ z)R3}f)8pzFnmzB~^Bg@=9_n#)ENgL7auI80w!KXM*2jUKiJX&-zxZYMFs?AK^n(p z4YbVA=YqA++)AhiK$9ym#}@P`=JDh#hIai###FBJ@t%YQa9e@}$P)JP+Fj@^B;=a*J=JaKZ|N+B0RsVJxfD4t$O>^JvR_^T`uxOzxazjKyHB z{$++QQxkH&c^tokh`&r*rp6Y1U=vwhyp4G%c-hF8cT9(RABaBB42&Llxnmi)@Xr=# ztZ4_}M0M>l>!=+3ph&W$EX{rkn1Cz!~{poXAc0ngP#upUCfi?iE?J zlZpInX+6I5i;Ri+za`2vVB-O1nUL^Y zB6-&Jf&5b;?}HN^SLdde)B!Q7O`fVnb1t5L<%oYb=SniUsTM(n>DGfkk=rV4RAc-Q zWKHS{aYrX1I5e)nd78qN^x*qJC{@ixT9@Q`>cAcKX7@^HRb9AQH+j0q^a-_KYo#L@ zCkUXS@uDD=jQ?dWk-4u$g`uG_dFW>nAw?^aMaVI^r~lmazV#}I^HJRy*Uv`p*cJD3 zH+t8nd$^?6M4b?2$LS2 zpgfSA?lzxULc2GScaqQtFWA`lse597G#ek3+W1aw}+)=Tze5OrA|W_SBvbxAn2e3-aOmE^OSi)?1& zH!577+!*2LG$uBDTk6)DRwXYRScO$jh!gZ@4PLFP9EVffpXH@|p%3&#Kahp!E}dJ0 zT<2EDt`;yUzp4Vc2d<*x$$N`A;#}Fa9|sM`2*5$uxN zTA;@S8ggrO%S3>`hD;-MUtA;hwQjCyU4ujf{yoQRU!&AX@d`+4PJTI3wYnWTlES+*A2Pp>hZYt>jhhP;7O9Rl;jG zcYhA|ln{8kOw@7GR9y$Z=V-M_HX}uSM8}fvkB$>i(x2}y97$6CeupVS_%Z2^Na^^Z zvXc?8dS@1Z>sfM>!D>qZ8KR_wvOq&v{VU#5Dnj?JFq#C%9u|Uxh7^?B-&JMD#tZqC zRjwlo`I(MH4jfFhwSWN$_{%xgntniz-nIZy(ci2sa7>%(oypcMBJE?#0xC&}#3G+8 zbtBU*JEWS(FOFN$w6>|N?s)cLo0^ii8DwWWGRz;>sj3OpiK$D(!i>=O5K}-p6HGTFRXT9sy1mdh^Fa(H{VAmxf5cw9p^L%pk$(rLrDz;NeWF=v;uth?n z;}W+Ekj%qmu>k09IKU4c>3K*u==ekjGa1${umBA|@(4Va{!FD54V#H?d)SnUUDldu zZ>w-t93e_f-P;P+Y$a&`^aEa-+LG|Tx{|%~Y zFWF9HeZj;}$$a^7W^)^={=dR(h}i$HFq;!BKBQd7REYND%m%e?G8eq-p~(M+;Q%uK z5yOdWOvP~a-uROl&Wjs&#&F!+H!rnxmkcLcv{9hy!R=~n&l)cpgX9DxT@*ZVaY^MM+h^(aJX=sNS=2gusx2|xII{D<+sFX!J*nI}F}=fx7X$s*;;D$6a_R`b%8 zh~FKBQ=&7G#VqMBB%o{XV`u;ee76_cY$j$``GsmLwya7j5e^`&ClG?I~&HdFIJCOZ%FyJ8-JdEYss-HTY<#s~7>2Oz|&f8TyWv!5e5+ z5}@E%L*if#g2fL{f*L+OG$U(#fGJWqlN#xAR2`xGl_P-?d4u@NT=B6Q8g2kIGNU06 z7~=Xjn~p3jhBvqMV^y9_@q+%$rynDiK{5a*N&92dsb1omD;P&u#7CVSQ<9En-?5qu zGrATNACdMMk{tu(c^ESC_?V=XP|RfSA6U-e)-1ms8K2vF;`=_(VfjQubhYgLOUc#a zEsV@{_5b!Wj=nBmRs;QNwr;C;x&CtIlrUPa`0cwcN4yR$c*7K!mBRzY$;s`Ow$L%K0H zY(ruu()Z9XfoHNOHK(13+YfAetsH`X&sUDGJ>aHq2sus_IU&OtmK+kqsVrnWl1$X*=6o!NCAlHa zCyX^-8_S@ujH?(QXtpUr78K1Gmw%g`zzXB?Kw%#GL>0v(aTMLumse(Z>7%xV z_MNow0eAQL)4Tnc!zozI@el`{#&>miz~E-ezlY42f8oR>GLDSU*T{>eo2o9rjPqy@ zWG~}(Q(-Hi>MUMB7d#ZcZ)WBpvzcVuRfbIv>4%6B*WtjBsOIGIGr^A@&Mv{(&cqB- zCYMXvT6**}2YKA2DrbzW%B7E6klqK)lzQmGj zOFmhHk&7G0Wwr!DYx&spY9@pzOg-;lp zI?TUTWS5zxo$A0rSmjKtGIZPA5UxRYd?b^3oTE4eQ3Y+7exG6wmV*(J*z}`PJ(4jl zZ5BB;MlFqyVZmX=Rhb2Bp!~B)0yml!zU{IK(CPiFz;iR&=%C8LeTmjXMbOSM&wi@Z zDHi^)tP`L~3}qpY&>YS{E#5H+;}yldFCdt9#X@5&=W8X1(03J9a&Bl z>C0UB8O}wpZPq3Uh#wp)P%Dxp(>&;Fuu@g(QxWr?{u~BUXT?J z5=;jslDUzrB&y%x`glV(dgRak+i*_;RG^|H0GK~~1;_hLGyf|%-e;Q4_R;Ta`E~Nw zI3(*PbKBQ2D3&h3kt8>n)%<(=y*P^JCR5ZE|NF=;b$lX%CV1Q#@Oi2W2#PiKq25lC zbe%cvl{ zlo_s-)=Z%$S;@%LXTPiAvo z7tU!7ZmYbf3ujnn?$Kjjtol(3;9_oaUXn*h%1JsFmG^+6;u%myfmuO z(_r7SCtx1_#UfdW=?HwM72ya()_dwr=l3dn1h6sm505W6rMx_&`;s$@OOP56YK*G#97V|Db-K$OEu%%Mnr-19?E_4{BI>lc)=EA=QK( zUNrGwrecplspxsPP1b`Q4bP3PK)ds^as=u8dIhyRup9}Qz)rN?wsn_N1ge;$c+!*> zDkmT@Do25FWyTRv$U=NcAvCajc_Y$}j|QnJvo>sP{M(Vl)~QUun5F&^4d`&hmZFex zPNuRUG^Z4p0R!~r^>m#XOVMeooC6N|Bcp=Z7@7wYWJKDGQmX5s5<=QJRy3a29V?iD zf31xPoDI!K73jhxlWi)J6-TtGa}Wo8fLh`Q5Yg>1%2_AUwORhA9E8lq-_)4!FBA{_ z3lkjw0>?rh=k5X$XpE2-T?9-^v|w8mjX4sofd>|#U=*^Ao(Aw|zlf`Y+lHtrei!I9 z*q8_5j1_)>A$5NuJ=*}s#lKWR)~35^Fb6@W4JuRjpm2?L3$0tXaBSx*DyO+og@NbC z4Y|UlAoKIav^Y6shp1p>Gu4~;c};jvzW)M+7iH+IP%;vmYclkaF?bb8 zpPrK10{>tu@rtVPJkb*)X+wj*hq(q%4KG)u(PFWls5fbDWnqZg(WpR8X=RQe@{r(+ z(h3|3VGSZ|?Esp?L@KQ;sK|&ER>+=UY;XgeM0X?0MARSL!`T=K&XNN&7>q}(M0oBp zxHFIzr1@K>uIgd6mMmO3FfUUN8N#30q1!@mz>$Eh8Il+Dr6Wj3)#jT_T?yA3xf*vq zVx7AjL=k@|bptLB01{_CIg*0VzBA54+X+2cV66;B`%jDJSaY4wtEM9o;}+5cZHv-@ zZC2^i%;GHFGu9={$hBha@WtN*_or?&Wtk+BE?Iwd1e=k4!Vi z2X5sI2hu6Zfw&(uAc1LUsUlPM;uK=+a#*pW@Qz5kzE^MA#tjP!i&)^4Q}&3k z4ooZ)YvXbLO!1)73Xt8`0v1>s&tmz7ec{Xq@qlvQ^!u4-Sd%l`NvHzf0zBeYr2`LK z^lQKTdm|iY;+Ao~^bo#fq02>s577IFkAFMd^XvCg@I%?^w5={!P|2+EHME!moYw7ppD>!zXQI* zxf9l@J_P&Wh3&^@53X*-xiiRYck=PvOXo|Lb;DRcKsnIFhp8>V)K+CF+dQ1B`)6`- z=9pEvTJ?($HI8vvpiA;aU|nXO#vO+ulv~TpZh5+NcqjNr3PKUJGl@T#3-fe%FnU8{ zbf_B-?W}jpcJ8P)WGaD?ghXiPJAJD z?b+0BvUr9~qP4Q=z%H@tg{_4bR)lMZpk*@@I0#o4H;6Tz_<#-7HrxdH)u}3rj}tR)@? zg&YHO;%QVbfgz%WL#qfmQ#+I;CDi1>mduKCY%YyvI?=Qg@U0Fa&Sbt<45U>C>6 z3>SUj_1#va$Cp9wd$JAMNE;ngu$!aRW@1Q>3{;y7LwZu8kwqm*PK<|cgtgvgUJL1} zxYj|D%L1OdMfI2ZsyLM6$!jxQ|5A&n9@U9%Tex~W^QsvKmS7jQ?G#wdPQ4U+>VZH2 z@yBF_%ym6=K{1_kR>_TKKpB}071um_UuLmc-c$D~?3#WZG(79$#z8dOd+G48_d%t1 z-*u%Coh(U`mEQ-2G&Bq9AMQ^j2gGfvqz;76#@ds(#inB(7kU)~2=g^373==7?>@$T zGJr4iyA95tu00FZ6gu1H31D^EVJV}hyyzscX_Qpu!)0 zoHgy;KSdDCX^6n&PbA4Wb3JamoxcQTs_kASVLwT8odK0eblSjwf3{El$FqGdKHHeg zHX|?pfIOT(%k`8=yL6s$i0~W#x5xRq$ zn-|9HF6tjyo>y5r-K&krN&bYq=-nyDOA+zY$4g(Qi z+i*`(hgBBcI2SC|e~>&s)Rpxn+p#9N^~HOs(lD!dQ0)G#HW2S<5TF&mMd`L4j}I&z;v2^&o+yzQy>>Aif{);y0~{8CNEq(g%8OEXb}zY(7bV0?27sp6 z7hfTvGRzD1pg&LF9nU*FVg!p$}9PO@R}%2L7F% zKhO%ccujwsSclKOEu$-f6?4h^~{=cfkb=6-*hq_xs_gAl$6@d)nm72 zRjJm;r|yxgn&ax$W4d6Ut(4rOTj_eUUzsk=VtvO&cWiw2{&|t|Q40PA|DhaqZ$#>G zIW?m7rnyY36H<@EE%X7%7t$qux`n@GxGNH1>{j}xbt?A%DgBSzb^q5VFPDWozydA* z(Q>VdJ4%sS;QG->3QhS!!)ANA-Yq2AV^%l*Irla$_z*kI|C=Y)FZj^x=&k*y@f^@c zpZDLI&iZZOOar=yDt@;8r|ZoPeYO8MiP!t;8-2s^$< zws}!P>ORbvh#u3UuB<{-I$YZv(O38u3QW3N_%y#l4?;x5LK<>egan{v6?o%D)q^U@T+$7BdRe1BKqrGu zIy=V0;FzFV2S@*;`ESgBBi9M6^rtg5I0vs$0E@t25**eU(N`#+vP1n{0gxg6z>4Nn zByo1S7bW0`&|htt&5ZThLZqP<$+km+vGXcWW=QaEIkuBM!KiyIhnl{m&Y{!I90EcT z?R=sl19lQ!xWPt2&xj91tWA7nlG+QNYAS=^6woH4VDM{2?_%9R=!{>*E7Kxj#T&ho zD0~$qd`5rMeNM%AJv;hB9~1!dXx$of%s{P&5`7on1BjLQAtn=I{xG8|lIPN5ZW^dZ ziUX~`gd^a|%%BQhSsc0!gfc47MFkziNsDI&VZhiN?0v2etbKY63CT_ze9Gq+8h#&f zgiHHKCSq?$5nxp?H-_kNz}~}^U`)b6UPN=TPIB%20Bp1s!Cp!;ezO3jdRZ^8AHJM;5=~ zLyj(7W6l_?b&MI zq_-iVZN-F3flG9Y!HQ*s`h%79H$8^xfwDH+2;saqggrhLZQlYjzX`Xm0vF;d18SF* zacn4WO@#~K#Bq4ayrDQ(e|p1p>u%#nf}xndvhVPT`-PC(nTCcM+`e2Pp~(#}%p*fW zFM4YZHH9n>xeK6K;jC?t2xFc6_FE|?ScIIw;fmFK7DfuDMuSr;WB95*&_wutP31)VH==;gI}*@Jv1?}+4_ zl~3*ispj`7G@Dh!^pH}pJBZpbbmjKPiK|7Sm+84cUTV+bx;W?WNHxPMer0wWuE*wl zu?d?(d*Ihp{<>`~)UzD?nm=4m2z+HewvQpZX@B||W|XX}nmcyWRcC^vAb(xmb`BLc zY9tL-S4kWz{U5@P&>A#at2RS`Q=9NKU)Cl+XQ;$Yj*?B?MWk7TquqoHa}+Lj*#}HG zDN`*$ql302?RfqYJ3QwMPu$;xucFoB-(>BWBcWymL$-Z{4)0}EDQIqX&HNd$DD}!i zuFuBzp()SWbkULenByE!Q5+>~kROJAb_p+G`*BrDygsbt%;Hy!%n|owgENG?c!8*a za`gTU&ZyMQs&E15!-kTEArlIW;N^6F#9=Or3^DrKEzELf8_bm5FI zqM@^A(p?KlHDje@V+st~v!z6NqMAo|-_7S#uoxuKSY*Z$13BWpdo)LYcTfi72@^z+ z&3E~bGx4DUI;;f>aMk>dB8~~mLPt^c-T<8~MF9VJDdKdhQaHHz{oVDMF=)T&*-5(N zK|$oG&AJk*3ROkA&G6lYz2tF`0d@%c0(AYXh`GOD5-GzVtkfxp0qDjn9XS*^wstEN z#Rj@^R|A|Rqky$$?TnMSwlNcZ2;6E@yr&*?BrGh^)!HF0CFdE~i|oyes4wSvInI*j z(bsaylHgdvebU4*(pQVUa8g#S8sL7J!Vm_HcZSh0S+&&eA|X&z>gH`7CQ2?U*(?n? z7%AX87|E^Z=24kz#^@r)-G!x35EyRRhnVB!cX# ze15)R5^JRaCThRSv(Zih&-OPX90^S~(Pr}JJ=xTyh%c$y z0?*j8w?5j*I2WEl>plpX@KaAEBiBsUBRuj_}mOU5bC3Qyh1f*?d>nNkD-A)YI}YFFfxrY+z3t-=wAhPAPl`(4+9o#VcS0 zC8=k~TZO{Z@1ys~B9nh$vuWQ)mt^zr50={41TIkK*sLHyB;3J1R~Lzg&V3(PCEIt` z`YsDYBBUOtJzl$zu?4pQtT?6>&S3d)`-K6MIbQnZweVMY7a=~N6&RZD~)Au`v7P4#HE9_@cN#y zpWd@SYdo+SmV^JGyumap_~iq$Xg`nj0{Ig}457$E-OzQAPhuwPCcCI)VV>v1ai{Rq zR9#pDg61TZ0B=@=iA8eaxZ7KN53EB`gTT=I_n?9;jS9@tp}(6&`|F|IkG}q#j7pReacM% zP`t>hnK*29dcSf()&ZU%ojZ zsxYC^E@+mQWJ~g3OMDQ>YqhshyQ#yHKgAxJsDk(-xi$)DM-Iu)<4a=BveOj+@OaD$ z-XS=Lk}|r)W8hd7*4ft0*G8Np3?K%+@z^(`e{}MZWr^3Xno8?Htbk@-KF8{+d!BM> z{r5YCvdhtgZQ8-2B~ZTKlf~7r+|2P`xx3rEonYxlGpXBAg`t&2mp=$Q)~{!<4eI7X z(Z1Y&yr+a_WzqVnqrLbbFCr*0tx=uXvm5G|52JdjFQ@=FK)oA1BL^W#TrdeFL4z~y zRDdL~+h48NP9X{E9H)zz^H~@vS&Pr9fc!~Z#)9010pb)9e2jY+L`TSiYXPtVo@Ivy z-c6@qTdu5Q_i#*WuGpbwuLJcF4)uyML?;Ll*ts%{G-7Ee1rdw!V%*s}hU4eV*H zpxbEEE68Ak%Hq@qRY=1kIqW+C(`FH{Rmr;^W7D!h=hhwIIY0m?G6QQ|#Tz9?HJjHD z(yBMUa(u4%a7WDow;!xWjV3vga71P|VWoOS;~X*CATL5wBxRlOt~X~KtkoHG$%@CY zA2gFW*h*JX>?n}nE*nY_S7$;e{x6^qM6T%+-gkz6f(y&=mXZUW`FdcL8_fZR0o-E< zeVk^t_F#R~1n{QF2(ZofuqLAdE!@ZtXu*0et%N!;1P3KTd1El>a%j`gw3%*MS4Kua zyflN$B4o)Fga*4?xx0)X9ry=;pU^bKU09CGMnv(pSXFH{{lYPC-O<7gkYUd~ z;26j8I6W7s<8b{4uvw&%PGUYIlttQBgw;R@nzONr}Z zfn&UgsE^L?*k3XrfA9al)XH4X6oVk z_kkMIdbsW#XgAvq*QJx!=L;0jFaY8>dI$i#05F_!$avu{LR*-*yG1C?7K7OEh6`2n z_#^ZHNM#ON$Nsmi%b=mN#0MR3eJ2Qw5%mt;=N^>;W`~ixXkkJ}>iv4*7`P;)F{dA? zBar2$`ba&9&-x?vapSs|bIHa-uBYgl@Eud)fZgnMl#Z0Ry$-XR9Egm|&ACVED)un* zDBY)oubgPfC&3B|FnoFXC_S_gf-E#AV0i`JeR-7LCwTYEX4KL8hQftJFe`h>F;^U| zhX(4+=SO3IDA*j)*Vco$^_{weTV91kh`gvK@q31|iMsTUBGf1b8C6VnKzUUPdMmO= zQdp6mVBA%pojPgF73l{#jd|LM<6!apD}FVX)mt4+GshlsPTyZPkFQeZ^J8?+@!*o( zU9DBbIf@+on{0wq;TQNV2a7?rLaj8qo(f)(PwS4@s-ach zwobfZ6{=NKiK5$B#p==Kl4JEj$D$oT(WmtUCsGK)Kb$R^3#bfL8$1pmC_?`*Sx&0N zC)4AXdU(}O74TXFd{zCKQccYr`;olflb!Hwk5sr%R|?iy^hzX5mBQ%t^zZW ztYLq1&}ZacTolNqD03Qs-cuSnk?Tw3CK(G;2IcY3ZOf%p~#&3O?2&*Du5AYEYN>v&)=zg5FJa149~Ak^9VjC+HD@H_gfu zbiXm|%SyxbxcyXQSLj50X)}VJb~)Vd?q}24g!}6EJW&rG%++`H!P4%4`V9Vr(|#&* z!1F37%?G1ay}9y4U6(~-y6;*u_#{o0&K!G^KB$B%d7#Aw$Zs*`>dm~9bOjkFKnZnJ z2qyHgC}8!yto}!3tO2Qd$e!k(bKKW>k;4}YdsSqoPek|G9C#w%te+Tf0@EqQEa<^8J6 z{N~rlVrzqQf^45DP~7|5J>(Fk5hvNssq%H0vS1gGve9*K5lT%ec} z2y`?tm$SCU;93%v4eV{l9!A;q$IPF0Mn3#r9JbLR5{8>^=X(Bi4#BC+EGnk;M7zo8 zh{$L=2O_WMp3jr9ao*TEcG0O?yF0$HJ3`2G29`_|G~fVQr#ET~Lghzce;|IME$1c9 z@WKm1k|~OOBBfD$k+PCDjJ?fW{~DP{N8mUsL2-aV4 z6WbCmj^zEpH5_XNuQ)0)kRPrE`u02OqUoJmHs3odtH9IoQb{1a~q z%?ZsGTXQ+nxCrAq5oU3l5vV3_phHq^in(lpN+cCJQIW85i85Ze05O^Jun(xEB(J&y2+FKwI`f&6zqJ7K*Aw5I5{J11B|xIr7qSw^AY)^ zXVZ?i)`b71duT4X*d3!MDgj&yBxI z#0!s?`qyRvx8b|e!WYW4-e=#Oxx$#S&m(EObMXfwaJut6(-zATdqXpv|IT~z(HMoB z&mQ+TRFxN;h^y`aWLzKeBMn-ufx1hFgRot~CYa1@5wCcgv8_vQ;`v=WyXX$%M_)=H0V()vqW8sNP$pP-3sWIYHqZZQWz9 zV!}d%boCShv#}#?sqlNo*n)dTQjVY^#=>{NB515RM^%Uevd&2y;A`lt&~eEw-8iu% zFjIsx0_8jUlZ^w@@NYwR_fAJ?5V#(VT^z{~MYP96l;aZ4G2fn}`|vc?1huQ5MGxQw z$^qpQEQ-EP-8Q0XC@!4}`U-y7N;K1bgokgo!)|(iU(kGi4BfK11m~Pv=M%H^TaZACB6O3LE|Lkic1V!daTGAv%V3r?EFLKl{%%l@${ap& zDPlazU3L}=5)=0%#SzbH8}yEY%Rh4(lZ5Yg$$5AEh1;c?xLakZU;Ynfc7(qU?1Q+> z7n_ycJZ8S1qE(q~mPI_CZHt%@Q+3&|p^f+@4}Lnc#L4Wg9_h=hG7k#1F)m3r*`(Z+x&blBZyPKy`8?3bvap&;InRy`kkEa;%ESbj;nv7c^h5fAk8i3>EhlV452~bkam}4q4jF> z?0LFuFI#~0;ahMrJkXE-RO-IgGsBkQE-pG>hYw3N!9L`nER@Vc3rO6vB<>9ox6U5& zz@h2zsh)qnKH3+&2N8f7Sq4NRWbnT2d@p$Kvb3MRZ?eN}jq~)gGelsx9&}*yDQXk! zT1hc+63>7iOA7ME8G9+BvQn30{mO`#NFK#r27vg-r z80hNU|bI~;2 zKhS1sr|Ga$ih6sTr-2Gk>gj1bL{-KGmX|P$4Ds@fNPADA(<(P4mKLdkgA#R{Jor^v zUwVVbGODb%-N!@d74M`Jv6p#Bx;k@&DL-msTW^6;PP5N3yeXz!v)nV&9lIT0V4lE} z;4{uCvmA!jDu9l2`b;(74B~n_Q(iUMJDL;2L?Z zcY)Kblxx8+kxwm?5S|&P&1T;S!k*+(JI@4zPaZT-49w1 zK5`D<@Q}7bpDvXdttOFUMSZu&(+L5XdSk!7(G>him*slRY&WC-gyhe}S|Fr^T3_FV zz7jUEVLmM3HM5nY@%ajHei7}v#AZQxiOsT-0Mab^qb{B3wYH8Q;s-ioYvWIu+s7vV zPr5ulwfALerzDOcd1_lzOl>FV3T2Akpz440At!xmMYm3LOmVFZ39z&pIxUAP@lO=oO~nQXTFC@!=O7)s$U5$SZS0Tg|3R^+}031yp0JQ-H20 z&&&yb{y)$uk~I`>uYsdeaE?SS=pHtF#Zz^<>lCN_RGq?x0Vu~I(})mQBSJTYf&rMi z3dU}>RK1ktdPy@N9h_I{D1)R?*09P(it`$lU8YaOj$Jz)FL1wUJ_7eXCS9Q5d__~} z#7FLqPCyw!_ic0=Yx!7Jf#QjvJFO?dc!=p}uyek-`Eq^4(ao5H3rAOSv`Yjn=*z7} z8Xh_Xs|&pr6#JO$0V)kt8;b&D`$U0Zf6-MJ5-xECX%5j>7?+E_ek60zm#sldv8_>W zNKz}sL+7j(sE)aPPBN=CpGR46in&HCAuq>TqCpX$?zR%{7vosG%?v@A7+g^PLu)Zl z-%qH_sDa6|Nvdg9ZL*j^P0YR+!9(I91h$l3Oc0@C?kM8F9i@ljCr1Lgfq#KLRv+o< zpbYgQ5)srQIV#;2BNF*_UAGhv3rD4wnKc*c;#eyQ)J_7U_W98;u=vjueJ6F@%@nnH zrgkJi5}$tMj)VMUq>J@7UHgAKaLgOCtbimLk=EvmbJ45AF+FCO6KItbb$;47Y)P{;{`+6d^gWXK>P!#7KKR7D)Fnae7%xz1))L4-Nx4| zp8D>z(QIytX*DI@jTc4`(6AeyCWv?4+VnMusb`ZT&43F$;@ zb5gZF7sedwlGR!U#dKflcvjCFg2deRYB;Lwt;8IHi#4bc$C^xm<`%RvJQ|!bA}wuP z8p=k7k4j4$56UFwHH(LkSX6OPUSyah+3_eg3^mX$Dtq+~LP9Q2k-)B7GSfPev) zr7i3g=?iJ}ZjR)7pGY>M{BCxVcd{ zEi_s){3^X0?n6BJD&42B4h)&G;p1tP^)**rr4Q&uCR+$jih$T$M5GY;GHb5Vd!E}D z`4Dh$!cpetfT9<8PI=@z9EaJFzOZ5B7YBvgOKe`CBu>z2Po0)+=Z4GOkU=#g?qV`k_!bLtG;TYhBV#}zYl9jPd~ncGx+(V2n* zp%<`1dj`gm71$=?-@pqSipbgByHa2szzoEQ=&R51uVP(}SdfGX03wr&xe|su)7UIv zj(?M#4DoBmDL5?T{FLtw=w05n=HCcgARXCC#BXeeaR}U2$(Rzocdm(Clj?w|!>-Z0 z4eWGp3&gC?#DWiJLB z#nN#e97m<-EJ;>QmIbE$T7BHU^Lz?fsm-Sf;0BOTUL>EJ2zZ?c@w2-3lmYOh6y-(V zUW~IgbZDe`cwN>$6<78`j5seZk8&Ha>(JKXydwEK62$qc!O%?eVvXKo!~*7}<=Z@U zoI9E>tp*}#p@kt7454keiIPxF`O=2MjKn`fLTmAce}M>xrk951m`CR7@qtaI_C7t(6xHj} zz*^HfQ|}*m!vyZt#RY}#csHhnzHJH!(}Asr9MSWs+x z9%#P5Q};{JeM55h6Yg@m-yivt&)(wpd@FldJ5Ka_~CT*){k|yZs%Q9m`88Zg@JYE>D#oj@RV6C^>>9IPFIirSXYfZ?`r=*qiUVfwyR#2CHJzz-wS>?y}bNmy}YukUS3J=<#m5A_~G=@n$Sz&UUTDI zXaIAJAE#C&xAm&OE&OoWTA9#R3e0_NS0jGS*GsYKU#DXM&_I%sX|T z%*EMvfIPO==@UV4lVTJCV8+w@&7jov#aC5wWQ)zThxA(+Z{|heL>c9?_zIsrFo`7pX2^LVv+tI6IrH@H@|!YFnY_(d_)h)`p}?Yi78r$ zjW??w(Wm15s7KMxhmB`Fs*ei}O#d>?7)4a4qkHaIdRFA=9@1=S;80PPm>W2bXnI4bp1A-6CGKW8|&*5{) zGrG@|&?OL!fxUyjK#Uq0 z#nG0uDbY90^UL*=z%n!PDP0y^_?|iJDP2+gCR?#bx%1W^94-B}x$Snz=H_Q~SD@8g->g3`T7@booCdcR`dZa^!?Sv3AY$`dAct{(Pwt`9U_j(X z+aa8tyqBQa@q*Uo*yjPQ)#jS#_0-<>3pBAJTc;ocPN`@s>zMo(^d7luLipW+->c0p zUeM8a1*a1_yqr$VoEHF_)#e?P3v4(2Uqt%ob~E-xeWbsY8(-ANXYt^)&}?(zKXu>U zC3(S#Xre2Kj0>3+Mw1(@MNalw)Bh!8DZJ5m%1b&o5csn3_y5!n3Mlec=sh8n4_Kiq zkQe{k6?$~pTddo=q9i|@H|d46NiPyK9qCByHuG2Dtc;t?iWU0szyee9vYw0}$C)qd zN%&R&vOXj*+iZVX-x;{yT=c3QY!*Yv3H-COKA2bDN#XAZ5*jOg+$#=NE<8NU1# zEPM~34^CUNh?5&_&Y&CQ5^C3Q0^uybXlEu&0CUmnKoB=xt-2HAU9d{`0cy9b(nsYl%d3b_t75gj%D+11rPZST zY+Nmn4y^G*x-bu52Cy;8Hm1;Exzpzj6dxi$I(K)Q6TK>F8f1=2Nd=(A0a zHw3KvzkwB*ZSab~$FIRk(61eh0ou5q7?{Ps&2Qe+2V%T)-n8SzZ9dM29dGJ$fCy*3 z1-kmuta?ko6?opvYtuItKhHDWDxD+vEm<`J1os7TY|6)P>+_30x*cliinMqM(A~7K`H<5?71z)_tD?`{y%)kx##Tc?Ck99 z?Ck9BY-qEgQCa%2yUOJ*?5a{gIKcTRyNA1gr=^mKPEI+lx5WXD5U6X8gewD zG1~5lqX`-Kc;qM$eNC}HL$t~+))p6^@Ub%_&=+yCqDBG`-nLTqV5|$`Mw6p@p2oJ8K zEgPVki>Sv5P=9b;t+HJxdzfO&+lQ1WYJC(dm<3ez3&yKGlzI}>=h5pYL45&zhDY2U zhO5yrQ2)aat|Qovju9c~G*r$<)Z=u*bIR+q{xtH=pi`$4b}OIKrZZsDPxQ-~gop4p z^4Em+aX*#TM)=OJ2^-M=M^}RK@9E3RgfD^qwX+GS@oP5Xj@!z(aF?P4W;P5kQ!<=E z6jK4e%$~CeQ*i=u)H$e?S6yG9gF08P(5>e&_FSb+=h1hrxNH|-I^%1--xJ@QXn-qp;g5u;fnj1*!Y8PQ^CEm7uhNi+(3>$6IR7ekA%A$V^)fiqRKhmVfyyZgk1@jSj$ER$g9IJ ze?uZXHI7TJjejLXDoUwq`=x}1DjZG|uY#Gcx!$}AgHCyC%^poCslXX*w&D1NA;=d5 z`Ilch^Hg7fkLNN)soG-^XEwu9h?4=$ZF4%tCeR{PyFocar&a9?_;@f-TNU#iPM7n{ zImoO4jjH1v$_vu2hY~p!q;*Qz7nWkPQnRtm+Gf?j;c~SP*2XFrFJ{@acCd_#ZQ4Nf zeaGzgLgJ};h}Jv_`7mQ`7I>%Cc|F)sMaAKwM?$nQsM*dC?HcusNcwARToP}pe#6zs zj&7;EL3f1$;4LZ&)$Vq_g)`+mOH>`N^5z89jDJY-GQ)aT9Iw*#VcOHkwJA(13$aQx=lE3{7(Wd*f)D{)9Trs_dv3b+TFjwEVx(aO&zX?>wNK2OrN zMs2-<4wz~##KZAt90@b=sJbL_PVdA~c+k)<9r1K3S&LIH&PmbI)pfs9>lAIw4O5|s z;dO}%HzQI5%{Q&L*l;rrZ&$w0;GZt?r{+hyX4l8ZWzL)t8Dmor%Qx?3s>$u<}+^m-F5L3LfF51VKYCb|>7)`)$7J=0XnRTjJA(zI+v*+vVRX?MqNTZDZUnip7M*yh@IYW4;?(OjE^r)zWz z?LEbQE+4aoa8xrWUAswL6G^G9G=m;X*BUYG+;r^(Kc}?Pnrbh`I2Fr+g6_fTAZD2j zn@#A8R@$S9)~1sZB(Wh@ET7AI^U;H>&8}gswZOoT%DK?xzr|65_d@EcQ=_Qkdm)=$ z?b~UXG0meE9kiP;2YI1`mZ}`0ybjs}c!YM;c7cfpI-)NtRdju4ZG&==7IxDbxtes* zk`(1n>eE%rL()O{p++(F&Ny|M{A?ot-hi+vO8 z(@O)i>oB%&9iV*^yq1p@(V&5v=D-?`%`Agj=8X)B<05SysI|t3dUl|ef;z5yc6x2F)&o!1_Q6^| z#kplWWFpwH1?O#BD~U2X4rX8+2U%*10P}llKU7<-mTaeAhH8D83)c+O8n=8oKHPBo z?|AGor~Cv#beiQqawmuj_xkp}g>R204};DqJ4i9x0+VUiFzs{YV|wLgtpR;E*9MAK_l#!Y<&J9t`bZawKn??smYA>Qy@3>Wa1teA6 zikAPF(r?oqg^iGRo7PdmbKfW}T*2p`Mr&Dkz2|nVQc)^s#2s2gw8_(V0Jwrq-J!LO zySM{gD9YQ{^XKW7z)W|Q z-m8sLl-XA5Z2IYb6mW=cc|dDrTMG}oqmo{I09|7NEqy@Ca&tHi8~JG1J;4vE>%(b9 zXka($@nT2>l}^?2-CruaDW!v>Hz_$ZyIavSWU_8@XGVQ}J+|r5m2sRz_A>p9hZxm+Wwq2j-Rcb*LK63qP(Epr5tqK^MW>6iSQY7P;tLyYN@uW#TXGQT_Q^>R#?v+ zeG#UV@+Dn;Ny|Xkk&MaOi0GmVSbYhDT=5J7;<9rxI`57P^vh)JnfmTTuReCeJTpaW z6t{yj##L);*UBjv=)EnnEXHb)+*&PSeW_4ADY8YD(b!j@hgU!%wALy{@V3*T<5sxN zOxLdA0X=nwmKTnq2k_Z8IMIXQCZ*U60S?cFcAC`lj}X zn)$|MOF{WHz}!8+kZ%4Wxm~Skwpl6j@o=1t3y*a-n%Tho;w#KCs<)$N?%o2EvlxFI z=i|b+s7eUi=DlD#Vg-Zuu&9pLU595w>nLx!nv&K4PwJbi&4R){kc$v5Yhzq#1O<*C z)Gt?ig7W8S&(p;DS|hq~K6EY7r1{!Yu*Of!hsm{(rY_K$W4gL>fi_S1iUz)|-I6>v z%DqOzP91E==%&ccl+waBp}RJ}t+h~A(&@Lgdz3$2H@&0X8UzeW-q#9&;hu$>$qMd~ zuVQhj%t9>|kb4$tccf4L5*4#UGT8j$KW-0Ipqa)VDtVZrGwi+2~c7e3NvLNP?;YmX>%DJx%lNG;e) zXY#eS7%@^7YiVj$xU2tSZKVQ({nE$Ut!^!wTSLp@I!9>PiAylDx@i9rt+!ejgXmfz zt!ThfZMZ)33$*Q`c%LA|o5lR;47rwSx1$;3muZio5N?A%| zN|a+Rf3HV-3$zZjtUzl@ZB}Y`#*zn&kMb}WSzxY}7(Z7~*-GtZJkmdbmA23|^b<{0 z#j2PT#qCE>*pHxi{Rs5XYV8E2a{K;qnsjGkMtygVnv|TqGqGWPcSdiTJO8lH zw1#o-*Wr%6b6nzFO4+1^!Y$N%lQz2kmALSD-$0ONE_;{f^{)AwV7+1NfJdPz!K3md zCI6CObCqw_916Pq+0V7}YT?Ut{0pryOxwsUFkSJQxkYOix9w#NyIrfPVq&hiPHe%j z6}oc1MB;9Qw_T@pYMn!rw_T0*X#=@;JzA!9fruVPG4r#|=LJt1{jr}@3$B%dDgC9W0C5kzWp71*LJ&fjkrw$KGMR4-2ONG9CCwe%0=ZoV^GRKVCMnk9S<4slRGV zVac|u)b4Keqg*i#;22XdUEwo;u1vA7c32Bl)jqDpTFRD67&p@>`KdtgP|U%!?4#w{;+S?0HN8 zrqPV^+AxQQWH~QX96!^q=fR|JDfEK&Y~p)9tTxQLfdSqR=&<*B?JDnr7T;?jRt4cG z;bS&7nY4)OED3l(yE*IuJ1=%c8EJWYZ`3u_5&9Fir$o%$^zN!w=3qiX2hxR~C znvc0@cFp=jI~@o^@TI@B^~z=HaY<{5u`lBiY`n|#<0TlsD_#0!*t{4e=UvfSs(+Qx zLzlEC@Y>@lHag-}T-NeuH_&60ve|9)r<6sr7whd5*X%>OQ`t91(G%lvf)bm7ctA## zLr_yVq+2U`ORTEiuIRsF2pFj9EtJpcDSlLN>336CRSyeO5zfY}P;hY*8G(8yfD8`= z@(Kb;A9Qfzk_SX(^c@_6m)KFBi9J-j4;L#)aO{PcS*qJHOyh#|bFctz4%UbAgz*EL z{w!WoL-fO{nsbukuhmZ~XXkX+$75=i(OvJSd`9nu>uOi*~v2e8B&11_I`^gh6y0^X&YoZnr})zE@grz+}VQ zMrzhmcT$%~y}9iuU&A(+p6#g%^yfJ}^>*rvskAmyZv+mU?WxC6mnc0ZJO`dRGsiaG zTria)qjb$LQP@A8ifu1;$5`5RonDV7Md{g?RY#e6Ppsn(HuZbZ-QS7U-$!Gc4n0vt zu(GiZeKcOzJM@q2(<-1%aSITYUxVD4F?uLe+AA@7W31q<;KxP!Hb&p7{6-66^(18{ zt&7zY?Hs2CuCJZ+Lo7($Nr7>?3$438PQO!K6@{(bis0wWRv~@yIV)aIRd>hI^5>K$ z{7h{flElfqT8A{jDp*WCy%B#lpI7APvCk`lCe_n>#}&VgyI!Lmouns~+t@6lFYD*>krhTkc?zW$WGh<&mFjvwf?`g$L=XfN%muMbu>Q%ZtfUtRSLbxzQmVZgjA zLGRr4k3XjIHlcgn%04p4EWpjb=>Y*~YmAMv*j97mB@pUHk#<`faK8Xl(meF>DP-nyeSc8wjF^k>t&j zNws+M2wH$XP12*?3^Fbr#n=X;%G3OO65?t=2K+BYbR|izpYS(4q81Hw-C|Nb8r49* zi8-~r0d&<4I@UnH?w`q3(BH|GGcd?8kFt~X4mJ3cgR=COWO|H_a*8WH!~Y zx7Mkr`grBuKv-uVL=*%*&BGJ2ju;;TS%4SP=B7|e^XTS=dg~gT%4w)i#mJq|NZ+DP zFQP+@^tyEDTB0M`vVefeOP{0@pfZ>15*8y)GP*X#CnO+z5qYX}6hlJyz_ zyph#11TMj(z-H$VYTHw9M)uaa5pEd-uTN#PSv~c7m^t)mtrvjA3#~Dt=kbUxXh<9V zVGQe^wZUMQcamOIlhT9Vi!~RVq>gR%Au68J+UiYU&tSxlqaJ}tp*-xDwAF9Nw`SMq z%hhQW^xSoNB25fR;sO8aH2^QCudmaSXgzA05!m%A|SKQ{b6F}BkdRKg`?4UPpx+w}4UC^V@#+#zBKLs!L44xBgjfsf&d!uVR z>MiVBIh+(AX=1gv_dDwS>mf}w^Dq*B#Xn}@JQ4#co%CTSYIrBT3+&q0JL&J@ExogR zyT7yEQ!9>%K&(g@mAuzI0O1$<8m*NeM=^cY83WuV`pJ6OyU4e6Jc2=JNH|T{o@j)~ zQQYx0J=H~@fZ87GqBq4Os;j;RrETe|j~?-53|##x?n73cfsb-$cNF6b{&1ns4`7d$ z<4e4#IE*5lpucmD58+FFtv}9w?Dn2e*cEKermL`DQ+i=+lCO>Ej$V4G&9YzVo9lFqt=DkM>7_pp zftMz%6nHjaA?w%B&S?D+nCBil_KDsQ=pwdbn^0A6{Ux_lH?{;ii8fsap_5YG#1iPm zSe2gFN1p+gLbK~JE68>|bG?3>O_@r22k48Gm+9$&`gO`Hv~i%Gfi?MNgY-QLHVR!H z43qn7sy{?e##={zd`-6u(I<#vh--?9c*ZI(ghz9mOvg&MY8JZF zqlfBqlrLQ$4%KZ6_O2}(hAx5UH#dP0vCWM)KbY|%VxVdk1an(&qv<#61UG4;5&8|v zR@a0PdjBA-Evy`kp|#{T{fP34YxyWFNTE*nmWXwRFj7d2Nm1XJ?TMIvwM%E zBnlk^h4MPh>ydP~Yv~wFm5}w_vHBfBcwV_%zs5#?P0$;-29MWIsY(fTn}BjlsO@;D zh{_3iI0hv7TYngnA?vrr01TTT)D8Le!}?%}he9X%;IKPP<>A!__xeOV)`M{)|90m; zJyGvw(b0F34%g;4RP~5{A0A^L)xSp_yFP|4{4#z2nBD_q>yPWLgVggS)c+{}y-h2h z(g)yi`6+#N!{U{1N!O1Pmvv&<9%D-4AcMEz!-zuA7IVrcZ@qQ4X`HM0X zZ97eGTMfm8X?iPwFPNqqO?=CTrfSaKfjOgQ{)rpl952R)|3^_X<+g$C6#R0Gcnu5J>PxgE zNB=5fA;*);=A9Yvh2*`VpNjqtqk!5oTQ6+*!@OBiTKw3om@`j<8&T#J7MvI3 z>CHK44(xE5qqj&a{MNe=0gDPR@({P3T~jCp2U*w$t-${lPkJBv55acGAoTQo^d#vY z#9dap2Jl%E_(c^w;2YdSt#iS(6*Ph$)9Kk<46nOrN3K2vdiSQekkRGz%3OU&Vty<~ z4{nLhhDTaz7(0l9d9O;4V>z9ltEU1<{dsUI<FH?9E)~L3w=kX-SLi0%eLMQS#Kfl>W>Dkj!x03;61%R zef6&XJ3Nn{<>?K9?Z-U*N#Gv!o_>?E+O_OGNFa7$hA-5Igsi$OJ3EbAs9ysg%B+R@ z$OenJ^!JF$nN zQbL*q+EZawreJ|1$#IBo`#>LVcm0Yy0(n+`2xDtCjmy^?Q~Zaz0sm>658Sxh@2~tTK|Lp!3*m=OJuoe%%E& zrpb#zn7hEw7VEEpy8a*QUF}P){(&!Cz(?;hdV zv4ZtMG5oMg@}hm+0@Hq0FWFZD^?ZOEIiZr}azq&JC7hD;7@|!}wuO zjlk^F&RRbNgMecf#VpfJoX{A)OveH)U08;O#vqDTRt}Mq?c|YB>LhsgW(G@8X9`&DOmQ?@H&V22v zB{QF{&|gnLGsvUIIMkUU>lujFa4e-!1?WMC=;;Ezi+vL^V8uJ1))nX-z_Q8${Wjxm zmWF!FChv3=+o&lR0UtgOP>(I9(<=IvKq%2z{N$Ij0J#iz=SgntP zs;OM9|B2P&lWX)_tTt#vkAAA_wySfY8Yj~mpXv$fi_!G)r#hvSats>9(Nel~Sw};y zvQM$#8@TO)9UEz!OHaU7q^DiFS#Kk}?yZ$;d9M>Qh7ah4e@{DIuro?2s!;!watiez z`l?VLsVt@BwUCI(G;XavQvc8jor#qWYuUg&%}e8fI3}=bE!yRCs$8oNgxqvr2gky4 zdT^b-7H*}6>oEg+nfkAX&U~3(>vKK;5uAIdc{H^Q8Hi840= z<7Z&`N0j-QK3AFU(l=qki;c={iU9KijVaO- z#IjiT8oFDztLCEPU`ZfYGNVYp5xt_U2>jhetv5qqN>T4ap`Ysr3`|`<*PHp#^Zw^h zN%QI8=kPpDrjRcrbs#I1`h9`^wUO@s0=|qlXyF$C@RE4y3%#FxZ-u)Vx^013Kc8~9 zNE}~mK}9!`@}=%n--xEH&y{%U@+I(2pIV&ID<4^Gi z4RKX@#BAT!FjZJxSkON}Z)}BZ9pp?b=3i{pdqd3I-kl^UDeQvzP+d=F``e8eobTUPi;Bl3Dl<383-aeOohyJ>v7VUG|n9@_&Gc^7@NM^CP|D8hGf z1slIrn4B*nbuW6evA2y zS{k0;AJhx+q_=+1_teXJ9i?D>A{8f}ZDv8>_>@pA_C0%8pPK$%3?wCNd}>HUKzKm7 zc`fEOAsJwEEIbJU!<8p%xHA-oPFf)jTlhX^N*d!p7_)M{WjJuKz{n3DmFpY9#CwnE z&&2Mx*1r%+IwhQockHLLM=+akGxvMWRt)B*fVq2r1arTqmOtrZ8}E1%J81$P2RJ(> zA$Bt`1@9bIC@{l(`E8sv2}b`b_(@NTDcuL@<|bJ64OXF$hfe&Y8*1r3m+hz?sfvYh z&J@SnaVbWM;Pp~FN|eokjUMU8q{TV>7{=18H02o76y)rf{uP92&T+`#RoZ!6zs6C3 zB4BP}(x9ZmirR-W1dz;w^g@N+J@zed)@;a1!+p<5EIo1pYjeL==uzk;S1R6MBEBij^ny9`+Lc*Z}%t*GWj^VjBDlKAz-{$-a*#`Qyxw@i7h`+n$8A zv6x;viH{5UqhI#4Q~D(PkNhzKkdOQdtLqSbb6Rg}zr-KeX8G(_SlF`kcp83MA8WtL zDfMfB=Ps!Oe8L%My!o601Ia_j#WN`K%wl|uu7M+q5wor3Uu2_7U8tWNBZSc!q^>(k zGb{C>NhR*=UM|8Vf|kld&%^kCsZwv7`~!m^-k~1|P9}MP4$#1}dOQ1ZH&C?_PoD+V zpEE7YQaAUWJ_qi-#^8Qc(SO6o5BOsf3$iQC{SBtsV%qqdo)+rel|?BT(VDs^in?Y* zr%{{p7-d{E`n*0LTJn$cQe7uqfG#;r&t8B*`x_fj%;0?&q|KReQBR?3e%D*tUxh}1 z^ygEXi*S`r`5oSt)%4!)`Xdc4&qqoqSJ!RDJK*fp&Y;vG(UQHi-A8qu~!)eBIbjkM}Ef)uX5IUm)){dgCui zSK(jicE8byzx1=v+6OLSaqQ8VK*r8Wp zb?l{%SM^KE^fm3orwVM4UlcJ8kAbRq9tOoWRa~QNaa~r$0#2M4Bzl7%hk`@`9v6bd zlge_}gkTY`#1+6`;2ErXGkm89u?kpNfdeZd)s9&s_BLZ;xzQ$C#jfD{Wdiz*cVg&7 zGuUxB;<8N)k6eME>OuGvhPmKs8WSSgg10k6#6gI|Lw3;u17a>>sU*&ihB#yP2xFP= zbi}Wq3_ilz*#UFJp~S{hg4eQ8~+!o0*YxW_*pmNcoP|*~e zD+v{B7n}1W5UI7xCmEgCPO^3Jq9bE3nZ3e8UckIPo0J?hoTcw}^GoUb`ZI#>I%+ zuth@HX>h!-h5qT;D@tQy#Aqsv7u~Sk`Fy+xRnRxC)Dtc7Xi;BGx0lQSDLknz_$H~o z-1u~WzOOHu+mCPptKNtNVS>iN38GWnpVAc~r#U>4fGcD=D zJs|f($0YrS9??WcNPWHrdEZ21b`dsi3D;h5Q`iw?@hIRbSqqI-lGips7LkP#Oh z5<*}WTqQ&rKBgL|`D*HC2oBfqvVoRfLwgMIfrZjZ^AkmDq-;+V?SS`cqG;c(2zPe2 zRt7rlSV)Cskfz>%O)_Rcs-3q6#F$6XfneP7#?)BzAonKR-UK-dG51!`!$~N8BfXL& zo{y+hGR&YMyj)>kq1XoE9`w^E8;I+$?Qwkrkpv3%HxLuBU9w*?`ptBDELn6#-sQ>Y zyG3+1Sqwl0x~GU{*bH)iibzI1rlo)jtLUo~S&w?DVib@~N|nfFq>4u2(zZr73&1R7 zV=5z>;}q>|7iM8%H-)-5MK@<9#&#xIZ36{>jk#5xceqn|u{f)YkmrxovNtS0S(0?K zI^f&2&a-f!BaBtBUzRr%oo&Uiwb72J8jAj?L#IaKRa+T#^8J|MK%$=97|bggqT}k_dxGE&eIrtg~YzoL^QU^o^Xb~ zZh}s`jFOv*@%BAuG0Lzyf1|1F2?v^rX>q&JB)IqmTbdBdhJB&CD(Hzcab7(hMRzn2 z9qGMhA{AZoi)Lan%J0`)^l?C$greZ-ur;lM=Ql@NET!+7`wCWCh#@F=SPOA2EYKM( z#2ub&OR+d%WxLcu7(lJH6!!rpv!z&!iZ)9ZkMVrroph1h+D`|Cm}MS?B#*0v@C3w9 zabauMZaS4N8bK&xT0!n7)3vQc!-$FIgp_c@MBIJM)iYW_K3=BTtswkIX=5vKeS1_U zgimTZRiA2vHQF`c8|kuSE(3KSr}K`m5*Qr0)Uh=>%4E8|wU_~=e6qE8E`(%1m`-O~ zi`!{i8zDlV7SS_i(dKK!=*V)^8l592*cs_KPBHDpSo)+b2BXQ;<{I%TkgUH({3qmP ziDb3RLT|Mb^+Mi~UpB}uA$*`T+RDDNo+P{|c)Sx%TaQi;rSaXx3pApG=nVZgql3`G zT<|l23cFLKBkjfG)TpEA5jI6)U1WDg@yCgDpd^pPGHYUI?zdc1}yVB zLyKO9cuOtn=p~xaU!4WpJjq?e>(BN=oh~ zoK{DJdo{wb(KWD}z`5DqX!Nz>RrSv(n$TTj1*0C0Pw1iU;x$NjRd;bcTCqnD@de=2 zo+2N@wWOyQWB(cYT^dRtgO&NHUSbc9nzS;-=QxXX))al%@6ho&u?dp&`*ordTDesp zjJmmWXCKiZUN&Ztw=oyV#(c96qT)j0w)GJc+SV;`#d7;U5$2iuczqU>%~o!(N`FMgRjz!uc{7wuD+s;9dmHB+Vo(`V@zg0kz%)S&yt^p(Yk&@ zgv*&b*orwj9quQdv|B>BNWyfb8F#~%u<{0UvZJ))25~Ps+1Gu<2r3^gf@u1UVj|db z=|(Xa(KQD27qijUNBWC4A(q6PqGA2Tqx9+ksOWPvW3U)U%leB1N*XA-v5<@!DAd^UC>|a z>6g320f_b1yG59a(_6dl6}_5X@>vD!1LXx0UdKfgJb8IBduMUnxR5&E2YYcgjl56X zj9M+d4;^+gmEI?=*RQ}$RjKra8D*VGHNWDyR3NltoBJ`kpP@VN7d_S874+WyqN!S1 zLEHFqKK*&Wa7G-7;&@?LB(cGEOnU%5>l}@G0OrLx%6R}yI2T9AFlK{K55UAeM-3l@ zl$@hm9~7O!VKPUtood5qH}65qYL1asa~%BVSh0fD{QZMahAZga@lXUm(%JFi6Fe4W zh>gH}*F)lV3>TXo63?}eBR8Cf5vV)Ph_~S-Y))j_5Hw;*WS(G!8FhFQn{3f6>bii;=LW4m~U;!QVT0A}lxQh?E{tgO*Md&UC9_ zIe=}9whB)};aoJdGgzO$L{aUTfiJ)~FQC6Biq@HM0f%Cjzr5I!Oa6=(3oyQ8IB;OX zfJeMD-0?$<+ROTv5|SR!0A>RoNxVG`&qOEu5`FnM92t!eJ-w8tA2PtAx;GZz(%6HT zs+#sx9;7O;K!x!#R>nDQ1=A~pS8PhLY*>zbW;r6`9$XHEE~k&7mSpt39{E3Q*uUc8D5n0biZyPiwJ zB-A765IjCh1IJMuoTO21`Nvm)$JK>y4DjWG1T!~oyt$vT$tk4OZ)850m-ztT$dh?Y zD=sEkz)$Sg=8W#B^m*~1orh3Kmxa%nud3QbWmkh>I-B0;{JeN29pKimDeUdddq1lKESavePvvQ!OOTSOIP zY~U*Xx*O3S8#f0t&pglAc%?G@F_D}=fVW}3eKg=<%(adNJd`1;K;~m26>OkMBO((r zB@@|uTX*fyds0*Eb=S^n>pJKGU#*tD%Jjh19pTTEYHicnuW{6W&^WGUk3)--<84fL z(gSe1G$ZQK-n|k6AG+)AdxC}~){ndQh8u6X@3xSeuOD%XuJj!~and7?_8%}X$!Or{ zVcJ8()cZTNi)kBs&2@bOI(O{ZzQgSgJUC|Lt%L6D-tXZqTGzqR84=0YSvF+c(DC&~ zjgCxpHf+?mNz=4u&0DlgZ#A}cRJUv6+XUMt+!3A9aW!5InM8H}olIsv!<_`n*I`f|D&Go>F78wvze}?+%^56b7V>DKgv6pJR7nb= z?}w$SjpR!sbglr$JGhnsN&^er&?N1V%cCyPgWWnrQf9LnM0T^QIkSdHCzq$!%1WVw zsW@MPfFTGA%TkC+{<}&AfmA!iY!UVEu2trTY-7sh759+HeEi=RY4Nc$x~};HFV(7! z-y{dGWp@QMxQ!R4n1gV)Fpn^+1Bc3?C&J)nI1KN1Yh`FnZl?zflpIM@`!F-4df-#` z7?aTngB(|RP=?OEwUZhc5b-oU@DxV$r|GSyM2k#D%_mGS5N?w8;yq5gq(q)-d0J9( zC)ztTGzDil0_;gv=em^>|jczLpXy+y4Qcb_bh59OD_6 zv1TAJZm3D!pB9msl}xM&uMnsxmvwxc*Ly&<%6OOx6UR7Zg}|9fesy|^2ivEx^vFXF zRvps=B21O<5`b31l+Zi&+IV;d^QI`+c+QvuJ($zf%q#`loS@{~8T^J}**MeX>XSb; z+&*fBufGx z($qq1ckxP1k)-}f$>JbM69x~aN%GvWgf|NS<@s0^96s;HAq+U`ahh654W1QAx*V$5 ztOI9YIzW(*ppg+OnKnNw5*olYBS!*>vu+s5dsYM|R>Q->UISI~ARc(lz^(yOFCeFAx3{gKDGcnq1`EVTNMk0fSdB+@1G;I5q# z*B3929;zH>C7os?DPL@_Oo{FtfL&E!{-Su~d)!NmtO`a#PgQc`=1dXEf%b^U>Bi@A zTdLG{c4@nL2acDHK;dB_!LyU3?t#N&%y`C2yY!%;D0^*VCL$HWpqM}NmIL;-8mXZX zkFcO-TDfv~{ZQWf5yDm=pk8FTvpf|?W1XRqk1!v~W2Mlc@nLsD?AUb!W#2V`c&Nv7 zHb0r693^BHj6APWvKqq@&QR6~xJ*9Isbrd&eIp;`H^>Wm4EI;uV7oLf;?ZyjGx`lg zHx{FtXO&r6H~<0-SZ2mfE5|ZRnZ!9m*#+#z`#+$yGDE$=_Z*t(c0T`;eDI@le4HG% zryR#@Zezw*m;bp;k7V1-5~xp)IArF%iV8sjTb>2L?hT z;1gRxOR_}&OlCTqrNJHx@)4=MA|2TJX7NikGy7Rh0YO5S@Cp)F)x&$t##ooKMybhm z*&Wz+m- zoe6T_x3+n)I)R(mJ%6xL=(iU!51Byrmqho3d~`Ct3T6>M!x&{i2J9}n{UxCVqpI*J zKm8KyiE0{Hik({vyEUH0bfy=ZJlu*HS}!zGR<<&hEAhV|J_z%b33SIYp{aP9lf@uS zQjW1eQXb@`Jf1RLA|V8%t*j*?GU%nLVoaU$w_QAcOaE{4H<)+-ZmQGi36>4)UXc?xn`Z(S<*@v#CDjbj zC-^35sSJzht!d(hOa%R94P{Q>>Ge-Z!+38sGxAv!!L=;Kkb2NdG-dArcl$70h=9HSDg&DAg=5E6y2BF|Ub)Ow2(rqNk;@;8?yyS$6eeJ)1!O=VBxNNwNMW zIaol+uZhrhavlY9dy!P;J=8qDXNPysV>m}U{1oF1V0$*evS)b)`6P{gP3W2O5EQ03 z%)&tF9KpnhE%T*vBLc9Ev3TRhVTC@dd5_YHXxbN!|BgYb9$Z;G? z_^U)K_0e!rCc^vw_H@y%J-b)IYqmg(N9By-H#y5Zp%L-Do^$+1!k+FV^z4^^wMoMRwUsoF79Eq8aTgZ%W8 zUdElQg0Y!sC9@1|dsM2WQ?)Rel~xs)j0(i2_0EecWi2LgEvnpf<+%O#aOlg%zm!=G z9m6u3DhTxy%+Y-GWZ})s4rF=~@hb}!_GfaAIz7<8&&$Gc7|fcjX7kAD@$TdVvX@~Z z(~~PfRI@nK%_t8+3#y@GSf(cz9*jlR=*eSx@+Cb<_?73SXK5`2a(||qo_v3L3P4Y0 zKm;r(h^m{QDOljQ+y)kdHdI5$piEC8=-E<@o+75FSklt~zp!ZP=1)m21ZJr$3mG6b zasC9AN(N1!bu+O>T23ct3TO0x>jo2KH*nI79MQbq6_`=n70i%sitGyPVW5?3U;$eq z4z-Gz9$Gr%VChY9T?e$nR<8a{o$HNGuu5R79JHys-1Y z!g5|>$wbeQUNZ?(^5$IF7}DzZkfRB-p(SR$L8? zqTUj=Ob=MG1iOd9uv`x&`e9q{!&WN6?q)EA%dZZ$$_G{^!R}(Pavzv)ifpbx^k{ZE zW`e?U2|SL0EBt^xjzp{ox`ElslCXC&Y^5J;4t4`s!_!J1Y^8)9%dprn;Gxxzh))zp zrlbOht0XYiEFfomp4Y0swaZ_!bhQt0mOT4AhGDb)V0{Fy@xf+G*xMO4#}D?PTi;~{ zn4kK9b0qL+2F~>Z_H0-PFxUEEb0zF3hRv%JcAXD4Pr}~Du=#$la6e_b*|y#XY@KYr zm4W5SW;Z9izAAHr54J!e9?7tU)e*b#ZuG$xO4wT%7W-D*9L@~#Ymd)-z(o>x1Opd) zf&F1O`CyAB?9B{YS|@Cg54Kdo4rkahhRv*1yUjk}G6{SW1DDr{_;Vj@xr80YuoZQ} ze&K_ykg!7;HnXx$;4MDjN(nrKfvf6-{n7_pC1D3MY?jT#Vt=k}^}%M@SS4l-V&LpL zfxq$rXG`FL42xh_-rnJpiDDmYj)Wb+u(@@@e(i(J&6L3X891*_;B7wOJPCUv!{*ls zyWIzyFJW(B*n&D?ODtFbGz%<{!2QU~6(V+r;yCVBorUsyUz&jL+Bd%MMe_UgjJ()J zMR_7#+v!U!mZ^O>wbV+DE%l|A%GB%VESI&*_q|Mh?@dW_QPytX_j38&WNa1gviA5= zD`aXfPOWsO?)9Zs%G92mT4kl)@vSelN~ZSU)T|KMreBW;xgGz8M=ML|rhFJ8ePh9SKqNh5X-x}cRS==Z=SY^rU_l6rdv`cTFxFz* zTIoDd|HeYA-Y^(~yz5p0W?`o3!lV|fCx$ghK|~5=_G_70MQ&z!g&#IFV&jVXnM`64 zNGxFzy(WAy-po?YWH!XFV$f=t%zLX2IMP z4WZx#!Xb$$2N9>L5mCWJR7xTm;a7#1i1XEmkR??4h^X`@qDm6cRSFDmoClA6X7XQh zLN~>p?!Q3DuxV-*;$Wf7YebzJ(m@ z*s>M`7hp@KoNh|fQ4*6U5lcHdm#ssO(U)iEChy{Da_?4p&x{Qz&?I*0z^FE{TM7@m zEJIF(84Ocls}couRD$P%tE-X4SvXSxDplmJ)CPWfg`$wFSS+iUj3zS+Q9)~BS5ga; zS?a4`v3~_iWd%EPHOky{WqYNZtwsUo;augY zOQpLmr>fPZg6mQx>yn0F72c{`s)fkR!Vg~Y)22L854RvW zPPi3uwoL5Ei8)qcnJ+O%CU)S&TuOac#C80|oh?_UwC9vOS+1W=`@Q1ufaOWBcJ#)( zqTZbceBbls_iH$NLCx$3eP9I=tSy5T)&x7`11pqZZ73>Fi29+9lOFS2es0aVi)Gd7 zhk4VAWm+pvE0t+6;oh`TnU+p7fi5P(`?*YhZb|F7lt}OAa{0LhW2&$)IULj6i~bcd ztvSWKhb(d4&z16XGtN>avuHo~cwQwF(>O6JOpbt=hkdD8VceEYIW;>>Dhk%HmVI8& zamv%E5~>M9<mTX*B=TCM5jH?%pjQ&jTk1c8ccu}CQqVi$RPO^i0Pd( zIIOO+G|XSKFsSVJVc4j^OFiDMTfmONLPlb0_*D=l^?4>b&W2hT%pzHs)J=svS@h_p zB1w;v=_&pjdP>6lwGe~CPY`Cgmuh4|&&`y6oW0d3;5?kG6m=-)IzYD`tX7vYu1kfi zi;iDqsEgaZR11+=>8nbGe^n}FRjBDg;k4Y|s>ypTz3cT?+3k&^ME`8P9v&6WiO@}| zwWOrhUQ*)INC}y8wXw?03Gdv?-I$lEF^@sv&9a!66)r{6JMRc`XPFZ2-~OD1GiAXw zoWsAtyXpM&$U&x>jaM_5v6%_@l^yP3-hx_~%sg4BHAcDDS*2N$7tUP;`-vczZn}JO zX}O-3hWpC_gJLuaPfg-6wV+mAtURmf$RbfMvjD_zV4^{MA(v4ksV%n#)j|+#4XRtJ z5iF@G_7Pmmj&>96uQrG8ir;x9o2SK1g{VfZ#F^eAG>F zIhRo(2|i*GT<#_KR5gMnHI+VsEBpzrlms_mWK}f^_c$9bc?fPP31(PGi$!o29K~$u z_**SJ;7^I5J3kchnOX4RPeGLgg-=hZ0PLorV5TNX;Dq?lo`5sRboK#pqU@eJ!rt5LvNq$GiUUg2Q+3z+^w zN&hbv{RLk7H`K~)76CHTJ(w5zSD;8%AdxFjY!PGWe}vCDgUYK%;Mq`i)HwgQ4+^Zg^sBON8OR0#E+N9C~sMXl# zCDcuo5xir;ta3wnoalCs6TKRXxI{>i3{~TsHT@SiE+s4$1B{>C?%O(6GHN+-vm#kO zYtMJGBAGJ@TSu_?!CZ%$@Jm++eDQYjZ?ggbbOT;V2Q4jY)X^nNHTHG&|gw*DKvE+Vz z=6qX;m=fjBS&QVXs3dNUf5cf{s-u^dLAZbRu($RyT`l%z zOKNJfH#>@j8$n26I$8ubUt-)Ul+&D0r z;};m^R+*W~YV0(UsN~|N2NhyVN>p1I6_6C-iOF7+|ZoTm87P2b5zOZi09_W ziniousn;fOI|ict+k`=3T188SWm{P+zHhJ=6YGG^j&30J1tR)Y8<0KhokdYAMQU=q~f1(#adMT8@7~5w!|=7%KwHfN2}G5LE&|=*izxnQc;5~r)p*yfjku!TPpvC zE$6GT#VV%qU$RAWfh{NgIa}IR{S8~HBwHNJmMon3<7GE%prlcSA~BP{bBNBmEb!?L zf0e>0V8b{p9Z@5TS4Y&5B?m!>P)cr%ED<~_>a zSv*YJP)C+R$pEvcMix0bG1InGW13Y=k>lTJ<^+mbFJAWTWN^B7GJtutb~1D?{u_Q3 zOMXT9@vF23#h6f0&IUKr%4#Hfn0Bxl2Y?PtE3=qZUL%W#X-DhGQf@J=qDB@k(@s@m znpI52zh_zk-MCRa?BiUM|ABLvm6Dj+l2$1>hp^a~?zrjo`6a9&{Zh3mGAO1y4mpR& zit%>kAooOTN{oLuVrYiX%!G2M!1zedTSs4!ZR)DHlp0zFhh>|Tri+yz|@~=xVE!*Vrs_|h&Kd;)y1@Nk+{MT`wkf@8|8+Ad4J;B7dg`&u(?(7Y(B}H!x+rw_?3+_(AE;*tXjFvTv?DM z*Rfu?Mx=sV>i+rP)cn`~pM>Gy=MaXxzp42mQoa!NZq7qhm-?#85x&dS|RD>VjsFiG^lga_8Km*>HoP< znRaGCk>pcLw6e9MZA&#CNswY6kBaC&bOth>pQ0#fe3DMjZACP!>9lIA*pYeZq&EUp zfO#G->^o5dFqF%iQ?n7o99}d&DT^pbc&VN|%RhN~t>ira;

&5OkbRWF=_mXZ+@+;^heWvC7WI=s3K(ZastWR4crb~}PzEvDzUi<|WQHS=Ki zFoH}VPsMiR`NNY(l*l~ym58?XKlvlahJ4rhc(Ozcx6dVfQ2!9eocfh zE-l)7m5S!EE8J+jRa0s3ZW(^}~|b!_a2CxDnjBY4k1+5egHLKn2@G z$A)E`+{&+#RLwx<)C5k^F9<^E6ym!HuAHatF4F`lh(T&S{i!EOQ#-&979|6o6cZo|2uYRd4 z?s89~nJ41L(t?9xT;$;e2p^sx6(24|4LgMRKRfBzA;f$uCGmskVaxg&!Qyt(9Y2T{ zlx?mnNpXPaw+QPWtSG_!Ez{zo1v_ zrbEAorpGZ*jR3&w>Acoq=GRPH50#7|fHNe=C}jXIqYbI_;0IfZyR z+v$%}VswKNW^7P5B`pH;0vm6eal&p&Q?aQg3_HmtotAAd|FpQls&z;W=26vYM9wN9 z=NaMD7XbxgfQ354V3yge-CDAxXv`TgrqACrB6=QTCS&`CjW-^d*(@+$A}9q;d4xKH zYGS%_2G?b6#Sxm;%E3C42mXqvVLK`HtcVj3kZ?W-gBcEQV6aYxqtg`ZrNh6XUKSXL zZ%`=);w__63gh%j1cF*bn<^1pwS@LnA`X`qvcp+%dm~v7yTu6Ha^)@|Ct^HU$6gd! z!kV*SGOhwWi)db@bn&bhhPMId#D26xURM#p0?5B7x3|2D!zc&UEAq{--QzxihmblTB6cWhB!)u?dR+phHT(2 z*fdsdwd93{{UKW6mWZrBL<=>0gKOCz!mg+v=ek@~;?qFfJoNA-1ftyI+HeVk;nN)<2^FaD8!{jjvymP`PTJbkdeh#898mnRJ<;>850%dJC|-Z z8YsAIrE{p!2^T|53N>!V#aCa38sn5dsA-td6>oQi8F!#pY!1WKMY~;r;l>sP&*BIJ z*Xc~2>*^I{oCsF3sd>Ed7H+rtEZ$hIpjH#=8zb?gFB3r93A#};COF*HfgVLW;>fRS zt7iNVq^_Ck`Y_3OHwbj~bs9T37Fe86()U7BV+<}0JlND|f*J;< zp%O>vu{2{aYX5nfaU*yU(aacti!yF)X5db9*R#!x9)Sorwyve|DA1&*8!Zs1^tN;( zNps=$Rv9aUw_!NJU=Etr3sKHzq#G%b+rGuErA^HD@o=1WtxpHn5GlELYop5coppJ2 zuQmo>UOlRfaYXr@u5D|yQ+{_%YHQrYAqT&>#+ZqwAKuP*NU5Ttc1CxEeY?`mn4na- z9%^p{^X0&gcEFO+MY^@4(H>!nU+-w#hR5-a#{KHSlQguGaW~@gUE9w{QBOtFuKNvK zXgA2HKc}-1g7~pH{fy3dn4OLOoV@cjqkgCrZ$`zHo=ZC;a|JoN7^6`4&E1W9l-0$s zsh8GL%8Q0Zd0mWlw!h}1hEX(Zx?x0cOq3wR7D7Dqb91^HhWg<&O6qF#47{>7n~vlg z33TT$BZQvsYJ@Yw=|+8ex2q9s+vfrfJGC7Jh|OJ%Cbs?gh#3~lA9S*HGu}to#a^S0 zF7#tJBMzbDe(z@V0omQIHG1Ij%(cc)40R4}s<_Wc#MU~K&%|Q(i4a^Mo2&VvMO-~QrttXs$zr;*hcOMZS<%B7 zUT?9(eQOAm9)`GU5t|+NG7ar%{J`NSTbsssHOoQsO`~7@rD)FuBSFwNhcj;|3ir*Pt6Jq}~*CV~r&S(8oweCHM3(dV5;y;p+_>ZrZp!&Pb%e*Bf)xbK$i4dL!O$lePygR!m)tc0{8D zQ*vJ;(p~Quj)BhMgm6zf{sucz&xBCalc7wojyX_eS^;khsgN-|E`8=#v(W8Tnv4P)~zijoHlY@WrvnCkkvLR^xZJ<@i_Iksk&B*M*~^DR4AV}ZvwA=rR_IiXsV>R;b8e0 z>M`8N03SadE<65-;j-g*y%~@d^w`a^cca}5pN6^-lD&R}5oI-Kru8raf0_IWrM?LH z%Bv1ws9$;XLa@n)-Glk0y`>kXqXz`bi{7CS+T3DfqXuhlsou!kLwkej>qZ)b5bN=c zkw#uG7@;fK8OJgNb|4~LpiqwYCRXB_-KK8x-Q{ z@+e6?R4r3KW3Sm~x;(34}3}^fFN}k5<~0SsGa#Yuc=Yem@)^oZ>zQut|@~*>E~dGpcTi&j(>f>NejV;8rcjS|7)c>zw9`S#>2|7Wfa9g+$3t0m z0LbIZKEM?N&Z=&364V|P2}pzXfD^w{ulA^YgeJ9D_afHeedOJs@7`DIJq^@R%?>I< zoK_uN{d(4~-~xb4A^p@r9gdm|-+aN47~85mTq-a9KrQVzem4qb(#a3hB;)sO^6Q8V zd4tM!RFjqQd#Pzh^>d%`d&k)+uZyZFn7C_QR0r8Qfy8K6UM?uCQ#Om~LuGs{e_)-}pT<_I{X&j^Rgu zkpj>KI9dCHoV;%8vlds4a-XXC`0d*R=xo zS3{J<(-)Dl5r6E1B7>qp>VpQq$tcd^yoSI&n4bGmO@pAaZgmRvd=uLfJUHDS1pq#iw@n5NfmG36f?61_7?u`uX za@R&?al~UAnWptp0~ibHuL3}^5gU4WFJLi~s7m@8bbKKV_*#7%tHpGn)p!`&*gN`y z`BGeO@BlaHh2E;bX8KoeHNmx+zU-|gyEfD8-fAh{Mf-ZIvF55t^63MxexADZDUPt2 zO7#uJIbwoA_gwFbp6%)b`pG0#DJfn37G29t*J%iVgD9&hSJ7$IPtc(;eF12UT`FmJ zU!0dh3hU>BOUxzA+rp^eYO!*EwHLo`n%!Uh z1Fs>?AMo@8sXxqMKn31dI-2tU9H2uSv|u2%F3b-Gx(N_pfQ4d{Tx}58l1v&rNUafB ztW!D!ah=86$OaSe++cNFXy$J&fdjb9jNd4KusRC7ZpR^N$MC#ieeKQ{-J&Cl^Eed@ zQAY)>oe!|N3V-Z>&=*71s_uORsRQE>28cfJ|5$t<0p3g;rh^+$HZjy9(K+dpVR$L3jjIO=~?5Bf@(tOyd*AQ%NooqTXkP=3! zZNQI3#^IGw>Mg&Mb0Jr&Na>@1T~E@RW7I#CQS+$rSQJ5+J68P> zp2a79gN<~Ve*Q*ngP_JZwZ474U8!ySLr((j6KKLXwHo``9;Y5r3U^WFctGa!w0*o< zRT;6DEECk$VC$*f1ocfU{^|)jb_|%PrZSUIc_Luo@ATG0^=inCpd@eO4#OKxm8m(Y z?V0RaL+VS)$UXFs)W%B2F={+X9q%{$EIJ=R8%RwI#hsfEyQ_3!hCzvNVlq{mtdsk% zPFCylG>n@Jj=hiyCu8@{p^8&LQQaWD6Zpc|DQYD*2^csLO!GOqHU-^2mPt*gsui&9 z`%G1jf>C{Q8rJ+W^_+&qoTIC+uMArmc~99iogXK zkQ7b(zg2B6uu<@>j(2>gt7}kn({#X<^K@dmK26We0KqyZX9zuNhaEF|h8oV8|I!RK z&czz&skQ)MIO7D<#Tjb6-#O+q0}RBGkO7E^AvDR*nTxM7K-(IJEtZyMsBs1uxJ~;r z)LO{~NMLZxu$cW(0ghL**jSFE4-IE8ZKm2&fmk+kCb~K|XWLA*mjzs7o!M%4zp=be zE!55C6G{7K10qcrNEc?SRl@IIoS`&Fb9C+GM$@)jdqz5=jy?`bJc&Da59Q^%>_g#B>#Dsy&Kee9uPN% z+IyZs#$TTYGBS6b>g&CH!7$QZ#FU zVJ5hS;%Q;r6c}`F&^-JeRg%2zzlGAb3k=o-9BoOZcwADy1?n4qTfW5-U^I&{nyV;f ze#CDhLp$sVPDihNsp&#BLb*iLVWC>qZy+yRkTC}fk%3wp7piK}Od&CN;v$`XMMgBq zMQRvcL9Vz+jaUC+QdH`*Nd25==FTG5%;f{q-}k;P1yGArGNZ0A(*#zX;6)mNi7-V2Ltz(+k;< zE#9Uz*^qrrA=@(bGiBR0>bFeo7QSs8c&M~uh{|U zBn*h(dc~{s>ESsO*J1}M>EX0so!X0>HSA@c!HoNCB1m+WUr^tr!pBvW&#O z*bZT_PnSd=@7fNZy1~GoNL)mn)&m=6(2@1(cFO~rwgD{3a9X`VyGxl}n9N`IFrYO`7&5We+hwK`+M zX`8Wfg>-(iS{1k`@q3^ML;gTbzc`(e+i<%f!RMW?-$skadRj%KnhGTRGwm|f7iSBMuD=Wk1 zQH8DQyEY>1yK(qq|09CLPIVGh+yuZ!8F}I zrrHwx?cV{X;i~jA_Lht_#U6p*Gl#$G@Kfz8DK}3|lEsQxm~`YKekw|#$fG>I^WogNo6-)ey+aE;6Z3b|hQpvUrqa)c)&CS5Oj(+KM1AAw z{eJ3*^s!<@m7~^p4uuI^*AOCU+ELY3JRbu!@;&<>_@kPy6zk5DbF0tb-}WS$3XiE; z+`1>a(*sl8*_c&_YOxn9p!dgB!01yB=JXwlGIA4LKA|Qmw2ACLgHc61{b#kZA8i7G z=u1;e#I6M0)+{A9vP8JP1F=3q&Skj+?Di`WK^{pz=}9#2B(7&>(2J+AH|NmkQ)(qF z-{w;)f!}CR07?CIx?iAvW7$ljPvd6iV2&P@JUl7C`>eC^Zd z*sq`?r<2clZ24LA`gu?}+i1*rwL1c(P%Rq`vtGQ!W;|3FE z@Y1nR0rNC~eLl_tg~fB;_O&>iTmg3YY<1NiCVXaDb|2@2*E!r{A1zc%)|!b2V+`3c z12&^w>~jo&feM_!;eZlkDhGJ1)6_Iz5qnZ7^bO!k zAI>QG%}iiuXW!u{`5a2JQa6azzE{*JW$kd9bVcnRZ8qc9HZWSFgsW$`a0z7;lQ?u zcDRJ4W!KfH0MOK4PSH6LH&WMCEeTYDPhyyZi3K>i4spU*$%c0(?ayIlLYS2frO+Gd zhhVotz+?ckEBJwx48g+NHw8LEDq5-}g$8@mq#J63a*9&h5mMgkMeMy0MwuW4P}AS} z@D94Z)yqCWukdn`FZ+@V{ar2H#}^!XVyF!Wf_=eb9l5*Cs8{eS#0hTH-NeD;I8;$) z3k~^`K_~$_;vEFw7T!j$VNTi<0dDW11kfDme9^*vfb>)!0j?44YyG&>?~H9tZU@+`QMU2Qa?VtKO%mz#~NS_HP1`LJi*YBOhF)^GkgJ zm;|3b$j3gj4-9u&dO-DtQ3;bxZ~&@nD0s0C%_M+RLu`O|J6ZLCX9a{jTKBQT?FWXM z&i%vsmG|m}z67&Jey<>#LWzH<3E`MU^p(|dSg{9nhtRQ`sw0HoZ77-udUR8b=l(FG zU`&VaW79F-l4S9zt<=W&&Ux|jVbIN!;5U`G3=U)|1zwMKT3tiMy7PCj?)toqfyYvj=l_{Gql5i5W(vZ>xWTvP-<94h}zgL4WiS z&l>TZ;bGegwDyi#`f2I6?tt|@QB+<(@h2}(wY#88j#G=f>NB3%SP3sDvZvowTPkSw z-d#08LHyx8FkF@Isk=E55y6S#K0?G_L>TAMCtaP3A6>!}<1l@4U+n=j^~-(WjPEJ& z0r-S5RQmzwstoG-KrMxU9;okms-Nk-gxXoqL)C%oatJ)L^$#Gs^+QmmBk1#o0OKQb zW<3Ngh)1BVKT_ZDo*Yq^x;;{(CbSZP7MjpeBw40U7$&;l?;oPBHZ#~wi8F?QUr75L zsQlm;aLpWQVG(awHqsJ{*bfT3mm->jQ97uID8$Yy;(4&03EmvY*Pu|lWZ?Tu9S3aT@f?Gb~Ys*CH;VZsGaK%>)MMIzaiBEu83;o2)2+I5G!KeOW zo@EWxJwz%$9p?-bsd$OPc`75FtZf5H2# z`3tRLrcQ^5uf=*?QrKq)J0Ux_uy=p>u!5UIb0)qF70n``UhZZHAtU2Y(8*8{V;vu! z$ehs}dVpAcUIU|Ch@w~k;bVsl)O3d(M9U1#t>KrW^`mGI0^tO3Zt)3#54o73RtfdRl z;y}^mh}C^L;s@E%ff(^2RA17icmems(oQ?2C_&}!cn45ctoX{6mD|*nCGR3@Mx6K* zIyK?(=>92c8ZY`I7^;ewDOSav(|<2VP+f>G5UdiSEP^vad}}$CgKtGy5S^%rCW!v3 zi4PToO%ug?O3u^Ikt%TSFE!I{k*s(k4*A&r3nRA$e zEa7qVQArVoYlz+@MI-FVy(IuS`vdOyNqZ> z70Zjj1ce{lDg-fS)^&H*Y$B-wK6Zj$sUV)QoXz>Ff{3-CyW=a0J=iR5(?r?OVHeQr zXYf(h=f+2;q+t$nFYp|^r+*{R{f%2xv66T`+N|OJlv%M?C44G3XJ#c)MNwA#Og}y& zN?CSJtb+ZCSg$JLIm^zR6;;F`3t0L=&tWqkr_Ilauajn-K@Sp~eG%9%M+8Nh^e~nr z+1Yv?hB2g+aXR~KF5f18b~zha^w6ow*h1uyFQbvW)JYlsP! zpL1r_5SJ|A-n+jfS|iANNko%RZQ%s(QtD*@m>E?6Wzm#Y)fO=j(dNC3e&&;}Q{2IB zdE^u=5j5FmkDA}D4pd+#8O==MX5K2+0&4{sm2>>-Vh<~0!syhPu=gxua{AW8>|4gt zvWxZ(2-N!G9aQaEU;p^T`r;>Ol5~3&+hHgzconcapH9EZ=zx40pfhX8zE!5udkw@# zU~CRF5DUdD*5U(=Vzu9Z&KZ-HHl~RfPW?`oUIQq;K^tBZ6@ZS-SY$&{6Jm%r8j7Z6 zxVBLT;1mRfeFaQ4!RzR+ONR06GaH2TmGk#C#F%f;{zjs%a{C90YAot2*M6WjjYV5! z2#g~d1Nx^QrVEY52Vhg0H4&8(^y7I4FN?t*6z_7m?pj%q2)g#8Xl4^J&u`l933mH2 zYSdJuz-IseJH~u2^MTOqW%|XLdm8H-ZQn{An~6GnoEJ3{T|<`KLTVHWfgFMg zbL#7uu<1E%UKbgbV3+&?L>$Buw&tRwM-s+KwVI16iNnKrvb>qHd;!Fig~7CU8iviP zplO}$!)bhT@lq)mC1Daky<(E_h$vHI&;kIt3tKI_o(Y-}ne?c+XaH$fgMW!<{I<^m zyL^rM|4aO!9>Ll$iPh;jXu#u(epn#ja($7yzbS;}_nc90irWg`84hV7)9mh#dC>eOCnZSo4xlIF}tz(+l<=%}weiJUm+ z6a@C`5kaau2Rk$WXXGV2S0Lb8#qu6(MP3ExJ_NWCKG$CCgY2!@e{eXLQcwpm4Ntdc zb`bS(rmlAo5Bvv2*iYFUUi8UVz<|LWMM)@lW_=}8YQn#d(zUO|Yk2sIfnjNHIE}<* z^D`DN`_Kp)+6%z=G+plqh%k^WUt|4_Q0GoM6flqSnNDIgj`GwGff}z3`+Oy1H$SwmH$+@k4c7e5uNpqoCc2Y~)f+R;P6NyS;Z-a~XoYOBvg8d66hh)6$+1$u1rST4oPq0jy; zmPD`8bsJ)J@ed|E(Z}Y?yX*O$;zcv>1v4)Vc|M#sxTn}ve2tZfVYHxwc*R)cI&|=J zQQ0q-SI{{uU2fCH5!^O3V;_n_tmjPlaWAWtNUW*XV6>yKxEIR zfA8u*32AB??nlP(Vim3EWjhKQp;2-k+-WUZi)L&avFvF4zwdrvUN zT+`TQ?}DFrV!RXo7vr5pF(X~$T`6aT@q>`oL~nEw5<@Ex20(dt7HrsOQ{pJ`Hn8NE zqeNZ%=ify~mQu~lYK_tByrkn8HvVy@g8fd`8eJ02fa>{}xkDL}7a zQiRj1zKRw7a*S}sY{RQ2-#9|-+aesHj^LNP@ZY;C27Cya>h_4F@C-*7)|#K0ewj1* zzxFDYzQS11LEFLO#{R>}awPH5F2!&Kuc|>855(-Uv7i`s(2lVpC2TT(Hpv39xC07j zs{J%QKnwNsox&0#eyR)2bkm!G>;z{t$z~tOAArD!v)bY(L^a6Jn@7z6hqaDZ9WOgk z<~LZ!BXsy1fHD18FrdU?c$PMd1D!OT7LLcX09ua6T+N`@CWw!*f!0hAp8=#*mI zpZZS}FGXgudoo6k4#nx)6AB;<&W=qK+fi#KfmWGMA(I5lglkU%74wk(GfC98tjJkC zN#t6d5XqiNzBOIA+7G*Q+60#FP7!3I~P*upyYHEsi)zftY^z+cCy)qJ4^=?`%;g|{)BmaGE}wke!` zHpAfcM!d#)k=kTaxDDIP)z;fMOi%-N7JO^)DeMW(mDd(|*qzP^IfK}qvj;nBbmetI z9`>U%gSuq`iHsXeBQrtI51dX55VzhO1d2|x_n^dKkx|+eZaf+dz~h~(fiVzzF;VC| zO^-5xct?|1fM6X}xcT;!<)tg^XbzY~{ z3&d-<9Pn8vUSXAkMhiuG7Kw5^$Uciif--F|Wh@fOVh&fqytq4(%Qc|N=7o!#Q;S53 zb>3jGf(oYLz_W2t^vN%xAQQlVo;Fwm0^^!p;&2Am1HuvbCPrOoLj@pVNC0jGc=0eU z8W|aqnmCYSMrjs0JyCinJ+nl-ru;sT(w7KFiHC;%RS$#CMK9eQ8{>`k@x+ZYleVG; zE?n(dBGG4?aC4RQ!k6;;W^i zTI{g?7;J#P7Ea@V6`mnSAa#!miKM2nA>}~=+Ox$$7v&>&@T6Py9P^P0 zSsa5^R>0N=SjG*SaWQ*#53o(Xe0Q1{Rf z4J6($Bm&4}bFhw%al>5R)bb1T5+6c&Voxa!zjJS>VZxl^=e>pbc=mUl{ z-XyA6&lo$R1C0p_sRBr{X_L@kD|T`d_MoA~h;CR$MhYck9M#GdNiGo3fj$WjsmLH? zO0KBHAY@-I+MP3w?x7Tbk+xY>;6-b^85rk24c;s?WmOoB8HJfbm^&&`wVFTxUx*Be z;nWACFkcT=QQhxBocE=k--D(aNLk+l$_=H0@5SqUlB;YHl{NDucSthcL<q0~L&oj3&!A z%))7MYy&!4Mb)>7fkl(C`J2d^JbeM%fhN#O!nnw$%2sTFago*OyX|5e&+)4}#LHZ0 z^bYLYodfB_4&V|LeiRp?7j70G@)C{QDb8|YFE!*@%Whh*%V_WbqRNiG^kA1!CxIfL z1;x;0H+Lqd%Wkksd?pv|5xp$Dw_cnQS&74sr$lb2+^Lbil)4}E{uTOgKVZWzl*O_0 zbPa*kJdz!#$u#V&jc^_yO1sWr2bwu8G6`pJ@d5F+vMroKlS1CczG;&umSPu$9uyz& zdRh*NNLoBSvV?LK+Fl2Nh{2xcAB2zvXAYTV`OH-~B+4k``_nszfRP6Dqfv+SnOt~C z=qiUvKZvnhZRHQ*`5GQn(9@W5mx!9rYV9t#nLgdnJD`tuZ_C%Xm(8HkhXI;)=6rk@ ztRC3K5=U_kwo(HQCQ>&Jw$nro_S1R}F4GwfMv(PK1Y4;B2ZyLR2Zi({2a73#gX6Rv zfs#&i`9~bo(-fYM)cy1V2f5UmgS#|U^v`i_Iybc};z6OZ9<0hQzcqH+YvnxCl0G1MP6ohBm$zS+ph+g8vy zjuukjaTLy>Gz7||!SvQ~q^_f09KD}Svk~P3x{E^)GFLhKCPkh=r7QFz2dAkm2e)Yu z2NP&92N`sTg95tE!4=YeMlhOQ=3pIl=3ohpL7+@NN;yBHQ7F1{>KRf_BDLQjDt!{E z`=~LZ&@cLogFQ5bGgmF6&B#>xEu-@sPFqI7r%?D8s(cC?Y)fC7atdtfTFO5q1Z#c% zaY~eog~kHj$||J{fG>hMzD(4EYk$;ayTqi@cM5`JsL61{9G6m||`ri^`%`ZI@W{3=R>=0jfA^^gk z%wHk*T}yetihADX(uY#qd2o6^QQh+Z@N4Nm=Y>`@j3YGTJchA9$kl$hm0&T3NVTF)T{z?=fpz_xr8q;?u z)&EV@moV#rPOiNT<_#*8Xqi!3uC9{&Jo#IbY{IAUMdEsA3Nu@0CrWz*>FgJzwmT! z-xrQai04T#YG-mbe3d)V%Z^us!?KfxmzJqPa6<0m%tkr}wf2fgcpeVPjUHli?Br)l zEuG=1Ex3-Q7o0Hqm>$OU!_AML8tUs7n@ZiwY7s$s+*%%5!<Z-8O7gt5dDolcKTK;f8t${3*f9Buc=6aJ1{-!}YkmEk+kh zwXXr!ow+Jv`ut;y2mY=_cq-Rhgi{dXP`Ib<8v2hpuy!fy?N!zLHjn0-KF9D%ZqMU6 z23zIhpwF*~;IiqMAQZNDN%CU331dqZ{ANT{^&Y}=$Iins>R|Tqk$p`>Lqi}vO^c44 zjRKRn06PQ6^63SxU&B3H1|_CxNy%=AGG$P@-RW0!IwD+il0i+bi-d?wy#WYx><7(F zmPviDi?kZ-_FGqX$KPzUzlgJOJhpO|F}tgSlMwsdNX+HFm`=ZSD1PO-h_>zIRCwTa zGGMUZ5TZ{WS2ng+J_O4UczA(Fucsz~Z}!1MRl4H-VZJG{>Mx<=n@)J#cIGmdjbrKp z9HB^0fWJDuFYLh^ZtVDD>_^)~B(A*{jI!n@3;S@HLbP{+*@e(z?XhLiP0rtkVZm*; zZn1NpLo6VF;5KI(F1w3uW{(e~hoA^NbUQDzrHi726)3p4cSwwRE)DgoL_Xeo@UZaB_%=2F++MRXrH!Pa+w2)Z$izrk*>A0H=|G1|}IA{nUu_%OK$hPjyY zd6;mytq=1%4sqDI{cO%O9B#XY8E+gdE@XTF{BF1AaCwxNBok}%QFh|^I`1+g=7E~ffD?|o?FZeclAFY~%fma` zZqPrNuH6(-$$wqYg;$4Dsarw>!gn|J6MAux8Y50)ZlT|g=Ht_Lz28v#e5~K_{*4`j z8d)^umPnyJL0SMDs)$s-+njToZr#F#=NPJ0N-G_d&f5|WwizuAKc^sD1_=4 zDo%>{Q^Z7I^OzvHh{&q(r$`N&#NCC*YzDob{3+u4WN-rfV>_=+0?V=y&F|oQ4FF)YE*w`NC-6{J@%ULM9V(KJ z5Cre2^Ai;(-l6ucO^toDz}Hv9uOvnekIo)+^6(lN+c z%Rq(f&65o^?VJ6Qg6ll8ys0C|)l}oQh*eI6(Zf=BmF6%ogt?7(;^$-dF`sj>w?lCf z@;IA4e_|`b6Q+(IAu)B;hO1 zP+Cgrbw>oeYI5Ulpa#8uo`tLQSx5U4LdB)-Op;BAnRQ|_*a@K(lLB}*Nls*HYpr>LViI`Z2GQC_e?wJXH$giQY zcB^7sEvWA|cA`#`v^WP{vB*X+ZkQe#SBb8r#f2*w7pboz%lpm@cTT%V&sBjTnNz*jt>=7j?=(je&HjT`I^DO z9opt2s|DY0R>blaP_VCj8RS*iMOk@VTB2XhFkjh|d0&gaED4Ub6bBQj2?yJ$CkOlK zTMjPMRt`qcMGm%7xD~-6s>(qjwdG(j4d&oDWg!SiCswf{>f)x%4L_uy9S;r zlteG+X3GeA7zEa=kgPT|m_rp2=!~)rU06q7a}A zU3Ov~VU=ChOxWZmXr6VS*bLUUg4~yFv?Ib~s++4G0hqD4h^yX2uZPK(z*SES!*{_| zZwy1Hh|VI4g$oMD?mt8=!Vx1%=inU8N5EY5fpA$>IUhuAq*gZOFSu)J7$H@3xKo7u z7cLZ^;G}mNob=8oIB8CCbJBVq*>o&RNeLaQEoI=Zc`XlOVnO1>Wax>7j=bsxpc6iMNJ{4SXbuI$1yU+Zxgfb z4obK$YlEx)DMpquk`ie6ed*L$;@4tjIk48B$I8l(+%JliT2YUW&=0Y)bfCL~`Q#TT z-_fhJkJGD-iIbJM!yzTKnqZ|HmC#C*Jj@sXk8>FqAPF;6$R3e-rd*Q??wT6L%hEP? z)66^fjhC+~Sy{9<9_zlB3ghL+Za%q{Dod7gmBuZLw|;nScx_5=c?_=sTrE2%Fxq6x zdAgpW4fZp>NY#Xl3(Dj&nJ6>w7_~t{bM`*WPK%wl{s5%X&Fx()3xr`byqe3vW3h7t z!+y^)Nqifsf1Ew^vQuB@HyFfTA!9$t=Yi&97p2;-yEl-7FF1^O;0nBBhJW|ihZAt) zm%DQU%avAx{oms6+A9erP6e~gmEoP)d5{`N8SgiVBHVMg}q^$Tf zLb8S?Yv_a|SRzyheukGQgO=o*P*7r!LoiL~UNV!GEZT%xabmK-*VR?ctmzu0Nlkjx z#0Nl5QrXg)jC_)i#CB>`S}R$Ml5CkEU3TM zlg=xeRXpv+gx(Wl`6ohe6FrwG9YG$19<@u9@s&)fuCwzh)9t+T(LG&~gBF=XH@G$r zUS@G3h|q4}Wr9uaN3Rk~)q=Em%SF1I2ozwjXnouV#AMNmhQTL?S+ApR9t|nHA(=;W z@5aGws_JON27stsvE(MTfDA&3)<4duk6R!^|mMc5Z*&G~$s%`VoSi_dQS-!j@y`@(8wt8_lw zkSAc+wJK;)#RV(1N=W&C6|59>ooD~=B`ZZ8MOkwy`V_Ko#6z-Dtik`OXys{NNav~W z5UuDN7EcE0+{x$kPKs1(86qo&kbob5DY9ZVhXq-W$*cg&4p!7uQy_*$JOpBoDr$+Q zWUYh?vpG%4TG2>DTpW7_H7F_L|3+5#BaJR8qyGoezaJ?N6|}#VE&fOem9%J(#sv_g zHr%V9MW&DNWSRM!1*ZDB1irJI;?26y5yFw>WE@<##FXWm1-<|y@Qn-Cuc>f8AD=1> zVeCJ*Z3<)mqHUJO>TL&d+mBM^$p5|Mo54EWtE|QSpT*xgOxFcK2DJ1Pe}7n7CO%F4 zy`i*pl>M*8-`HVV6)mBxhsYbijF~YPKKA&$DF%PNjBFlY3K($uH&@ZBGZFWwik3v7 zWn}|q4_cO$AMp*tuCgHNH__FyQomt{FDH9L4{mZfSslUAa4*Fyln7{ zPW^fC|8Dn0eGUF!KVmKcz~_v-3usY!`KobA1{>-MvI2g;SV5+Qt;P)-F5AHDJIf|| zJHIXj9AC6YrbgHrmn?F97VSER#Zzfsu0t=+~d=PGy+|?k)2f zxd5&&Uaum%AhxlJ9En)NXJtFYvYwT2t3WS4C)*=7{W+Oq*_QL>^HQ;Zr)u$noQvSm z3-T3k@UK*ri~Wb%*aW>Hd41 z1F1$$*$Vc2Q))`9#WIY`MAF_CapmZjT5=_dWxW&kF8xtkc7xhuN2lConM>vC$iC3K zTv|uMArS4YBbOo8`y~`VOs8LyG4$HYU=EJZ=PyfX6evmSUzV@ox3#YP1y`V#>dG|4 zWIg#7V*jp({>`Py_2fIaF}+z&c8eJT?Nv5o4s_W1L*p~3f1N<6e9on>UXd+Io(zYJ zWVVS8M3$djFYDk~@v?Vck)Md{Y2)pDVVmfSl~~LXi1%=j1nr_}G_bxLg)c_FD$78O zQ0rBFJgr`pJ=FqyACFOc+i`!VK={Xsslj!6*6D*jTz*v!f*|3u2J$oX`nLx1Ph;FK zVTMu~$`#g}k$9rO3V(wI4FRx^)4hhWjP-j?j6h=fMsg}1qS)0)K94+0V{pJXph@pk zK68%AAE);($-4_Y_OT%UhF2q8HFr*Ado7>OoCW!0uNxIftsBcVO8$wQxF)iREfmjy z_!+`)XsHq(k3IE8Ym{6>T05Bv z%4vUVz>G(9vo&Bw-%u(z6B``_K7&n0eDN?8wQDO&1n6&_`r!#z8r4=l3zr~{_w-u3 z+Q{)}s&!kLYSkY|^s~bObX%M>caaNiWjU+yRw^FyD*n-r+7*42mb8=p#)o|QLx20- zdhf|M{05JQ6lpijcn>@GIBj^37w$9`4sTn~)%T#?U?F5AILK9Z}ID9-+drcZ5|)DQDQr2 zBj5i3TjMO1>Znh3XuTWkMdo+#gENw9Gn$lS|LE#IXWfG*Q!Cf$Uhv@Y#ay12fByVDy zJ^V=aw`b$Vz_s~tskxrUek^O+78mNijuPXXOA6`u$Fg(LLm-X1%BmQ`;I0^#`yr5h zU4bDM&|9C#Z=u6<>l1u3n_|0RH)m7rZc?rH(EZd-96$Zw1;`VKyS{Yy*JJtBWg|J< zBRPgIW{u=z`yiUxO-9EJa#xD7;Z0N{cYp=idEI18Y*BWE4Ya6{?Ty?=sNAP0H_QfG zHzPO1UX*O-mjaDsFOTF<8=jUklJO;X4?_6y1tZzdBRQB~C^M4%J(6uU8sA+e@Y=2H zF1sb?8R~H547&tBN4WiB2%|U%Bwz;3@f@oEsjL)#!##b-ETw#w6og&o2YZ1BH11RR ziT3j{9I|q}m(0ZkFn6#NBpYI`BWLIr8CzkyCimRWj z7!%tm$rpYeAW1<-F;M3K>=;0&4Rri7`BuOrej(v=pCPl;d3ax}cBEMdKD!C(U6p(UrM{2T_n zY5$R95N!UBY+(P?+09{9kvk5TIu#*V-_R3m^b4QMjsVyhpMzvsO(#DGhFX&o@P!Ps z0B5UT0un8wcfW+(@>b65FJ+X)deZ`14*o>$SMr7MTVO}8%g>S~kF^ zfB0H{g`i1q85i8c+1)IHG0?wzV*6`+Vkn7GEQRy3FLwu#k0;yjhTzr*RWxTN796wy97Z@2oEeDdwv&u>C%Gb-^m#hq-FRA@E=z{F zCkq#V!HyvNYWgJ|U~~-y^p&i%SD~*=w@>%*Fp=*Cujd>40_ENzTR-_l)XC5!e;rnV zJz{=XH926%$d5z+z6sk9M5weWh|a)fLcw`?x_ z4eAmZcS9_Zf$m!F2$`&`noH+K$ZE=(xs)_gPOdzUi)xR;SiYm~qmX!(rjG)`K0@n9$?kahslsTf;j*F8Xc-H+ z(+8tbxRqOgcpVMHhY-#b!gsmqCp+(=w z4nQ|y|43kg4Qd}kTnr>ogoi^HK>^(PXRb- zGi5r2^fP9HmYPOKXUaMV;%0#|{F8dll7o~CIBJ*$I(O5)jP8!Je zbubx%?-~{|VpU>ws@T3K2x|s@UZLDf84ZV&atu3gh+HU-;lAPOLXfzpa#9xoTEUUl zhl^!>?>qJ&np&VHMKh@iq8)q0J~SM^bxy7!ZN95S(4)m5j_y!}CGwPq(KFjY$7jjs zJd)TB`rRx5=zBCT3)01Vv@Z()b2bGnl`?2uk<~LjvsBjd*S%)=)TXedGNxGW)TJ`T zNHFc7_dJ%6b8jg~`M{NS2*-oLyse~!Wilob@c_g_Iwys}&=yp?9XSn_$qBJAkA<6> z&PgGvp{c4=NhtzkqY_GZ+pm)w!F?vJ#}P#;+$$zg_YJa(GAr2dv8ZgsdLF0R8v%#Er_VM5gy66& z+bCbCdK?$~%$>2LL5H`?qwG$;x3fE!Be0KfyC(mUQ~jO0^;AmQgcGoaT5OV!EW2}B z&Vj8*oXqC2}}4YB+2qE>zqfJ^Q4joAQ%w7 zhl0;M9v(L8aVj|^u59uTTu^^!(M|cIAgr&Qk?w+R_sMcW1za#(Ck`imo)Aab`()3` zczBU7?hGFh4qx2H>J$S@Y82;)E8GX?U=G5ZzoWjrUnIS~UpBRly^1t{P=wk0u}sHl z=YCn%I+YXoc|}`Hd_^jAK!$@bt#Lrc`mHX|pCoK~0NlnYns5NnekmP1AS0u1gMUuL z*Py>?We{kE0j)iY?i~OoxI+nffMX-5UY?uO@br^zmo!CPd?`d*$k-lj~{S64$>co`$Tx`5=x4%`l&6 zN(?4In<0gBTO&V3h?_MaUr(RS*2~*T?}!l99tHns-*FHGdL0 zoO%*DoHCFDh(`Rg>BxZ@4PXTYFdnw>jIHo57+HS68D-ANmy0k2ikcWA{hTL;z+T|m zPsI@X&H+PgFfhbOO8FHSVH7q0Res~M5zJWH$9VFMB~Ya{s(Mp}_d9 z;>^gF^z3gC`OT)0zsU)<@4?-A>)<=64t2kPJK2-7BK@h^1^IsP$_Cz6m-UXW%2bUW zT)<`P&K&47EoL>QjhAp0IBq1j(poNkh)#0p!bN88$MlgExPCE}yn@{0)Bu43>z+@p$Rz9OiMpm!4;pL5 z6~W>wG9b`YbLwI1M7a@YHkXcZMZ9Rn!Ffu$iu%xVdgUr0AM~8Ma0or8(Fg4A(58K=1h(@a?DgHV-1p}d4*KrOD={-bo@&<7#41^YO z>N?twXyAPo+lQe?%_!T39-0=2J#0;>X^f^@K3BVe;y0=F4HS2qJU60-!RX>?nulZ@ z(cK(OpeqQh8ElP)XabkS{xU7ylp(ZwtD&hMx&ntF4vj%IPNgtjAKt*DE? z9>r6ZXtxBQALD-zx;@mfJYizRmx4(;_2VFhGCY(IVXz%Ue@zg2|q}dyPfJ{0|-Ty%Up(-`;5A>gC4Wi&2 zfBpjy^AM%{i5StV9Gs(%5wNP%H-7@Ct)zW_$_gHuQWj4;BnrPRKZxA{O(&bf1_jad zB>vm`Yty_4#z%>z3_U1^Z9XV%7#W%FB)Y&?gszH$s%Gh*Zo?P}rT|}pMr2(8M564aPFL-J&&Cfa90j3itK=6~oLYYuV_r@L zcjfCv)vodVG`~0t_0^|U>qo8bVH&qnpL?=#Q8iOtimS1b)DvHuLw_38;_m}Youan) zfs(el-1ks>#?W`}nnl+jbx`%kgW!#Ocb$qm! zne9?L$fp($a2tNs;WjfoAN5Ve9%^7@((O z6)kxr`}c7T8JxuuE8ZYAMp~qmv>&IDt+{m#DzxCCc7>D2IlA5yavs;e>cI{+^=W-v z>q@r`H}2P;(+#(B4O$@Pt zG-NlneH>QMzrGH5jW%`CVV;FPICPzKn_DLx_E!#wByH8b_&y1@Mha$uJ3Gfl89rL% z$FS1)UmJ4$5^js*DShG|+W>*AogNJHEL}UDwJLT}qOX=*%&x16uNEyHyVyoSjKwvR zeSNi*#K&*4dA`lhn)lZ`e6c=m&4F6~sFmO{HYn+0Za?4=f$DDC9c-g~=AGSKykr;%w|z|*X`&Qd#nD03Lr zTn$_&-lcQW!>wroEtk*u>H(XUxdJced011il?iJG8@63fsItV-1Ai^H&;LnVW;<)Z zu>(Ig^C?m>^R)P4ZVO&E(5Xa*e{AUFY5oOUEbjE*+kbII5Bo1h6o0Rr1mN#psmFDa zP@BPwY2;Pyzq0c3Y_CWKi5drJ@&ARw8FzmSjE79~HM9GFqh{v$xyRMZ%=~9 zpiWbz7EbG3Cy%YNJ~KR4wCZM12c4QtH;HnybOPK7otrL~9El|i@gq#K|* zgS+Hmf7L_B*{1asdij?sv&dlG!scJYj^<`?q!3Y}2!B$$t!67=xK_UIg!D5mT2#(WB2$(DG9HFt#i_x6A zpH^~^OUF653vVs>()lCM9`?iMGXkW>d~oAPt%P*|^S%B^y~3&BhNmEvt$uP5f+ISI zs$hPDq7Y zYhgY*#NK)AHVi$7mY}3{68qJ$BC$0muA@6hWRo993|fWBPdyG{^79cwu)1So@a-#< z!@+6#nSR%dzd5)m2N%n0RD@f2|ph&Vhe@pF{Ak!w|x5W@)_k zfz{OV>p&aqAaZxmGF6KR%P6w&(W$o%6dxuXe`V*RSE^$@dkjq4_3CAOAVSSwJI#) z{}D{r|9@6L*_!q`E(Ue0pI>#WA7ynIHHeZg(XR=bv&iISAXRc`rHV{m#!-6*#;}}* zI<%%m#jepW#ftT#s6@=h4tgcO_N7*rg6-pmJybtctCaRQN9_KhX7HwH%`n{ot&)V+sJoPv z407X_RP2b`OeNhWdnxUyrrGuUH>|;_ zLTN4jDW>2%sAXxbxGDI^(puarkCP(23I1QR-+AY+=?Zpr@;7uv;a}VDm{4}60|LjV zS@F2%_J3={1F-OXqD&}e#WT9B7U%CGB$k%d5&}JF+x)Vc&~0^;NAu}XSxwamWoS#3 zCp6+j) zVm$2wMeG&5P(c&LZFJfq<^O7<l<(0QI^N&&6U!Jm+;Io_L)w^k9;UjCg4J^AMI6nd40x8byB6A{iE3i8524_=Bb?q5&Dq%Hnm-SI~&92=IcNK(|row*6b?FRb7D=q| zKc%|X(x0;wt%;OCbQ&*z{LL`fpd!tw z4+AwKXv8wjjt+ghOdrd(W%^hmm+NEMyj&ZBJiXlLm-J!Gd`TZh<_din$cdqcE3_Br z{g<`sL6;5xX7Fi#oYIzP(Y$C|Ue?mAm)WwyhOJ_oq@Bhr{9G4@Dvuu4)dXT{J;aVu z^?I7H&K|EXTpQ{>8D?ca(wD^&mrmB=t*7>)F@H36aIzL%RN*S;4cv!3-jiWdJo73} zLEb1=UbA9(pK#tZZjW%G90`>Ni_3$LQjE4EWe13g-<0ipwT zP*Wq?6;ViX#x{VnklB=tSn8eK_$1tDq3`8A`VIprXC7R1yZatE9evotg?XLJPxtJ5 zL(cn+^WY$jJ}H(riu3Y04-T_vS+Tr4sD_cipD_L0_5?|Suy=<7ae(@@Xs zjhJ=0Yx4KE*C#(0iK!>eL<}IsV*q$2!I=jyo9+R`XP_hZT$5iT!*c+wIBzOXa0oit zr&!)}&YQ~vzzWmmVtEC~Q~K|vOO5m{2R6nC7Ve=6jrC|lj_%k=-HhlcM4|GSS;@v@|2N#>3$Qvv++&Q*)_YVW>Y=dilal}l+=h$N7Oo%I}nbKgmluUzW|A; zS2!_79|CT^+?6dK**j>=>-uoA5Vhu*vrQE`>;1om#MBLD)7U;R zmT~vrkNfZE(f-IOjBfH5NJ7 zjhtFI0^ce&Pi~KewW^Dt`DhKa||MDCuJC=HX;fU>1jQ4 z;=j=OJ^WQ;|KQ%;-Fa>(4-L5||D8;9eh}{i4ITM9Q}6tqx6zTTOmy)W&jFgDO-4>| z3*=nmoS_WZ;TVi83-mfoIA_eq==^u*soa}d!y;IE{bQ`gPc-dKz3Z5nB<0%~bm~og zfS8UXW%vwAd`pjF4w9_tGtf2zyVG6uwlN7wjsnBe6N4l8k#mixfE7gxpxZE;Feh4YN=IH`t_x2BSWH~#Ob1XSOr<9da_z- zRRT;*3d3y^mF{b$B?6URZDsW6UBr%3#dq~sBaZz@pBS-`?_ztLqU?9|p&URgz(kj5 zjqxQ07}gr8CZa?tW6A(?mmtchGQdQYh%&D9$aNvhb*=Re9BZv5GqQYSM71_ra$<%7 zi(v-tZF|0G`LY=kW-}(F_fSk(u#X0}(HohECi|BNf$aIj+g8z|uZ;P! z8S_y;6a#vi*G})wc8=Yl3q~yPJ;VU%-_!FNBNkvHK%PfnIgidT3Jfq&AaWT8dgPi& z@UGEPe0%g1NU&CWy{D}aP2A@(tEnD6WfYgqD2`@vt>yb@hf(WSL~%_L_`cq`GVddH zj~W}Xu80Mgs1BWBT<6glMs@)vvO_LoJC9r!x>GyooqMqZz6x~L#)$StG;zmH%xbVP zt57p?9pG$6Y1xd@=zA0c8vM0`-Z{Sy(8lN;RQ3bC$p(nRJ5<*X^vqF+1(>J}y^t3kW!!}aFwoaC zTx;qs^6#WKQnC|zcZC{s(tFpLW7lYu5z9g>z{Fwb4I?p+-Y^ymFtOPG$J%>9Nm0Df zqcgqaxUi&!rF(YCIcE@tBnl`fh$2cxaz=u{EF!SvOd}vcnw&8#3Mv?2NfJaPn9xBo zl7oQ!@BONZU4h^Gzw^%9bKrJ&-M(G%tFJ=$Ae7x$a;WadT6YuKVcj6R*IlU2zQkGV zQq^%uMDhOTqlmJT+Q?4IwYnpsiM!k)-6f(8dHTg}w}(2Nz|*b!+zsmVdz_}%9Tp;^ zd#rxF?Yz=srPnTEU6tg(CC13l#-mvNe2cTk9t?xCjl zg$jG9^ty*a5WA=pkqxXuWYJ5_?`1djFLjXzc{9vqKQb5n$Z6V z{wkyHuPAOhEM!K3^t!J?3fNhtNI}~*s5FPUDVb)P~4<*u*Xivw(@Lh=U&|FdnDU;W4ynUpP40lr*?-=D{pBYa{T-+I8dif0De zRrB1&>jC&^F17^3$MOG1TWY5aM7Mg!-8j(B*Z594e9Awg+C95=Y-IN`KK>kcM(o7( zy^JY@R6#%920$9f)1M`jlK^bp4(u4<2mU20nPT1MgX|n`@j=MwYwin!?CPnmWzXcO ztBVKOc~gCtEt9QI5A$?qHf&$)_qLtK9ls@4Bz`e9d!`t5Ug>Q(E!W-VZ)1MoxZCq> zyJ`#q<#(u36|-7Yi8#i${P81+I=i;NZ8rfi^I*Gvn&a5(8u^{uYOvh_mp&hCSILi0 z!y%L93-t+nQ-;4seIq+fVrnq646#2&&G>GJ-36~gmK;sU0W({id({6cBFu?~ap*;6eBGVRp=`7txBb z(F4UEZ@m)7%_QgZ3a@V7%8q3VZX;1u2cPR@ z%CEQwhS^1ONgR=`D`a0m5>zf^ddIFBx}81pwruZ<;8gr#?8MczlH1)_Ufk|Bmy?T_ zJ`0}bC(dDgQt|5`fwZXo`0**M25K_sa~UmONjK{7(e%+ZdIt_b3*hET$qb ziB}nc1T8s>h?>RcPh;RTbBo(+xE-i@miy{iMezUc_{|M`Ivy`dV&@%RyU^nBhNW6!;M?x#yUBXSiM3eBr0$2s@CCAHhG!n=v$vyptW< z*~*NtqbpU=AJ9)?P?8G5&Nf{@T-Vay=HE`jc16GsYhrrs%Mo^#`uD|31@XClq*xjg z?E$|3&iB0&uyBxKP9BNjW&AQjX47=kWPIdEyXgO2Da920)0AZHefUVbTSz{uZK=;{ z+{16Ov8%xO9sI65enLX>F(EaZ>a^5+7f?1V zr$+6-ncm`svXq!WFzijb}2zqd>lAEAkH$hnF1{z zVq9W$Eac`~2G2$2qY0*evI%Z+H-+r{c~^oUF-M!(!aKGgcB&bk4cV{2=GBh3J4CrN6$E^q18QpKCh6T{>s1ox9?}<8V0eiczK}$$mosU3dUq zgPOd>FBfWmqA0Ex?H)YpHXdu|jea7yDuSza5B}tiL~!LNf*TiHJRYmA2;k2+PTB9~A7|&S@&sWB2}bvoj~{2}i+Mt1E{StN#29!x81VIe#tqf<76^YFfYA9sqBSH)$ggo*X61wt86D1pJI7ZC5a(P2)XOVOt51L zK9O(7NH_+9p0pm2sj6FUp&f-t_nm;OI_FNnefgfa?+)*S!ND)e>;M7uUrGPoy@Ru- zR0EE}=VBC&L3`PWk|#|jB2V<7eL$uP$*I}+XvF?RHDJgVs9+Gk5GqfWU=kTgVCebo z0h!7r3m;^l%yzq1@o-LxPI_uJAP+x28PpR115(a>Tw&l91TJ;kPC_+Uw#OYd>8aI# zgZTtFxS09g1O~EbKW?bDnlrfgh09DOlVi4++{GODKc3{348f0B1~EhKOcs?Ilc92r z)qw9L7Ee~$PVV-nsU$HZ2_cw6m<*Mt)B`e(fuZNm2V^ShHvdrS!S8sUwSBL94>vxU z<9B!?I>MlyV;GRBaB_^|Irxc}NrD%qKm`-&-KIP(v(Rgyet?L{hs9tZv$o-eYI^cv z0LLfBoNgpnW*#2TEc9fkA5g($M3$*fi!FQ?WCR#`LS9}BGs5tBP(LKL?WdxCTyfu- z`qcVC-dXVUM25U7W<;(q@QR2WfQYqzw|gE@d9nq;=|la1Gk?zwOp_K=YZ_9#m$Mk$ zr;n|HMsqQ#@L!)&Js1LiHHb<4snaCi)=))H;t$~0ijB&4axuzyQUwDH%B*1^c zEX;H;Q1#d0hHA&@Vemaf_}E4iKcR+-0Pd4^f+2jb5vvIgl}f%@c67RloU4JIa2NHq zb3SR8lXzPaZo}+MuUSt^B!-YEc`)>vgS;?e;*(;6&; zjWfV4_o^&Ll%9=-cGzt+`)Qp_ius!m2*{ZQpjXq=Hu6TKiAnOD%@dV@vpHKZn}cbb z%d_o#uRamEBr=k~(5n`B<25Ir|0v~=RYw~#62Csb%e^eyL7>+G3!If_NId(m> zAEfht_JgE#?FMutUvTZR5%5plQLY`8Djq*mKl4zz9OC|NaBa1% zzC2g<2xNU?v`U&}gQLQBoZDHiyftJ6L>H4FTmUA@4+2^Ry} z_3Dg?;-@a~yVt>j^Ob9XOr}*@0NpWr-Pab#V+QjSPSt#M`Wa8*LH(jm@9~st6CVh< z)(1F+XVhMuhH#ordq$nz_3dQ}a0f01^uj&k^wfoWH)0{;wAU@XP~y~pXXo6m>TDd( zj=8JV*>0YF?_N}A85bc2@Mg*^k_a`$Dc0fpE)tokI5X?;c%MP7!ym%Mfc8rmpQoQ%$mQ~9lBVa;_?(8$5wTEoTqRv9;nlNOK^&nhT2Pn{02|qHjGlI zi*TAwyA62hq_gDFDO?Qb^>xPSsq5=*fe#Ub2ArA&^Uh|${37U}SKL=T ziPIpS{qD|HXNfpt$9vL~INW96JvU~VP-`s1*)fSQ z$gPc6Acp_Ay;lfhGS0ZXy-5Wgz-hV@^!|$B^@taGN-<_zi5Tj>j4^!bGPnCOSnSOP zuaw99yatcv$~K1ETUN@m?6tVW1p{_h_Y|!iubIW{TC0*5v+<+bYB77=D!Cacmc{HV zt3)1&jWgX(XZHiOdX3~hTGH-pmb8&x>;S`hfLYgO5}v-Ujm-G(x;Ch0nE*MX*0rtC z7u@P=BofG&M@!o8tVv$d#*db(CG9V85oQ*7!6ofEYvnFvLtMJiCy>X{$m1{iN**I0 z9<6KRXSnsc_R_VOV_)eWS!*|c>eNA_b#{peOk9Y?x8kFcH~XzvXP>r~pKzzFmo+$l;B=;vk1b;;3-}Uw@>E(A&{E@R$xzi4zGe4w0EPxF{hwNhRiVb#Q?3w$1gW5Cq zV1w+LE3)zb%bvLc|4)1V{(s*rmx#@BD=a2{#ivO1O?Tg?cA@l-eqP4?b-kTmG9hnb zawdF}Rx%;I&IBy=NG^PvXt%*cQS27GR-9f$z+?|Uh?X%2UK7Lw5&z>?7`edU#&5CP zRA;tg-2?Mf!ixbV@-9A)#EBwbiisj{)CARDUt>%F`Y_L*>odFde+s(YXLc?#dpi6x zdm>Vk?sL1Lwfzsb+2?ju;)Kubyn#uH>ciVu2Z6h%PcUI$2>yf>oR;W*`?8%yKd%-igiuxlN+*+sG}i$a7k+k>y#MMj=-=WerWBIw6$cHzttgiknS zl#p~^*jo^?;|n`~MtsE^({lKtW#oPL+!vVHdw>tg+4KDO6Hk6=Z}R&eBu?Irl|So9 zlKb-xygLW9zP1Y!i+_!8+Z;(sZ1^>th3r2f&-fMb>OOyfGa(=h{noCW;yPS0b$!RT zcAga1$xlW8g>NzQm#o9@`-x7>cXsI%*SRlN_-($k3+GJcbHX1}uM*^bXBWwN>a47=c#Cz-#=9^RVQISb@j?jMvkT85=lTk`efIo=* zOaJ6mL_hTtS5Z8V-EN^|{&)IgpQQ7v9Xfj?nn--EHgS>?mVL^IaqaH0ONi?eQIL9r z-RF;`%S7L;yc;!sRFwPXZo6alqz7oIXfjpMY9c_{{=ofVx4j>qN?o!CrUu{K-eV`G zf0vCBdyL<8zuap#O+Q+nj$V;tpY2aRP0YXF&Sv5JaAgjlF~Q(9K43@3=pWmXkG+@y zjQX5taFQDjCXHX>2M1u#(=9(CpNxT5`ziXSo9@Mf(obYNgja~cQtvef5^cwAa|jLj zkh}Vj9rBNIrh-Rw7rj7hxpo4w7SS4F`Bmw&Zi!PhZOME0Gs2cYAt^M{>;o74Yk z=g)+nGr%kgS_tD*{!hFGJ1%j+pZ4LjS?A*iE@Ii*`D@pa^AlTKu-jVxMTs9@vj1ir zy(=WUr?0>^F2hgG+qqI_lwVD#b=58$12dVLli^s`#H;K$#`HEydW0}SSM5Uigi)u* zBf_y1gs-mJ1@j7lmR2iNO%`}?6&?99H};yH(^?kguD^>l>1Nlkp=^@-)-^krV^S3F z!q1oTqvEMKl^i+A-F6M{Axuh)ypB~5XI@mszay*&eDtk=FIW~!<^_FN@`a(`zsPBB zryKSXq%O@(EJuuUE8Vnb`x6rP-n7eF_-Tv#x3SJW*3Es#9-@+-7l35LsN;!#rqLuH z7oL`Ud~7Qv6WL&hk7Ywl+<%D34nzEJcH~R{i04kdi}C(4ciCOLN^ax?10w2X9Scay zsvwzh{jOb22Qnfk7YS53Rqr2c%Ae%U_y@09OmdI>V|PZrRljHd>(4qRDkCZs?m$lA zH*yo7ePH)xZP@bAKJOp*$x>%+L?+Z&tcnKGV6{FW@%2>Bm;V1=DwM|ADVOjTFJ$nW z8i}{lI)g0#3b$7Vr&6w!QIqi2P6S^3te>Y;{TBCP?|!uyAHD3+%!!Sd7r6poqjM_d zUKwRLhhr;*h9A$q9h|61?xAM*RXdQL&*+q>xhg6c(JxDc--^Hv34e(Q{7i`YcXcYweW8?pd5%mVZX#s7PmzAJ`UnBTlk8-{C;>Zau$)^V5*n^iu%i1$pI#X0%#mC&AX zP65EQI42sgI?jm&?2B{C;}>ck#yR~mjfrAqW=oEA-HoN39PYFN!u_q3Q`|jLz}aTq zznD0qpfka;5-z!R5$9)AfO|!pVtnAICgU3ybyiq&FD2e6>WuOS=3YkkS|S4P`M?5W zV@`da{B8Mq@e<_g;>+&r;!X?5oG6>1xkz?F9$~YCPyHQ-(M=vJ%7=_T_dywy)(+Px>l6gkSJ17j zQwiV3SX9<&j?cbcE$cWa$!z7MuuGMbv!>;6-$b{MI-9D(*5EAr1V&>TJg(%2{7lwF z_r8Ld@=jsoLA~-$=@*bSX=zbu4H@y@{rE0p+8`D-(b>hNiWIT!2*+o;8II-AwA=@U z&`7x#3z8U0;M2JHj_O4BD@bRT>)4tKO?;&bM)Yg!BG(ds!BoFbrpS;0Aoi&HD2p3ZhxRYVQ{+TCAK!fsYX9hmJtSIKEp z8if)<)R9&cOT7GT-@4t$!iZpDpxU7Kz&0Dkc!&E#B~rXSssd|eYAnx7;@yf>oEPx*meEz564~ZQJ@PZ6BEO4@T$K1# z73XL~)~Qk0DZ)C#fB2laR|Dyo>?YN40=Xyi0sQ3cqla+U%uM%T4W}(QZEL~`j&s-5 zMDrNuo~h|{#Kp$7oR%i;BuNeS<3o2aeefz!27cw8py(>pMxC4JcB}2w04%HRdh7iP(`pU3C~CI z^u?iat`M8lkrUibO`JfkS%~`cY;UTCp&7!%8{^JvBF1f76DKYwL~!v@vBy9BDg^U( zy@^u+Pb<>YdBeXnaZFREn1vr5+wh|E4z~H1Xy()gpeHT}n5NDSsXwchzMbN zKzW{S{}xUsYf;pkl1`qdn7E&xV&V$Am0LOu;Tex;DXH1i(&>e7t;1fuhMx!+`ihg) z!u>BGQAPH==G+79Z0!sHRDT_P`8fCc*U<|kB>LMp=~Ll5M5hKh1ry7( zbH4WbPbOY#@3aG|i-S8l+jvs8ZJt7juXT2YlX0|*gAdKCi*C`b&LS>M?C$E!CwA%P z90#XPcjTqHaY7Gt)(kw~%lU@5p*Nm!GBL7`bC-e{`Z?v~_Zw>Ur!VqH;==w;W508f zKQNvdT>O)<+?#bN{Z1q)&a6!nYB7C@MyU{!b8f_ynE zm9^^N1cn{I9l@`mrTjQ6w_#f_%Jeei=dOB>nkz2F!MwoYeFi39XXVgO(F%uE_ zW$I))9$M6j!MPtXh~Y^djG6IO`XF{1(xJpiKk_I(U>V3**(wS}>{}{`GlT}zSq#oH z@Mk4-ieRLeN`4$2y=OZ9q!hl}jyIvxVXvi+-@r=m<{0d>h(>BMKAD;f_*DF;!A==u z-=@J1e}iq`VA$f7?t{V33}oiCAx;CF9Uby0Yuz$KovOIhb*Pg7!quV9F_zEXVXBG* zTIGp#C%@xFLTceV&Q_N6>%*M`evWQ;L^pK%jYOX-Kb7`2%zD+3(;uJAS`%_YS??#M zDEb>oZnb!)de+D5gFh*?<1UGJay}9AUA)uC`uKA<>nJA%4=*{&iGD(|#VDud6E}+F zm!q7V(T_b${nCx)%hm00^-=e6|zx4N5{IMKPt_Tf!-K5#zY zoc%0*RS4ZwWXAMr&H|W^6m&X_KKU;jcuL1NU5Ih3>Z-)(5HW(NU1K(o~u_RvB%ul%6YA~`XtWY z9D62h+Rj7zcJ4T^b7J4mWA8?`WURV%>fAptXh65#Zv~3fL3G~gElKb_5%wr`PX@K` z)T#f=ecN~J%v%%R+8dk2-{kT82lgLYq$Dz;{lJc0alj~c>r&(iteIh-&jFnu z(Gmyji!I)^-MnoRP!_3C4r%Z&tuMHd7yLzi!KANvP|O$n{c9eS^abyH$AeP7;I!R5 zDD4Zb+{c45zTmzCJSgW2h7a?gyf3)z2OLy=&K*@UuB7{G$+%2ug9%4)Dbii?Z(J0* zpJpZF-n1?rbvKrbJ06O?;J4Bt0(mr^E8?>lp{uG^sp7+aj9QrcyKm29I zzt#9dypH1mse=nFD;wg^lT7hf{$VBa`8w~RT82GX?z7SZnfe%9&j950%Ftm7c~3>?WCk)P98nm5GZEHE8Rz8sfXAzafq}@7+^RHrP9d&nn^zdcPykVbqRXQv`!IqDWv=o1s8S z3ozEB!ir{apQfeurK$tDQ{*vLXA?tyDYUbR3X6eQ6anc1iz6XOqQhjBIjIB<4%33^ zkQqVm57L<8fwz^6!3KywW;yE zU6sNaDzI5(Ip>o~XYl^s5c4h=7Dgl(ujW>fFxVav6%mQEl*q0o(KOT z`O)B?yQ!L)!O(|3s}T4k1oDDV{klq$!O^MwRxMoj|Nd|Qgf3AiAI>xAlo{Nw6DEWh z5MD;^;wO9KGPQ|Cq+vq6%e*%~g7REYMPo2qq|bu078ZgHLfX`Ri@9ZR3UZ|i6#ix` z9R&Qw3KA)8r@nm2$tw-}`mFYIPzmw03#$&FLK)cZ_kFw zjq+LfAaj=lTA1bO{L-lzTo>afAruw{P0ZpJs)87t{HD*!1&MzsK@;;H+8Hg$T#bKL z@>{hL2@)Izq`$2ykiq4zFcSP@&vcJ8^o_pOH5H8*V#TXJK~(_Zg~<~GG`gW`{|0;D z+=0-25^~|bw4bP~F_;DC_;gTM2sBBX-dBzHON~DPb3ow%74m>EG1Nn4%W92truwY1 zkPrr~R1HV9D}&8(&Ti;mO3+G8Lt|i7OVoJr4!wb3SO`pg6#6qZK!b<#`Yjs@52+Ah z#lMbtGan3Q%jai8!@^+uiA7x}!QdiA@Zu*zLafv|MM$eLq!olfD^*HA!r)azf_WJl zMTr0yM^L-@41=2$BP@hi1nfkuCc$7xOT0@38ZZwPngoMwwSo`|ARr&AG6@E2=kkgI z^NL_F>q>OQV0dH5U?E*bVbQu6EVojOa99Y8`>9$!=?@ZXD=g4gjO5C(j6k!EDuD)D z&hS|+5dj8D1UBPtHl+mIO)MCSmHOt5GZ8qgd)@0Ahc@$BB_JULM&RUKJ`ir)KMIE~ z_F0XPgajxAXr=Q$qXMqr86<`y{Z@M*{%A6UM`K+9yqvT@>FeMC7y$8gApY21$5W67 z`(H$w75NARiNnEr3y41ok|!oR53-x#6*V>k(vzA%0yDJ}o=B{Y2NJ7fu%!IM!eAo` zS640CV6&RiqP>Zfpl|n_mTXUz601Uh{GB9^@Kh$du& z0$bY@D$p8V*8~hy6mvZ!U=+f_pfx_L8DDC`7f44fNKB;!tIiLauu2nJgU|sALZCH% zZ@p?N2CZLJPE4Z$?eH@T{8orHh6lt7U~up#4AzJ(<&1?bVw>1=P-vZ#vS!*t~^w5PLWDOC*Fr3)}*OPUc7# zjZ+e2ROQX21TFBQ41Te|t2CzRpcI6_3fT#sE3<5{#tA?;Pu{GFk)e#yw7{$2YO>%y z)3_Um5q201M3`VmBov+7ztvUSkW5Yryf`G#tl$9iwrb#OdGl{{BH;)oU zaiJcZZl)t%GzR92zgisEIk97MPk7Tg@?3?YEd4)w(D31$CAkY{s1cCSg6xb`0P`Uyx zbepA$+~99NxOsz ~TR1YAvMtYkP=nF=!#lTqcq}y!b3osOd(W5z&t#IncNr8 zAa=kIh|PQ{74Z9Mz7|km)9Z#ii5~-Fpdf@AxNsK@jE~5|N3d($m_|&A=TV|2E?lmq z48^xdFb&2?)HDuSg-{C@8o)Vb<9$`*@2d8D%c$@S0^;k__@Gy5pm6kkKkPs-EQHz! zD2Z57ArwR`cu=U8-+BY-SWbyLxG)5M4*Ma4gCi^%$qONffJN|gNHC}g-U=$zMZn>r zJ|Udan7Og?vxHC&gkKiIHDh(cfnddP%2QfNiTVhrw@w8Z)P%4Q8i3FcSwvGAgE~R% zfUdeGlCg>k4RPT+Y+r5qkFQB2ffvlXoL&h;c(Hy zSKFkpC6L7-gy#^@@vzF}WhWGF2f`S6YpC!%2*=U)u{c^TRoE9uYqe%#2#m%EIi;=c zEp2rxppnz`ucbs25S~S+$JjO3SPBzHY+yoYihxmntC5w#Ysd+X0M=3A1rVm<5ln`M zM-cm?4ZjwGgfL#jl{H|{`fdk<_&Y4#NJy-wL^E92gKEXfG6>a**dM(l#&=;MG{=P^ zm;_d)yju@JF&u={g31Pg9D}`X@DA7UV2sAMGrrt(M zv_Qa+Q+{a`5q~KBE0raExe!`{Q1v5KG5Z}aY90kQ@y8$Y-$& z6Gkh9WJNStTM8nY#F;=?Wp6VjUd4rauppH9P-76eO|vb8*ATGb1vTdTTw{7XlP=;% zRA>!CR2+LSw|K+2453SK%rIpgmcZ8$h&52jp3)l2q3O`de9XJsfN<%edcK26^ISN; zI8{8iun^wBg}SJ;bblLbd>!>>AQV2K!kY-_Tt;<&1IqZbNE$O^MvIa7#NE*l{onQ7 zYHsIK-p~#=T$rhftmG_(v*9_g83=*C|6nvE`ch5Nkcc)2nEUe*sn7uzied=P+^npz zF9>V~Lg#q7y=5ZROP$*XaJ{vsiLM=nTRGR86*%wD9nV zN1?!}w9lx}1s6W-&MZ^yFAggWY(#GZ*+7NR3m1Mt3ufa_ zKsFI))s>-*_XVTg8yD6f%8|hI$MwN`?yrsF@`b`=ME60+w_ViwjKQDK#Khg3SkfeVruxM8=j`IP(`dahyc8C~{&Fym1aYgfIdZa_WHX8ow&5W}m*J!blJ( zQ`NZ7HIzT=^HEH9bH;HO8SmmkgUxC_+u*Ry%7_VJGzeD^BbpS0i(sg^B9=sj_Ym-~ zj8ZUIc8RJeLKp+Wb&MdgGLdose80GAb-O7s78llH(8z2ts0m>qj6*eKk%5qdFq6pAr!W z*nz2CmeI@T5{c_xQG-(3n6@?$Y;g|KN@2QX)gpoRplQh1FB(TAOfFU$n zvt3g4J*6~$4n{>p;s7ORQi>f`39YH|U@PVL3W5D$hLb9Gxiwm^iT~jpqymk4-D;|= zUefqnYdMbL5pa^XfW5yXdJDYXIKa^ z2)K_L%VapPjKuV4Uz~D1L52LZKP{n6iGCW-w2)d87KYTfgQ|&M*EkzR&L(=2612A4 z%lT!g?19GA$f|lsh7bZEjL-{Vmo<(lpW)o!SMXwN-`XOY`9H9{x|!ZH*Gi~c(71o0L!yDJ#puaw}xB+GSW ztqN)kqViKh2!%n&4I{|dKCiJbiu_q9{6>W$28M0fn)9c0g3#ytRG=QjWvCb#{NS%tH*sL*b~9$(7LuptY{()7R)ZwC*GeV zF#3CPD#La{F90w+!N?)u*x(k3<>U}@pvF+_6mADR`)#@ z6;7YM%+}qYe8879K6uVAYvQM=K;yZ{RfalAWBKpY5`+*!)V_>n7l zPWsElh6iGA`_xuhY%qT>HuT_bVOq!}9>}7p@4oU14R*Pv+OsSkpCOCZ_i_lAnIo4q zHcmkc3ymhY)@j8uST+UAJ4-Rz;kG9g%V5qFtgx`yrfpbIK2afB`#;(iNzBesj3&A3 zW<@jjTMAZKSTxI(us4Nb2ER?g^3GF>ws|j1E?EXwC9}}mktP%Pn^8b)g(o$>G*TIr z3nVb$osKH^4K7FSbKZ`G{H(U0!AIkR4338#E{^kfUvSDrko@q=Jsya)-hrwm3${F9 zEzI?za>#^1bKSqYTI)3U7b-Gcx=WOxxo!yp?=<)}Rz^6-Ed(+27*|lKzQ&lNs?lDi z0<3k&7pSRhZ8?qcQ&~~4WrGZw>znW^>2MgF)kf;?q`yIsw!#D1{gGQQkr>Pa)5Bdg zLZI3HJDYMz?rYqTCTPi&#}!J@Zcoas+<|!-4|i7sXA&v~Kq%NsWwF5y?&4SCVng0l zD$o#4`GoEwCRsJk$>L+z5Eg=%?GIE-Xs0nD+M+@9u2G=??(D9cqrv0o8aQ|-A&zGI z^hGtQGw8L48L5r{`9ooQ*GZ-QHuL@l&z#~gU;nXR6=q>v$T43{W8~LZW2`b_!cFZ9 z&ba|iKejx0Jcy%d&$dzRrpvz(oi^REFJ7SG(0?!oN97(=x-bu9EubpOh%LXN#;$+* zEW~5ZO{(L-<3U_8Fyg?VbtTS!6!Vs=u&p#cVq99$qK=P z=qdI9YqN^cf z@X>*3^Y%+%7a$*akwK@MU5J&BC8Y&>e$7*C7T$H|ZShI2qh zIjd1uT;v>U#Axa_K=5~(en8W&bdg+3BEiq9E6j#qj?>JoySd`M9f-XoQDmj}_$ zBBZ~rW^e0iRudTv&vTbBS!lv+1ZG1N0Y|PKfQ;bfj=~%_hMF`$Jcxb{A%E#y%hv~! zMtpoKRlZ4NSOG>=xX&YKo93R-nYL4vMZ#E8>o9+LBnu=VOUc^H{j(@?Iw${VP2Odk_%_m#I6tPYAnprwbUw1 z0tqkTLJtJ6l^JY|jtd#Kj|8^hurQl}Q4r$-HVlIc^Kg_MoIajRWP&$-64!p3gJPrU zGQI{i^^l>4c_6DNV-R5`$Y5R!HaJq4K*GxiI2Ny3%6*N$wO3mVgwO(nGJh$;IG}jh zRWNH43yF!8XbHx-ld2^fjA|-PJ}iV+KzO;aN}0j?*(`CtCQ+dk2-i3G#1C5 z!LSfs1>wiKVpT%E+v>pgJce8FuDr>RDD)Z_pJi4FHMkjbO6*1OSI5^*=FP(-%SuWu z^cbv@1~=zclUq|rcpU*1HNjvZlm#{!hr+^W14aqWFn9qHV0cp@QIyLm<2R~AFV|?l z!tP7|#S5~%kT0t%={Bhv6wp{zFz8Jqp)L61!WiYTD&asdsfXnAQ8J_|3AG&V~3 z2*055W%xiW_36}VkANXMQU>#az;-5t4j{CgtNPY%8b<(gvwNOFiH=~z*HJ@ESL1ph zr?_I6X^x^^iI6J&$NI9djws2aG1VjTtSRhOy85NaJKAgI&82xW;nhCQ6XKYXrOzVqPG3V$Y+* z09>dCYh$IrwJX#>Ob7!J@CHUQtilGdV$CJzN%Nr~{tOSI2Z6D=i;8Zd#=iOBCUEUp z7;l4-4qJygcFm_T9T?E^7Eod^0!kx*DQ>H=2nd*U4GUoi0=_%1-2FouOAh2@7xu|e zVJHa2F`#5Zt7%N15e(+)2kxnk=nmS!cj4Zgg}mV%5J%-!#?s&(J+c+Ta1b7!F58Z! zXtvBnPzZ2or8gQkA2~wfP_#@A=Uty=9?}MbH-X^bx>MfK1p=(VR37PW7PWhh_125Iqhd*>#t7?}QSquSE?rEX)Kj zXKF`h8jzX`Vdts23{oKxNgy*U%n20HqluY7ibg8YvCF~C z5WofbV~lwvdLmBE0OUP=%l%v!tsx>i<(@j~4iq{bBlk?g6*ClR0DD7AtlfmMEBKiB z6t{T151!PxD5;+8P3gfbSK0*)ES_%WX0y^HdyhKa*E_(!L7 zCH1G`qzrUfL?wYtc>`5Mhe(h-66Q37m?6&v7#T9#A|^=hxK(7r>-JVna{Ip(m%HK_ z;ep;7aEs5z$qwyDPQi$U4^+vNQ9xasvdi-M z+5Pj5Qgd*2`n-z4uQ~?p83SBrOIEkkiAU+GF~nNj7472W3^Iq=8P=Jkv-2-G^`8|Ee=J4(vGQ%e1515?lUApdbsi0*jXmIA?iQCf zCQJf0NMLeWi~p>}eR|;w3^Nb{!a1F?pXV1r9`anFr_mLsR>a zL_h5>4>0M6e87w!n}ETge>@tKu*C(vEnr4(0HZbfBWfGm+E04Hqgz50WuGh5ji8jn zWF^bY;KUciVV(UMm}&&fqv%bbyou+tjTp2sM~NBQA4!my@*uDoj6OQ12A?%Ch511f zn)5mDU|I7Z`Xk&C4VRTMHds=}SeQ!?VPSp@Mll^>gRiLw&)G`Ny3pi7>?dHh(D5~R zPKIVIx3Iol}S2;w}5P6RXWVePbP{P<@X#_ks8 zc4!K73z*g6QPB~eK^Kb$=iyp8(E5T}pW(ueRBBH7kj7I$cyVDNd=A3a>8b@JY5Wn$ z0{@Z|hr@`|O(GreFr{u}C}@p?RvjU%7p1zL6z-)U^B zcQXrt4KP1Oj&Z;`8i!zzPyq_x(lL@3i?Z6P*EE>(RoU$o216}rc1CB+tTH(Hq#7cB z2ZFo-`ese#6&PGv$cJqo_+uj=OI9-n{iH_0pK5FvdPj{*c9KC$+(3tn)i`XZ+Eyln z%ph!fR&50MLE~8<_t5U50<*!7`4nP1jc>f-v(Uc6LSRici>^d@eWxF0x=?GpBudcZ z8CFk~n8B65%Uo1g2-!fWbz2pR!8J!!GImpeL%l)&sxq0TaZx%;UceAS6bSq72qEM< zqYiutis9{{1pS1+E-4BBWrh8;gb;FqPyw5Tna~$Bw$=)JsgMf+xsNMCd5!h7f)H|p zQ1w7aFq7lV-fuq{C8gXjR5qfhG`%5_F1qeos@zYGf_ z7L3~npy{>FDl7?;g~~MZ5VcVGJs!yJ5wnPFuoWgSG0hYvA%6i#m_=lRIl92`(?Zn2 zFzzt*XqkB+ZyNQ^tQ<7y`cOp}YWt{bFQ4i}xcH zii2<;9t9N)zK-ED2i`&`!C^(39ExGE1llWlxfw?xA;ram*pkqAO=rbajo%|n%Hul! z&=ZA8j4p+fx6i53qrpv(M87!wCrYx^cpz^eh5Bl$!HJ4`$WX&VEd$Zvj#)g^t_G)SDJ1g*PS zUNtxa9#nb^!b$Km!-ZJ|Ob=$7_I;)v__;)JQ0pY)k!N~t+kf1Xo zj35}V!J}Z4F&IGq#66a$C{Y&ynWI%rG+1J>$_XLV1Hmlv7}SeB-XBz`4}zCpjR?Gu zJ~+`%Y~)Td{483bHUPB}CW}+2z!R9o?1Nv(zm_;a3$jlme$2$bdv(LhY&M+CWH21F_^B8<(ikfylO~UiI^J<(L^8KT+ zEgW6iIw3R$;X|wzv0E|tSzCGCD&+k|i6#hX1t*9MgGI6U6NH2inj+wvC>2YC8I_^( z&QRe65XNDylnMr$_Y&8BCkcLLsxV&!Jte^j7j%j}9>|+ZW$vhIWbi1Yu$L$l7Dg**n3WHM ziLkGD-P*fIiB~~rmql$H9-;9!xDI?BKnSmaPh$S+0;@?p4 zqY`*Lkd?Ocm}-;#Vmx3rZ*QY&oG{wr!U$|^qxUgG3f?!q(pMFnAW#H~e6DMDS1^%cRp zMu|=!WP}6CXB5`BBVH*8p)&$X!v7@US&h#qf_Gg;C|wZJ2@WV3A&r^gmoXAxs0Fsq z;WjWQ4ruI)NH8aEkkAzYKAi)ZG=8XaLI~XuZs{DzqR|!tRuXSgqB|Hlbq>U8oUalZ z7D5jYI{mI<*;iv8ofEgH&=Z6n#}r|(#@RY2gwP9wgNcgpv&QTpofWq!(Ho3~>l9

fyPdX;N77@Ul7VIR)ks_PmNT0DTIC?oW^1U^YRK%<`pg>63ooI zl<1F;B@dLuI*o7Z%oM@^5E8JoK#7?eyK9Ais4x%#w>Bw)AKN}jJcC%`5n&+=!i5Vf zB_QOxr4D@46vMkmiMPR+y;R-0SYtIUA%wvo^v0Nj+T%2Sii9#5_o*-h0X<78gKhBN z-&9)_!cY+Eb%Q2tq**ZBze3HhJfOrd1dP-jkHJG|?sR~K@D2!O1<{~hNgV$#6vQFp zfxOMs`WIz64Av}+bwaEp9uO*g|FBR;K(w;0-ko|;<0tuKAAcGcKFui7UXKN$+~2uQ%Z8Ej6-9Qa}p9r*sc$za68Ja9%)LuaGG z7z~m)zK|)onWM-@>^&aHn@zcosxg71F}|OVJ2npr6W(`Nn4@w3&p#sn*?)xLA`lxW z>a=$$N=Kas^0L#75~?f>c1Jg&6`}!|H;He&P@r5ve%M80KOAiI7_iZzdgZv&Ms%^5xjN4#qTN zDV+||Jcyozt4pwm#8|G^xB_e>L+VseD!r?Q=q)s6tnah>A&LnkOaoycW>{F>!$bO@ z^I)~5Ul`L7(n(i3gU8Tzxj;Rh5;H(}>$-|^KaHKR{DxG9g)kF@8OT_sX@SNXir`J4 z!Yl+_#LzTE#w{EWvug=q%*KV0hgCo;SV|J6qtbCqK zY;B?39)ry=*v$onNmQ82_E)79_ab8G2bFd1s@0ZcLp0 zau}41Wj_GJEJ^)$pCSTS3+1m)q(UFuA#W=0TZjv0q3Y45MYr|Xxcn``LRbWXS*Utq zuOeDvJZylkV7fY>q2|?P1DXcma*J`nEMO&XTXgqAITR+N&=N4r3f7bR6#Z}q@Evzw zaMpB?WfhkP(I4V2v#j;_c12;LmLK7Pm8vX?NbXsRd(2AL)?WT@GFUPj7iS2U58{zD zQyvudaFbd5GFZ1O_l@X3wqGPSOm^92I5Epp1_N)p2gk+5guIzxL@x)!tWIJ3qQpV( zUOYmAm5O#(s4GA<%T$l;UYs=xRDS|;nFrA;!8Getk8NH&LV^|P=i7zCT?MXLx-zIY zFHWBgZYq=?7t47ZyBg$@7!Oz}urs{KjkOYBj$L>TKpxUBtagAd23X6#a8JqTvS!k}KcI7$L*M_8B}z%2Z%>Q}333|)EP z;|pBgTxx9uBL?HKG{6EHtGwuw?}7?p69Oh+mrv>xm~Eg;DXx4U3OUbZQ})8(?EIXe z#pWl}F%3%;Hk1m1ZTxGL2YVKS!J1Ou-V!QgM!@%Y>554Qs!hq?^i%zuFtQ+| z*ao%B$ly=4=)4EL4(PKwB=^hHS$_wNI~56h{qyY2Dw<)$n))fG2TVgfcti})?u5d^j02;9E@Xob`l>=^o#wD% zEhOdLuU*4yxyri*YL6$*h+Rh!eQOZ8Y~N@`^Vgi#obk9FfV zcpnXrv-;~P!9MNyA!U&bHpKKMXGn#>GJ23!6{^9%UXWFIZvzw@Hr0%XWNP+xasb@) zzNttkk}!F)+ANl!PmOeHNsrYN0caskfW$;WEd=rV#7xz!a^vIfXL#CVDR-3>eC<}Q=tL~ zJ5lh=DuY8Y`3B>DmV}%;-&1DUU_EpMrCG5)aobEsPjC-vY4EsDsAfTBMW_`~3qFO0HQrHvi@{^NO_{UCeMuVojOv)(W)(5`<*t-9NNDUQ>qM!FW-uev zXx3ppDEAfR*iUv#P>!U*g^*LxV}%qN{k{GLRTdb02{d*$N^LvTV%b*?!}koB6LU2N zk8!0y{h@mfZ=Z~JhGN-g9`B&`9Nf`3@3>EvJjrE8zJro%O1nW|A)M7X3PcLkJXk$;pFCR4X_gUXx(8qfbkE2#b$ z$!{phs?`hWr5`s@V{RylZ-r}A6e6>~TL`gZ4!If!{x^rbZz;(FsPc=NY-p@;7oN>N zkAIXDVgM&4Ft^7RHB94Zm{DHmA0zo46#7)CBlRfQ8m=t#iuc2R;4|L2Ta z^)R> z4~-*1Pz?$f)A?S&H<3tXHEOFV`!&9qlFEGE%V?DXv+Lg~4-5{6N#l@ZubX9VT%Pnt zcgpg=x6dtu(@;g^P_n_>M-g_X@a9!9n8f?%_RoX*f7OaMVpXMqHV!f|0{*4sT3aJqW$@!~;+yZ?* zM`-;u4nm*LG_ZsZGjcU>vKxwQayK--3B_1!awH)l9XtIn4-3`=r-2sgsPQE&h#;!s zt$A$!p>QpnZ`Fc-X{@P*N${h{!oqw8%tN_UV>Z|fO_iR)5lYntVUH#ltf&ZKA=Ck3 zZCe^Qn3(-?fB{bqdEwdnkrF{LzCZx2`L7yN7&5L~o!X4Eo` z#o#!=@7zU#q~|Ez64~C+q@A*i2Iqpx1pP!p18C&ab*7ERZ&79FJ_><7d;)TqevQE& z(Oc4|KSqUT5pb`PdbKfaWra~dET&_(4;hWXaNuCl0v6YJq=uUMJx;=N2*`)ZMr&MD zV?k6lnj8{hpGSaM>o9l*>+`f?{9|J|0ix3wC&yIzxV0C=r4Ma^O-MEZ7>i%Q3dy|FwR(zXa5=sy#GMOd$VZ22fxzzg1&tQoQ$*k4{YC=gKO%!7Owl+B z1b!Sw2sD=0&MR{haY5lJL=~kH@_wfTt;k_a0rDAtYJ43M+@382I@t5pD#99#B|*TZ z2=5dXSpDjt3#3AGjbGszFb-iMuyVD(t4!MfjSVt~fIfCD>{n-xM)KHb>wmt4N@qTY5b;;qPl4yHQ2r90_!gW3X~gLQ##+3t~oI z81#%geW(~Ajq?Pt!G{tYeZK#`A}rImR}dR~NT4J9_`ZvbXC$}13nYk@`By2JeHRr& zaseMvB7>gq;~OuU$Oa7T>mh*-(&PIsN?oEP_Vthu0O9d{7c+hrf_I68SP)X~y9hB$ z-j@v+*w;e_yWGb&UR;(982F_t5(b#cWThs26VJ#`r?x(3nP|=ocFDreann~1PPhe< zzdrPMAZ~4~UdjbFSRSUBdq;&pw{}o>A%x6<@7o+=+q~P9pig@PPDMlt{1XIPb0Jhl zz(;z@#^AS^Ecrg?9V*b1UDHX;=@=XjLUkwzfe!52+-_AbE=%#NNK0`<|1R&O5LO@;yd^F6pzmm2o$?5>LgPTlk(78eP$#W*Gbi3`BF>eG@Mph);SDPh=lz zumYZl6z?+3urTX@5x}UI9k#(3B%QtN14;!E&|w3fN=63^_ld1hw%iu@!2MtuGUr3w zP!u=(%Nyz;{GFVtaT)vydBSuEp*{%dZ>U*igN1WSubl7@3RWG~D;|j}IuGe!{u=xW z>400ilY~_95%CdRV- zy+|D1`0_?kfo|zGIEajp!44sG^8utz7|$bQ7`AngVQ>+mj6xdwE+i0T9|jj5kLB|> zQ(sb}J%c^)JnVA`3!w>Aa_9&dyr&4>Xe!V#4ON0m$>$lofm)BE4hw^xX`PFzUKvb{ z>_&{e_b5THv>tpP7OcT_AiU}e?jb=Ic!k*vjGFL2$TV0x8b89+2>Un3kjeoT59I4N zZ8|DZgK3aYuS3)@!@_)tV*2q0Td2oR7)#A;(By%92B(sKyun-enY%8$7&79=}JJczjrxuR`og{dj|&*UIB3jHf0Z@9`k|H86+k z#~Zx15Gw;ABwwg_d|0ThK`qxq<-WlSSVF^7y$RHM9fVJG{0y!|H-+rkO9DOPurS+z zSrt;u9)tbh?jd_7P9)Rfx&x1*-vH$VL|Huy=KD#Wx>u;E9bsX<2}V(fvUChChUdi6 znM6@qMIOipbxO@wlWsLMuC68PM`uaMnNSt$zVv%>Ah-rA#JzF*WZus1E4HATiZD0^ zJz`tLLdTX>-u65a6>$+G=U5nD9RxP^|q@mFs7iOq)m_p6#71p3iYl^&2oJB5okW>=gS~)97 z`9P7_B!3?7%ITVDGG?L{b{K0&IWfgwc_=Om4W`v{qRhvbF)5d{6w%>C^k%=YYF^ds zfku0W!F zmNojHM1Du&8YNasN^RzHEk*PeBFeO}+G{_`tcdHZv3C;DJ3fn*R;}u|Z|z4i(^5na zBEk%wAwv19O`TJs&kn}3MjuZ^Z%*E+#A;Bd46p~-X(^&d5ZRu@#;P?fd&gba*r$o; z!gndH>g=+0b|#RPB6=1PwKHS2vCc~zYx&9={U2t2tt@JlSS#^|7^zfGQbcbjqB}NL zd+P5VvDM!!l-xxPn z*Qp1@j)&bBbMl#%BDy`1-AQX~4E9yb)fJ6>l8Cxuozj-*@a5wUyN$Fo(Km_gOJbuZ zkod9d?T9mLY%LKU_@o|G;;ms1+Q)t)BP~UA7b0q0#%=?u$yzbOAAO#5zQx}qe5f1hy6VY z_C{G__w@(C^-4PlcI`1XWTd5tCO#v!Cy9;T0eax?Tvs&ud**O;#fOzx`{3=q*B&*V zmLj?t5zRHm?gYEyVPmt#K1)PtA5mIuttR1_^Vzf%(J@3AxDpwowTpf7XnV+$HTpgx z+73Rd#Jj*A`?elM#M4ql4*I8qy62WzF~Hd2L^K9GuC&_R zem%~{)3g-PE+UMl8Dq7>om0g4%kYvl`dnfRFR3S#SPx@9q6MgqrHHN|qB=HKyWB_q zNLQ#~zJVr^;HF@~xu zN)cT{L|xI?17NSFA#=W&HFg#eRnwD7I|cT6s+FdfmLmEH5%maTwQoIa2UktT?m=X0 zmddH8l=wjCc>~?xBSmx$5e+`Z9t8VDq19s6*n5aji>b8I9t>MVw`X~lmLfWUh>kjp zJp^_x%K+G{v9pQ5rk=($k$)(3J+pusmo(8kh^TQXl7ATNCv5moUsN~?Y814SHuX}FapdMhnJcWm^L&`X)> zsEDkwDI!!vs!55p4c+lN*FL0(Zb3xt!&vP>zvpv+swQJIL{v@BDy{aPZEls2epcge z^clBI$Qb=c=)IY~DUYla(QS!P9;xS)_-NRQvt4OP5xtU#O3TmM0DZj zmG&6e9-4%PYAK@c|Bm&aTBgy*LjR2YKrU?b$3(Q)ZB}CKAG72WHZ4W;BO`uh)0p_ZF z+?m;pMAYtHloxFk7woOASUfF7bT$#Lkug@=!w#N?>wb)VhKTOxC8gDl@R&!re{!0Z zCi**GizTPa712kDGG?cZ;YW-s1$Z&DSBNk`-O%FAQVQg2SGW}ploctWgNP_A#%d#Y z_&dgCjh#$Hh4FGiiM9LN4o#HAFDvmdBHD*2l7AZPbya!_63-fYArXq|hF4&7O7WsV z{^^*_qA_fY6Dgu65}_|FH#6OjnN7oNH3RezyrE$Hd4m|;vEo&^%f+1n`Db8v%42#| z8Ba?QJ&*`3r!AOe%H3>sd4FCPLP4Xq7jvno=PDEX*b!=UR^x(M^d^7ny|7 zXG8BfTpPl8*61yXsE}U^UKGeb2eXIn*XA{zmLhsH5wgBKm}SiDT+C`|=kjJ|*Av0p z{AKc{Vpkx4I%Yp6*czzVrHOVEQL!6+9`s3r-FRv26e5fs^Owtuid}*H^D)~IM)R8# z(UC;xa?8wY3f|1@0?g*~keR_IYi1V{VQfy!Z<9M^N`d?t*v;G7UQJ9(5uHVZIc-@m z%b3}Pn0=mO?KNv=D~NEeJOB0IO@aK2Fx!-I3-@U$qQBe7cfl-UW*1}j`ziL?e%8!(BSM3n|3>hpK>j6|U8;|> z)3DRhL{D~h%Yt3T>@LM_8qcfMV$EzS5o-OWcDXC1?SGk>$(@;9j@b!p)RZ|h z+m8sDyWuT)%OP_LZjfk-H$Rv!u0{Ye+b=VTm8vPF<6DhH`<%Nr- z6v+QOW=x|pOG^>`Vx*ZZ3uYNJyArc;hw0cUo;9<9MCfeuJAyX_@~^^d>%>AGaKzKn zL<@*e5*efa0UbrL5nhb#skEBE>7C$3f&71BHjg|N;zWw*EF#-dPQff=W?JW^{V-}~ zce!CSk$P8NN}+E-qtccl`gbCfcDo{W_GV^RWA+68H58iJ?L^eF-jkWiNddl-BN939 zFt==!B6>6tR`<(-S;ow+#Vqk53mJyYtl7OxgduZ&XK<%Lei?SPY_`<0q=;TmL@g_r zWz1|YW_Pr^rL37kSgndV1{`+#LqEjG$ zK6YQS(Pr#SOA&pO2xI3mGvlfmGrIw^OMkLj&zj<7BHA|5;w!r3Q5jSqzXI)D4_KY0 zO>rHO3C?tRm*zj4Y>irg`bq|CnnBhSXV`MZx&1(%sKRV45*z zA=-@Ju$W>w5$(+6^&{^!r9l48XwTo(7QSgy{E5g;$;r**M<#B8n>fUseHb^Ch&D8G z(;eI>kY9y%-(&4KD{YDx5pCF%xnPlgH3S@5qVQ3e5@qZM5^byJCq`tAi_pynIbtfs*IW4hS|N> z+R&Uev-t^PH2Ksg@^U-$wQPeKL(`@>pU5^Sxxr;pm?vZIKzkl(ah;VSdNdI>b@Mac zETuqx4Q4CcCDKwvml8RM@6|IivY*J9-D2#9m)Yq~*6e=7?qJ+~8r&(6eqL6z>!9^^^Kc>1(lgob{kKW~R6;K}QKQHM-bV;dCQpMJ|g{`C8$%H;u9ijDDv@zeB4jubhh=HNKA20g%cElS#Vo93V;8n4WD{+Hf1r9gfi+6s2ox=~YHO2psjJ7&sglQHH& zOnXjnOoFALn~ zyRb+lzLAs1F?s1y*RD;mgowsaIWff(MCQ^#w0D;xI)exue10#H9BMVCKz<`;2h(*l zmPirZo=6G3H<)G2Y$;|#={n;$cFUUG54hWluW9{O?rL$TK>m~1O~p==kQC9Kh-eZr zGqoi%dkV8-Sd?gnG_&6knMmfolQ(5ff&4UPSHkG%ON!_jm2CT%n3n~+jM+Vn-L~GH z*%f+s{|W9C$p05+bLP12Cq?u$B3keSvy7QNgV_=s=$yyQ782Qk%=O7zLb+2YzX`i% zuX6V)MKnc3_iA>!S2KGSv(G6ktuxJR1rgSn^S_rnc~c<&In18^o1I#urHIxNVTZpW zm}SiDc`e5Zq397=vs-(ab%^;t$lVm&DUjcc*$3R7I*t_479#YUH_c3~#LQm6>~A>G z(X^SJN`ym+g=^(a?M;FF7cu)7h9XI%rHQ^qj56soJBE{t*}a5aRM*lXyqVd{m}Mwa^=>m;P9!mzqWe+qRCEgDzk=N% z6p0$06wygUR1v`}V`i^n*2IPA&RH|NmxxB1pX8(!cEaVZtw|9bOoXPEG4?gs1IY0f zYX3%WO-!d*KP&Mv=y}-dG)s!;EF#?ZGDUL8XvWNzV|KI4Xx7ZGa2cK7@6A#Q)&ZF!kFl&m@M0WCCe+^!L)v`Cg9raS~P>U{6`87ne=pqNpf^Ei_H_~LMGEA@$|cV!`W3gmZT zx(ALJz0#)Gg2)t<)ceX{njyd<^#jzCeeTS5)88uowzx*U2l*>9*?jHkBKh9^&~x;GR;C_hoGf=+W)^q88i6=`cZ!& zQ{1}2h01lIT)PVY=t9!uXNdILh2m*bytl!1q|k5b`9Ix}*?fv(1_Oz9;8H}7C88bp zJR&*8_*NkQGt3V7)@^c4u{9AbV7P~jDLyB1B6FDLM^o%iB&?I>%g5>jCNn0v5zI8l z64~85F~t`|T5UlQ&zj;s@?LEwI zEb_9ZNX#SVS9$X*ylqN>{2pwVFm}tW6w!r5^cc_BuVI&RJ9_GAYz>i}DWnC#i30g+ zFgugkLlc-3(Ieahw#=LH8lTyHgIy0pE;-Gb-P=U8>A5kuQy{+=vxi}*jkFZeDkA%H zo53t&X5V7=85d%f$(q^gM3`mf-xRzlkpCTv)W~c+aB!5CCVC1H)@sXwUB>MGgS+7{ zT1lAMk8X)DzcRQ}fY%y%B7cKbcUp?*cp^;w8DqbPJ*2`dAdHD&pN7(boiPpEq9!-Sx zZR!?G6ZtVa@2AZ$p0C$W3PAHEHm4i2(x~wN^C#u;(6{!SBhvE zk;$Yr_7~XS&DWb>@vO1ML}-GkMK@`Z{1tjCC8``OQsSM6kb{gO`RiauJ2q?VI;K$A z`)-9D#MrW$xRNR!eZ!F%Me>>2B8^;1&A`|@h|mmblduJYaGaaKF*XYO3MEZb%^LeK5t?f1 zHl-a18>OHV%*$zMqCLGcPO+aH+CfvwUxz6J49*8lJ+W#HUC8KA*KbS(LxhA`xwIC_i=b4-)u;0 zsY_una-dhv^>~mYGa~K9%Ne|@8>MFjyy7x@ooD`i7$~ZRjN+;l8+sBaaMbH zTsOlGurp?mkHPnB8wMm-bd295@xpm7OAjhb%-Sgh>^CMJ`a};@cqHiYluLAX{Anj? zR+|v{i2QE60sgwZo;>n51z$_#YcP?I2da(zhA9r)?e3zOWtJpQeTR27S6uG4NOpzP zL!=!ygf!=$;qE5j3smcl=v_w4Y$%cIIX2VH2fQ6`yUNNA((2`{kjP(n9YkgUAOD*> zA9IIx8QD!327kmRdN%VLZa-U<&z}-gEULVRF}AN(I?ESAz;h`CyS*v)a7A|Zl@Slk zaD^3c3b&?Bq2)1=dPH_b#NHg_ZaLr>?xiHyWn{MHNTRiC-3zz@Pv%~BlbOo?QCW>5 za{s69UEzRRV5QBStTM71w<(bcJyePAZ30hUgy->6#WtWTzXsW<_D}WK4EP1!b`EA4 zGuw=4Y!AKB_8aa&+=|a?<1u;L9C`+orpgoAS6^3Ax!U{MRWq{NQpt|zs;Z5E4@Nb~ z@Tb#{$FZ^x$31|R`eVTJY4=QH88c9QJWNrjNe5g&lV&DMJs}VL#xk#*zo$njzu{|@ z+F+!T#OE{_eRhGXYbl>-{bMbja|u+-N6r(PYT! zZ`tSKp4mx``BbmRhq2)BEcGwBP#e18EG?gSYUnX@r@A_CFUdfAp~Gl(8WaBPu@M6* zJN1kVG{ii^p^ZE&_c(@2?7_M@V-`EXM9H3pi%mTqi3=?^n&e_K#5Q}mk1e0&@$VRD zp=Ji^I3H)mWBo8{T8R&_T9usR8nMKAdG{k-Rh@L3&0+GiTF<_2Q zJtr3$5Z=Y72I*BEuN@cB$89oZpt3*zK|O%rn9<`@KAwFl9-fznJs=+7g%Zsij~&Ou z1qI%@F_L>BF3dtZzAtui*XZ+@Io`cr-7FV-VQ|_(Zty$bHwY17tl^aco3fQku+)ry&*Ll+834E~p2z;5rVG!eYbM1a-k3|^7@z5#{ zQ!zMyS2qdnAO$Ek{;U_64=pY%;1j@uTi|p&6^(I=QFfl;-O6*j)wSQ04sTwKN~=s zUQgzGGS0(=S^NoNDMOi>R>0~D-0=LmTpR=OBi&O=(}4e6Zc|{!4334E^qw0E0xqc3 zlTyA=MjnpCAaTj2?ivBVbxX*MSsahWOnSJk5%8ckH_g5w7bifppYJ~R6YxI1XF+G@ zW^f_~hx!r-co`o%)jqNv56L?|;(K;83fgDXPM~tttOF+57tp0sZ_40gh$H6cA$uh9 zSC3!w!97}9#tcr;)$pL23%Cz65;IBVTX?Wmt$_X7#6cUm_Ht0d2li>ThsqhVI29k~ zZ0QOo;M@CHt4+Nv7k|ZIJTrwZ7O(}=@zRe|9rAEG1`k4< zs3~KWx47F`WXxh3#14PZk|Gj0$m6dSZWH{DT$}+>`JHQu0ZS)o>CLY|B?qq>Kl;e= z>{GPUc~|ylVgD+t9JS1V+r4H688bK=;@^L8RUYsLmId5Z>b>Ml947Y1p>Fa$IXoBp z{iZtmfTz+#WZx-+=@^`Nx?5iaoZ}2KW^f(`A5U^^DBzcjBh``kf|Yp4QT;2h+4)#r z)0faXkcB{>!`H^<w+cC9xL^_bY-eFy2k`3JbLr!ETEPfM_DZaX9xXCJD*+n*@RDLK|8uAse-_9K-{liR#ru%Q6UV5|d22@oS3(rB zv{41k^jLv`j^;j=!Br5)HRz0q-OpnV6UQEIQ*Fj9{sEKIT|ie4uc8YiP~Vm4(?<# z9`&@#!j2ft^mP)LsKtpJR9SmJD*HkS()JV)5EUSN{QL@Ih|s|K?tAnNq<0 zs>IRPxqA&*%pEYpz7Mx>pAe({4d z2zV6zbOiUG`c4+P_`m%NXA$s1=Racx8c@nUas~lE``9v&`j0$lp|yw4M8KzfCd@#c zufQ7wT*UmVY^M6;LSN zFH1AfL|5Z(BM}0T27ez}xzHM}^KIuM;52_9W}ppJ+}}sQ&HZisC=Z&2cKp?O2>3I% z!E=U;8E8L!XqJy*sRRzqIy|5Iz#{dNTvkU%8Y47jdKV@UuJ= zVQ}nI&LH5?!}_f;NnPghhKGtkO#6Q7BINBB&v zlZUYw4Dgo-cs-X$C>Lg-qlH%AY69--U6fYhLSyo&zRCmc=nK;f#$oWGZ@B^aIz_9F ztL32>gMUBh3fp5M(#=XlnJ^2TLY`ga_L>22AwGm*<{Dg#TshS30l)Wn-xW5nWklLA zGd9odKX>wYAjkva)U`6uDD(7IZWHr?A@%?AmG*vT#w;|<;6PYGe&S>Z7RtHUg2~Qv%3zqy}k6^8P>xATy9!qyriBM@j&hg`|*9Wbo0H05Th? zL%NW{KT!h69HbuUMv9K11dywc1|)-wJ~lxkIF=GX8j;n=*yAVxqzp+TJxKBKlmJqW zG$Fl6$qAGIQh_uheaOTUDFLJsX+g5cq(4&vNEOnG^dpl`q6CoY1pl-lk&`I_WI9rV zv?F<^Py)ydq!#Hw2K|K+KxQE+q!Sr@DkXr-M(U6*r0}nl05S)uN4k-s(XB}wXa*&KT!l0snHdQh!G)9nQi?PptC6u6Q36OAl16%v z;+d2HQjRnsy-3L{N&u-qnvp(a;>DBzQi-%6S!B{BlmJqNv?9%qQ3~MX#HADiQjN4B zk=c|2G99Tw+L64=CB8|vuWbBoc0#b&gkshS@DoOzqz5UUM@b;%NE6bFl+33jkP4(3=|d*oKuI8#NDGohCRI=pNL7M=T9JNa z@&ZZ%sYcq6$c>Z&G99Tw+L64QC;?;!Qj2sTgDNQjWEPS_I+4K(DFH;KHXE!%x{$(~ zDFtK>Qja9M`KRa>N&&eFX+Sc_=qgG9DMcEQ)yUXIlmb$Qq>&z^_*O~*DMy-+UZf;R zDIgU{Gt!4ltfmx@N~8tJB9m^T{!hP+VnAAveq{3Plmb$Xv>}l@Ct&DFtK}l0rI>!FN&$$ZVtz=|T$cq6CmRNc~;Ze>Z`mT1o)93TZ%8Y#DI$ z-IM}SiZmjtk+Jts3P>4}MtYFqdnpB^9BD#&k&+apfK(vONFOrsK1uvIOkivRO0ZGi^pL(PlDSDVvKy>$4felCo8T|;QfRrMQ$ZBNlqm%+thNO`mq_}}n zK+2IOq!%f{*PoFJM1K2_iH}nXNaf?ye+z*uGU*9Q0jWY-k$z-yBc*^;BW*}zDW!l+ zM{1CEB=1Q|0hxi+A|1$}rzizv7Lr0bk-=$70hx`|Azet})71aLPtzEXdZZgE`WK~u zT!l0s8D#V`lmJqSG$N~!u}zc!Qii0F9;EnLN&qQGnvh!1duAE73oJNzd#8f)kqr>d65!8rXw{-JCgSjC4kI8YLO0PPzxo1%tBH~ zCo=eDN&uOS)FE9+qVN?;0GWf-Bi%^RtCRq871DrYkkPG_08)xHBCC8IneN zkm6;O08)-LA-zb+a!LTHK$?+0WMUg7&_?}N5@ zmlMqyn3ErgH#M`}*l1678$0gE3k@BL4j90@oAK2?I5-mTcR}8Xj90!OgIpP;d=P_l zLg8pG7Mt+v42tLlPdgZd?)onUo6BA)^meH%;^i;OXU-tb7i)Yl8i_afAm%MT$gZ=~ z1(lVr70gwtt6xf3kW`CavJiIcljVU*qd-+r7L?`>4wOn+6S?yx8U$W10wNeALO*W!v`@~ZNXtO==VVk zDqoSaVS_M8S+G#~N&6uAX>-AZEV?Z`R2F?ch(-CUaxqi}H5S}dS!?h?v@I4KC2gk< zqV2I@k(`yb%0tm0oK^WC26Yx3qhw93D*pjvbd7dXkCQs%gJ`oB94l?bYqH%!!CDLM z5y7C*1!DwTEjU32T|PLFBKAQH%9i0FI>9xzDn;`5P+OY7wi>$5G(kc2Hc6p(a?JvW zEa8v4U6x$&%lPq$(&g~Edd^X!&>$TMIE!}0MRY4*Omx{#?@9*DDLh2S2Su{+Ch3isZsy$B*Bnd4;aS#XD9cpZj(EAI@xe z1I0D{ph>JzOZ& zo}9UEeDTg_a#E;s6#XsY&0C#LDB1J8@}jUV`6WkzIv7y{ZcjF^8^3$v0}jwd?Trll z!kxPljMSXzawnH>@uHCqc~t0E9^mxFgx}>{O8OGyy&`u9IxbnmaY-JiBb1MRaABQ} zt~kMkbq+L;g1{yb(NSL$2a-y#EwbmkF1#J#<~v-1od}=ATL#LE?&-r`cdsgr)4X2C z$hVVe+34i%ApicbPS~#I^&jcCLgrDV3Xew)9_P>Ps3g%rPJK-D~~$3UCvRW^g4kZ%5!CfH`7__#oVzX z6OeiDxbS4c5lTh+J&-57UbDbD!n$)++i5f?g;m3K+`Ym&!M)~77uG50vJMy4f#*S7 zOEx;Woc1lRX)2;q%Cjj(g=5HxKEXu7FZqj2BD~y(cO<-}zrfCfPxJPAzb($AT>04* zDf-SmQPH9F1-rS&uzHYsB$-e<;hgw{$Xp)rs-dVM74!U5VYP*++`aBf?X`ysE38BK z@;zNxXULUgLJey#H@0nJ`xAd_x80w(wyNun@p`qxG5(3U3hhHq zW|a*!$?=c7u+Eux=RTAr)!gRXpTfG2Vz1YE_c(k?uR{L)!Dchu+E{$8BUG@@Crby! zHqE&rSv?>YOT5T~6g4sxPu?QefYj>G;v73PzHd3mRU1&N-yOFKt0b0R;KC|}^Qm{~ zRgKS)C54NTzwYe9YV{MmejCC^xW<>T?sf=HRbR?`#|#(N#rO4k75{tJx<;nrAI&39 z*{i5`;+_>&cYBE2R9M~ZP+GdeYCk`sSJzZyJs6(~i<`A&^69+Ts2%=JCRHbDkoSM) z9#fVO&d|kmqv{l$ydTV@(e{3_KQA^R@i-4Z<&IK`uJBbxByV)eRSo)q^J+qv;vfsU zCH|u4Qf@vx@KOJ$1^veV;NgPGjf_VB*cZYB20k<0WtnVmypX;ICL-i_ z%!So3Hv7?q)jUt}Bc0lFK3z)%BH6gXg>}E5F>9eq*x-I9jX?%#!MO~F3aex6N2gL) zt@D6SU05SgnQxJ5B&&UcQKp9a7xz@*qx`_4&iOelRgFdWeJgW;!s>+g4Np$lC^l-d zw;30dDRtTpNT;xDdXqCZifx+s!yZmG9@S^iDjzkRPVPZrHG~J4NflQA{}{c7AGPfp z$g0A{$e=gfw5bmEx3}HPhib1w-gDs+!bj4WWFL@6%ZcnNYH(QkNyh}_iA4R!B98pg zWiKE^w}=rn5Xw`)L6KS(E}tmP_)bR!!W~J1(H(I*g0MCFE2Ap(D$`RKn+ZvMF6a$2A#O zz0z?39oK8z1n(=L<5FMA=l;H71ccM~)^v&-cIz9?X+T;{MURM+c+jhy1cYc7F`U+K z6&6rM+-J;?C2sx=sPd@$T4}P3zv{sO?bYTkQNwos!qtDkQnpQNlx9i2BLeC=Eym2_ z3A36^KrvY{!wPufs!RvOS^YNkp!3#J%iSV}eM>5h4FUOd)S_O9LIz{$ zBOdYAD*f=vuifngR0jHundn^w6w~mn(lqfXSI!Kr{Xu1nI+3xAN{IwiqU!IIXdd&8 z5(N~~X3RNHI3}Q&(*G#Ub88(FP)wsSyEHmxmqymMc4HL5YNG~Hb%N+4oA5@k~HvA#F@06SUf2#0NC$#(P8!d*3GtNG;U_|Dq~zD-@MA>UWHvs?&ffx%z(Gjm*E-T_~WE zL3SHib-N=2da~*lQWpKqS5rW`9=}x=ZxuOw3f*6&9#B5}E!nmoIVK>irjZALw})Lkl|n9|aPB>K@8Z$L4P#(eac zyHG$etBslBFBDKr&DHXD)Lrg6M=t zg!A0J1{70!t-M`Stt`;~T!8X`>M-ggpM`*8%FC3f%4Z>Bd#b7l0*0bGjXI3YvX-X-#Z+9UMAx#~R+@lfnvJ;wMk~UAV)~5P)i0U@ zimAIEZ^IIUX!&X;0U0{F#0*a}){6+JG?nFIwrA@iCZIl&*ka6RzwQYrCTmQK@3#TP z)X!VUN8*Ry?)zRqQQc6R41e=0*9QYC3sv)BMi%)#7?9kEY&EjM_rZXk>=!xwZNEP7 zNd1$p;RaC``MwlTOvaeKeP0SFrn*9DX8CFlD5lMrD}2ifD5i9Q(kyz(H3*@te?&DJ zb+#|sfMQk~bIeRv?E%Hq+$eW5{a_hTOuI4j$ebEcKrv-EDa}xSt3wk$AS!KCfxp*) zVtR}@%HL~1F}0O)_iL@Yqkv*MjOp+lCZL$|g-Uawl@I0b0n{m?i#>0*a}t zlDpx)d;*H;GNzqU)({X-Oywe_No0K23@EC_sGEF84=5&U%tOAT2NY9(tK1##y#*B0 zEoRsV-_HZm&#RKw|6cMPJ)qLGLTxg9$b+t<2Nct9Obaj9>4pM|X{c73`xwwQZwAy_ zC?jTM532_a8vzM&wnj&~P3-Z$(*`t_z9e$^{eB1yD5s^ji&;i(C?f&IG#axzwV}%e z6tmixGiZ5Ygb4*i)!ZR>)82Kt52*WUH|7?4rY;mvOj(W6RK4ezfMU|doa8%KKrubW z?BqMyP6;0nRl8X3&ho7&pqLJ0-u44!Kr!WaD$NdlixN;wlQGBo0VSZAUSkfm4nzNQ z0d5T{b(h?o>3d8-F`dTb`8x_IrlMA9zVzK9pqOT3p0$aVFD3LSrq7s`e)^v(fPkT> zy1V6WN8g@uNT0cYVk+-ZnzMYL4Jf9?n7e%D0*c8Rli1sL&48ln@0GiizApt7 z(``)i5H}VF6jPN_njW_I8c+g?X*Fhl?=7I1{?tM~+CBU!>Q#vXifXtIcSR4?xaE65 z4mnu)WyFna_lxm>I8egs`$Zl}Z&GUw=*c#bMYV6Z(iU3#cWz4`5P2p|NmUZiagE}J zS1xwFBcOFDV;1@j8qj)Fozg7z9W$igC?_`gh1IEiA5;gN1mnNW? zCS&&bw_^f|=@nD-Sk`$9$hjRGid4P0H@|jVK*uFIjogwW6lEhIr;#MAcvuN<@hvo< z25^yy5b$i5v5(X_HlQafA63#zyx)MH zY%wy;wn=^idNS)$dbgK&gyeXi{?;JBPj$Ma0e#YLBL_X=$bg=#dQ2&=e!!6dJ=rR9 z*rwiXKXzf$-d9>gA26X8< z5=Iuzba$~H?GDS+N;r|Vr7jrIHSs2KBR}!2Eg)uUPrXLo=37}nPo|zGe{>!hI0(!FUnS}h_;@d_*&vrc{ z@M86Sho^-C(Bzyp-;d%Lr`F0WzB4b3Gl z)y+y#<5!#kA=*R?Uqhj*jsxlzOJ9H)`GqgjFIFa8&VA7|8heeetbm?eZDh(9YCuoc zyePlZz2AVIY&Y@|UsnN*Wc^$Al9Ha_{RZ?&(;|n}`2AHtZluSE+_zmh285_>QHpPT zF$RR_Fk-T=5|0TLO8Lu5a`O|;S3rm+BVO}Q1p-3!8u1gpY=-d&k$Oe0R;HY*fDoNV zT(xP>`7f>VvQ{`()d5b3lda}jHZ&g1FEMgY5(%%jxma(p-nD^d#ivlB4-&R z*Wh3CLO_vtsD523b7=)41BxVNn~^v9QVuARl%*?_@>>;TvNaYPo@g{hzrV?V-qmU& zQ=SayUDdoHSAX-@3FygoBMVvPsWt<8vaDSx|3M~(Bu^@d4bM%tCoe3CjX9~uh{^Nh^k8M&jO&lp0Xe^HGh#JsB|U2k$dFe0J}DBzcH+6Mk_0T~)I!X# z*-WKM5^xF&JtOw?z5=pXt?44g@E=*p$W=hyO}jDsaW`TDYH3vVfv!LN0j39CCZO&z zEo%6docSnGK%K_+7<26~_i{l%jnK6pl4j%}8jQxFfCQC`4kORtBwJ)ag7(n6{39hj zjcOJfkf5^JWaM77evtu1;9#*P~}ER;d6^ za7bj2?ls;8?Z|*4`6Ow-$b#@* zpTnc#4WFSMb~vveYJnDz8_0+#m^03mw8MD6lmpc&)lREFCpP{{j)9c+%H-nh7*X1! zEO^4d($%sG_2)2tx0HGvwNZhhxBRo14?U8UhW<`4TCKqNFV?vX z22Ad`eXM9`%@^Y4{OB{EJbC-rn8J2bM%g+jyU}lwr)(eFys+#`nf}ZoT-u*kB_EYG zE$vp{&?Kb&=9gs7q}XPKJ*NGMkwMy@);ewNSF(Mv$7x^eaoP^k{)LAevi(c9)0X$h z_GI>a(w^Muv`waco`FT$=bv)gUehjMD<|!OhfO;y^|d@4MBk7WOm4M9tZ2m13`3np z_4vE)NsilrJE>SB`}zK^=YNwd-XS*9%$tq5jAzX9bXoFZ%oBZ5Zn=(9)hkf}32MKg zx4R+{u2lC8Rt1Z=lB^uYUzRclw#(RExTIKz@gDm)ulf(xt_uvZF3=!F!3dvG zhw;|mtXxOQnALYaBM#&Jzgan7)qV1Hfh*HQ#0BDyO8eXI12CJ!+oam;TVMDAxo2KV zD;(HD$NXLf1wQWqH!x^4gO7dT1(d-cJRHm{nUKY}E7`lL1_DO*%9F)L2cxr@rRE2j zy~g3G%mUVCH*#jfRIQ8@?K0bJSB_C-7LZ`baoJk=*=D9Q0Ns~_c4rTZlt(7#9h{># zF*!WLDFCVu$e#Dc85UUNiZFH*pv*|4Alc zTuv!gFq9KLb!N5?@^Tn|UdsP&xm{9ixvRhLfF${^ zfvNHrdF$ptTesyfUiXVm_ctu(7Bk!I33q=E<6Tm2Xq7dq5BGM?9L5*@ij_*CUV)L% zQ3}d#bw%6ufZ z0e@Y$?!;f1!$ppY`_30|9e=+tZ8ntN%+23cqhF7^VtIx}un zApW4VYClazUjePH*G;f|;OBiQH!5U~jYOufz&4vFz0E7m=H~0=fjdhnP%sx(CnI;j z4vxfMk`fPk7Z?wnW^+KoyExvt_{m%_A5@gf#SHJ_8t396DdmCz1sBa`vz+qNaN;n& zN=ki|TA#81@~p%7qIsUJQ=nkMTE-$3{sM}MG_M7^%jjubUaREGxjZHGOJFPKEAfrA zXN_zQ#y;-v z$zlBJ3ZJ%0fr5KH>oC4Fu&u@(>2GP8yQMD@MpI|~MlbP+9mW?g@U9yaD7c@*YEVri z<`b1~8cW)Yu{EB3+_7_SR9e_-1qyEVY@K7D_G}{FW^@ZJSv|;M{Ogdo^d==Pv+Ci^ zcUMh!OQ||;G`3_1*TMX1{as_H(5)31zA1fEl{m?x)?(LI$}6kJK?#QGDX@i%jWyB^ zKZ8L+_7{4T{ZnSo&@pI=H)pfdZsxmjDl78?Jj(p5_3k(DUbaxz{P$PR{8PhtT|(L% zGMhGfKbG3^Hq|iR71$nQOZO{XOKEop&v^Y{4iGLziBV(VL zRnk;7t}XT$%#ycyvpNMvjq;o4tvuQ_ak4y^bt#Y-wauL_=eu|ecI$#&Wm4{z@@B7! z>IIL%>9ji}#C-JGJ&MxxMsTXIkzN zH!8OHOJda)JIw3{nyPL-XS%~+wl(6*D(=B- z)UCdHmV|2JE_1oLN5$$co6T&gFZky@>MmvWNigeEprB-&+ekQ!FS=JwiaD`RVB)x4 z+-EMv?UFqAfLL*&OWJ~KX}8pI#9_QNr8HAGNmroYh;gon9L67&Qj4QpYrZXJvt5Jh z0S@DznFsDQt3c8B-?=d*hvHN};g1~Mao^4CN_2zu_hB{W2uf4z2_CKQnK3QCT_#%f zbervBT7+z`_MXkQRL0nr-7i~JmjVSR`D0Xv@dhdVAi;N|##_yZugbG^fy4O6Qf@rO z+!ni9GqY8z-O9vaeDMRi61i$npkM{_jYe#T@izmTG4@C zM5$}x`cSeV9@}zg%@UMbxBcq6*1O3M;*4YMrre1Anue=k!eqliu~DO^M4Bnkhm>SI zT}AAkLa}3prj0m@jgp9qlII>68#lDalvCLtNqJ0i5y}y@^|;vPD8?}jJ*Nqi9~>4N zJEFsgXX*bU+J#08Eq_=kPGJ5Jab9w(gJQ+GO%EpzIw&@2Xs^hvx8u%4{x$i}gSc?& z5h*|BDTI_?CF@ZZcA9c)I*pV&J)V5{pxBmsRy>O7rtk5oRdxP=1UX@)K|U&4J)l{E z37zk`f#s9r)fZBWYM6_Y^A9FVT~bb1ze-A`Nxx6! zV<<}s{8DIxB~hd>r!-39t&|b|4raEM?S%C!qvWtdsKTr{*x64R`zH54gzMKoF0V`c zV&SRe`BHXEx%K*WQ1aG8V&nF$dO|+`*LsJ+{!p%)V^`-N+ES|-uV3~gzf}hMr7T&$ z+DUGCDA#Ielyd#zCV2$P5gAkd*HR|=heKnV?Nhx}*8gMiQc59cFmi>EqYYS_*{)x} zBvdI5oEE?zK-Vsh?9C6&W_Vm~RVlNt?ku>Z3!%g!NNP^6yirkMe(^+zfBv-I!yQLHSOoOyOtji=k~FD2E1z(CbN0PrOb2B;CS=(k13KnA08Vq`c)}4 zG<7Pl_4?T(`Ip1#=@m^VCmhCHtWSWPC`?W{BDVR^W)USX_&MP9cLb zP+wTz3|!sRJuA=ar-|gyBe?Z0Q?8#6lKV*EnDogWs6Ol=$E$SX}oIm38-sM&M6EPPUlmDY7q;m*$X>rXWGD*TCU0Uj3q!^O+lUD-Pprru?2Z%vYQ8?W+WsB1>PA>2Ovk zQaX$`N;zVEt)K0RQR~3?YEi>i;9A!U7@?Eav?x(LCD&UlAWlM)=UDcK~C zwvH)(m1IR-OdiT(K!V(KlX1nk6cVdD3sbz_ivu-+r;hu zjpG6u)os-AJRDN8fbtrzdR?jBrOB(S1T?DEsC?eMQAGtbs^6#_UX2`J<*xuX#x<;v z$2YylfJSAEI*iqltOFWV{f1JFrPP#ll#fb4;E~^1` zpNV+w+v473!=u{>Xywyk)blh>6?j0S$~%;+ujms>6>!7iX_Cdr|9{|eJ=MsDGdT;A zYXZIn7@K-W&X0fB_3?lkI`1@#D%RZUJ^{Jqfz54mhqrRe74OQ&gESU3zkpUKEv`_S zWpU=_+tKOOG6D`$XYy6tXHNS3yEFke%t+mPy3AgbgM0)W7Rj#n(e+;Pt3SnxODa2M zxfuh6ECVi_@)I$d3pL%+ncV3ZHiB8ReEeQ#8Su5!tzqSsHZT>gl&=Xa(B&)OhPU5s z7WY;;i-1@}np@@`xMCJv_uu%4?!sWt8C^<|+#yp~WBxlK{iPkI?=<~T^!*AIOu<|; z^|^-ehWAkpyBb?5>pU`^W<(Thjg@BLQw-zPU9vtGD=BL{V%;WU`0ugOrYkYq2O-snD-KnI@MoDgOO#<5`+6A-526Ot6H!Mz%s!+5hP|GS6B`=lIJONUm^3|PsOm(e{eU_e!e z4A{V-dY71j1W8on2^WZ0ekw-?a{wXxfTeU3BkKLaC15QF97bHgNTw748|W^d$<+`2 z?zRGwr*0$mZghl4zI=h+@wt+4+-W5d5TezHS=@$-C?G_?5$`!;B}A2FO_l#uTUv_0Wnx@L_V{X z>LnmV%~wisYM=^N@U+V|V zDW#HolxW0pc++w(U`{1e?bo7q#Gj~uMs*mq-CK?dm{ZBiXXR^1RdC2|dWaW^IE*Kn zOuKf3%ag-+uPMh+C>o|5@kXdQU*MFP^5cSUdhJW@rb?f zYMkcoOfxC_Q8{~pFA`Jddm1+Qr-OCCh2>^_*BaSHp{9h$i)ZE4ZL(Ely5+x^Z921vY=;e}GihNKkgdaiMC27)1(*L!IJTC~sPfyN16-m0 z)E0{QPmrUw(Dd`ogSmJIZA_zcNAiHbkj-8>DESDbn)^q|3#3f-OS#lrE=?v;j_8y! zHh@cMP&Q01oE95VR4VTkzbHw~C$7rwPp%qic^{7Z+ zNG%GNtlZ8GFe{Vap2|IDO?f^Of_gz!a*MyBtS`L<%e#H`-km%gWujZkf*j^*m94}0 zIw`&Xs;gzt?-zs)<4;KG4O$f*xz-y5#F=vX`38plX84^qbXX!g8&xl{Y*jGmJ@=Gvnpk>*8=)z#O^!R>pw3cEcy z4F^Npq>Sy$_0{I~O)fYsHg;NR8Oo7g`8M`D-^NrH|YUWD07sHae)+xf|0gOOH+eMVD;!FLs!&sF({dAgE*>zHG z!qw^*wH{x zn;bk%N9m?aG1|(~FgfJ(*ys`E<+9$Md}=QGgV5!-$%tng-T3@$ash7k>XmZjN4(!B zHvtJMXE)7*^o5vGICcT6CAH)WlB<-7PE$U^xFw}wa^V^DJ?q&O^OYp|l^cJO$pvS` zHXUtDvoRO5kWxBBr5io8&xq@MlIxUY?9jR!xSgJXT-KGtgH|@gqPdY zmxnx&9C{|7_-Ls}PC7HT?TD<{k|ln`FiaMl7TauS{Q?mwnwiFzRI>6+npw9g=icJl z>D*+KlvOwC0?$%+y1=u^)n~@W=Cx>DB7xX>sakj^pFb&l-I$6U(*)Vz?+(Pp--Tk4 zDKLLxC1<87CO4Trk{osp&8f$f2mb6%bPTOIC67Kc79Cn!h4+$fKXY{_&pn5srNfk~ z{md0`7L(*Z^CrHrU1a*L?bi+)R2wWQvIT_W_Udn!)9`a_0jH=P#k-AbUG1(Du$1FbZm{YOB@92p7La@34qL^I z48Ok?kgVty`;GiRzrm)w=pGwtNIATLF0PsMIge-ZE%g~O1y8f)8=x`L0ujCkC7GEX z+o50zPcd>(Yp}gNx#f9$qw9D1zb#;f@Kl%r=13(HIi0~&s0m=<7A`Co9sU?cI1hjwQ_zm%T5bWWLXPPljV1d zqH3xwKsD4^fHF^8fEw*qAgViJQ_*KyT$J9Eyz~6nHaj)kBM_n0c?9M zKvpa6P4=B1E6KSsx!DD=EpjvWCil94mFFw0X;gxm*EgYx6qYRZ-_)&={l>q2u6%5| zvm5&eDo-sbWl;6YwYn53(0H!VQ3b`pQ|W!mB&HP#n5p`&X$MBm=NnI?R$Y_HR#TIz zV?*N})2i`XfR{Ea?lC1IO|M~u&`xmb3z258k&s@*-eD7z!m*;-& z-*V0=s7^Y+^rsmaV1-v92K)*&V#58iqxba*7von|qL20ohl|XZ!w5NIa$psV_qC|S z!RWd^;WE($eZuc2U!6-yZVe(nLe-gb9wm9wq4ej}JV#|gu2r`R@Rk35#mRZmNZ)YD z3X|tk{$IX0e}&2u)jqoL*>Hu>@CDH$eZyTMmlkM1eHZ^iK>fR-F1V2$@8BDtr48Y~ z33|k_aD0J;q!e=f`E3w)mIerZi`fViQR{!=WP8Sh$`&r7GR{>bXDzBBN@_;fsY^5f z=TFK~0baey@&Hf9)-6*BZ0}zdJ>4%{Bl7zacYAm4Z!Qn-b@{=oE?;fmyqxv1+sECp zI!*ISK1Uy}femXO&BeIEzf-hLx1s)$%6STo84flNbd@0y`@@fy7cFRyXn0 z#Zum-yWFX~j(X9P?L!79m{`KQx4p}2(N7MdBDoBBU~Lz^^$I{`y0QMf-x%V`^Vm`r2teOAn!YZ5 zrwLZfH#Omkk8Cd8HILSO|6&j8D`k1Xb&9Ky*^fKnumrL@(_t~~YeV1J>}y2dQ~tea zM-2NKY6AAP)D-M%Dgj)@+Dl-$+i+(@3n)kO)u->K_Ep#n?5k0-^HnL|;j2^MUu`P& zzBk*~s-A88n$?$4``RrJ_BDK4cL-n296Gn;a0yr&N_N8!x!k1QI20ZX`e>L!JtE0VN;sw3A6XT@iKw~beSJS49^xue-MADyD z>^IUus765?(3#cI%`b(+RVRP0f*v?XfxOSqThen_dL>e< zUlN+TE_!GnG5_{;(aQtFcSkIOa<9%*)}Tku&pM*<+Nw#ycDu<4IC$9`_0lAT_G##v2Sy zPjp_X6S%0|hU+ZMtL)m3Pm@mJc!Z_dPguNgFH&+Bho1#^a_#wK9mG^TmKyaTeRa3P z{lITucK8MG)e7$Vr!}}3ujEUG-AKDyxbo-0{yupSyns+iUgTj?ee;lyfUmGPm3JVW zn%~DYdII7kZ*!`mJ1G&4g$I#pHg@i_CAboofbuT?B7Mum!aYbub~%^Y7u@(yhhGA> zyQdLBk_v)cM9dY?TmIgk)X<#$ z;MH>eXL;a3B2$4lRTE82Oou4qt56GD{*-m4js=ia4E7dy|O&Ss|AIjby?KUJlF_N;ATJQ5@ z8UP8>MOM3B!%Z1+kvB7!>P5!!S#IpY!9y)1adw;JA`9G5rQE70E4 zd^PyU-$Jj%b@trVx|<5BqNbbrlqV{_sYNZsdQ*#PL|qx0*B`VJj?pXd=jAuQR(S<{ zp}SiNzpT9drY5zqikk{BlXEu}!1(B0n#Lc4$Y$D21vtm0Du^@DWQYhhVPvmaQ-vV< zQleNw^=BY)s^C95Qot`DER-?{!KM#rCU z_3}Tef4Q5he_RV7ePjLQ!L{Kc9b9{PYtcpB@ez>67Cnv2Q_ZLKK}P}){Ot<5T7yUI zhmZ=P6a5s)Al$zkjvS^2xYM3&K4tV#qs6T1H}d;6YTw=HOE%s!Mjv^@)$0@p1TnB5 zD!a2ro>T)=O>$?3ypQPge>s}tgMZ4ZJKFP7&;^aIY3(<19Uz@GGn(HA@@SoR>c5HS zORDdt`UnL(?L|hZN)tZFVX6i?(M7jv?&w}d*E27x0D@062lD53URS}U+BZd_I;#|x zX~G|g3Pj6HRKE?0impT|q6V29hAOB`65THP#qe;suK8=Z;zkrp6Yc6a`ax*T8_Tv) zH=S!5w|^r?D{9a%#jIXtr@#JOJ*d6RPxV)#_q-7>i_07ew{^%ZoT$MM|44whR@`qz@inLs=mS< zu6+Wu47vi>B&sh@qJ1Rr9qLg*1y>Mgk9tIhjeexHqw5&`ELWGRzt`w@xtbDvKS>i# zB*YNi-0IV-JG!OS$DUz*P{nA)7NW}%@Th~fxabeLeIr`&j3%6i zghVS|5&fTVz`H67L96|)=q+!C%O(HDI&xE_=t0f$pgz%gjD8Kli%v8;%i7;&^q6RG zhKVf7B48r5P#(XB;7cf_b<(bY(jQe2+s)sf-*d$)(y0;8n^AxY?2qqimpL$dga zB#jqGq%XRiNa$C32SeI$4;g(YXY+9m7C(?#Dk7IGM0z3a`TBTt(Wvmf#YbdQ5#&sK zPryI9XJ$u(qr>HjZdGBP80*GN99UV|(K@5Un@a3IL0$g6)Tvy~X-M~>9J?o?w~h&q zu9b390~0ii^T3nDLLMNNoaq4$#HAjnz>zMnBl_)_aMN(te*K;wkT9S}{{abI6NdC3 z%DDZ9CUo!7tq(UDyC?MO@lubp0%OBJb7v)xK)mor+U2+KFQIkkqb1)7-xfM^KAQYa zxNT$>+eQrg7gzoTlz;J5x2n59`cDa$pZ(e8{x2!|*Z(K%;;FoybpFMZT}TDi*(a5n zaZ^Mmq1~N{{ByB%iVyJU1WUq5m1l65MY(^0G=#e-(u#ipRJVaUVEk*EPr3V|`XhGm z+|Sjb=$3Xc`PV!Cwa)Zpy{*GZ_$x=J9CSlEDDS|JYAN^cPL`sf=u&KHXmOp!V!VLxCmB$jqRzt zEmu~`_cMX^dmcI}|AG$6zqfoT_1dl%-(zLNQ69BtFgW!S~{TZ@;e6bMe4wg0U&}@_-k5ICW%x@EQ-d z$Swrl?%}F6ih{ovj!POev;@R&9`VrLL!}|Ec*NPbN(oOujU7(A94Y-q4G2R`^{9ka z^LE`1HQ%G!@5~jh1ogQ`{hGYJcU7ouqH-p6YqxfDb;tuA89(g(x}|GF{yIEu*hF4; zjAV?andg{1pxZMBK^q>Uus<(FSpDi zl3p$F=i`Co^&)blY@RvnZC10}t6Km3*^%Ku@{eBC*iM6*bz@CuJ*xYh<)3BYJBPoe zZrNjE!&}C3*&-@ufo@ehZ|TkIW_Vi&R+@tobFta@XS>nc6Vf3ZgH+agLPm6ZGYia zJ6!l7{OB5oAy4_+-*34T~NpH z>!?6jc2SlI>Kd+w3hEg?isXc4BYk0@zTtO~Py@qvq5{RpYV!^%5RS-rHZp-OaD;O) z(0zuVL`1?es!FJ!q2YItL?gosVL(_0mJI_*hF?Sl$%bpAg2sk-B2i%(Vb8C5w%^2v zS*W0?;ospvSjO3i4$Tbz1_$>W-ib(sWvFXVL36`hkx&c6JyC&h0_ivmv^3lY6}0j& z`mYQJ|FVhR&H9PxvbLmSYY(4|$IA;j>(ul9bn2H9n!3G9LBk2vKl29UafHPAt& zBM#?e&=Zqgo4de;7rXKwnBWs8P~UjQS)b*~tAlHucepqB$Zpr>P4N5$u6z!7)#ZpI zwn7x+F`y=vKbUybb&xJc%yi|W!N0)0Cfh|C$fpW~e_$;tsmLyCZNgZkek%1@1J*;aC<_(QrZV#$R2B%HTyN#{0nAX1n&C!8=ih z7W5)`7itxL4V*R4wRsEtrxSZ%Cio*3$B*rCAq){QJ*@*@w3TiHk3sBea~#}yy2ElZ zC#N{9ZT6VigbZyb2b0>rN*bH$@Dy;y0f#q$e_QAl_nqzyFEO2EQPF&*Yjg@c*>rXp zJl5<$;;pjZwc&l=K!zDwdGJaG)x>%VFwk^d1)O`XE3XdTch2G3;9M(Y;OxT;#NN$1 zWP-~XH^;$WOm!X3f@fh9n&2XMkQt+l?jzbr)CItaru!1$CO^9NWz^=R!*_whW)pS6 zxgw^^B#2*af=9qx%(%LMN3l3f&#pjR|z~b>L!z8`NbAg4Llk@p>bsGkJ%#Ra0ZzwYl64hF4HcEbThHa6+Y7$KIMD8R%_flJD*3US_%wKwZ8`0lCcm46z&lL3e}U7Su}12=)K>}DM0 zQ_Wz9BduEOR@!qBT-{P{$n9K5#)hE#+jM zvc(+-|9Z|%pyT_9abF#r-=tL^JlPCT_>y;`vi}-EY#{W~>J$Y%W&T`F>AZ0%r}U#m zN(vyST5zGT?3l#|3c2_iX^-Px;1oQmxPOV%AF0TDD!?gchWRr1K*UZhd9f|%LyH(q z8g7<97CePE8t8perdjxh;L=#K+AkqZFfQfkPNGVcuO;b z1B-|X=+WU0({~Xn8W@%vo;|}2Dm=}&QJ}HY4k5Ycx9wz8)O)K*QLg&0G$)}uz%SaE z3QS^s2L=8?3u1mRIDE+*jv|)ch*9E|KflN#gcbFkw!JRg(T-sG`Ko4U!l~x}<@58P zK1oPEe}he23tZiHhv)x$n1{NXinGR<&VmsZk}En&M;)?W;a9wE!^0GCInH}cAY7O& zDy;LOB*x|AxJ<`@LiOpkh$G;lVA@0iI!Mmpq0~Y6m~o&(rLB1`;p(yQ%%@(5O{fpiExW$F;_{n_>M z6ULbirz2)`!Us@+4i&|KgYCrAp;hUi8(%ojB!_iqU7Kb&08J&=?t#pfP0>0C9tkd#w7OlQIEw`9+dq^1Rs$3^$zz#WZZw7l1{5=a2GYVch%TLJvi+BzrQpIubPCMCzKeD?ax_jB! z{I(*TGkYBe!oxjF))$&^G8)#U*58xdn2L7pGouquHuVWdQZKnijUYB-P+EkdpjPJR zh3DFFtlMr+!ll|MIvR_#Bx>PLt-T_pBy&o_b8TYbl9M12N4EN8!{_ zGe%weePafw8w&~ORh^$84gSb2q8GS~oe?jBr`h5Za&2VmYH{P3OJ6yMD0_h|05Qa>WcLl)A17UM3cmq;9qS5#dizr1QQ-*i(3ocgGe=~Zn5;Y zi52%9#7nAt7ips{Lih`IO(#_-20UmUEfYM#CJ^3-O{k4x!?5iL;aSFk@D}V67w0Y##);;^KUjX@sN2cz7 zvqSBdAzz=N#wl5K2X9P;}JZztJ|3G`}xVE61t>vFFN_0h}a%Gb|mwv;3vW(_C>)HJ)BXf8+fLNQ$|z+ zuN01X?h?--H+gXMM&NfIOnMi1Ofb|DbiqT3ppi2vTb+1D`zvk2PvJU+LR+^+)6a*$ zk1R~5>fdE26>!h9yR~x+WL#pMHe8$|6Mv*+R; z5mV^V(8TI4?^N482s^ykjlcRS_v|Tyya??gN0aQOtnu#oc1ljSfF0A^s|q7|2V4Vg zhR#7giV1U**J$eo7-kDtd)}3QU&rxmi;Ov9$f&IBs?kU_BKEYa)@>P`U zIm2P2OEq!NtoBkaTYkN@p474R+Wz4B404owVQ)THSmGE1Kz{2#X|$$gRZMB-1DeOOjw-yJ?C8i&u23(^9O!v=sFIv z3Ccbk@E+^!W&$l_BDp%2V<0^$iZAW*wUlciyBJ6le}(AvB<8Vq-FT0WcX=OjNp^f~ zCz0pL%R?VvyoerTE<3L5N8SGCCMv%5Db+i?*LtbJU6r!G92CBO5U7Y z3wfMe3+`w6TyiaFljT2>-w9o@rCV72mUijai z%5I__yxOLTmLMt_+YxL-^ddwqQE&XqP5cA7I8Q^ATHt=#tNsG-+o=73?vAmEgOE{TS?wSul0@>bEA&`sNj^8gSMg4l`*%6(@08OmZ2Kw4 z(Lr{BR8*>(li-{pZb3PjSQ2Q)J9$#^Hu}pZA{%+ZMx3XnIIBNn9PNJ0ak%lE+Z_>J z8I{P}nxw{}5^=cisH?wN$@~E?3VA( zC+gFPT*lhEn^X02&qK2RzJ1sg^ui;_Xc|p+BAS3`m~VR*}wnyF>KyQD7zekSn@mddVmFx{-IahJjfjn#)NK6 z+3R8AamsE;>YKfR@_v*njl7=b{t^l$1oR(m7fgILvSL(hNGWL(8r+6}_r`|Sq`M^i z|4r+b#fFspem7#jOu5Y)3C;X>>_15r#rwJeZtS@3h3f+jqRogIE}i)#Hl(DsFU)so zCi#An#tICG4c)pZHq?T2XjN>ez-pJPeGHZm6NsjV63^z%LA;=}cU~~GH@Yn*u}Kbn zL_c44^l(gK$>^Dw#Q3n^=Gu3`ke?nZ8we@wz~z&oM`997l;8PiAar9=gSl+Oe^PXO zY+~Wtr&8pnCMDgj)=t-%bI<8O=prtr(CKJ;Y~trFuO5PzA7VqwW69$Ui_QZM(no$U zmUMi4F!T}r?X7}=5Ty5VkIuaUe0C{2x+5;}!3KJnb_$N;f2G<_2Se$-f+2m%u@Xt2 ze7t9Jw0(}m+skf!AsEtoX*cG=j*d>wkyxS3(h0m2Gm)2DZb-$!w~`7*_vJ`@qs(Z$ z?;$?p*sWa9OV76nhLl9FjJ}dHF&yc71p(g@3@O))?GTi(($qyR&zR)$=Mm_Q^}Fr~ zgnq~Wu0T1;U(Fp1ePUSjGB9#!L|Pk2e&-ZH{*1a=BKgZ&yW^h7GifE_6DO4lEu9%% l7EUZ2+B!3Bb2zbOsQiEXxGFaRyua3b%57e>`t6C2{2x>AKpFr5 delta 436299 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%0Ag}3&w3?5_hsyFt4P`IQCFGM_~5M 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

X7f65DtJmc0xMk-5wijKFwzYb)^ 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%0D>PNkkce*?B*z_}VfTPVJ_D~!Pqte>u?*q>;e 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𝔱OeUuDiHKR=4VA$1(G|O|pu`6MBq;Qqk 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 Date: Mon, 30 Jan 2023 18:22:50 +0100 Subject: [PATCH 10/65] link: make MachO atoms fully owned by the linker --- src/Module.zig | 12 +- src/Sema.zig | 2 +- src/arch/aarch64/CodeGen.zig | 38 +- src/arch/aarch64/Emit.zig | 10 +- src/arch/riscv64/CodeGen.zig | 4 +- src/arch/x86_64/CodeGen.zig | 31 +- src/arch/x86_64/Emit.zig | 8 +- src/link.zig | 4 +- src/link/Dwarf.zig | 2 +- src/link/MachO.zig | 719 ++++++++++++++++++---------------- src/link/MachO/Atom.zig | 81 ++-- src/link/MachO/Relocation.zig | 16 +- 12 files changed, 495 insertions(+), 432 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index dcdbeec322..8301505492 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -4098,7 +4098,7 @@ pub fn ensureDeclAnalyzed(mod: *Module, decl_index: Decl.Index) SemaError!void { // The exports this Decl performs will be re-discovered, so we remove them here // prior to re-analysis. - mod.deleteDeclExports(decl_index); + try mod.deleteDeclExports(decl_index); // Similarly, `@setAlignStack` invocations will be re-discovered. if (decl.getFunction()) |func| { @@ -5265,7 +5265,7 @@ pub fn clearDecl( assert(emit_h.decl_table.swapRemove(decl_index)); } _ = mod.compile_log_decls.swapRemove(decl_index); - mod.deleteDeclExports(decl_index); + try mod.deleteDeclExports(decl_index); if (decl.has_tv) { if (decl.ty.isFnOrHasRuntimeBits()) { @@ -5276,7 +5276,7 @@ pub fn clearDecl( decl.link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = link.File.Coff.Atom.empty }, .elf => .{ .elf = link.File.Elf.TextBlock.empty }, - .macho => .{ .macho = link.File.MachO.Atom.empty }, + .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, @@ -5358,7 +5358,7 @@ pub fn abortAnonDecl(mod: *Module, decl_index: Decl.Index) void { /// Delete all the Export objects that are caused by this Decl. Re-analysis of /// this Decl will cause them to be re-created (or not). -fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) void { +fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) Allocator.Error!void { var export_owners = (mod.export_owners.fetchSwapRemove(decl_index) orelse return).value; for (export_owners.items) |exp| { @@ -5384,7 +5384,7 @@ fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) void { elf.deleteExport(exp.link.elf); } if (mod.comp.bin_file.cast(link.File.MachO)) |macho| { - macho.deleteExport(exp.link.macho); + try macho.deleteDeclExport(decl_index, exp.options.name); } if (mod.comp.bin_file.cast(link.File.Wasm)) |wasm| { wasm.deleteExport(exp.link.wasm); @@ -5696,7 +5696,7 @@ pub fn allocateNewDecl( .link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = link.File.Coff.Atom.empty }, .elf => .{ .elf = link.File.Elf.TextBlock.empty }, - .macho => .{ .macho = link.File.MachO.Atom.empty }, + .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, diff --git a/src/Sema.zig b/src/Sema.zig index 9c553a0092..9083cc92ab 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5567,7 +5567,7 @@ pub fn analyzeExport( .link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = .{} }, .elf => .{ .elf = .{} }, - .macho => .{ .macho = .{} }, + .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = null }, .c => .{ .c = {} }, .wasm => .{ .wasm = .{} }, diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index 0efd34937a..edbe7905a2 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -4022,7 +4022,11 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type const mod = self.bin_file.options.module.?; const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { - .macho => owner_decl.link.macho.getSymbolIndex().?, + .macho => blk: { + const macho_file = self.bin_file.cast(link.File.MachO).?; + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk macho_file.getAtom(atom).getSymbolIndex().?; + }, .coff => owner_decl.link.coff.getSymbolIndex().?, else => unreachable, // unsupported target format }; @@ -4308,11 +4312,12 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier const got_addr = @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); try self.genSetReg(Type.initTag(.usize), .x30, .{ .memory = got_addr }); } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { - try fn_owner_decl.link.macho.ensureInitialized(macho_file); + const atom = try macho_file.getOrCreateAtomForDecl(func.owner_decl); + const sym_index = macho_file.getAtom(atom).getSymbolIndex().?; try self.genSetReg(Type.initTag(.u64), .x30, .{ .linker_load = .{ .type = .got, - .sym_index = fn_owner_decl.link.macho.getSymbolIndex().?, + .sym_index = sym_index, }, }); } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { @@ -4349,11 +4354,13 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.bin_file.cast(link.File.MachO)) |macho_file| { const sym_index = try macho_file.getGlobalSymbol(mem.sliceTo(decl_name, 0)); + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + const atom_index = macho_file.getAtom(atom).getSymbolIndex().?; _ = try self.addInst(.{ .tag = .call_extern, .data = .{ .relocation = .{ - .atom_index = mod.declPtr(self.mod_fn.owner_decl).link.macho.getSymbolIndex().?, + .atom_index = atom_index, .sym_index = sym_index, }, }, @@ -5491,7 +5498,11 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro const mod = self.bin_file.options.module.?; const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { - .macho => owner_decl.link.macho.getSymbolIndex().?, + .macho => blk: { + const macho_file = self.bin_file.cast(link.File.MachO).?; + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk macho_file.getAtom(atom).getSymbolIndex().?; + }, .coff => owner_decl.link.coff.getSymbolIndex().?, else => unreachable, // unsupported target format }; @@ -5605,7 +5616,11 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void const mod = self.bin_file.options.module.?; const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { - .macho => owner_decl.link.macho.getSymbolIndex().?, + .macho => blk: { + const macho_file = self.bin_file.cast(link.File.MachO).?; + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk macho_file.getAtom(atom).getSymbolIndex().?; + }, .coff => owner_decl.link.coff.getSymbolIndex().?, else => unreachable, // unsupported target format }; @@ -5799,7 +5814,11 @@ fn genSetStackArgument(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) I const mod = self.bin_file.options.module.?; const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { - .macho => owner_decl.link.macho.getSymbolIndex().?, + .macho => blk: { + const macho_file = self.bin_file.cast(link.File.MachO).?; + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk macho_file.getAtom(atom).getSymbolIndex().?; + }, .coff => owner_decl.link.coff.getSymbolIndex().?, else => unreachable, // unsupported target format }; @@ -6122,10 +6141,11 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne try decl.link.elf.ensureInitialized(elf_file); return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { - try decl.link.macho.ensureInitialized(macho_file); + const atom = try macho_file.getOrCreateAtomForDecl(decl_index); + const sym_index = macho_file.getAtom(atom).getSymbolIndex().?; return MCValue{ .linker_load = .{ .type = .got, - .sym_index = decl.link.macho.getSymbolIndex().?, + .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { try decl.link.coff.ensureInitialized(coff_file); diff --git a/src/arch/aarch64/Emit.zig b/src/arch/aarch64/Emit.zig index 3812597789..f348fb70e3 100644 --- a/src/arch/aarch64/Emit.zig +++ b/src/arch/aarch64/Emit.zig @@ -670,9 +670,9 @@ fn mirCallExtern(emit: *Emit, inst: Mir.Inst.Index) !void { if (emit.bin_file.cast(link.File.MachO)) |macho_file| { // Add relocation to the decl. - const atom = macho_file.getAtomForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; + const atom_index = macho_file.getAtomIndexForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; const target = macho_file.getGlobalByIndex(relocation.sym_index); - try atom.addRelocation(macho_file, .{ + try link.File.MachO.Atom.addRelocation(macho_file, atom_index, .{ .type = @enumToInt(std.macho.reloc_type_arm64.ARM64_RELOC_BRANCH26), .target = target, .offset = offset, @@ -883,10 +883,10 @@ fn mirLoadMemoryPie(emit: *Emit, inst: Mir.Inst.Index) !void { } if (emit.bin_file.cast(link.File.MachO)) |macho_file| { - const atom = macho_file.getAtomForSymbol(.{ .sym_index = data.atom_index, .file = null }).?; + const atom_index = macho_file.getAtomIndexForSymbol(.{ .sym_index = data.atom_index, .file = null }).?; // TODO this causes segfault in stage1 // try atom.addRelocations(macho_file, 2, .{ - try atom.addRelocation(macho_file, .{ + try link.File.MachO.Atom.addRelocation(macho_file, atom_index, .{ .target = .{ .sym_index = data.sym_index, .file = null }, .offset = offset, .addend = 0, @@ -902,7 +902,7 @@ fn mirLoadMemoryPie(emit: *Emit, inst: Mir.Inst.Index) !void { else => unreachable, }, }); - try atom.addRelocation(macho_file, .{ + try link.File.MachO.Atom.addRelocation(macho_file, atom_index, .{ .target = .{ .sym_index = data.sym_index, .file = null }, .offset = offset + 4, .addend = 0, diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index d50a614206..07a8dcd858 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -2556,9 +2556,7 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne try decl.link.elf.ensureInitialized(elf_file); return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |_| { - // TODO I'm hacking my way through here by repurposing .memory for storing - // index to the GOT target symbol index. - return MCValue{ .memory = decl.link.macho.sym_index }; + unreachable; } else if (self.bin_file.cast(link.File.Coff)) |_| { return self.fail("TODO codegen COFF const Decl pointer", .{}); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index df24fe5e7d..fc244e3130 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -2670,10 +2670,12 @@ fn loadMemPtrIntoRegister(self: *Self, reg: Register, ptr_ty: Type, ptr: MCValue const abi_size = @intCast(u32, ptr_ty.abiSize(self.target.*)); const mod = self.bin_file.options.module.?; const fn_owner_decl = mod.declPtr(self.mod_fn.owner_decl); - const atom_index = if (self.bin_file.tag == link.File.MachO.base_tag) - fn_owner_decl.link.macho.getSymbolIndex().? - else - fn_owner_decl.link.coff.getSymbolIndex().?; + const atom_index = if (self.bin_file.cast(link.File.MachO)) |macho_file| blk: { + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk macho_file.getAtom(atom).getSymbolIndex().?; + } else if (self.bin_file.cast(link.File.Coff)) |_| blk: { + break :blk fn_owner_decl.link.coff.getSymbolIndex().?; + } else unreachable; const flags: u2 = switch (load_struct.type) { .got => 0b00, .direct => 0b01, @@ -4023,8 +4025,8 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier .data = undefined, }); } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { - try fn_owner_decl.link.macho.ensureInitialized(macho_file); - const sym_index = fn_owner_decl.link.macho.getSymbolIndex().?; + const atom_index = try macho_file.getOrCreateAtomForDecl(func.owner_decl); + const sym_index = macho_file.getAtom(atom_index).getSymbolIndex().?; try self.genSetReg(Type.initTag(.usize), .rax, .{ .linker_load = .{ .type = .got, @@ -4080,15 +4082,15 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier }); } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { const sym_index = try macho_file.getGlobalSymbol(mem.sliceTo(decl_name, 0)); + const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + const atom_index = macho_file.getAtom(atom).getSymbolIndex().?; _ = try self.addInst(.{ .tag = .call_extern, .ops = undefined, - .data = .{ - .relocation = .{ - .atom_index = mod.declPtr(self.mod_fn.owner_decl).link.macho.getSymbolIndex().?, - .sym_index = sym_index, - }, - }, + .data = .{ .relocation = .{ + .atom_index = atom_index, + .sym_index = sym_index, + } }, }); } else { return self.fail("TODO implement calling extern functions", .{}); @@ -6722,10 +6724,11 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne try decl.link.elf.ensureInitialized(elf_file); return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { - try decl.link.macho.ensureInitialized(macho_file); + const atom_index = try macho_file.getOrCreateAtomForDecl(decl_index); + const sym_index = macho_file.getAtom(atom_index).getSymbolIndex().?; return MCValue{ .linker_load = .{ .type = .got, - .sym_index = decl.link.macho.getSymbolIndex().?, + .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { try decl.link.coff.ensureInitialized(coff_file); diff --git a/src/arch/x86_64/Emit.zig b/src/arch/x86_64/Emit.zig index af3ed5e053..980dbfd41e 100644 --- a/src/arch/x86_64/Emit.zig +++ b/src/arch/x86_64/Emit.zig @@ -1001,8 +1001,8 @@ fn mirLeaPic(emit: *Emit, inst: Mir.Inst.Index) InnerError!void { 0b01 => @enumToInt(std.macho.reloc_type_x86_64.X86_64_RELOC_SIGNED), else => unreachable, }; - const atom = macho_file.getAtomForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; - try atom.addRelocation(macho_file, .{ + const atom_index = macho_file.getAtomIndexForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; + try link.File.MachO.Atom.addRelocation(macho_file, atom_index, .{ .type = reloc_type, .target = .{ .sym_index = relocation.sym_index, .file = null }, .offset = @intCast(u32, end_offset - 4), @@ -1140,9 +1140,9 @@ fn mirCallExtern(emit: *Emit, inst: Mir.Inst.Index) InnerError!void { if (emit.bin_file.cast(link.File.MachO)) |macho_file| { // Add relocation to the decl. - const atom = macho_file.getAtomForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; + const atom_index = macho_file.getAtomIndexForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; const target = macho_file.getGlobalByIndex(relocation.sym_index); - try atom.addRelocation(macho_file, .{ + try link.File.MachO.Atom.addRelocation(macho_file, atom_index, .{ .type = @enumToInt(std.macho.reloc_type_x86_64.X86_64_RELOC_BRANCH), .target = target, .offset = offset, diff --git a/src/link.zig b/src/link.zig index 668c5b72e3..2a96efe89d 100644 --- a/src/link.zig +++ b/src/link.zig @@ -264,7 +264,7 @@ pub const File = struct { pub const LinkBlock = union { elf: Elf.TextBlock, coff: Coff.Atom, - macho: MachO.Atom, + macho: void, plan9: Plan9.DeclBlock, c: void, wasm: Wasm.DeclBlock, @@ -286,7 +286,7 @@ pub const File = struct { pub const Export = union { elf: Elf.Export, coff: Coff.Export, - macho: MachO.Export, + macho: void, plan9: Plan9.Export, c: void, wasm: Wasm.Export, diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 1b65bbb04b..2595cd8ba5 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -2639,7 +2639,7 @@ fn getDbgInfoAtom(tag: File.Tag, mod: *Module, decl_index: Module.Decl.Index) *A const decl = mod.declPtr(decl_index); return switch (tag) { .elf => &decl.link.elf.dbg_info_atom, - .macho => &decl.link.macho.dbg_info_atom, + .macho => unreachable, .wasm => &decl.link.wasm.dbg_info_atom, else => unreachable, }; diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 543cb473d7..29aed25b31 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -66,7 +66,7 @@ const Section = struct { // TODO is null here necessary, or can we do away with tracking via section // size in incremental context? - last_atom: ?*Atom = null, + last_atom_index: ?Atom.Index = null, /// A list of atoms that have surplus capacity. This list can have false /// positives, as functions grow and shrink over time, only sometimes being added @@ -83,7 +83,7 @@ const Section = struct { /// overcapacity can be negative. A simple way to have negative overcapacity is to /// allocate a fresh atom, which will have ideal capacity, and then grow it /// by 1 byte. It will then have -1 overcapacity. - free_list: std.ArrayListUnmanaged(*Atom) = .{}, + free_list: std.ArrayListUnmanaged(Atom.Index) = .{}, }; base: File, @@ -140,8 +140,8 @@ locals_free_list: std.ArrayListUnmanaged(u32) = .{}, globals_free_list: std.ArrayListUnmanaged(u32) = .{}, dyld_stub_binder_index: ?u32 = null, -dyld_private_atom: ?*Atom = null, -stub_helper_preamble_atom: ?*Atom = null, +dyld_private_atom_index: ?Atom.Index = null, +stub_helper_preamble_atom_index: ?Atom.Index = null, strtab: StringTable(.strtab) = .{}, @@ -164,10 +164,10 @@ segment_table_dirty: bool = false, cold_start: bool = true, /// List of atoms that are either synthetic or map directly to the Zig source program. -managed_atoms: std.ArrayListUnmanaged(*Atom) = .{}, +atoms: std.ArrayListUnmanaged(Atom) = .{}, /// Table of atoms indexed by the symbol index. -atom_by_index_table: std.AutoHashMapUnmanaged(u32, *Atom) = .{}, +atom_by_index_table: std.AutoHashMapUnmanaged(u32, Atom.Index) = .{}, /// Table of unnamed constants associated with a parent `Decl`. /// We store them here so that we can free the constants whenever the `Decl` @@ -210,11 +210,36 @@ bindings: BindingTable = .{}, /// this will be a table indexed by index into the list of Atoms. lazy_bindings: BindingTable = .{}, -/// Table of Decls that are currently alive. -/// We store them here so that we can properly dispose of any allocated -/// memory within the atom in the incremental linker. -/// TODO consolidate this. -decls: std.AutoArrayHashMapUnmanaged(Module.Decl.Index, ?u8) = .{}, +/// Table of tracked Decls. +decls: std.AutoArrayHashMapUnmanaged(Module.Decl.Index, DeclMetadata) = .{}, + +const DeclMetadata = struct { + atom: Atom.Index, + section: u8, + /// A list of all exports aliases of this Decl. + /// TODO do we actually need this at all? + exports: std.ArrayListUnmanaged(u32) = .{}, + + fn getExport(m: DeclMetadata, macho_file: *const MachO, name: []const u8) ?u32 { + for (m.exports.items) |exp| { + if (mem.eql(u8, name, macho_file.getSymbolName(.{ + .sym_index = exp, + .file = null, + }))) return exp; + } + return null; + } + + fn getExportPtr(m: *DeclMetadata, macho_file: *MachO, name: []const u8) ?*u32 { + for (m.exports.items) |*exp| { + if (mem.eql(u8, name, macho_file.getSymbolName(.{ + .sym_index = exp.*, + .file = null, + }))) return exp; + } + return null; + } +}; const Entry = struct { target: SymbolWithLoc, @@ -229,8 +254,8 @@ const Entry = struct { return macho_file.getSymbolPtr(.{ .sym_index = entry.sym_index, .file = null }); } - pub fn getAtom(entry: Entry, macho_file: *MachO) ?*Atom { - return macho_file.getAtomForSymbol(.{ .sym_index = entry.sym_index, .file = null }); + pub fn getAtomIndex(entry: Entry, macho_file: *MachO) ?Atom.Index { + return macho_file.getAtomIndexForSymbol(.{ .sym_index = entry.sym_index, .file = null }); } pub fn getName(entry: Entry, macho_file: *MachO) []const u8 { @@ -238,10 +263,10 @@ const Entry = struct { } }; -const BindingTable = std.AutoArrayHashMapUnmanaged(*Atom, std.ArrayListUnmanaged(Atom.Binding)); -const UnnamedConstTable = std.AutoArrayHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(*Atom)); -const RebaseTable = std.AutoArrayHashMapUnmanaged(*Atom, std.ArrayListUnmanaged(u32)); -const RelocationTable = std.AutoArrayHashMapUnmanaged(*Atom, std.ArrayListUnmanaged(Relocation)); +const BindingTable = std.AutoArrayHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(Atom.Binding)); +const UnnamedConstTable = std.AutoArrayHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(Atom.Index)); +const RebaseTable = std.AutoArrayHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(u32)); +const RelocationTable = std.AutoArrayHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(Relocation)); const PendingUpdate = union(enum) { resolve_undef: u32, @@ -286,10 +311,6 @@ pub const default_pagezero_vmsize: u64 = 0x100000000; /// potential future extensions. pub const default_headerpad_size: u32 = 0x1000; -pub const Export = struct { - sym_index: ?u32 = null, -}; - pub fn openPath(allocator: Allocator, options: link.Options) !*MachO { assert(options.target.ofmt == .macho); @@ -451,9 +472,9 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No const module = self.base.options.module orelse return error.LinkingWithoutZigSourceUnimplemented; - if (self.d_sym) |*d_sym| { - try d_sym.dwarf.flushModule(module); - } + // if (self.d_sym) |*d_sym| { + // try d_sym.dwarf.flushModule(module); + // } var libs = std.StringArrayHashMap(link.SystemLib).init(arena); try resolveLibSystem( @@ -547,8 +568,8 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No try self.allocateSpecialSymbols(); - for (self.relocs.keys()) |atom| { - try atom.resolveRelocations(self); + for (self.relocs.keys()) |atom_index| { + try Atom.resolveRelocations(self, atom_index); } if (build_options.enable_logging) { @@ -643,10 +664,10 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No try self.writeCodeSignature(comp, csig); // code signing always comes last } - if (self.d_sym) |*d_sym| { - // Flush debug symbols bundle. - try d_sym.flushModule(self); - } + // if (self.d_sym) |*d_sym| { + // // Flush debug symbols bundle. + // try d_sym.flushModule(self); + // } // if (build_options.enable_link_snapshots) { // if (self.base.options.enable_link_snapshots) @@ -999,18 +1020,19 @@ pub fn parseDependentLibs(self: *MachO, syslibroot: ?[]const u8, dependent_libs: } } -pub fn writeAtom(self: *MachO, atom: *Atom, code: []const u8) !void { +pub fn writeAtom(self: *MachO, atom_index: Atom.Index, code: []const u8) !void { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const section = self.sections.get(sym.n_sect - 1); const file_offset = section.header.offset + sym.n_value - section.header.addr; log.debug("writing atom for symbol {s} at file offset 0x{x}", .{ atom.getName(self), file_offset }); try self.base.file.?.pwriteAll(code, file_offset); - try atom.resolveRelocations(self); + try Atom.resolveRelocations(self, atom_index); } -fn writePtrWidthAtom(self: *MachO, atom: *Atom) !void { +fn writePtrWidthAtom(self: *MachO, atom_index: Atom.Index) !void { var buffer: [@sizeOf(u64)]u8 = [_]u8{0} ** @sizeOf(u64); - try self.writeAtom(atom, &buffer); + try self.writeAtom(atom_index, &buffer); } fn markRelocsDirtyByTarget(self: *MachO, target: SymbolWithLoc) void { @@ -1026,7 +1048,8 @@ fn markRelocsDirtyByTarget(self: *MachO, target: SymbolWithLoc) void { fn markRelocsDirtyByAddress(self: *MachO, addr: u64) void { for (self.relocs.values()) |*relocs| { for (relocs.items) |*reloc| { - const target_atom = reloc.getTargetAtom(self) orelse continue; + const target_atom_index = reloc.getTargetAtomIndex(self) orelse continue; + const target_atom = self.getAtom(target_atom_index); const target_sym = target_atom.getSymbol(self); if (target_sym.n_value < addr) continue; reloc.dirty = true; @@ -1053,26 +1076,39 @@ pub fn allocateSpecialSymbols(self: *MachO) !void { } } -pub fn createGotAtom(self: *MachO, target: SymbolWithLoc) !*Atom { +pub fn createAtom(self: *MachO) !Atom.Index { const gpa = self.base.allocator; + const atom_index = @intCast(Atom.Index, self.atoms.items.len); + const atom = try self.atoms.addOne(gpa); + const sym_index = try self.allocateSymbol(); + try self.atom_by_index_table.putNoClobber(gpa, sym_index, atom_index); + atom.* = .{ + .sym_index = sym_index, + .file = null, + .size = 0, + .alignment = 0, + .prev_index = null, + .next_index = null, + .dbg_info_atom = undefined, + }; + log.debug("creating ATOM(%{d}) at index {d}", .{ sym_index, atom_index }); + return atom_index; +} - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); +pub fn createGotAtom(self: *MachO, target: SymbolWithLoc) !Atom.Index { + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = @sizeOf(u64); atom.alignment = @alignOf(u64); - errdefer gpa.destroy(atom); - - try self.managed_atoms.append(gpa, atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; sym.n_sect = self.got_section_index.? + 1; - sym.n_value = try self.allocateAtom(atom, atom.size, @alignOf(u64)); + sym.n_value = try self.allocateAtom(atom_index, atom.size, @alignOf(u64)); log.debug("allocated GOT atom at 0x{x}", .{sym.n_value}); - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = switch (self.base.options.target.cpu.arch) { .aarch64 => @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_UNSIGNED), .x86_64 => @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_UNSIGNED), @@ -1087,45 +1123,39 @@ pub fn createGotAtom(self: *MachO, target: SymbolWithLoc) !*Atom { const target_sym = self.getSymbol(target); if (target_sym.undf()) { - try atom.addBinding(self, .{ + try Atom.addBinding(self, atom_index, .{ .target = self.getGlobal(self.getSymbolName(target)).?, .offset = 0, }); } else { - try atom.addRebase(self, 0); + try Atom.addRebase(self, atom_index, 0); } - return atom; + return atom_index; } pub fn createDyldPrivateAtom(self: *MachO) !void { if (self.dyld_stub_binder_index == null) return; - if (self.dyld_private_atom != null) return; + if (self.dyld_private_atom_index != null) return; - const gpa = self.base.allocator; - - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = @sizeOf(u64); atom.alignment = @alignOf(u64); - errdefer gpa.destroy(atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; sym.n_sect = self.data_section_index.? + 1; - self.dyld_private_atom = atom; + self.dyld_private_atom_index = atom_index; - try self.managed_atoms.append(gpa, atom); - - sym.n_value = try self.allocateAtom(atom, atom.size, @alignOf(u64)); + sym.n_value = try self.allocateAtom(atom_index, atom.size, @alignOf(u64)); log.debug("allocated dyld_private atom at 0x{x}", .{sym.n_value}); - try self.writePtrWidthAtom(atom); + try self.writePtrWidthAtom(atom_index); } pub fn createStubHelperPreambleAtom(self: *MachO) !void { if (self.dyld_stub_binder_index == null) return; - if (self.stub_helper_preamble_atom != null) return; + if (self.stub_helper_preamble_atom_index != null) return; const gpa = self.base.allocator; const arch = self.base.options.target.cpu.arch; @@ -1134,22 +1164,23 @@ pub fn createStubHelperPreambleAtom(self: *MachO) !void { .aarch64 => 6 * @sizeOf(u32), else => unreachable, }; - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = size; atom.alignment = switch (arch) { .x86_64 => 1, .aarch64 => @alignOf(u32), else => unreachable, }; - errdefer gpa.destroy(atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; sym.n_sect = self.stub_helper_section_index.? + 1; - const dyld_private_sym_index = self.dyld_private_atom.?.getSymbolIndex().?; + const dyld_private_sym_index = if (self.dyld_private_atom_index) |dyld_index| + self.getAtom(dyld_index).getSymbolIndex().? + else + unreachable; const code = try gpa.alloc(u8, size); defer gpa.free(code); @@ -1168,7 +1199,7 @@ pub fn createStubHelperPreambleAtom(self: *MachO) !void { code[9] = 0xff; code[10] = 0x25; - try atom.addRelocations(self, 2, .{ .{ + try Atom.addRelocations(self, atom_index, 2, .{ .{ .type = @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_SIGNED), .target = .{ .sym_index = dyld_private_sym_index, .file = null }, .offset = 3, @@ -1208,7 +1239,7 @@ pub fn createStubHelperPreambleAtom(self: *MachO) !void { // br x16 mem.writeIntLittle(u32, code[20..][0..4], aarch64.Instruction.br(.x16).toU32()); - try atom.addRelocations(self, 4, .{ .{ + try Atom.addRelocations(self, atom_index, 4, .{ .{ .type = @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_PAGE21), .target = .{ .sym_index = dyld_private_sym_index, .file = null }, .offset = 0, @@ -1241,16 +1272,14 @@ pub fn createStubHelperPreambleAtom(self: *MachO) !void { else => unreachable, } - self.stub_helper_preamble_atom = atom; + self.stub_helper_preamble_atom_index = atom_index; - try self.managed_atoms.append(gpa, atom); - - sym.n_value = try self.allocateAtom(atom, size, atom.alignment); + sym.n_value = try self.allocateAtom(atom_index, size, atom.alignment); log.debug("allocated stub preamble atom at 0x{x}", .{sym.n_value}); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); } -pub fn createStubHelperAtom(self: *MachO) !*Atom { +pub fn createStubHelperAtom(self: *MachO) !Atom.Index { const gpa = self.base.allocator; const arch = self.base.options.target.cpu.arch; const size: u4 = switch (arch) { @@ -1258,16 +1287,14 @@ pub fn createStubHelperAtom(self: *MachO) !*Atom { .aarch64 => 3 * @sizeOf(u32), else => unreachable, }; - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = size; atom.alignment = switch (arch) { .x86_64 => 1, .aarch64 => @alignOf(u32), else => unreachable, }; - errdefer gpa.destroy(atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; @@ -1277,6 +1304,11 @@ pub fn createStubHelperAtom(self: *MachO) !*Atom { defer gpa.free(code); mem.set(u8, code, 0); + const stub_helper_preamble_atom_sym_index = if (self.stub_helper_preamble_atom_index) |stub_index| + self.getAtom(stub_index).getSymbolIndex().? + else + unreachable; + switch (arch) { .x86_64 => { // pushq @@ -1285,9 +1317,9 @@ pub fn createStubHelperAtom(self: *MachO) !*Atom { // jmpq code[5] = 0xe9; - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_BRANCH), - .target = .{ .sym_index = self.stub_helper_preamble_atom.?.getSymbolIndex().?, .file = null }, + .target = .{ .sym_index = stub_helper_preamble_atom_sym_index, .file = null }, .offset = 6, .addend = 0, .pcrel = true, @@ -1308,9 +1340,9 @@ pub fn createStubHelperAtom(self: *MachO) !*Atom { mem.writeIntLittle(u32, code[4..8], aarch64.Instruction.b(0).toU32()); // Next 4 bytes 8..12 are just a placeholder populated in `populateLazyBindOffsetsInStubHelper`. - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_BRANCH26), - .target = .{ .sym_index = self.stub_helper_preamble_atom.?.getSymbolIndex().?, .file = null }, + .target = .{ .sym_index = stub_helper_preamble_atom_sym_index, .file = null }, .offset = 4, .addend = 0, .pcrel = true, @@ -1320,29 +1352,24 @@ pub fn createStubHelperAtom(self: *MachO) !*Atom { else => unreachable, } - try self.managed_atoms.append(gpa, atom); - - sym.n_value = try self.allocateAtom(atom, size, atom.alignment); + sym.n_value = try self.allocateAtom(atom_index, size, atom.alignment); log.debug("allocated stub helper atom at 0x{x}", .{sym.n_value}); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); - return atom; + return atom_index; } -pub fn createLazyPointerAtom(self: *MachO, stub_sym_index: u32, target: SymbolWithLoc) !*Atom { - const gpa = self.base.allocator; - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); +pub fn createLazyPointerAtom(self: *MachO, stub_sym_index: u32, target: SymbolWithLoc) !Atom.Index { + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = @sizeOf(u64); atom.alignment = @alignOf(u64); - errdefer gpa.destroy(atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; sym.n_sect = self.la_symbol_ptr_section_index.? + 1; - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = switch (self.base.options.target.cpu.arch) { .aarch64 => @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_UNSIGNED), .x86_64 => @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_UNSIGNED), @@ -1354,22 +1381,20 @@ pub fn createLazyPointerAtom(self: *MachO, stub_sym_index: u32, target: SymbolWi .pcrel = false, .length = 3, }); - try atom.addRebase(self, 0); - try atom.addLazyBinding(self, .{ + try Atom.addRebase(self, atom_index, 0); + try Atom.addLazyBinding(self, atom_index, .{ .target = self.getGlobal(self.getSymbolName(target)).?, .offset = 0, }); - try self.managed_atoms.append(gpa, atom); - - sym.n_value = try self.allocateAtom(atom, atom.size, @alignOf(u64)); + sym.n_value = try self.allocateAtom(atom_index, atom.size, @alignOf(u64)); log.debug("allocated lazy pointer atom at 0x{x} ({s})", .{ sym.n_value, self.getSymbolName(target) }); - try self.writePtrWidthAtom(atom); + try self.writePtrWidthAtom(atom_index); - return atom; + return atom_index; } -pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { +pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !Atom.Index { const gpa = self.base.allocator; const arch = self.base.options.target.cpu.arch; const size: u4 = switch (arch) { @@ -1377,9 +1402,8 @@ pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { .aarch64 => 3 * @sizeOf(u32), else => unreachable, // unhandled architecture type }; - const atom = try gpa.create(Atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = size; atom.alignment = switch (arch) { .x86_64 => 1, @@ -1387,7 +1411,6 @@ pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { else => unreachable, // unhandled architecture type }; - errdefer gpa.destroy(atom); const sym = atom.getSymbolPtr(self); sym.n_type = macho.N_SECT; @@ -1403,7 +1426,7 @@ pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { code[0] = 0xff; code[1] = 0x25; - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_BRANCH), .target = .{ .sym_index = laptr_sym_index, .file = null }, .offset = 2, @@ -1424,7 +1447,7 @@ pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { // br x16 mem.writeIntLittle(u32, code[8..12], aarch64.Instruction.br(.x16).toU32()); - try atom.addRelocations(self, 2, .{ + try Atom.addRelocations(self, atom_index, 2, .{ .{ .type = @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_PAGE21), .target = .{ .sym_index = laptr_sym_index, .file = null }, @@ -1446,13 +1469,11 @@ pub fn createStubAtom(self: *MachO, laptr_sym_index: u32) !*Atom { else => unreachable, } - try self.managed_atoms.append(gpa, atom); - - sym.n_value = try self.allocateAtom(atom, size, atom.alignment); + sym.n_value = try self.allocateAtom(atom_index, size, atom.alignment); log.debug("allocated stub atom at 0x{x}", .{sym.n_value}); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); - return atom; + return atom_index; } pub fn createMhExecuteHeaderSymbol(self: *MachO) !void { @@ -1586,9 +1607,12 @@ pub fn resolveSymbolsInDylibs(self: *MachO) !void { if (self.stubs_table.contains(global)) break :blk; const stub_index = try self.allocateStubEntry(global); - const stub_helper_atom = try self.createStubHelperAtom(); - const laptr_atom = try self.createLazyPointerAtom(stub_helper_atom.getSymbolIndex().?, global); - const stub_atom = try self.createStubAtom(laptr_atom.getSymbolIndex().?); + const stub_helper_atom_index = try self.createStubHelperAtom(); + const stub_helper_atom = self.getAtom(stub_helper_atom_index); + const laptr_atom_index = try self.createLazyPointerAtom(stub_helper_atom.getSymbolIndex().?, global); + const laptr_atom = self.getAtom(laptr_atom_index); + const stub_atom_index = try self.createStubAtom(laptr_atom.getSymbolIndex().?); + const stub_atom = self.getAtom(stub_atom_index); self.stubs.items[stub_index].sym_index = stub_atom.getSymbolIndex().?; self.markRelocsDirtyByTarget(global); } @@ -1686,10 +1710,11 @@ pub fn resolveDyldStubBinder(self: *MachO) !void { // Add dyld_stub_binder as the final GOT entry. const got_index = try self.allocateGotEntry(global); - const got_atom = try self.createGotAtom(global); + const got_atom_index = try self.createGotAtom(global); + const got_atom = self.getAtom(got_atom_index); self.got_entries.items[got_index].sym_index = got_atom.getSymbolIndex().?; - try self.writePtrWidthAtom(got_atom); + try self.writePtrWidthAtom(got_atom_index); } pub fn deinit(self: *MachO) void { @@ -1699,9 +1724,9 @@ pub fn deinit(self: *MachO) void { if (self.llvm_object) |llvm_object| llvm_object.destroy(gpa); } - if (self.d_sym) |*d_sym| { - d_sym.deinit(); - } + // if (self.d_sym) |*d_sym| { + // d_sym.deinit(); + // } self.got_entries.deinit(gpa); self.got_entries_free_list.deinit(gpa); @@ -1739,12 +1764,12 @@ pub fn deinit(self: *MachO) void { } self.sections.deinit(gpa); - for (self.managed_atoms.items) |atom| { - gpa.destroy(atom); - } - self.managed_atoms.deinit(gpa); + self.atoms.deinit(gpa); if (self.base.options.module) |_| { + for (self.decls.values()) |*m| { + m.exports.deinit(gpa); + } self.decls.deinit(gpa); } else { assert(self.decls.count() == 0); @@ -1778,14 +1803,15 @@ pub fn deinit(self: *MachO) void { self.lazy_bindings.deinit(gpa); } -fn freeAtom(self: *MachO, atom: *Atom) void { - log.debug("freeAtom {*}", .{atom}); +fn freeAtom(self: *MachO, atom_index: Atom.Index) void { + log.debug("freeAtom {d}", .{atom_index}); const gpa = self.base.allocator; // Remove any relocs and base relocs associated with this Atom - self.freeRelocationsForAtom(atom); + Atom.freeRelocations(self, atom_index); + const atom = self.getAtom(atom_index); const sect_id = atom.getSymbol(self).n_sect - 1; const free_list = &self.sections.items(.free_list)[sect_id]; var already_have_free_list_node = false; @@ -1793,45 +1819,46 @@ fn freeAtom(self: *MachO, atom: *Atom) void { var i: usize = 0; // TODO turn free_list into a hash map while (i < free_list.items.len) { - if (free_list.items[i] == atom) { + if (free_list.items[i] == atom_index) { _ = free_list.swapRemove(i); continue; } - if (free_list.items[i] == atom.prev) { + if (free_list.items[i] == atom.prev_index) { already_have_free_list_node = true; } i += 1; } } - const maybe_last_atom = &self.sections.items(.last_atom)[sect_id]; - if (maybe_last_atom.*) |last_atom| { - if (last_atom == atom) { - if (atom.prev) |prev| { + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[sect_id]; + if (maybe_last_atom_index.*) |last_atom_index| { + if (last_atom_index == atom_index) { + if (atom.prev_index) |prev_index| { // TODO shrink the section size here - maybe_last_atom.* = prev; + maybe_last_atom_index.* = prev_index; } else { - maybe_last_atom.* = null; + maybe_last_atom_index.* = null; } } } - if (atom.prev) |prev| { - prev.next = atom.next; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; - if (!already_have_free_list_node and prev.freeListEligible(self)) { + if (!already_have_free_list_node and prev.*.freeListEligible(self)) { // The free list is heuristics, it doesn't have to be perfect, so we can ignore // the OOM here. - free_list.append(gpa, prev) catch {}; + free_list.append(gpa, prev_index) catch {}; } } else { - atom.prev = null; + self.getAtomPtr(atom_index).prev_index = null; } - if (atom.next) |next| { - next.prev = atom.prev; + if (atom.next_index) |next_index| { + self.getAtomPtr(next_index).prev_index = atom.prev_index; } else { - atom.next = null; + self.getAtomPtr(atom_index).next_index = null; } // Appending to free lists is allowed to fail because the free lists are heuristics based anyway. @@ -1849,9 +1876,9 @@ fn freeAtom(self: *MachO, atom: *Atom) void { }; _ = self.got_entries_table.remove(got_target); - if (self.d_sym) |*d_sym| { - d_sym.swapRemoveRelocs(sym_index); - } + // if (self.d_sym) |*d_sym| { + // d_sym.swapRemoveRelocs(sym_index); + // } log.debug(" adding GOT index {d} to free list (target local@{d})", .{ got_index, sym_index }); } @@ -1859,27 +1886,28 @@ fn freeAtom(self: *MachO, atom: *Atom) void { self.locals.items[sym_index].n_type = 0; _ = self.atom_by_index_table.remove(sym_index); log.debug(" adding local symbol index {d} to free list", .{sym_index}); - atom.sym_index = 0; + self.getAtomPtr(atom_index).sym_index = 0; - if (self.d_sym) |*d_sym| { - d_sym.dwarf.freeAtom(&atom.dbg_info_atom); - } + // if (self.d_sym) |*d_sym| { + // d_sym.dwarf.freeAtom(&atom.dbg_info_atom); + // } } -fn shrinkAtom(self: *MachO, atom: *Atom, new_block_size: u64) void { +fn shrinkAtom(self: *MachO, atom_index: Atom.Index, new_block_size: u64) void { _ = self; - _ = atom; + _ = atom_index; _ = new_block_size; // TODO check the new capacity, and if it crosses the size threshold into a big enough // capacity, insert a free list node for it. } -fn growAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) !u64 { +fn growAtom(self: *MachO, atom_index: Atom.Index, new_atom_size: u64, alignment: u64) !u64 { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const align_ok = mem.alignBackwardGeneric(u64, sym.n_value, alignment) == sym.n_value; const need_realloc = !align_ok or new_atom_size > atom.capacity(self); if (!need_realloc) return sym.n_value; - return self.allocateAtom(atom, new_atom_size, alignment); + return self.allocateAtom(atom_index, new_atom_size, alignment); } pub fn allocateSymbol(self: *MachO) !u32 { @@ -1986,31 +2014,29 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv const decl_index = func.owner_decl; const decl = module.declPtr(decl_index); - const atom = &decl.link.macho; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeUnnamedConsts(decl_index); - self.freeRelocationsForAtom(atom); - } else { - gop.value_ptr.* = null; - } + + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + self.freeUnnamedConsts(decl_index); + Atom.freeRelocations(self, atom_index); + + const atom = self.getAtom(atom_index); + _ = atom; var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - var decl_state = if (self.d_sym) |*d_sym| - try d_sym.dwarf.initDeclState(module, decl_index) - else - null; - defer if (decl_state) |*ds| ds.deinit(); + // var decl_state = if (self.d_sym) |*d_sym| + // try d_sym.dwarf.initDeclState(module, decl_index) + // else + // null; + // defer if (decl_state) |*ds| ds.deinit(); - const res = if (decl_state) |*ds| - try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ - .dwarf = ds, - }) - else - try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); + // const res = if (decl_state) |*ds| + // try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ + // .dwarf = ds, + // }) + // else + const res = try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); const code = switch (res) { .ok => code_buffer.items, @@ -2022,16 +2048,11 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv }; const addr = try self.updateDeclCode(decl_index, code); + _ = addr; - if (decl_state) |*ds| { - try self.d_sym.?.dwarf.commitDeclState( - module, - decl_index, - addr, - decl.link.macho.size, - ds, - ); - } + // if (decl_state) |*ds| { + // try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); + // } // Since we updated the vaddr and the size, each corresponding export symbol also // needs to be updated. @@ -2065,11 +2086,8 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu log.debug("allocating symbol indexes for {?s}", .{name}); - const atom = try gpa.create(Atom); - errdefer gpa.destroy(atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); - try self.managed_atoms.append(gpa, atom); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .none, .{ .parent_atom_index = atom.getSymbolIndex().?, @@ -2088,21 +2106,21 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu atom.size = code.len; atom.alignment = required_alignment; // TODO: work out logic for disambiguating functions from function pointers - // const sect_id = self.getDeclOutputSection(decl); + // const sect_id = self.getDeclOutputSection(decl_index); const sect_id = self.data_const_section_index.?; const symbol = atom.getSymbolPtr(self); symbol.n_strx = name_str_index; symbol.n_type = macho.N_SECT; symbol.n_sect = sect_id + 1; - symbol.n_value = try self.allocateAtom(atom, code.len, required_alignment); - errdefer self.freeAtom(atom); + symbol.n_value = try self.allocateAtom(atom_index, code.len, required_alignment); + errdefer self.freeAtom(atom_index); - try unnamed_consts.append(gpa, atom); + try unnamed_consts.append(gpa, atom_index); log.debug("allocated atom for {?s} at 0x{x}", .{ name, symbol.n_value }); log.debug(" (required alignment 0x{x})", .{required_alignment}); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); return atom.getSymbolIndex().?; } @@ -2129,41 +2147,36 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index) } } - const atom = &decl.link.macho; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeRelocationsForAtom(atom); - } else { - gop.value_ptr.* = null; - } + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + Atom.freeRelocations(self, atom_index); + const atom = self.getAtom(atom_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - var decl_state: ?Dwarf.DeclState = if (self.d_sym) |*d_sym| - try d_sym.dwarf.initDeclState(module, decl_index) - else - null; - defer if (decl_state) |*ds| ds.deinit(); + // var decl_state: ?Dwarf.DeclState = if (self.d_sym) |*d_sym| + // try d_sym.dwarf.initDeclState(module, decl_index) + // else + // null; + // defer if (decl_state) |*ds| ds.deinit(); const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val; - const res = if (decl_state) |*ds| - try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .{ - .dwarf = ds, - }, .{ - .parent_atom_index = decl.link.macho.getSymbolIndex().?, - }) - else - try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .none, .{ - .parent_atom_index = decl.link.macho.getSymbolIndex().?, - }); + // const res = if (decl_state) |*ds| + // try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + // .ty = decl.ty, + // .val = decl_val, + // }, &code_buffer, .{ + // .dwarf = ds, + // }, .{ + // .parent_atom_index = atom.getSymbolIndex().?, + // }) + // else + const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .none, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }); const code = switch (res) { .ok => code_buffer.items, @@ -2174,23 +2187,31 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index) }, }; const addr = try self.updateDeclCode(decl_index, code); + _ = addr; - if (decl_state) |*ds| { - try self.d_sym.?.dwarf.commitDeclState( - module, - decl_index, - addr, - decl.link.macho.size, - ds, - ); - } + // if (decl_state) |*ds| { + // try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); + // } // Since we updated the vaddr and the size, each corresponding export symbol also // needs to be updated. try self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index)); } -fn getDeclOutputSection(self: *MachO, decl: *Module.Decl) u8 { +pub fn getOrCreateAtomForDecl(self: *MachO, decl_index: Module.Decl.Index) !Atom.Index { + const gop = try self.decls.getOrPut(self.base.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = .{ + .atom = try self.createAtom(), + .section = self.getDeclOutputSection(decl_index), + .exports = .{}, + }; + } + return gop.value_ptr.atom; +} + +fn getDeclOutputSection(self: *MachO, decl_index: Module.Decl.Index) u8 { + const decl = self.base.options.module.?.declPtr(decl_index); const ty = decl.ty; const val = decl.val; const zig_ty = ty.zigTypeTag(); @@ -2341,13 +2362,11 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8) const sym_name = try decl.getFullyQualifiedName(mod); defer self.base.allocator.free(sym_name); - const atom = &decl.link.macho; - const sym_index = atom.getSymbolIndex().?; // Atom was not initialized - const decl_ptr = self.decls.getPtr(decl_index).?; - if (decl_ptr.* == null) { - decl_ptr.* = self.getDeclOutputSection(decl); - } - const sect_id = decl_ptr.*.?; + const decl_metadata = self.decls.get(decl_index).?; + const atom_index = decl_metadata.atom; + const atom = self.getAtom(atom_index); + const sym_index = atom.getSymbolIndex().?; + const sect_id = decl_metadata.section; const code_len = code.len; if (atom.size != 0) { @@ -2357,11 +2376,11 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8) sym.n_sect = sect_id + 1; sym.n_desc = 0; - const capacity = decl.link.macho.capacity(self); + const capacity = atom.capacity(self); const need_realloc = code_len > capacity or !mem.isAlignedGeneric(u64, sym.n_value, required_alignment); if (need_realloc) { - const vaddr = try self.growAtom(atom, code_len, required_alignment); + const vaddr = try self.growAtom(atom_index, code_len, required_alignment); log.debug("growing {s} and moving from 0x{x} to 0x{x}", .{ sym_name, sym.n_value, vaddr }); log.debug(" (required alignment 0x{x})", .{required_alignment}); @@ -2369,19 +2388,19 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8) sym.n_value = vaddr; log.debug(" (updating GOT entry)", .{}); const got_target = SymbolWithLoc{ .sym_index = sym_index, .file = null }; - const got_atom = self.getGotAtomForSymbol(got_target).?; + const got_atom_index = self.getGotAtomIndexForSymbol(got_target).?; self.markRelocsDirtyByTarget(got_target); - try self.writePtrWidthAtom(got_atom); + try self.writePtrWidthAtom(got_atom_index); } } else if (code_len < atom.size) { - self.shrinkAtom(atom, code_len); - } else if (atom.next == null) { + self.shrinkAtom(atom_index, code_len); + } else if (atom.next_index == null) { const header = &self.sections.items(.header)[sect_id]; const segment = self.getSegment(sect_id); const needed_size = (sym.n_value + code_len) - segment.vmaddr; header.size = needed_size; } - atom.size = code_len; + self.getAtomPtr(atom_index).size = code_len; } else { const name_str_index = try self.strtab.insert(gpa, sym_name); const sym = atom.getSymbolPtr(self); @@ -2390,33 +2409,36 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8) sym.n_sect = sect_id + 1; sym.n_desc = 0; - const vaddr = try self.allocateAtom(atom, code_len, required_alignment); - errdefer self.freeAtom(atom); + const vaddr = try self.allocateAtom(atom_index, code_len, required_alignment); + errdefer self.freeAtom(atom_index); log.debug("allocated atom for {s} at 0x{x}", .{ sym_name, vaddr }); log.debug(" (required alignment 0x{x})", .{required_alignment}); - atom.size = code_len; + self.getAtomPtr(atom_index).size = code_len; sym.n_value = vaddr; const got_target = SymbolWithLoc{ .sym_index = sym_index, .file = null }; const got_index = try self.allocateGotEntry(got_target); - const got_atom = try self.createGotAtom(got_target); + const got_atom_index = try self.createGotAtom(got_target); + const got_atom = self.getAtom(got_atom_index); self.got_entries.items[got_index].sym_index = got_atom.getSymbolIndex().?; - try self.writePtrWidthAtom(got_atom); + try self.writePtrWidthAtom(got_atom_index); } self.markRelocsDirtyByTarget(atom.getSymbolWithLoc()); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); return atom.getSymbol(self).n_value; } pub fn updateDeclLineNumber(self: *MachO, module: *Module, decl: *const Module.Decl) !void { + _ = decl; + _ = self; _ = module; - if (self.d_sym) |*d_sym| { - try d_sym.dwarf.updateDeclLineNumber(decl); - } + // if (self.d_sym) |*d_sym| { + // try d_sym.dwarf.updateDeclLineNumber(decl); + // } } pub fn updateDeclExports( @@ -2432,22 +2454,17 @@ pub fn updateDeclExports( if (self.llvm_object) |llvm_object| return llvm_object.updateDeclExports(module, decl_index, exports); } + const tracy = trace(@src()); defer tracy.end(); const gpa = self.base.allocator; const decl = module.declPtr(decl_index); - const atom = &decl.link.macho; - - if (atom.getSymbolIndex() == null) return; - - const gop = try self.decls.getOrPut(gpa, decl_index); - if (!gop.found_existing) { - gop.value_ptr.* = self.getDeclOutputSection(decl); - } - + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + const atom = self.getAtom(atom_index); const decl_sym = atom.getSymbol(self); + const decl_metadata = self.decls.getPtr(decl_index).?; for (exports) |exp| { const exp_name = try std.fmt.allocPrint(gpa, "_{s}", .{exp.options.name}); @@ -2485,9 +2502,9 @@ pub fn updateDeclExports( continue; } - const sym_index = exp.link.macho.sym_index orelse blk: { + const sym_index = decl_metadata.getExport(self, exp_name) orelse blk: { const sym_index = try self.allocateSymbol(); - exp.link.macho.sym_index = sym_index; + try decl_metadata.exports.append(gpa, sym_index); break :blk sym_index; }; const sym_loc = SymbolWithLoc{ .sym_index = sym_index, .file = null }; @@ -2535,16 +2552,18 @@ pub fn updateDeclExports( } } -pub fn deleteExport(self: *MachO, exp: Export) void { +pub fn deleteDeclExport(self: *MachO, decl_index: Module.Decl.Index, name: []const u8) Allocator.Error!void { if (self.llvm_object) |_| return; - const sym_index = exp.sym_index orelse return; + const metadata = self.decls.getPtr(decl_index) orelse return; const gpa = self.base.allocator; + const exp_name = try std.fmt.allocPrint(gpa, "_{s}", .{name}); + defer gpa.free(exp_name); + const sym_index = metadata.getExportPtr(self, exp_name) orelse return; - const sym_loc = SymbolWithLoc{ .sym_index = sym_index, .file = null }; + const sym_loc = SymbolWithLoc{ .sym_index = sym_index.*, .file = null }; const sym = self.getSymbolPtr(sym_loc); - const sym_name = self.getSymbolName(sym_loc); - log.debug("deleting export '{s}'", .{sym_name}); + log.debug("deleting export '{s}'", .{exp_name}); assert(sym.sect() and sym.ext()); sym.* = .{ .n_strx = 0, @@ -2553,9 +2572,9 @@ pub fn deleteExport(self: *MachO, exp: Export) void { .n_desc = 0, .n_value = 0, }; - self.locals_free_list.append(gpa, sym_index) catch {}; + self.locals_free_list.append(gpa, sym_index.*) catch {}; - if (self.resolver.fetchRemove(sym_name)) |entry| { + if (self.resolver.fetchRemove(exp_name)) |entry| { defer gpa.free(entry.key); self.globals_free_list.append(gpa, entry.value) catch {}; self.globals.items[entry.value] = .{ @@ -2563,17 +2582,8 @@ pub fn deleteExport(self: *MachO, exp: Export) void { .file = null, }; } -} -fn freeRelocationsForAtom(self: *MachO, atom: *Atom) void { - var removed_relocs = self.relocs.fetchOrderedRemove(atom); - if (removed_relocs) |*relocs| relocs.value.deinit(self.base.allocator); - var removed_rebases = self.rebases.fetchOrderedRemove(atom); - if (removed_rebases) |*rebases| rebases.value.deinit(self.base.allocator); - var removed_bindings = self.bindings.fetchOrderedRemove(atom); - if (removed_bindings) |*bindings| bindings.value.deinit(self.base.allocator); - var removed_lazy_bindings = self.lazy_bindings.fetchOrderedRemove(atom); - if (removed_lazy_bindings) |*lazy_bindings| lazy_bindings.value.deinit(self.base.allocator); + sym_index.* = 0; } fn freeUnnamedConsts(self: *MachO, decl_index: Module.Decl.Index) void { @@ -2595,28 +2605,22 @@ pub fn freeDecl(self: *MachO, decl_index: Module.Decl.Index) void { log.debug("freeDecl {*}", .{decl}); if (self.decls.fetchSwapRemove(decl_index)) |kv| { - if (kv.value) |_| { - self.freeAtom(&decl.link.macho); - self.freeUnnamedConsts(decl_index); - } + self.freeAtom(kv.value.atom); + self.freeUnnamedConsts(decl_index); } - if (self.d_sym) |*d_sym| { - d_sym.dwarf.freeDecl(decl); - } + // if (self.d_sym) |*d_sym| { + // d_sym.dwarf.freeDecl(decl); + // } } pub fn getDeclVAddr(self: *MachO, decl_index: Module.Decl.Index, reloc_info: File.RelocInfo) !u64 { - const mod = self.base.options.module.?; - const decl = mod.declPtr(decl_index); - assert(self.llvm_object == null); - try decl.link.macho.ensureInitialized(self); - const sym_index = decl.link.macho.getSymbolIndex().?; - - const atom = self.getAtomForSymbol(.{ .sym_index = reloc_info.parent_atom_index, .file = null }).?; - try atom.addRelocation(self, .{ + const this_atom_index = try self.getOrCreateAtomForDecl(decl_index); + const sym_index = self.getAtom(this_atom_index).getSymbolIndex().?; + const atom_index = self.getAtomIndexForSymbol(.{ .sym_index = reloc_info.parent_atom_index, .file = null }).?; + try Atom.addRelocation(self, atom_index, .{ .type = switch (self.base.options.target.cpu.arch) { .aarch64 => @enumToInt(macho.reloc_type_arm64.ARM64_RELOC_UNSIGNED), .x86_64 => @enumToInt(macho.reloc_type_x86_64.X86_64_RELOC_UNSIGNED), @@ -2628,7 +2632,7 @@ pub fn getDeclVAddr(self: *MachO, decl_index: Module.Decl.Index, reloc_info: Fil .pcrel = false, .length = 3, }); - try atom.addRebase(self, @intCast(u32, reloc_info.offset)); + try Atom.addRebase(self, atom_index, @intCast(u32, reloc_info.offset)); return 0; } @@ -2860,34 +2864,36 @@ fn moveSectionInVirtualMemory(self: *MachO, sect_id: u8, needed_size: u64) !void // TODO: enforce order by increasing VM addresses in self.sections container. for (self.sections.items(.header)[sect_id + 1 ..]) |*next_header, next_sect_id| { const index = @intCast(u8, sect_id + 1 + next_sect_id); - const maybe_last_atom = &self.sections.items(.last_atom)[index]; const next_segment = self.getSegmentPtr(index); next_header.addr += diff; next_segment.vmaddr += diff; - if (maybe_last_atom.*) |last_atom| { - var atom = last_atom; + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[index]; + if (maybe_last_atom_index.*) |last_atom_index| { + var atom_index = last_atom_index; while (true) { + const atom = self.getAtom(atom_index); const sym = atom.getSymbolPtr(self); sym.n_value += diff; - if (atom.prev) |prev| { - atom = prev; + if (atom.prev_index) |prev_index| { + atom_index = prev_index; } else break; } } } } -fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) !u64 { +fn allocateAtom(self: *MachO, atom_index: Atom.Index, new_atom_size: u64, alignment: u64) !u64 { const tracy = trace(@src()); defer tracy.end(); + const atom = self.getAtom(atom_index); const sect_id = atom.getSymbol(self).n_sect - 1; const segment = self.getSegmentPtr(sect_id); const header = &self.sections.items(.header)[sect_id]; const free_list = &self.sections.items(.free_list)[sect_id]; - const maybe_last_atom = &self.sections.items(.last_atom)[sect_id]; + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[sect_id]; const requires_padding = blk: { if (!header.isCode()) break :blk false; if (header.isSymbolStubs()) break :blk false; @@ -2901,7 +2907,7 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) ! // It would be simpler to do it inside the for loop below, but that would cause a // problem if an error was returned later in the function. So this action // is actually carried out at the end of the function, when errors are no longer possible. - var atom_placement: ?*Atom = null; + var atom_placement: ?Atom.Index = null; var free_list_removal: ?usize = null; // First we look for an appropriately sized free list node. @@ -2909,7 +2915,8 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) ! var vaddr = blk: { var i: usize = 0; while (i < free_list.items.len) { - const big_atom = free_list.items[i]; + const big_atom_index = free_list.items[i]; + const big_atom = self.getAtom(big_atom_index); // We now have a pointer to a live atom that has too much capacity. // Is it enough that we could fit this new atom? const sym = big_atom.getSymbol(self); @@ -2937,30 +2944,35 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) ! const keep_free_list_node = remaining_capacity >= min_text_capacity; // Set up the metadata to be updated, after errors are no longer possible. - atom_placement = big_atom; + atom_placement = big_atom_index; if (!keep_free_list_node) { free_list_removal = i; } break :blk new_start_vaddr; - } else if (maybe_last_atom.*) |last| { + } else if (maybe_last_atom_index.*) |last_index| { + const last = self.getAtom(last_index); const last_symbol = last.getSymbol(self); const ideal_capacity = if (requires_padding) padToIdeal(last.size) else last.size; const ideal_capacity_end_vaddr = last_symbol.n_value + ideal_capacity; const new_start_vaddr = mem.alignForwardGeneric(u64, ideal_capacity_end_vaddr, alignment); - atom_placement = last; + atom_placement = last_index; break :blk new_start_vaddr; } else { break :blk mem.alignForwardGeneric(u64, segment.vmaddr, alignment); } }; - const expand_section = atom_placement == null or atom_placement.?.next == null; + const expand_section = if (atom_placement) |placement_index| + self.getAtom(placement_index).next_index == null + else + true; if (expand_section) { const sect_capacity = self.allocatedSize(header.offset); const needed_size = (vaddr + new_atom_size) - segment.vmaddr; if (needed_size > sect_capacity) { const new_offset = self.findFreeSpace(needed_size, self.page_size); - const current_size = if (maybe_last_atom.*) |last_atom| blk: { + const current_size = if (maybe_last_atom_index.*) |last_atom_index| blk: { + const last_atom = self.getAtom(last_atom_index); const sym = last_atom.getSymbol(self); break :blk (sym.n_value + last_atom.size) - segment.vmaddr; } else 0; @@ -2992,7 +3004,7 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) ! header.size = needed_size; segment.filesize = mem.alignForwardGeneric(u64, needed_size, self.page_size); segment.vmsize = mem.alignForwardGeneric(u64, needed_size, self.page_size); - maybe_last_atom.* = atom; + maybe_last_atom_index.* = atom_index; self.segment_table_dirty = true; } @@ -3002,20 +3014,25 @@ fn allocateAtom(self: *MachO, atom: *Atom, new_atom_size: u64, alignment: u64) ! header.@"align" = align_pow; } - if (atom.prev) |prev| { - prev.next = atom.next; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; } - if (atom.next) |next| { - next.prev = atom.prev; + if (atom.next_index) |next_index| { + const next = self.getAtomPtr(next_index); + next.prev_index = atom.prev_index; } - if (atom_placement) |big_atom| { - atom.prev = big_atom; - atom.next = big_atom.next; - big_atom.next = atom; + if (atom_placement) |big_atom_index| { + const big_atom = self.getAtomPtr(big_atom_index); + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = big_atom_index; + atom_ptr.next_index = big_atom.next_index; + big_atom.next_index = atom_index; } else { - atom.prev = null; - atom.next = null; + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = null; + atom_ptr.next_index = null; } if (free_list_removal) |i| { _ = free_list.swapRemove(i); @@ -3155,7 +3172,8 @@ fn collectRebaseData(self: *MachO, rebase: *Rebase) !void { const gpa = self.base.allocator; const slice = self.sections.slice(); - for (self.rebases.keys()) |atom, i| { + for (self.rebases.keys()) |atom_index, i| { + const atom = self.getAtom(atom_index); log.debug(" ATOM(%{?d}, '{s}')", .{ atom.getSymbolIndex(), atom.getName(self) }); const sym = atom.getSymbol(self); @@ -3184,7 +3202,8 @@ fn collectBindData(self: *MachO, bind: anytype, raw_bindings: anytype) !void { const gpa = self.base.allocator; const slice = self.sections.slice(); - for (raw_bindings.keys()) |atom, i| { + for (raw_bindings.keys()) |atom_index, i| { + const atom = self.getAtom(atom_index); log.debug(" ATOM(%{?d}, '{s}')", .{ atom.getSymbolIndex(), atom.getName(self) }); const sym = atom.getSymbol(self); @@ -3359,7 +3378,7 @@ fn populateLazyBindOffsetsInStubHelper(self: *MachO, lazy_bind: LazyBind) !void if (lazy_bind.size() == 0) return; const stub_helper_section_index = self.stub_helper_section_index.?; - assert(self.stub_helper_preamble_atom != null); + assert(self.stub_helper_preamble_atom_index != null); const section = self.sections.get(stub_helper_section_index); @@ -3369,10 +3388,11 @@ fn populateLazyBindOffsetsInStubHelper(self: *MachO, lazy_bind: LazyBind) !void else => unreachable, }; const header = section.header; - var atom = section.last_atom.?; + var atom_index = section.last_atom_index.?; var index: usize = lazy_bind.offsets.items.len; while (index > 0) : (index -= 1) { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const file_offset = header.offset + sym.n_value - header.addr + stub_offset; const bind_offset = lazy_bind.offsets.items[index - 1]; @@ -3385,7 +3405,7 @@ fn populateLazyBindOffsetsInStubHelper(self: *MachO, lazy_bind: LazyBind) !void try self.base.file.?.pwriteAll(mem.asBytes(&bind_offset), file_offset); - atom = atom.prev.?; + atom_index = atom.prev_index.?; } } @@ -3828,25 +3848,35 @@ pub fn getOrPutGlobalPtr(self: *MachO, name: []const u8) !GetOrPutGlobalPtrResul return GetOrPutGlobalPtrResult{ .found_existing = false, .value_ptr = ptr }; } +pub fn getAtom(self: *MachO, atom_index: Atom.Index) Atom { + assert(atom_index < self.atoms.items.len); + return self.atoms.items[atom_index]; +} + +pub fn getAtomPtr(self: *MachO, atom_index: Atom.Index) *Atom { + assert(atom_index < self.atoms.items.len); + return &self.atoms.items[atom_index]; +} + /// Returns atom if there is an atom referenced by the symbol described by `sym_with_loc` descriptor. /// Returns null on failure. -pub fn getAtomForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?*Atom { +pub fn getAtomIndexForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?Atom.Index { assert(sym_with_loc.file == null); return self.atom_by_index_table.get(sym_with_loc.sym_index); } /// Returns GOT atom that references `sym_with_loc` if one exists. /// Returns null otherwise. -pub fn getGotAtomForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?*Atom { +pub fn getGotAtomIndexForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?Atom.Index { const got_index = self.got_entries_table.get(sym_with_loc) orelse return null; - return self.got_entries.items[got_index].getAtom(self); + return self.got_entries.items[got_index].getAtomIndex(self); } /// Returns stubs atom that references `sym_with_loc` if one exists. /// Returns null otherwise. -pub fn getStubsAtomForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?*Atom { +pub fn getStubsAtomIndexForSymbol(self: *MachO, sym_with_loc: SymbolWithLoc) ?Atom.Index { const stubs_index = self.stubs_table.get(sym_with_loc) orelse return null; - return self.stubs.items[stubs_index].getAtom(self); + return self.stubs.items[stubs_index].getAtomIndex(self); } /// Returns symbol location corresponding to the set entrypoint. @@ -4232,26 +4262,31 @@ pub fn logAtoms(self: *MachO) void { log.debug("atoms:", .{}); const slice = self.sections.slice(); - for (slice.items(.last_atom)) |last, i| { - var atom = last orelse continue; + for (slice.items(.last_atom_index)) |last_atom_index, i| { + var atom_index = last_atom_index orelse continue; const header = slice.items(.header)[i]; - while (atom.prev) |prev| { - atom = prev; + while (true) { + const atom = self.getAtom(atom_index); + if (atom.prev_index) |prev_index| { + atom_index = prev_index; + } else break; } log.debug("{s},{s}", .{ header.segName(), header.sectName() }); while (true) { - self.logAtom(atom); - if (atom.next) |next| { - atom = next; + self.logAtom(atom_index); + const atom = self.getAtom(atom_index); + if (atom.next_index) |next_index| { + atom_index = next_index; } else break; } } } -pub fn logAtom(self: *MachO, atom: *const Atom) void { +pub fn logAtom(self: *MachO, atom_index: Atom.Index) void { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const sym_name = atom.getName(self); log.debug(" ATOM(%{?d}, '{s}') @ {x} (sizeof({x}), alignof({x})) in object({?d}) in sect({d})", .{ diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index f15958b3df..da0115d069 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -39,11 +39,14 @@ size: u64, alignment: u32, /// Points to the previous and next neighbours -next: ?*Atom, -prev: ?*Atom, +/// TODO use the same trick as with symbols: reserve index 0 as null atom +next_index: ?Atom.Index, +prev_index: ?Atom.Index, dbg_info_atom: Dwarf.Atom, +pub const Index = u32; + pub const Binding = struct { target: SymbolWithLoc, offset: u64, @@ -54,22 +57,6 @@ pub const SymbolAtOffset = struct { offset: u64, }; -pub const empty = Atom{ - .sym_index = 0, - .file = null, - .size = 0, - .alignment = 0, - .prev = null, - .next = null, - .dbg_info_atom = undefined, -}; - -pub fn ensureInitialized(self: *Atom, macho_file: *MachO) !void { - if (self.getSymbolIndex() != null) return; // Already initialized - self.sym_index = try macho_file.allocateSymbol(); - try macho_file.atom_by_index_table.putNoClobber(macho_file.base.allocator, self.sym_index, self); -} - pub fn getSymbolIndex(self: Atom) ?u32 { if (self.sym_index == 0) return null; return self.sym_index; @@ -108,7 +95,8 @@ pub fn getName(self: Atom, macho_file: *MachO) []const u8 { /// this calculation. pub fn capacity(self: Atom, macho_file: *MachO) u64 { const self_sym = self.getSymbol(macho_file); - if (self.next) |next| { + if (self.next_index) |next_index| { + const next = macho_file.getAtom(next_index); const next_sym = next.getSymbol(macho_file); return next_sym.n_value - self_sym.n_value; } else { @@ -120,7 +108,8 @@ pub fn capacity(self: Atom, macho_file: *MachO) u64 { pub fn freeListEligible(self: Atom, macho_file: *MachO) bool { // No need to keep a free list node for the last atom. - const next = self.next orelse return false; + const next_index = self.next_index orelse return false; + const next = macho_file.getAtom(next_index); const self_sym = self.getSymbol(macho_file); const next_sym = next.getSymbol(macho_file); const cap = next_sym.n_value - self_sym.n_value; @@ -130,19 +119,19 @@ pub fn freeListEligible(self: Atom, macho_file: *MachO) bool { return surplus >= MachO.min_text_capacity; } -pub fn addRelocation(self: *Atom, macho_file: *MachO, reloc: Relocation) !void { - return self.addRelocations(macho_file, 1, .{reloc}); +pub fn addRelocation(macho_file: *MachO, atom_index: Atom.Index, reloc: Relocation) !void { + return addRelocations(macho_file, atom_index, 1, .{reloc}); } pub fn addRelocations( - self: *Atom, macho_file: *MachO, + atom_index: Atom.Index, comptime count: comptime_int, relocs: [count]Relocation, ) !void { const gpa = macho_file.base.allocator; const target = macho_file.base.options.target; - const gop = try macho_file.relocs.getOrPut(gpa, self); + const gop = try macho_file.relocs.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } @@ -156,56 +145,72 @@ pub fn addRelocations( } } -pub fn addRebase(self: *Atom, macho_file: *MachO, offset: u32) !void { +pub fn addRebase(macho_file: *MachO, atom_index: Atom.Index, offset: u32) !void { const gpa = macho_file.base.allocator; - log.debug(" (adding rebase at offset 0x{x} in %{?d})", .{ offset, self.getSymbolIndex() }); - const gop = try macho_file.rebases.getOrPut(gpa, self); + const atom = macho_file.getAtom(atom_index); + log.debug(" (adding rebase at offset 0x{x} in %{?d})", .{ offset, atom.getSymbolIndex() }); + const gop = try macho_file.rebases.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } try gop.value_ptr.append(gpa, offset); } -pub fn addBinding(self: *Atom, macho_file: *MachO, binding: Binding) !void { +pub fn addBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Binding) !void { const gpa = macho_file.base.allocator; + const atom = macho_file.getAtom(atom_index); log.debug(" (adding binding to symbol {s} at offset 0x{x} in %{?d})", .{ macho_file.getSymbolName(binding.target), binding.offset, - self.getSymbolIndex(), + atom.getSymbolIndex(), }); - const gop = try macho_file.bindings.getOrPut(gpa, self); + const gop = try macho_file.bindings.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } try gop.value_ptr.append(gpa, binding); } -pub fn addLazyBinding(self: *Atom, macho_file: *MachO, binding: Binding) !void { +pub fn addLazyBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Binding) !void { const gpa = macho_file.base.allocator; + const atom = macho_file.getAtom(atom_index); log.debug(" (adding lazy binding to symbol {s} at offset 0x{x} in %{?d})", .{ macho_file.getSymbolName(binding.target), binding.offset, - self.getSymbolIndex(), + atom.getSymbolIndex(), }); - const gop = try macho_file.lazy_bindings.getOrPut(gpa, self); + const gop = try macho_file.lazy_bindings.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } try gop.value_ptr.append(gpa, binding); } -pub fn resolveRelocations(self: *Atom, macho_file: *MachO) !void { - const relocs = macho_file.relocs.get(self) orelse return; - const source_sym = self.getSymbol(macho_file); +pub fn resolveRelocations(macho_file: *MachO, atom_index: Atom.Index) !void { + const atom = macho_file.getAtom(atom_index); + const relocs = macho_file.relocs.get(atom_index) orelse return; + const source_sym = atom.getSymbol(macho_file); const source_section = macho_file.sections.get(source_sym.n_sect - 1).header; const file_offset = source_section.offset + source_sym.n_value - source_section.addr; - log.debug("relocating '{s}'", .{self.getName(macho_file)}); + log.debug("relocating '{s}'", .{atom.getName(macho_file)}); for (relocs.items) |*reloc| { if (!reloc.dirty) continue; - try reloc.resolve(self, macho_file, file_offset); + try reloc.resolve(macho_file, atom_index, file_offset); reloc.dirty = false; } } + +pub fn freeRelocations(macho_file: *MachO, atom_index: Atom.Index) void { + const gpa = macho_file.base.allocator; + var removed_relocs = macho_file.relocs.fetchOrderedRemove(atom_index); + if (removed_relocs) |*relocs| relocs.value.deinit(gpa); + var removed_rebases = macho_file.rebases.fetchOrderedRemove(atom_index); + if (removed_rebases) |*rebases| rebases.value.deinit(gpa); + var removed_bindings = macho_file.bindings.fetchOrderedRemove(atom_index); + if (removed_bindings) |*bindings| bindings.value.deinit(gpa); + var removed_lazy_bindings = macho_file.lazy_bindings.fetchOrderedRemove(atom_index); + if (removed_lazy_bindings) |*lazy_bindings| lazy_bindings.value.deinit(gpa); +} diff --git a/src/link/MachO/Relocation.zig b/src/link/MachO/Relocation.zig index ca6bf9d681..07e5cf1aa2 100644 --- a/src/link/MachO/Relocation.zig +++ b/src/link/MachO/Relocation.zig @@ -29,33 +29,35 @@ pub fn fmtType(self: Relocation, target: std.Target) []const u8 { } } -pub fn getTargetAtom(self: Relocation, macho_file: *MachO) ?*Atom { +pub fn getTargetAtomIndex(self: Relocation, macho_file: *MachO) ?Atom.Index { switch (macho_file.base.options.target.cpu.arch) { .aarch64 => switch (@intToEnum(macho.reloc_type_arm64, self.type)) { .ARM64_RELOC_GOT_LOAD_PAGE21, .ARM64_RELOC_GOT_LOAD_PAGEOFF12, .ARM64_RELOC_POINTER_TO_GOT, - => return macho_file.getGotAtomForSymbol(self.target), + => return macho_file.getGotAtomIndexForSymbol(self.target), else => {}, }, .x86_64 => switch (@intToEnum(macho.reloc_type_x86_64, self.type)) { .X86_64_RELOC_GOT, .X86_64_RELOC_GOT_LOAD, - => return macho_file.getGotAtomForSymbol(self.target), + => return macho_file.getGotAtomIndexForSymbol(self.target), else => {}, }, else => unreachable, } - if (macho_file.getStubsAtomForSymbol(self.target)) |stubs_atom| return stubs_atom; - return macho_file.getAtomForSymbol(self.target); + if (macho_file.getStubsAtomIndexForSymbol(self.target)) |stubs_atom| return stubs_atom; + return macho_file.getAtomIndexForSymbol(self.target); } -pub fn resolve(self: Relocation, atom: *Atom, macho_file: *MachO, base_offset: u64) !void { +pub fn resolve(self: Relocation, macho_file: *MachO, atom_index: Atom.Index, base_offset: u64) !void { const arch = macho_file.base.options.target.cpu.arch; + const atom = macho_file.getAtom(atom_index); const source_sym = atom.getSymbol(macho_file); const source_addr = source_sym.n_value + self.offset; - const target_atom = self.getTargetAtom(macho_file) orelse return; + const target_atom_index = self.getTargetAtomIndex(macho_file) orelse return; + const target_atom = macho_file.getAtom(target_atom_index); const target_addr = @intCast(i64, target_atom.getSymbol(macho_file).n_value) + self.addend; log.debug(" ({x}: [() => 0x{x} ({s})) ({s})", .{ From 4404c4d20094bb5021aac4a047cd33b6c24b9a9b Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 31 Jan 2023 17:54:12 +0100 Subject: [PATCH 11/65] link: make Elf atoms fully owned by the linker --- src/Module.zig | 6 +- src/Sema.zig | 2 +- src/arch/aarch64/CodeGen.zig | 13 +- src/arch/arm/CodeGen.zig | 15 +- src/arch/riscv64/CodeGen.zig | 14 +- src/arch/sparc64/CodeGen.zig | 12 +- src/arch/x86_64/CodeGen.zig | 13 +- src/link.zig | 4 +- src/link/Dwarf.zig | 26 +- src/link/Elf.zig | 1535 ++++++++++++++++++---------------- src/link/Elf/Atom.zig | 61 +- src/link/MachO.zig | 4 +- 12 files changed, 891 insertions(+), 814 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index 8301505492..0695a2e98a 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5275,7 +5275,7 @@ pub fn clearDecl( // and allow it to be variably sized. decl.link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = link.File.Coff.Atom.empty }, - .elf => .{ .elf = link.File.Elf.TextBlock.empty }, + .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, .c => .{ .c = {} }, @@ -5381,7 +5381,7 @@ fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) Allocator.Error!void } } if (mod.comp.bin_file.cast(link.File.Elf)) |elf| { - elf.deleteExport(exp.link.elf); + elf.deleteDeclExport(decl_index, exp.options.name); } if (mod.comp.bin_file.cast(link.File.MachO)) |macho| { try macho.deleteDeclExport(decl_index, exp.options.name); @@ -5695,7 +5695,7 @@ pub fn allocateNewDecl( .src_scope = src_scope, .link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = link.File.Coff.Atom.empty }, - .elf => .{ .elf = link.File.Elf.TextBlock.empty }, + .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, .c => .{ .c = {} }, diff --git a/src/Sema.zig b/src/Sema.zig index 9083cc92ab..28d559f730 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5566,7 +5566,7 @@ pub fn analyzeExport( .src = src, .link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = .{} }, - .elf => .{ .elf = .{} }, + .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = null }, .c => .{ .c = {} }, diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index edbe7905a2..67197c35f8 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -4308,8 +4308,9 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier const fn_owner_decl = mod.declPtr(func.owner_decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try fn_owner_decl.link.elf.ensureInitialized(elf_file); - const got_addr = @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); + const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); + const atom = elf_file.getAtom(atom_index); + const got_addr = @intCast(u32, atom.getOffsetTableAddress(elf_file)); try self.genSetReg(Type.initTag(.usize), .x30, .{ .memory = got_addr }); } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { const atom = try macho_file.getOrCreateAtomForDecl(func.owner_decl); @@ -6138,8 +6139,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne mod.markDeclAlive(decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try decl.link.elf.ensureInitialized(elf_file); - return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; + const atom_index = try elf_file.getOrCreateAtomForDecl(decl_index); + const atom = elf_file.getAtom(atom_index); + return MCValue{ .memory = atom.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { const atom = try macho_file.getOrCreateAtomForDecl(decl_index); const sym_index = macho_file.getAtom(atom).getSymbolIndex().?; @@ -6168,8 +6170,7 @@ fn lowerUnnamedConst(self: *Self, tv: TypedValue) InnerError!MCValue { return self.fail("lowering unnamed constant failed: {s}", .{@errorName(err)}); }; if (self.bin_file.cast(link.File.Elf)) |elf_file| { - const vaddr = elf_file.local_symbols.items[local_sym_index].st_value; - return MCValue{ .memory = vaddr }; + return MCValue{ .memory = elf_file.getSymbol(local_sym_index).st_value }; } else if (self.bin_file.cast(link.File.MachO)) |_| { return MCValue{ .linker_load = .{ .type = .direct, diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index 49f979624d..c6ee960e51 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -4256,12 +4256,11 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.air.value(callee)) |func_value| { if (func_value.castTag(.function)) |func_payload| { const func = func_payload.data; - const mod = self.bin_file.options.module.?; - const fn_owner_decl = mod.declPtr(func.owner_decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try fn_owner_decl.link.elf.ensureInitialized(elf_file); - const got_addr = @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); + const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); + const atom = elf_file.getAtom(atom_index); + const got_addr = @intCast(u32, atom.getOffsetTableAddress(elf_file)); try self.genSetReg(Type.initTag(.usize), .lr, .{ .memory = got_addr }); } else if (self.bin_file.cast(link.File.MachO)) |_| { unreachable; // unsupported architecture for MachO @@ -6084,8 +6083,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne mod.markDeclAlive(decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try decl.link.elf.ensureInitialized(elf_file); - return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; + const atom_index = try elf_file.getOrCreateAtomForDecl(decl_index); + const atom = elf_file.getAtom(atom_index); + return MCValue{ .memory = atom.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |_| { unreachable; // unsupported architecture for MachO } else if (self.bin_file.cast(link.File.Coff)) |_| { @@ -6106,8 +6106,7 @@ fn lowerUnnamedConst(self: *Self, tv: TypedValue) InnerError!MCValue { return self.fail("lowering unnamed constant failed: {s}", .{@errorName(err)}); }; if (self.bin_file.cast(link.File.Elf)) |elf_file| { - const vaddr = elf_file.local_symbols.items[local_sym_index].st_value; - return MCValue{ .memory = vaddr }; + return MCValue{ .memory = elf_file.getSymbol(local_sym_index).st_value }; } else if (self.bin_file.cast(link.File.MachO)) |_| { unreachable; } else if (self.bin_file.cast(link.File.Coff)) |_| { diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index 07a8dcd858..a0af1b3cce 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -1721,12 +1721,9 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.air.value(callee)) |func_value| { if (func_value.castTag(.function)) |func_payload| { const func = func_payload.data; - - const mod = self.bin_file.options.module.?; - const fn_owner_decl = mod.declPtr(func.owner_decl); - try fn_owner_decl.link.elf.ensureInitialized(elf_file); - const got_addr = @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); - + const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); + const atom = elf_file.getAtom(atom_index); + const got_addr = @intCast(u32, atom.getOffsetTableAddress(elf_file)); try self.genSetReg(Type.initTag(.usize), .ra, .{ .memory = got_addr }); _ = try self.addInst(.{ .tag = .jalr, @@ -2553,8 +2550,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne const decl = mod.declPtr(decl_index); mod.markDeclAlive(decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try decl.link.elf.ensureInitialized(elf_file); - return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; + const atom_index = try elf_file.getOrCreateAtomForDecl(decl_index); + const atom = elf_file.getAtom(atom_index); + return MCValue{ .memory = atom.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |_| { unreachable; } else if (self.bin_file.cast(link.File.Coff)) |_| { diff --git a/src/arch/sparc64/CodeGen.zig b/src/arch/sparc64/CodeGen.zig index 5e9326d23b..e67244167e 100644 --- a/src/arch/sparc64/CodeGen.zig +++ b/src/arch/sparc64/CodeGen.zig @@ -1216,11 +1216,10 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.bin_file.tag == link.File.Elf.base_tag) { if (func_value.castTag(.function)) |func_payload| { const func = func_payload.data; - const mod = self.bin_file.options.module.?; - const fn_owner_decl = mod.declPtr(func.owner_decl); const got_addr = if (self.bin_file.cast(link.File.Elf)) |elf_file| blk: { - try fn_owner_decl.link.elf.ensureInitialized(elf_file); - break :blk @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); + const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); + const atom = elf_file.getAtom(atom_index); + break :blk @intCast(u32, atom.getOffsetTableAddress(elf_file)); } else unreachable; try self.genSetReg(Type.initTag(.usize), .o7, .{ .memory = got_addr }); @@ -4205,8 +4204,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne mod.markDeclAlive(decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try decl.link.elf.ensureInitialized(elf_file); - return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; + const atom_index = try elf_file.getOrCreateAtomForDecl(decl_index); + const atom = elf_file.getAtom(atom_index); + return MCValue{ .memory = atom.getOffsetTableAddress(elf_file) }; } else { return self.fail("TODO codegen non-ELF const Decl pointer", .{}); } diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index fc244e3130..23d3ca5514 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -4000,8 +4000,9 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier const fn_owner_decl = mod.declPtr(func.owner_decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try fn_owner_decl.link.elf.ensureInitialized(elf_file); - const got_addr = @intCast(u32, fn_owner_decl.link.elf.getOffsetTableAddress(elf_file)); + const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); + const atom = elf_file.getAtom(atom_index); + const got_addr = @intCast(u32, atom.getOffsetTableAddress(elf_file)); _ = try self.addInst(.{ .tag = .call, .ops = Mir.Inst.Ops.encode(.{ .flags = 0b01 }), @@ -6721,8 +6722,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne module.markDeclAlive(decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { - try decl.link.elf.ensureInitialized(elf_file); - return MCValue{ .memory = decl.link.elf.getOffsetTableAddress(elf_file) }; + const atom_index = try elf_file.getOrCreateAtomForDecl(decl_index); + const atom = elf_file.getAtom(atom_index); + return MCValue{ .memory = atom.getOffsetTableAddress(elf_file) }; } else if (self.bin_file.cast(link.File.MachO)) |macho_file| { const atom_index = try macho_file.getOrCreateAtomForDecl(decl_index); const sym_index = macho_file.getAtom(atom_index).getSymbolIndex().?; @@ -6751,8 +6753,7 @@ fn lowerUnnamedConst(self: *Self, tv: TypedValue) InnerError!MCValue { return self.fail("lowering unnamed constant failed: {s}", .{@errorName(err)}); }; if (self.bin_file.cast(link.File.Elf)) |elf_file| { - const vaddr = elf_file.local_symbols.items[local_sym_index].st_value; - return MCValue{ .memory = vaddr }; + return MCValue{ .memory = elf_file.getSymbol(local_sym_index).st_value }; } else if (self.bin_file.cast(link.File.MachO)) |_| { return MCValue{ .linker_load = .{ .type = .direct, diff --git a/src/link.zig b/src/link.zig index 2a96efe89d..09804add53 100644 --- a/src/link.zig +++ b/src/link.zig @@ -262,7 +262,7 @@ pub const File = struct { lock: ?Cache.Lock = null, pub const LinkBlock = union { - elf: Elf.TextBlock, + elf: void, coff: Coff.Atom, macho: void, plan9: Plan9.DeclBlock, @@ -284,7 +284,7 @@ pub const File = struct { }; pub const Export = union { - elf: Elf.Export, + elf: void, coff: Coff.Export, macho: void, plan9: Plan9.Export, diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 2595cd8ba5..8278377095 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -1099,7 +1099,7 @@ pub fn commitDeclState( switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const debug_line_sect = &elf_file.sections.items[elf_file.debug_line_section_index.?]; + const debug_line_sect = &elf_file.sections.items(.shdr)[elf_file.debug_line_section_index.?]; const file_pos = debug_line_sect.sh_offset + src_fn.off; try pwriteDbgLineNops(elf_file.base.file.?, file_pos, 0, &[0]u8{}, src_fn.len); }, @@ -1152,7 +1152,7 @@ pub fn commitDeclState( const elf_file = self.bin_file.cast(File.Elf).?; const shdr_index = elf_file.debug_line_section_index.?; try elf_file.growNonAllocSection(shdr_index, needed_size, 1, true); - const debug_line_sect = elf_file.sections.items[shdr_index]; + const debug_line_sect = elf_file.sections.items(.shdr)[shdr_index]; const file_pos = debug_line_sect.sh_offset + src_fn.off; try pwriteDbgLineNops( elf_file.base.file.?, @@ -1332,7 +1332,7 @@ fn updateDeclDebugInfoAllocation(self: *Dwarf, atom: *Atom, len: u32) !void { switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const debug_info_sect = &elf_file.sections.items[elf_file.debug_info_section_index.?]; + const debug_info_sect = &elf_file.sections.items(.shdr)[elf_file.debug_info_section_index.?]; const file_pos = debug_info_sect.sh_offset + atom.off; try pwriteDbgInfoNops(elf_file.base.file.?, file_pos, 0, &[0]u8{}, atom.len, false); }, @@ -1399,7 +1399,7 @@ fn writeDeclDebugInfo(self: *Dwarf, atom: *Atom, dbg_info_buf: []const u8) !void const elf_file = self.bin_file.cast(File.Elf).?; const shdr_index = elf_file.debug_info_section_index.?; try elf_file.growNonAllocSection(shdr_index, needed_size, 1, true); - const debug_info_sect = elf_file.sections.items[shdr_index]; + const debug_info_sect = elf_file.sections.items(.shdr)[shdr_index]; const file_pos = debug_info_sect.sh_offset + atom.off; try pwriteDbgInfoNops( elf_file.base.file.?, @@ -1475,7 +1475,7 @@ pub fn updateDeclLineNumber(self: *Dwarf, decl: *const Module.Decl) !void { switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const shdr = elf_file.sections.items[elf_file.debug_line_section_index.?]; + const shdr = elf_file.sections.items(.shdr)[elf_file.debug_line_section_index.?]; const file_pos = shdr.sh_offset + decl.fn_link.elf.off + self.getRelocDbgLineOff(); try elf_file.base.file.?.pwriteAll(&data, file_pos); }, @@ -1690,7 +1690,7 @@ pub fn writeDbgAbbrev(self: *Dwarf) !void { const elf_file = self.bin_file.cast(File.Elf).?; const shdr_index = elf_file.debug_abbrev_section_index.?; try elf_file.growNonAllocSection(shdr_index, needed_size, 1, false); - const debug_abbrev_sect = elf_file.sections.items[shdr_index]; + const debug_abbrev_sect = elf_file.sections.items(.shdr)[shdr_index]; const file_pos = debug_abbrev_sect.sh_offset + abbrev_offset; try elf_file.base.file.?.pwriteAll(&abbrev_buf, file_pos); }, @@ -1805,7 +1805,7 @@ pub fn writeDbgInfoHeader(self: *Dwarf, module: *Module, low_pc: u64, high_pc: u switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const debug_info_sect = elf_file.sections.items[elf_file.debug_info_section_index.?]; + const debug_info_sect = elf_file.sections.items(.shdr)[elf_file.debug_info_section_index.?]; const file_pos = debug_info_sect.sh_offset; try pwriteDbgInfoNops(elf_file.base.file.?, file_pos, 0, di_buf.items, jmp_amt, false); }, @@ -2124,7 +2124,7 @@ pub fn writeDbgAranges(self: *Dwarf, addr: u64, size: u64) !void { const elf_file = self.bin_file.cast(File.Elf).?; const shdr_index = elf_file.debug_aranges_section_index.?; try elf_file.growNonAllocSection(shdr_index, needed_size, 16, false); - const debug_aranges_sect = elf_file.sections.items[shdr_index]; + const debug_aranges_sect = elf_file.sections.items(.shdr)[shdr_index]; const file_pos = debug_aranges_sect.sh_offset; try elf_file.base.file.?.pwriteAll(di_buf.items, file_pos); }, @@ -2285,9 +2285,9 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; const shdr_index = elf_file.debug_line_section_index.?; - const needed_size = elf_file.sections.items[shdr_index].sh_size + delta; + const needed_size = elf_file.sections.items(.shdr)[shdr_index].sh_size + delta; try elf_file.growNonAllocSection(shdr_index, needed_size, 1, true); - const file_pos = elf_file.sections.items[shdr_index].sh_offset + src_fn.off; + const file_pos = elf_file.sections.items(.shdr)[shdr_index].sh_offset + src_fn.off; const amt = try elf_file.base.file.?.preadAll(buffer, file_pos); if (amt != buffer.len) return error.InputOutput; @@ -2346,7 +2346,7 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const debug_line_sect = elf_file.sections.items[elf_file.debug_line_section_index.?]; + const debug_line_sect = elf_file.sections.items(.shdr)[elf_file.debug_line_section_index.?]; const file_pos = debug_line_sect.sh_offset; try pwriteDbgLineNops(elf_file.base.file.?, file_pos, 0, di_buf.items, jmp_amt); }, @@ -2487,7 +2487,7 @@ pub fn flushModule(self: *Dwarf, module: *Module) !void { switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - const debug_info_sect = &elf_file.sections.items[elf_file.debug_info_section_index.?]; + const debug_info_sect = &elf_file.sections.items(.shdr)[elf_file.debug_info_section_index.?]; break :blk debug_info_sect.sh_offset; }, .macho => { @@ -2638,7 +2638,7 @@ fn addDbgInfoErrorSet( fn getDbgInfoAtom(tag: File.Tag, mod: *Module, decl_index: Module.Decl.Index) *Atom { const decl = mod.declPtr(decl_index); return switch (tag) { - .elf => &decl.link.elf.dbg_info_atom, + .elf => unreachable, .macho => unreachable, .wasm => &decl.link.wasm.dbg_info_atom, else => unreachable, diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 2c55e55f83..0b8128aa33 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -1,43 +1,89 @@ const Elf = @This(); const std = @import("std"); +const build_options = @import("build_options"); const builtin = @import("builtin"); +const assert = std.debug.assert; +const elf = std.elf; +const fs = std.fs; +const log = std.log.scoped(.link); const math = std.math; const mem = std.mem; -const assert = std.debug.assert; -const Allocator = std.mem.Allocator; -const fs = std.fs; -const elf = std.elf; -const log = std.log.scoped(.link); -const Atom = @import("Elf/Atom.zig"); -const Module = @import("../Module.zig"); +const codegen = @import("../codegen.zig"); +const glibc = @import("../glibc.zig"); +const link = @import("../link.zig"); +const lldMain = @import("../main.zig").lldMain; +const musl = @import("../musl.zig"); +const target_util = @import("../target.zig"); +const trace = @import("../tracy.zig").trace; + +const Air = @import("../Air.zig"); +const Allocator = std.mem.Allocator; +pub const Atom = @import("Elf/Atom.zig"); +const Cache = @import("../Cache.zig"); const Compilation = @import("../Compilation.zig"); const Dwarf = @import("Dwarf.zig"); -const codegen = @import("../codegen.zig"); -const lldMain = @import("../main.zig").lldMain; -const trace = @import("../tracy.zig").trace; -const Package = @import("../Package.zig"); -const Value = @import("../value.zig").Value; -const Type = @import("../type.zig").Type; -const TypedValue = @import("../TypedValue.zig"); -const link = @import("../link.zig"); const File = link.File; -const build_options = @import("build_options"); -const target_util = @import("../target.zig"); -const glibc = @import("../glibc.zig"); -const musl = @import("../musl.zig"); -const Cache = @import("../Cache.zig"); -const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); const LlvmObject = @import("../codegen/llvm.zig").Object; - -pub const TextBlock = Atom; +const Module = @import("../Module.zig"); +const Package = @import("../Package.zig"); +const StringTable = @import("strtab.zig").StringTable; +const Type = @import("../type.zig").Type; +const TypedValue = @import("../TypedValue.zig"); +const Value = @import("../value.zig").Value; const default_entry_addr = 0x8000000; pub const base_tag: File.Tag = .elf; +const Section = struct { + shdr: elf.Elf64_Shdr, + phdr_index: u16, + + /// Index of the last allocated atom in this section. + last_atom_index: ?Atom.Index = null, + + /// A list of atoms that have surplus capacity. This list can have false + /// positives, as functions grow and shrink over time, only sometimes being added + /// or removed from the freelist. + /// + /// An atom has surplus capacity when its overcapacity value is greater than + /// padToIdeal(minimum_atom_size). That is, when it has so + /// much extra capacity, that we could fit a small new symbol in it, itself with + /// ideal_capacity or more. + /// + /// Ideal capacity is defined by size + (size / ideal_factor) + /// + /// Overcapacity is measured by actual_capacity - ideal_capacity. Note that + /// overcapacity can be negative. A simple way to have negative overcapacity is to + /// allocate a fresh text block, which will have ideal capacity, and then grow it + /// by 1 byte. It will then have -1 overcapacity. + free_list: std.ArrayListUnmanaged(Atom.Index) = .{}, +}; + +const DeclMetadata = struct { + atom: Atom.Index, + shdr: u16, + /// A list of all exports aliases of this Decl. + exports: std.ArrayListUnmanaged(u32) = .{}, + + fn getExport(m: DeclMetadata, elf_file: *const Elf, name: []const u8) ?u32 { + for (m.exports.items) |exp| { + if (mem.eql(u8, name, elf_file.getSymbolName(exp))) return exp; + } + return null; + } + + fn getExportPtr(m: *DeclMetadata, elf_file: *Elf, name: []const u8) ?*u32 { + for (m.exports.items) |*exp| { + if (mem.eql(u8, name, elf_file.getSymbolName(exp.*))) return exp; + } + return null; + } +}; + base: File, dwarf: ?Dwarf = null, @@ -48,12 +94,12 @@ llvm_object: ?*LlvmObject = null, /// Stored in native-endian format, depending on target endianness needs to be bswapped on read/write. /// Same order as in the file. -sections: std.ArrayListUnmanaged(elf.Elf64_Shdr) = std.ArrayListUnmanaged(elf.Elf64_Shdr){}, +sections: std.MultiArrayList(Section) = .{}, shdr_table_offset: ?u64 = null, /// Stored in native-endian format, depending on target endianness needs to be bswapped on read/write. /// Same order as in the file. -program_headers: std.ArrayListUnmanaged(elf.Elf64_Phdr) = std.ArrayListUnmanaged(elf.Elf64_Phdr){}, +program_headers: std.ArrayListUnmanaged(elf.Elf64_Phdr) = .{}, phdr_table_offset: ?u64 = null, /// The index into the program headers of a PT_LOAD program header with Read and Execute flags phdr_load_re_index: ?u16 = null, @@ -65,12 +111,10 @@ phdr_load_ro_index: ?u16 = null, /// The index into the program headers of a PT_LOAD program header with Write flag phdr_load_rw_index: ?u16 = null, -phdr_shdr_table: std.AutoHashMapUnmanaged(u16, u16) = .{}, - entry_addr: ?u64 = null, page_size: u32, -shstrtab: std.ArrayListUnmanaged(u8) = std.ArrayListUnmanaged(u8){}, +shstrtab: StringTable(.strtab) = .{}, shstrtab_index: ?u16 = null, symtab_section_index: ?u16 = null, @@ -113,39 +157,14 @@ debug_line_header_dirty: bool = false, error_flags: File.ErrorFlags = File.ErrorFlags{}, -/// Pointer to the last allocated atom -atoms: std.AutoHashMapUnmanaged(u16, *TextBlock) = .{}, - -/// A list of text blocks that have surplus capacity. This list can have false -/// positives, as functions grow and shrink over time, only sometimes being added -/// or removed from the freelist. -/// -/// A text block has surplus capacity when its overcapacity value is greater than -/// padToIdeal(minimum_text_block_size). That is, when it has so -/// much extra capacity, that we could fit a small new symbol in it, itself with -/// ideal_capacity or more. -/// -/// Ideal capacity is defined by size + (size / ideal_factor) -/// -/// Overcapacity is measured by actual_capacity - ideal_capacity. Note that -/// overcapacity can be negative. A simple way to have negative overcapacity is to -/// allocate a fresh text block, which will have ideal capacity, and then grow it -/// by 1 byte. It will then have -1 overcapacity. -atom_free_lists: std.AutoHashMapUnmanaged(u16, std.ArrayListUnmanaged(*TextBlock)) = .{}, - -/// Table of Decls that are currently alive. -/// We store them here so that we can properly dispose of any allocated -/// memory within the atom in the incremental linker. -/// TODO consolidate this. -decls: std.AutoHashMapUnmanaged(Module.Decl.Index, ?u16) = .{}, +/// Table of tracked Decls. +decls: std.AutoHashMapUnmanaged(Module.Decl.Index, DeclMetadata) = .{}, /// List of atoms that are owned directly by the linker. -/// Currently these are only atoms that are the result of linking -/// object files. Atoms which take part in incremental linking are -/// at present owned by Module.Decl. -/// TODO consolidate this. -managed_atoms: std.ArrayListUnmanaged(*TextBlock) = .{}, -atom_by_index_table: std.AutoHashMapUnmanaged(u32, *TextBlock) = .{}, +atoms: std.ArrayListUnmanaged(Atom) = .{}, + +/// Table of atoms indexed by the symbol index. +atom_by_index_table: std.AutoHashMapUnmanaged(u32, Atom.Index) = .{}, /// Table of unnamed constants associated with a parent `Decl`. /// We store them here so that we can free the constants whenever the `Decl` @@ -173,15 +192,8 @@ unnamed_const_atoms: UnnamedConstTable = .{}, /// this will be a table indexed by index into the list of Atoms. relocs: RelocTable = .{}, -const Reloc = struct { - target: u32, - offset: u64, - addend: u32, - prev_vaddr: u64, -}; - -const RelocTable = std.AutoHashMapUnmanaged(*TextBlock, std.ArrayListUnmanaged(Reloc)); -const UnnamedConstTable = std.AutoHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(*TextBlock)); +const RelocTable = std.AutoHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(Atom.Reloc)); +const UnnamedConstTable = std.AutoHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(Atom.Index)); /// When allocating, the ideal_capacity is calculated by /// actual_capacity + (actual_capacity / ideal_factor) @@ -190,15 +202,11 @@ const ideal_factor = 3; /// In order for a slice of bytes to be considered eligible to keep metadata pointing at /// it as a possible place to put new symbols, it must have enough room for this many bytes /// (plus extra for reserved capacity). -const minimum_text_block_size = 64; -pub const min_text_capacity = padToIdeal(minimum_text_block_size); +const minimum_atom_size = 64; +pub const min_text_capacity = padToIdeal(minimum_atom_size); pub const PtrWidth = enum { p32, p64 }; -pub const Export = struct { - sym_index: ?u32 = null, -}; - pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Elf { assert(options.target.ofmt == .elf); @@ -230,16 +238,19 @@ pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Option // There must always be a null section in index 0 try self.sections.append(allocator, .{ - .sh_name = 0, - .sh_type = elf.SHT_NULL, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = 0, - .sh_size = 0, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = 0, - .sh_entsize = 0, + .shdr = .{ + .sh_name = 0, + .sh_type = elf.SHT_NULL, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = 0, + .sh_size = 0, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = 0, + .sh_entsize = 0, + }, + .phdr_index = undefined, }); try self.populateMissingMetadata(); @@ -286,75 +297,67 @@ pub fn createEmpty(gpa: Allocator, options: link.Options) !*Elf { } pub fn deinit(self: *Elf) void { + const gpa = self.base.allocator; + if (build_options.have_llvm) { - if (self.llvm_object) |llvm_object| llvm_object.destroy(self.base.allocator); + if (self.llvm_object) |llvm_object| llvm_object.destroy(gpa); } - self.sections.deinit(self.base.allocator); - self.program_headers.deinit(self.base.allocator); - self.shstrtab.deinit(self.base.allocator); - self.local_symbols.deinit(self.base.allocator); - self.global_symbols.deinit(self.base.allocator); - self.global_symbol_free_list.deinit(self.base.allocator); - self.local_symbol_free_list.deinit(self.base.allocator); - self.offset_table_free_list.deinit(self.base.allocator); - self.offset_table.deinit(self.base.allocator); - self.phdr_shdr_table.deinit(self.base.allocator); - self.decls.deinit(self.base.allocator); + for (self.sections.items(.free_list)) |*free_list| { + free_list.deinit(gpa); + } + self.sections.deinit(gpa); + + self.program_headers.deinit(gpa); + self.shstrtab.deinit(gpa); + self.local_symbols.deinit(gpa); + self.global_symbols.deinit(gpa); + self.global_symbol_free_list.deinit(gpa); + self.local_symbol_free_list.deinit(gpa); + self.offset_table_free_list.deinit(gpa); + self.offset_table.deinit(gpa); - self.atoms.deinit(self.base.allocator); { - var it = self.atom_free_lists.valueIterator(); - while (it.next()) |free_list| { - free_list.deinit(self.base.allocator); + var it = self.decls.iterator(); + while (it.next()) |entry| { + entry.value_ptr.exports.deinit(gpa); } - self.atom_free_lists.deinit(self.base.allocator); + self.decls.deinit(gpa); } - for (self.managed_atoms.items) |atom| { - self.base.allocator.destroy(atom); - } - self.managed_atoms.deinit(self.base.allocator); + self.atoms.deinit(gpa); + self.atom_by_index_table.deinit(gpa); { var it = self.unnamed_const_atoms.valueIterator(); while (it.next()) |atoms| { - atoms.deinit(self.base.allocator); + atoms.deinit(gpa); } - self.unnamed_const_atoms.deinit(self.base.allocator); + self.unnamed_const_atoms.deinit(gpa); } { var it = self.relocs.valueIterator(); while (it.next()) |relocs| { - relocs.deinit(self.base.allocator); + relocs.deinit(gpa); } - self.relocs.deinit(self.base.allocator); + self.relocs.deinit(gpa); } - self.atom_by_index_table.deinit(self.base.allocator); - - if (self.dwarf) |*dw| { - dw.deinit(); - } + // if (self.dwarf) |*dw| { + // dw.deinit(); + // } } pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: File.RelocInfo) !u64 { - const mod = self.base.options.module.?; - const decl = mod.declPtr(decl_index); - assert(self.llvm_object == null); - try decl.link.elf.ensureInitialized(self); - const target = decl.link.elf.getSymbolIndex().?; - - const vaddr = self.local_symbols.items[target].st_value; - const atom = self.atom_by_index_table.get(reloc_info.parent_atom_index).?; - const gop = try self.relocs.getOrPut(self.base.allocator, atom); - if (!gop.found_existing) { - gop.value_ptr.* = .{}; - } - try gop.value_ptr.append(self.base.allocator, .{ + const this_atom_index = try self.getOrCreateAtomForDecl(decl_index); + const this_atom = self.getAtom(this_atom_index); + const target = this_atom.getSymbolIndex().?; + const vaddr = this_atom.getSymbol(self).st_value; + const atom_index = self.getAtomIndexForSymbol(reloc_info.parent_atom_index).?; + try Atom.addRelocation(self, atom_index, .{ .target = target, .offset = reloc_info.offset, .addend = reloc_info.addend, @@ -375,7 +378,7 @@ fn detectAllocCollision(self: *Elf, start: u64, size: u64) ?u64 { if (self.shdr_table_offset) |off| { const shdr_size: u64 = if (small_ptr) @sizeOf(elf.Elf32_Shdr) else @sizeOf(elf.Elf64_Shdr); - const tight_size = self.sections.items.len * shdr_size; + const tight_size = self.sections.slice().len * shdr_size; const increased_size = padToIdeal(tight_size); const test_end = off + increased_size; if (end > off and start < test_end) { @@ -385,7 +388,7 @@ fn detectAllocCollision(self: *Elf, start: u64, size: u64) ?u64 { if (self.phdr_table_offset) |off| { const phdr_size: u64 = if (small_ptr) @sizeOf(elf.Elf32_Phdr) else @sizeOf(elf.Elf64_Phdr); - const tight_size = self.sections.items.len * phdr_size; + const tight_size = self.sections.slice().len * phdr_size; const increased_size = padToIdeal(tight_size); const test_end = off + increased_size; if (end > off and start < test_end) { @@ -393,7 +396,7 @@ fn detectAllocCollision(self: *Elf, start: u64, size: u64) ?u64 { } } - for (self.sections.items) |section| { + for (self.sections.items(.shdr)) |section| { const increased_size = padToIdeal(section.sh_size); const test_end = section.sh_offset + increased_size; if (end > section.sh_offset and start < test_end) { @@ -420,7 +423,7 @@ pub fn allocatedSize(self: *Elf, start: u64) u64 { if (self.phdr_table_offset) |off| { if (off > start and off < min_pos) min_pos = off; } - for (self.sections.items) |section| { + for (self.sections.items(.shdr)) |section| { if (section.sh_offset <= start) continue; if (section.sh_offset < min_pos) min_pos = section.sh_offset; } @@ -439,31 +442,10 @@ pub fn findFreeSpace(self: *Elf, object_size: u64, min_alignment: u32) u64 { return start; } -/// TODO Improve this to use a table. -fn makeString(self: *Elf, bytes: []const u8) !u32 { - try self.shstrtab.ensureUnusedCapacity(self.base.allocator, bytes.len + 1); - const result = self.shstrtab.items.len; - self.shstrtab.appendSliceAssumeCapacity(bytes); - self.shstrtab.appendAssumeCapacity(0); - return @intCast(u32, result); -} - -pub fn getString(self: Elf, str_off: u32) []const u8 { - assert(str_off < self.shstrtab.items.len); - return mem.sliceTo(@ptrCast([*:0]const u8, self.shstrtab.items.ptr + str_off), 0); -} - -fn updateString(self: *Elf, old_str_off: u32, new_name: []const u8) !u32 { - const existing_name = self.getString(old_str_off); - if (mem.eql(u8, existing_name, new_name)) { - return old_str_off; - } - return self.makeString(new_name); -} - pub fn populateMissingMetadata(self: *Elf) !void { assert(self.llvm_object == null); + const gpa = self.base.allocator; const small_ptr = switch (self.ptr_width) { .p32 => true, .p64 => false, @@ -477,7 +459,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { const off = self.findFreeSpace(file_size, p_align); log.debug("found PT_LOAD RE free space 0x{x} to 0x{x}", .{ off, off + file_size }); const entry_addr: u64 = self.entry_addr orelse if (self.base.options.target.cpu.arch == .spu_2) @as(u64, 0) else default_entry_addr; - try self.program_headers.append(self.base.allocator, .{ + try self.program_headers.append(gpa, .{ .p_type = elf.PT_LOAD, .p_offset = off, .p_filesz = file_size, @@ -487,7 +469,6 @@ pub fn populateMissingMetadata(self: *Elf) !void { .p_align = p_align, .p_flags = elf.PF_X | elf.PF_R, }); - try self.atom_free_lists.putNoClobber(self.base.allocator, self.phdr_load_re_index.?, .{}); self.entry_addr = null; self.phdr_table_dirty = true; } @@ -504,7 +485,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { // we'll need to re-use that function anyway, in case the GOT grows and overlaps something // else in virtual memory. const got_addr: u32 = if (self.base.options.target.cpu.arch.ptrBitWidth() >= 32) 0x4000000 else 0x8000; - try self.program_headers.append(self.base.allocator, .{ + try self.program_headers.append(gpa, .{ .p_type = elf.PT_LOAD, .p_offset = off, .p_filesz = file_size, @@ -527,7 +508,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { log.debug("found PT_LOAD RO free space 0x{x} to 0x{x}", .{ off, off + file_size }); // TODO Same as for GOT const rodata_addr: u32 = if (self.base.options.target.cpu.arch.ptrBitWidth() >= 32) 0xc000000 else 0xa000; - try self.program_headers.append(self.base.allocator, .{ + try self.program_headers.append(gpa, .{ .p_type = elf.PT_LOAD, .p_offset = off, .p_filesz = file_size, @@ -537,7 +518,6 @@ pub fn populateMissingMetadata(self: *Elf) !void { .p_align = p_align, .p_flags = elf.PF_R, }); - try self.atom_free_lists.putNoClobber(self.base.allocator, self.phdr_load_ro_index.?, .{}); self.phdr_table_dirty = true; } @@ -551,7 +531,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { log.debug("found PT_LOAD RW free space 0x{x} to 0x{x}", .{ off, off + file_size }); // TODO Same as for GOT const rwdata_addr: u32 = if (self.base.options.target.cpu.arch.ptrBitWidth() >= 32) 0x10000000 else 0xc000; - try self.program_headers.append(self.base.allocator, .{ + try self.program_headers.append(gpa, .{ .p_type = elf.PT_LOAD, .p_offset = off, .p_filesz = file_size, @@ -561,278 +541,290 @@ pub fn populateMissingMetadata(self: *Elf) !void { .p_align = p_align, .p_flags = elf.PF_R | elf.PF_W, }); - try self.atom_free_lists.putNoClobber(self.base.allocator, self.phdr_load_rw_index.?, .{}); self.phdr_table_dirty = true; } if (self.shstrtab_index == null) { - self.shstrtab_index = @intCast(u16, self.sections.items.len); - assert(self.shstrtab.items.len == 0); - try self.shstrtab.append(self.base.allocator, 0); // need a 0 at position 0 - const off = self.findFreeSpace(self.shstrtab.items.len, 1); - log.debug("found shstrtab free space 0x{x} to 0x{x}", .{ off, off + self.shstrtab.items.len }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".shstrtab"), - .sh_type = elf.SHT_STRTAB, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = self.shstrtab.items.len, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = 1, - .sh_entsize = 0, + self.shstrtab_index = @intCast(u16, self.sections.slice().len); + assert(self.shstrtab.buffer.items.len == 0); + try self.shstrtab.buffer.append(gpa, 0); // need a 0 at position 0 + const off = self.findFreeSpace(self.shstrtab.buffer.items.len, 1); + log.debug("found shstrtab free space 0x{x} to 0x{x}", .{ off, off + self.shstrtab.buffer.items.len }); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".shstrtab"), + .sh_type = elf.SHT_STRTAB, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = self.shstrtab.buffer.items.len, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = 1, + .sh_entsize = 0, + }, + .phdr_index = undefined, }); self.shstrtab_dirty = true; self.shdr_table_dirty = true; } if (self.text_section_index == null) { - self.text_section_index = @intCast(u16, self.sections.items.len); + self.text_section_index = @intCast(u16, self.sections.slice().len); const phdr = &self.program_headers.items[self.phdr_load_re_index.?]; - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".text"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = elf.SHF_ALLOC | elf.SHF_EXECINSTR, - .sh_addr = phdr.p_vaddr, - .sh_offset = phdr.p_offset, - .sh_size = phdr.p_filesz, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = 1, - .sh_entsize = 0, + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".text"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = elf.SHF_ALLOC | elf.SHF_EXECINSTR, + .sh_addr = phdr.p_vaddr, + .sh_offset = phdr.p_offset, + .sh_size = phdr.p_filesz, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = 1, + .sh_entsize = 0, + }, + .phdr_index = self.phdr_load_re_index.?, }); - try self.phdr_shdr_table.putNoClobber( - self.base.allocator, - self.phdr_load_re_index.?, - self.text_section_index.?, - ); self.shdr_table_dirty = true; } if (self.got_section_index == null) { - self.got_section_index = @intCast(u16, self.sections.items.len); + self.got_section_index = @intCast(u16, self.sections.slice().len); const phdr = &self.program_headers.items[self.phdr_got_index.?]; - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".got"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = elf.SHF_ALLOC, - .sh_addr = phdr.p_vaddr, - .sh_offset = phdr.p_offset, - .sh_size = phdr.p_filesz, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = @as(u16, ptr_size), - .sh_entsize = 0, + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".got"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = elf.SHF_ALLOC, + .sh_addr = phdr.p_vaddr, + .sh_offset = phdr.p_offset, + .sh_size = phdr.p_filesz, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = @as(u16, ptr_size), + .sh_entsize = 0, + }, + .phdr_index = self.phdr_got_index.?, }); - try self.phdr_shdr_table.putNoClobber( - self.base.allocator, - self.phdr_got_index.?, - self.got_section_index.?, - ); self.shdr_table_dirty = true; } if (self.rodata_section_index == null) { - self.rodata_section_index = @intCast(u16, self.sections.items.len); + self.rodata_section_index = @intCast(u16, self.sections.slice().len); const phdr = &self.program_headers.items[self.phdr_load_ro_index.?]; - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".rodata"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = elf.SHF_ALLOC, - .sh_addr = phdr.p_vaddr, - .sh_offset = phdr.p_offset, - .sh_size = phdr.p_filesz, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = 1, - .sh_entsize = 0, + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".rodata"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = elf.SHF_ALLOC, + .sh_addr = phdr.p_vaddr, + .sh_offset = phdr.p_offset, + .sh_size = phdr.p_filesz, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = 1, + .sh_entsize = 0, + }, + .phdr_index = self.phdr_load_ro_index.?, }); - try self.phdr_shdr_table.putNoClobber( - self.base.allocator, - self.phdr_load_ro_index.?, - self.rodata_section_index.?, - ); self.shdr_table_dirty = true; } if (self.data_section_index == null) { - self.data_section_index = @intCast(u16, self.sections.items.len); + self.data_section_index = @intCast(u16, self.sections.slice().len); const phdr = &self.program_headers.items[self.phdr_load_rw_index.?]; - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".data"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = elf.SHF_WRITE | elf.SHF_ALLOC, - .sh_addr = phdr.p_vaddr, - .sh_offset = phdr.p_offset, - .sh_size = phdr.p_filesz, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = @as(u16, ptr_size), - .sh_entsize = 0, + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".data"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = elf.SHF_WRITE | elf.SHF_ALLOC, + .sh_addr = phdr.p_vaddr, + .sh_offset = phdr.p_offset, + .sh_size = phdr.p_filesz, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = @as(u16, ptr_size), + .sh_entsize = 0, + }, + .phdr_index = self.phdr_load_rw_index.?, }); - try self.phdr_shdr_table.putNoClobber( - self.base.allocator, - self.phdr_load_rw_index.?, - self.data_section_index.?, - ); self.shdr_table_dirty = true; } if (self.symtab_section_index == null) { - self.symtab_section_index = @intCast(u16, self.sections.items.len); + self.symtab_section_index = @intCast(u16, self.sections.slice().len); const min_align: u16 = if (small_ptr) @alignOf(elf.Elf32_Sym) else @alignOf(elf.Elf64_Sym); const each_size: u64 = if (small_ptr) @sizeOf(elf.Elf32_Sym) else @sizeOf(elf.Elf64_Sym); const file_size = self.base.options.symbol_count_hint * each_size; const off = self.findFreeSpace(file_size, min_align); log.debug("found symtab free space 0x{x} to 0x{x}", .{ off, off + file_size }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".symtab"), - .sh_type = elf.SHT_SYMTAB, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = file_size, - // The section header index of the associated string table. - .sh_link = self.shstrtab_index.?, - .sh_info = @intCast(u32, self.local_symbols.items.len), - .sh_addralign = min_align, - .sh_entsize = each_size, + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".symtab"), + .sh_type = elf.SHT_SYMTAB, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = file_size, + // The section header index of the associated string table. + .sh_link = self.shstrtab_index.?, + .sh_info = @intCast(u32, self.local_symbols.items.len), + .sh_addralign = min_align, + .sh_entsize = each_size, + }, + .phdr_index = undefined, }); self.shdr_table_dirty = true; try self.writeSymbol(0); } - if (self.dwarf) |*dw| { - if (self.debug_str_section_index == null) { - self.debug_str_section_index = @intCast(u16, self.sections.items.len); - assert(dw.strtab.items.len == 0); - try dw.strtab.append(self.base.allocator, 0); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".debug_str"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = elf.SHF_MERGE | elf.SHF_STRINGS, - .sh_addr = 0, - .sh_offset = 0, - .sh_size = 0, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = 1, - .sh_entsize = 1, - }); - self.debug_strtab_dirty = true; - self.shdr_table_dirty = true; - } + // if (self.dwarf) |*dw| { + // if (self.debug_str_section_index == null) { + // self.debug_str_section_index = @intCast(u16, self.sections.slice().len); + // assert(dw.strtab.items.len == 0); + // try dw.strtab.append(gpa, 0); + // try self.sections.append(gpa, .{ + // .shdr = .{ + // .sh_name = try self.shstrtab.insert(gpa, ".debug_str"), + // .sh_type = elf.SHT_PROGBITS, + // .sh_flags = elf.SHF_MERGE | elf.SHF_STRINGS, + // .sh_addr = 0, + // .sh_offset = 0, + // .sh_size = 0, + // .sh_link = 0, + // .sh_info = 0, + // .sh_addralign = 1, + // .sh_entsize = 1, + // }, + // .phdr_index = undefined, + // }); + // self.debug_strtab_dirty = true; + // self.shdr_table_dirty = true; + // } - if (self.debug_info_section_index == null) { - self.debug_info_section_index = @intCast(u16, self.sections.items.len); + // if (self.debug_info_section_index == null) { + // self.debug_info_section_index = @intCast(u16, self.sections.slice().len); - const file_size_hint = 200; - const p_align = 1; - const off = self.findFreeSpace(file_size_hint, p_align); - log.debug("found .debug_info free space 0x{x} to 0x{x}", .{ - off, - off + file_size_hint, - }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".debug_info"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = file_size_hint, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = p_align, - .sh_entsize = 0, - }); - self.shdr_table_dirty = true; - self.debug_info_header_dirty = true; - } + // const file_size_hint = 200; + // const p_align = 1; + // const off = self.findFreeSpace(file_size_hint, p_align); + // log.debug("found .debug_info free space 0x{x} to 0x{x}", .{ + // off, + // off + file_size_hint, + // }); + // try self.sections.append(gpa, .{ + // .shdr = .{ + // .sh_name = try self.shstrtab.insert(gpa, ".debug_info"), + // .sh_type = elf.SHT_PROGBITS, + // .sh_flags = 0, + // .sh_addr = 0, + // .sh_offset = off, + // .sh_size = file_size_hint, + // .sh_link = 0, + // .sh_info = 0, + // .sh_addralign = p_align, + // .sh_entsize = 0, + // }, + // .phdr_index = undefined, + // }); + // self.shdr_table_dirty = true; + // self.debug_info_header_dirty = true; + // } - if (self.debug_abbrev_section_index == null) { - self.debug_abbrev_section_index = @intCast(u16, self.sections.items.len); + // if (self.debug_abbrev_section_index == null) { + // self.debug_abbrev_section_index = @intCast(u16, self.sections.slice().len); - const file_size_hint = 128; - const p_align = 1; - const off = self.findFreeSpace(file_size_hint, p_align); - log.debug("found .debug_abbrev free space 0x{x} to 0x{x}", .{ - off, - off + file_size_hint, - }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".debug_abbrev"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = file_size_hint, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = p_align, - .sh_entsize = 0, - }); - self.shdr_table_dirty = true; - self.debug_abbrev_section_dirty = true; - } + // const file_size_hint = 128; + // const p_align = 1; + // const off = self.findFreeSpace(file_size_hint, p_align); + // log.debug("found .debug_abbrev free space 0x{x} to 0x{x}", .{ + // off, + // off + file_size_hint, + // }); + // try self.sections.append(gpa, .{ + // .shdr = .{ + // .sh_name = try self.shstrtab.insert(gpa, ".debug_abbrev"), + // .sh_type = elf.SHT_PROGBITS, + // .sh_flags = 0, + // .sh_addr = 0, + // .sh_offset = off, + // .sh_size = file_size_hint, + // .sh_link = 0, + // .sh_info = 0, + // .sh_addralign = p_align, + // .sh_entsize = 0, + // }, + // .phdr_index = undefined, + // }); + // self.shdr_table_dirty = true; + // self.debug_abbrev_section_dirty = true; + // } - if (self.debug_aranges_section_index == null) { - self.debug_aranges_section_index = @intCast(u16, self.sections.items.len); + // if (self.debug_aranges_section_index == null) { + // self.debug_aranges_section_index = @intCast(u16, self.sections.slice().len); - const file_size_hint = 160; - const p_align = 16; - const off = self.findFreeSpace(file_size_hint, p_align); - log.debug("found .debug_aranges free space 0x{x} to 0x{x}", .{ - off, - off + file_size_hint, - }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".debug_aranges"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = file_size_hint, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = p_align, - .sh_entsize = 0, - }); - self.shdr_table_dirty = true; - self.debug_aranges_section_dirty = true; - } + // const file_size_hint = 160; + // const p_align = 16; + // const off = self.findFreeSpace(file_size_hint, p_align); + // log.debug("found .debug_aranges free space 0x{x} to 0x{x}", .{ + // off, + // off + file_size_hint, + // }); + // try self.sections.append(gpa, .{ + // .shdr = .{ + // .sh_name = try self.shstrtab.insert(gpa, ".debug_aranges"), + // .sh_type = elf.SHT_PROGBITS, + // .sh_flags = 0, + // .sh_addr = 0, + // .sh_offset = off, + // .sh_size = file_size_hint, + // .sh_link = 0, + // .sh_info = 0, + // .sh_addralign = p_align, + // .sh_entsize = 0, + // }, + // .phdr_index = undefined, + // }); + // self.shdr_table_dirty = true; + // self.debug_aranges_section_dirty = true; + // } - if (self.debug_line_section_index == null) { - self.debug_line_section_index = @intCast(u16, self.sections.items.len); + // if (self.debug_line_section_index == null) { + // self.debug_line_section_index = @intCast(u16, self.sections.slice().len); - const file_size_hint = 250; - const p_align = 1; - const off = self.findFreeSpace(file_size_hint, p_align); - log.debug("found .debug_line free space 0x{x} to 0x{x}", .{ - off, - off + file_size_hint, - }); - try self.sections.append(self.base.allocator, .{ - .sh_name = try self.makeString(".debug_line"), - .sh_type = elf.SHT_PROGBITS, - .sh_flags = 0, - .sh_addr = 0, - .sh_offset = off, - .sh_size = file_size_hint, - .sh_link = 0, - .sh_info = 0, - .sh_addralign = p_align, - .sh_entsize = 0, - }); - self.shdr_table_dirty = true; - self.debug_line_header_dirty = true; - } - } + // const file_size_hint = 250; + // const p_align = 1; + // const off = self.findFreeSpace(file_size_hint, p_align); + // log.debug("found .debug_line free space 0x{x} to 0x{x}", .{ + // off, + // off + file_size_hint, + // }); + // try self.sections.append(gpa, .{ + // .shdr = .{ + // .sh_name = try self.shstrtab.insert(gpa, ".debug_line"), + // .sh_type = elf.SHT_PROGBITS, + // .sh_flags = 0, + // .sh_addr = 0, + // .sh_offset = off, + // .sh_size = file_size_hint, + // .sh_link = 0, + // .sh_info = 0, + // .sh_addralign = p_align, + // .sh_entsize = 0, + // }, + // .phdr_index = undefined, + // }); + // self.shdr_table_dirty = true; + // self.debug_line_header_dirty = true; + // } + // } const shsize: u64 = switch (self.ptr_width) { .p32 => @sizeOf(elf.Elf32_Shdr), @@ -843,7 +835,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { .p64 => @alignOf(elf.Elf64_Shdr), }; if (self.shdr_table_offset == null) { - self.shdr_table_offset = self.findFreeSpace(self.sections.items.len * shsize, shalign); + self.shdr_table_offset = self.findFreeSpace(self.sections.slice().len * shsize, shalign); self.shdr_table_dirty = true; } @@ -874,7 +866,7 @@ pub fn populateMissingMetadata(self: *Elf) !void { // offset + it's filesize. var max_file_offset: u64 = 0; - for (self.sections.items) |shdr| { + for (self.sections.items(.shdr)) |shdr| { if (shdr.sh_offset + shdr.sh_size > max_file_offset) { max_file_offset = shdr.sh_offset + shdr.sh_size; } @@ -884,15 +876,18 @@ pub fn populateMissingMetadata(self: *Elf) !void { } } -fn growAllocSection(self: *Elf, shdr_index: u16, phdr_index: u16, needed_size: u64) !void { +fn growAllocSection(self: *Elf, shdr_index: u16, needed_size: u64) !void { // TODO Also detect virtual address collisions. - const shdr = &self.sections.items[shdr_index]; + const shdr = &self.sections.items(.shdr)[shdr_index]; + const phdr_index = self.sections.items(.phdr_index)[shdr_index]; const phdr = &self.program_headers.items[phdr_index]; + const maybe_last_atom_index = self.sections.items(.last_atom_index)[shdr_index]; if (needed_size > self.allocatedSize(shdr.sh_offset)) { // Must move the entire section. const new_offset = self.findFreeSpace(needed_size, self.page_size); - const existing_size = if (self.atoms.get(phdr_index)) |last| blk: { + const existing_size = if (maybe_last_atom_index) |last_atom_index| blk: { + const last = self.getAtom(last_atom_index); const sym = last.getSymbol(self); break :blk (sym.st_value + sym.st_size) - phdr.p_vaddr; } else if (shdr_index == self.got_section_index.?) blk: { @@ -900,8 +895,8 @@ fn growAllocSection(self: *Elf, shdr_index: u16, phdr_index: u16, needed_size: u } else 0; shdr.sh_size = 0; - log.debug("new '{s}' file offset 0x{x} to 0x{x}", .{ - self.getString(shdr.sh_name), + log.debug("new '{?s}' file offset 0x{x} to 0x{x}", .{ + self.shstrtab.get(shdr.sh_name), new_offset, new_offset + existing_size, }); @@ -927,7 +922,7 @@ pub fn growNonAllocSection( min_alignment: u32, requires_file_copy: bool, ) !void { - const shdr = &self.sections.items[shdr_index]; + const shdr = &self.sections.items(.shdr)[shdr_index]; if (needed_size > self.allocatedSize(shdr.sh_offset)) { const existing_size = if (self.symtab_section_index.? == shdr_index) blk: { @@ -940,7 +935,7 @@ pub fn growNonAllocSection( shdr.sh_size = 0; // Move all the symbols to a new file location. const new_offset = self.findFreeSpace(needed_size, min_alignment); - log.debug("moving '{s}' from 0x{x} to 0x{x}", .{ self.getString(shdr.sh_name), shdr.sh_offset, new_offset }); + log.debug("moving '{?s}' from 0x{x} to 0x{x}", .{ self.shstrtab.get(shdr.sh_name), shdr.sh_offset, new_offset }); if (requires_file_copy) { const amt = try self.base.file.?.copyRangeAll( @@ -961,25 +956,26 @@ pub fn growNonAllocSection( } pub fn markDirty(self: *Elf, shdr_index: u16, phdr_index: ?u16) void { + _ = shdr_index; self.shdr_table_dirty = true; // TODO look into only writing one section if (phdr_index) |_| { self.phdr_table_dirty = true; // TODO look into making only the one program header dirty } - if (self.dwarf) |_| { - if (self.debug_info_section_index.? == shdr_index) { - self.debug_info_header_dirty = true; - } else if (self.debug_line_section_index.? == shdr_index) { - self.debug_line_header_dirty = true; - } else if (self.debug_abbrev_section_index.? == shdr_index) { - self.debug_abbrev_section_dirty = true; - } else if (self.debug_str_section_index.? == shdr_index) { - self.debug_strtab_dirty = true; - } else if (self.debug_aranges_section_index.? == shdr_index) { - self.debug_aranges_section_dirty = true; - } - } + // if (self.dwarf) |_| { + // if (self.debug_info_section_index.? == shdr_index) { + // self.debug_info_header_dirty = true; + // } else if (self.debug_line_section_index.? == shdr_index) { + // self.debug_line_header_dirty = true; + // } else if (self.debug_abbrev_section_index.? == shdr_index) { + // self.debug_abbrev_section_dirty = true; + // } else if (self.debug_str_section_index.? == shdr_index) { + // self.debug_strtab_dirty = true; + // } else if (self.debug_aranges_section_index.? == shdr_index) { + // self.debug_aranges_section_dirty = true; + // } + // } } pub fn flush(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) link.File.FlushError!void { @@ -1011,6 +1007,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node } } + const gpa = self.base.allocator; var sub_prog_node = prog_node.start("ELF Flush", 0); sub_prog_node.activate(); defer sub_prog_node.end(); @@ -1018,23 +1015,25 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node // TODO This linker code currently assumes there is only 1 compilation unit and it // corresponds to the Zig source code. const module = self.base.options.module orelse return error.LinkingWithoutZigSourceUnimplemented; + _ = module; const target_endian = self.base.options.target.cpu.arch.endian(); const foreign_endian = target_endian != builtin.cpu.arch.endian(); - if (self.dwarf) |*dw| { - try dw.flushModule(module); - } + // if (self.dwarf) |*dw| { + // try dw.flushModule(module); + // } { var it = self.relocs.iterator(); while (it.next()) |entry| { - const atom = entry.key_ptr.*; + const atom_index = entry.key_ptr.*; const relocs = entry.value_ptr.*; + const atom = self.getAtom(atom_index); const source_sym = atom.getSymbol(self); - const source_shdr = self.sections.items[source_sym.st_shndx]; + const source_shdr = self.sections.items(.shdr)[source_sym.st_shndx]; - log.debug("relocating '{s}'", .{self.getString(source_sym.st_name)}); + log.debug("relocating '{?s}'", .{self.shstrtab.get(source_sym.st_name)}); for (relocs.items) |*reloc| { const target_sym = self.local_symbols.items[reloc.target]; @@ -1045,10 +1044,10 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node const section_offset = (source_sym.st_value + reloc.offset) - source_shdr.sh_addr; const file_offset = source_shdr.sh_offset + section_offset; - log.debug(" ({x}: [() => 0x{x}] ({s}))", .{ + log.debug(" ({x}: [() => 0x{x}] ({?s}))", .{ reloc.offset, target_vaddr, - self.getString(target_sym.st_name), + self.shstrtab.get(target_sym.st_name), }); switch (self.ptr_width) { @@ -1069,43 +1068,43 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node self.logSymtab(); } - if (self.dwarf) |*dw| { - if (self.debug_abbrev_section_dirty) { - try dw.writeDbgAbbrev(); - if (!self.shdr_table_dirty) { - // Then it won't get written with the others and we need to do it. - try self.writeSectHeader(self.debug_abbrev_section_index.?); - } - self.debug_abbrev_section_dirty = false; - } + // if (self.dwarf) |*dw| { + // if (self.debug_abbrev_section_dirty) { + // try dw.writeDbgAbbrev(); + // if (!self.shdr_table_dirty) { + // // Then it won't get written with the others and we need to do it. + // try self.writeSectHeader(self.debug_abbrev_section_index.?); + // } + // self.debug_abbrev_section_dirty = false; + // } - if (self.debug_info_header_dirty) { - // Currently only one compilation unit is supported, so the address range is simply - // identical to the main program header virtual address and memory size. - const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; - const low_pc = text_phdr.p_vaddr; - const high_pc = text_phdr.p_vaddr + text_phdr.p_memsz; - try dw.writeDbgInfoHeader(module, low_pc, high_pc); - self.debug_info_header_dirty = false; - } + // if (self.debug_info_header_dirty) { + // // Currently only one compilation unit is supported, so the address range is simply + // // identical to the main program header virtual address and memory size. + // const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; + // const low_pc = text_phdr.p_vaddr; + // const high_pc = text_phdr.p_vaddr + text_phdr.p_memsz; + // try dw.writeDbgInfoHeader(module, low_pc, high_pc); + // self.debug_info_header_dirty = false; + // } - if (self.debug_aranges_section_dirty) { - // Currently only one compilation unit is supported, so the address range is simply - // identical to the main program header virtual address and memory size. - const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; - try dw.writeDbgAranges(text_phdr.p_vaddr, text_phdr.p_memsz); - if (!self.shdr_table_dirty) { - // Then it won't get written with the others and we need to do it. - try self.writeSectHeader(self.debug_aranges_section_index.?); - } - self.debug_aranges_section_dirty = false; - } + // if (self.debug_aranges_section_dirty) { + // // Currently only one compilation unit is supported, so the address range is simply + // // identical to the main program header virtual address and memory size. + // const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; + // try dw.writeDbgAranges(text_phdr.p_vaddr, text_phdr.p_memsz); + // if (!self.shdr_table_dirty) { + // // Then it won't get written with the others and we need to do it. + // try self.writeSectHeader(self.debug_aranges_section_index.?); + // } + // self.debug_aranges_section_dirty = false; + // } - if (self.debug_line_header_dirty) { - try dw.writeDbgLineHeader(); - self.debug_line_header_dirty = false; - } - } + // if (self.debug_line_header_dirty) { + // try dw.writeDbgLineHeader(); + // self.debug_line_header_dirty = false; + // } + // } if (self.phdr_table_dirty) { const phsize: u64 = switch (self.ptr_width) { @@ -1126,8 +1125,8 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node switch (self.ptr_width) { .p32 => { - const buf = try self.base.allocator.alloc(elf.Elf32_Phdr, self.program_headers.items.len); - defer self.base.allocator.free(buf); + const buf = try gpa.alloc(elf.Elf32_Phdr, self.program_headers.items.len); + defer gpa.free(buf); for (buf) |*phdr, i| { phdr.* = progHeaderTo32(self.program_headers.items[i]); @@ -1138,8 +1137,8 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.phdr_table_offset.?); }, .p64 => { - const buf = try self.base.allocator.alloc(elf.Elf64_Phdr, self.program_headers.items.len); - defer self.base.allocator.free(buf); + const buf = try gpa.alloc(elf.Elf64_Phdr, self.program_headers.items.len); + defer gpa.free(buf); for (buf) |*phdr, i| { phdr.* = self.program_headers.items[i]; @@ -1155,23 +1154,23 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node { const shdr_index = self.shstrtab_index.?; - if (self.shstrtab_dirty or self.shstrtab.items.len != self.sections.items[shdr_index].sh_size) { - try self.growNonAllocSection(shdr_index, self.shstrtab.items.len, 1, false); - const shstrtab_sect = self.sections.items[shdr_index]; - try self.base.file.?.pwriteAll(self.shstrtab.items, shstrtab_sect.sh_offset); + if (self.shstrtab_dirty or self.shstrtab.buffer.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { + try self.growNonAllocSection(shdr_index, self.shstrtab.buffer.items.len, 1, false); + const shstrtab_sect = self.sections.items(.shdr)[shdr_index]; + try self.base.file.?.pwriteAll(self.shstrtab.buffer.items, shstrtab_sect.sh_offset); self.shstrtab_dirty = false; } } - if (self.dwarf) |dwarf| { - const shdr_index = self.debug_str_section_index.?; - if (self.debug_strtab_dirty or dwarf.strtab.items.len != self.sections.items[shdr_index].sh_size) { - try self.growNonAllocSection(shdr_index, dwarf.strtab.items.len, 1, false); - const debug_strtab_sect = self.sections.items[shdr_index]; - try self.base.file.?.pwriteAll(dwarf.strtab.items, debug_strtab_sect.sh_offset); - self.debug_strtab_dirty = false; - } - } + // if (self.dwarf) |dwarf| { + // const shdr_index = self.debug_str_section_index.?; + // if (self.debug_strtab_dirty or dwarf.strtab.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { + // try self.growNonAllocSection(shdr_index, dwarf.strtab.items.len, 1, false); + // const debug_strtab_sect = self.sections.items(.shdr)[shdr_index]; + // try self.base.file.?.pwriteAll(dwarf.strtab.items, debug_strtab_sect.sh_offset); + // self.debug_strtab_dirty = false; + // } + // } if (self.shdr_table_dirty) { const shsize: u64 = switch (self.ptr_width) { @@ -1183,7 +1182,7 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node .p64 => @alignOf(elf.Elf64_Shdr), }; const allocated_size = self.allocatedSize(self.shdr_table_offset.?); - const needed_size = self.sections.items.len * shsize; + const needed_size = self.sections.slice().len * shsize; if (needed_size > allocated_size) { self.shdr_table_offset = null; // free the space @@ -1192,12 +1191,13 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node switch (self.ptr_width) { .p32 => { - const buf = try self.base.allocator.alloc(elf.Elf32_Shdr, self.sections.items.len); - defer self.base.allocator.free(buf); + const slice = self.sections.slice(); + const buf = try gpa.alloc(elf.Elf32_Shdr, slice.len); + defer gpa.free(buf); for (buf) |*shdr, i| { - shdr.* = sectHeaderTo32(self.sections.items[i]); - log.debug("writing section {s}: {}", .{ self.getString(shdr.sh_name), shdr.* }); + shdr.* = sectHeaderTo32(slice.items(.shdr)[i]); + log.debug("writing section {?s}: {}", .{ self.shstrtab.get(shdr.sh_name), shdr.* }); if (foreign_endian) { mem.byteSwapAllFields(elf.Elf32_Shdr, shdr); } @@ -1205,12 +1205,13 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node try self.base.file.?.pwriteAll(mem.sliceAsBytes(buf), self.shdr_table_offset.?); }, .p64 => { - const buf = try self.base.allocator.alloc(elf.Elf64_Shdr, self.sections.items.len); - defer self.base.allocator.free(buf); + const slice = self.sections.slice(); + const buf = try gpa.alloc(elf.Elf64_Shdr, slice.len); + defer gpa.free(buf); for (buf) |*shdr, i| { - shdr.* = self.sections.items[i]; - log.debug("writing section {s}: {}", .{ self.getString(shdr.sh_name), shdr.* }); + shdr.* = slice.items(.shdr)[i]; + log.debug("writing section {?s}: {}", .{ self.shstrtab.get(shdr.sh_name), shdr.* }); if (foreign_endian) { mem.byteSwapAllFields(elf.Elf64_Shdr, shdr); } @@ -2021,7 +2022,7 @@ fn writeElfHeader(self: *Elf) !void { mem.writeInt(u16, hdr_buf[index..][0..2], e_shentsize, endian); index += 2; - const e_shnum = @intCast(u16, self.sections.items.len); + const e_shnum = @intCast(u16, self.sections.slice().len); mem.writeInt(u16, hdr_buf[index..][0..2], e_shnum, endian); index += 2; @@ -2033,124 +2034,150 @@ fn writeElfHeader(self: *Elf) !void { try self.base.file.?.pwriteAll(hdr_buf[0..index], 0); } -fn freeTextBlock(self: *Elf, text_block: *TextBlock, phdr_index: u16) void { - const local_sym = text_block.getSymbol(self); - const name_str_index = local_sym.st_name; - const name = self.getString(name_str_index); - log.debug("freeTextBlock {*} ({s})", .{ text_block, name }); +fn freeAtom(self: *Elf, atom_index: Atom.Index) void { + const atom = self.getAtom(atom_index); + log.debug("freeAtom {d} ({s})", .{ atom_index, atom.getName(self) }); - self.freeRelocationsForTextBlock(text_block); + Atom.freeRelocations(self, atom_index); - const free_list = self.atom_free_lists.getPtr(phdr_index).?; + const gpa = self.base.allocator; + const shndx = atom.getSymbol(self).st_shndx; + const free_list = &self.sections.items(.free_list)[shndx]; var already_have_free_list_node = false; { var i: usize = 0; // TODO turn free_list into a hash map while (i < free_list.items.len) { - if (free_list.items[i] == text_block) { + if (free_list.items[i] == atom_index) { _ = free_list.swapRemove(i); continue; } - if (free_list.items[i] == text_block.prev) { + if (free_list.items[i] == atom.prev_index) { already_have_free_list_node = true; } i += 1; } } - if (self.atoms.getPtr(phdr_index)) |last_block| { - if (last_block.* == text_block) { - if (text_block.prev) |prev| { + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[shndx]; + if (maybe_last_atom_index.*) |last_atom_index| { + if (last_atom_index == atom_index) { + if (atom.prev_index) |prev_index| { // TODO shrink the section size here - last_block.* = prev; + maybe_last_atom_index.* = prev_index; } else { - _ = self.atoms.fetchRemove(phdr_index); + maybe_last_atom_index.* = null; } } } - if (text_block.prev) |prev| { - prev.next = text_block.next; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; - if (!already_have_free_list_node and prev.freeListEligible(self)) { + if (!already_have_free_list_node and prev.*.freeListEligible(self)) { // The free list is heuristics, it doesn't have to be perfect, so we can // ignore the OOM here. - free_list.append(self.base.allocator, prev) catch {}; + free_list.append(gpa, prev_index) catch {}; } } else { - text_block.prev = null; + self.getAtomPtr(atom_index).prev_index = null; } - if (text_block.next) |next| { - next.prev = text_block.prev; + if (atom.next_index) |next_index| { + self.getAtomPtr(next_index).prev_index = atom.prev_index; } else { - text_block.next = null; + self.getAtomPtr(atom_index).next_index = null; } // Appending to free lists is allowed to fail because the free lists are heuristics based anyway. - const local_sym_index = text_block.getSymbolIndex().?; - self.local_symbol_free_list.append(self.base.allocator, local_sym_index) catch {}; + const local_sym_index = atom.getSymbolIndex().?; + + self.local_symbol_free_list.append(gpa, local_sym_index) catch {}; self.local_symbols.items[local_sym_index].st_info = 0; + self.local_symbols.items[local_sym_index].st_shndx = 0; _ = self.atom_by_index_table.remove(local_sym_index); - text_block.local_sym_index = 0; + self.getAtomPtr(atom_index).local_sym_index = 0; - self.offset_table_free_list.append(self.base.allocator, text_block.offset_table_index) catch {}; + self.offset_table_free_list.append(self.base.allocator, atom.offset_table_index) catch {}; - if (self.dwarf) |*dw| { - dw.freeAtom(&text_block.dbg_info_atom); - } + // if (self.dwarf) |*dw| { + // dw.freeAtom(&atom.dbg_info_atom); + // } } -fn shrinkTextBlock(self: *Elf, text_block: *TextBlock, new_block_size: u64, phdr_index: u16) void { +fn shrinkAtom(self: *Elf, atom_index: Atom.Index, new_block_size: u64) void { _ = self; - _ = text_block; + _ = atom_index; _ = new_block_size; - _ = phdr_index; } -fn growTextBlock(self: *Elf, text_block: *TextBlock, new_block_size: u64, alignment: u64, phdr_index: u16) !u64 { - const sym = text_block.getSymbol(self); +fn growAtom(self: *Elf, atom_index: Atom.Index, new_block_size: u64, alignment: u64) !u64 { + const atom = self.getAtom(atom_index); + const sym = atom.getSymbol(self); const align_ok = mem.alignBackwardGeneric(u64, sym.st_value, alignment) == sym.st_value; - const need_realloc = !align_ok or new_block_size > text_block.capacity(self); + const need_realloc = !align_ok or new_block_size > atom.capacity(self); if (!need_realloc) return sym.st_value; - return self.allocateTextBlock(text_block, new_block_size, alignment, phdr_index); + return self.allocateAtom(atom_index, new_block_size, alignment); } -fn allocateTextBlock(self: *Elf, text_block: *TextBlock, new_block_size: u64, alignment: u64, phdr_index: u16) !u64 { - const shdr_index = self.phdr_shdr_table.get(phdr_index).?; - const phdr = &self.program_headers.items[phdr_index]; - const shdr = &self.sections.items[shdr_index]; - const new_block_ideal_capacity = padToIdeal(new_block_size); +pub fn createAtom(self: *Elf) !Atom.Index { + const gpa = self.base.allocator; + const atom_index = @intCast(Atom.Index, self.atoms.items.len); + const atom = try self.atoms.addOne(gpa); + const local_sym_index = try self.allocateLocalSymbol(); + const offset_table_index = try self.allocateGotOffset(); + try self.atom_by_index_table.putNoClobber(gpa, local_sym_index, atom_index); + atom.* = .{ + .local_sym_index = local_sym_index, + .offset_table_index = offset_table_index, + .prev_index = null, + .next_index = null, + .dbg_info_atom = undefined, + }; + log.debug("creating ATOM(%{d}) at index {d}", .{ local_sym_index, atom_index }); + return atom_index; +} - // We use these to indicate our intention to update metadata, placing the new block, +fn allocateAtom(self: *Elf, atom_index: Atom.Index, new_block_size: u64, alignment: u64) !u64 { + const atom = self.getAtom(atom_index); + const sym = atom.getSymbol(self); + const phdr_index = self.sections.items(.phdr_index)[sym.st_shndx]; + const phdr = &self.program_headers.items[phdr_index]; + const shdr = &self.sections.items(.shdr)[sym.st_shndx]; + const free_list = &self.sections.items(.free_list)[sym.st_shndx]; + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[sym.st_shndx]; + const new_atom_ideal_capacity = padToIdeal(new_block_size); + + // We use these to indicate our intention to update metadata, placing the new atom, // and possibly removing a free list node. // It would be simpler to do it inside the for loop below, but that would cause a // problem if an error was returned later in the function. So this action // is actually carried out at the end of the function, when errors are no longer possible. - var block_placement: ?*TextBlock = null; + var atom_placement: ?Atom.Index = null; var free_list_removal: ?usize = null; - var free_list = self.atom_free_lists.get(phdr_index).?; // First we look for an appropriately sized free list node. // The list is unordered. We'll just take the first thing that works. const vaddr = blk: { var i: usize = 0; while (i < free_list.items.len) { - const big_block = free_list.items[i]; - // We now have a pointer to a live text block that has too much capacity. - // Is it enough that we could fit this new text block? - const sym = big_block.getSymbol(self); - const capacity = big_block.capacity(self); + const big_atom_index = free_list.items[i]; + const big_atom = self.getAtom(big_atom_index); + // We now have a pointer to a live atom that has too much capacity. + // Is it enough that we could fit this new atom? + const big_atom_sym = big_atom.getSymbol(self); + const capacity = big_atom.capacity(self); const ideal_capacity = padToIdeal(capacity); - const ideal_capacity_end_vaddr = std.math.add(u64, sym.st_value, ideal_capacity) catch ideal_capacity; - const capacity_end_vaddr = sym.st_value + capacity; - const new_start_vaddr_unaligned = capacity_end_vaddr - new_block_ideal_capacity; + const ideal_capacity_end_vaddr = std.math.add(u64, big_atom_sym.st_value, ideal_capacity) catch ideal_capacity; + const capacity_end_vaddr = big_atom_sym.st_value + capacity; + const new_start_vaddr_unaligned = capacity_end_vaddr - new_atom_ideal_capacity; const new_start_vaddr = mem.alignBackwardGeneric(u64, new_start_vaddr_unaligned, alignment); if (new_start_vaddr < ideal_capacity_end_vaddr) { // Additional bookkeeping here to notice if this free list node // should be deleted because the block that it points to has grown to take up // more of the extra capacity. - if (!big_block.freeListEligible(self)) { + if (!big_atom.freeListEligible(self)) { _ = free_list.swapRemove(i); } else { i += 1; @@ -2164,60 +2191,69 @@ fn allocateTextBlock(self: *Elf, text_block: *TextBlock, new_block_size: u64, al const keep_free_list_node = remaining_capacity >= min_text_capacity; // Set up the metadata to be updated, after errors are no longer possible. - block_placement = big_block; + atom_placement = big_atom_index; if (!keep_free_list_node) { free_list_removal = i; } break :blk new_start_vaddr; - } else if (self.atoms.get(phdr_index)) |last| { - const sym = last.getSymbol(self); - const ideal_capacity = padToIdeal(sym.st_size); - const ideal_capacity_end_vaddr = sym.st_value + ideal_capacity; + } else if (maybe_last_atom_index.*) |last_index| { + const last = self.getAtom(last_index); + const last_sym = last.getSymbol(self); + const ideal_capacity = padToIdeal(last_sym.st_size); + const ideal_capacity_end_vaddr = last_sym.st_value + ideal_capacity; const new_start_vaddr = mem.alignForwardGeneric(u64, ideal_capacity_end_vaddr, alignment); // Set up the metadata to be updated, after errors are no longer possible. - block_placement = last; + atom_placement = last_index; break :blk new_start_vaddr; } else { break :blk phdr.p_vaddr; } }; - const expand_text_section = block_placement == null or block_placement.?.next == null; - if (expand_text_section) { + const expand_section = if (atom_placement) |placement_index| + self.getAtom(placement_index).next_index == null + else + true; + if (expand_section) { const needed_size = (vaddr + new_block_size) - phdr.p_vaddr; - try self.growAllocSection(shdr_index, phdr_index, needed_size); - _ = try self.atoms.put(self.base.allocator, phdr_index, text_block); + try self.growAllocSection(sym.st_shndx, needed_size); + maybe_last_atom_index.* = atom_index; - if (self.dwarf) |_| { - // The .debug_info section has `low_pc` and `high_pc` values which is the virtual address - // range of the compilation unit. When we expand the text section, this range changes, - // so the DW_TAG.compile_unit tag of the .debug_info section becomes dirty. - self.debug_info_header_dirty = true; - // This becomes dirty for the same reason. We could potentially make this more - // fine-grained with the addition of support for more compilation units. It is planned to - // model each package as a different compilation unit. - self.debug_aranges_section_dirty = true; - } + // if (self.dwarf) |_| { + // // The .debug_info section has `low_pc` and `high_pc` values which is the virtual address + // // range of the compilation unit. When we expand the text section, this range changes, + // // so the DW_TAG.compile_unit tag of the .debug_info section becomes dirty. + // self.debug_info_header_dirty = true; + // // This becomes dirty for the same reason. We could potentially make this more + // // fine-grained with the addition of support for more compilation units. It is planned to + // // model each package as a different compilation unit. + // self.debug_aranges_section_dirty = true; + // } } shdr.sh_addralign = math.max(shdr.sh_addralign, alignment); - // This function can also reallocate a text block. + // This function can also reallocate an atom. // In this case we need to "unplug" it from its previous location before // plugging it in to its new location. - if (text_block.prev) |prev| { - prev.next = text_block.next; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; } - if (text_block.next) |next| { - next.prev = text_block.prev; + if (atom.next_index) |next_index| { + const next = self.getAtomPtr(next_index); + next.prev_index = atom.prev_index; } - if (block_placement) |big_block| { - text_block.prev = big_block; - text_block.next = big_block.next; - big_block.next = text_block; + if (atom_placement) |big_atom_index| { + const big_atom = self.getAtomPtr(big_atom_index); + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = big_atom_index; + atom_ptr.next_index = big_atom.next_index; + big_atom.next_index = atom_index; } else { - text_block.prev = null; - text_block.next = null; + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = null; + atom_ptr.next_index = null; } if (free_list_removal) |i| { _ = free_list.swapRemove(i); @@ -2272,15 +2308,10 @@ pub fn allocateGotOffset(self: *Elf) !u32 { return index; } -fn freeRelocationsForTextBlock(self: *Elf, text_block: *TextBlock) void { - var removed_relocs = self.relocs.fetchRemove(text_block); - if (removed_relocs) |*relocs| relocs.value.deinit(self.base.allocator); -} - fn freeUnnamedConsts(self: *Elf, decl_index: Module.Decl.Index) void { const unnamed_consts = self.unnamed_const_atoms.getPtr(decl_index) orelse return; for (unnamed_consts.items) |atom| { - self.freeTextBlock(atom, self.phdr_load_ro_index.?); + self.freeAtom(atom); } unnamed_consts.clearAndFree(self.base.allocator); } @@ -2295,43 +2326,57 @@ pub fn freeDecl(self: *Elf, decl_index: Module.Decl.Index) void { log.debug("freeDecl {*}", .{decl}); - if (self.decls.fetchRemove(decl_index)) |kv| { - if (kv.value) |index| { - self.freeTextBlock(&decl.link.elf, index); - self.freeUnnamedConsts(decl_index); - } + if (self.decls.fetchRemove(decl_index)) |const_kv| { + var kv = const_kv; + self.freeAtom(kv.value.atom); + self.freeUnnamedConsts(decl_index); + kv.value.exports.deinit(self.base.allocator); } - if (self.dwarf) |*dw| { - dw.freeDecl(decl); - } + // if (self.dwarf) |*dw| { + // dw.freeDecl(decl); + // } } -fn getDeclPhdrIndex(self: *Elf, decl: *Module.Decl) !u16 { +pub fn getOrCreateAtomForDecl(self: *Elf, decl_index: Module.Decl.Index) !Atom.Index { + const gop = try self.decls.getOrPut(self.base.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = .{ + .atom = try self.createAtom(), + .shdr = self.getDeclShdrIndex(decl_index), + .exports = .{}, + }; + } + return gop.value_ptr.atom; +} + +fn getDeclShdrIndex(self: *Elf, decl_index: Module.Decl.Index) u16 { + const decl = self.base.options.module.?.declPtr(decl_index); const ty = decl.ty; const zig_ty = ty.zigTypeTag(); const val = decl.val; - const phdr_index: u16 = blk: { + const shdr_index: u16 = blk: { if (val.isUndefDeep()) { // TODO in release-fast and release-small, we should put undef in .bss - break :blk self.phdr_load_rw_index.?; + break :blk self.data_section_index.?; } switch (zig_ty) { // TODO: what if this is a function pointer? - .Fn => break :blk self.phdr_load_re_index.?, + .Fn => break :blk self.text_section_index.?, else => { if (val.castTag(.variable)) |_| { - break :blk self.phdr_load_rw_index.?; + break :blk self.data_section_index.?; } - break :blk self.phdr_load_ro_index.?; + break :blk self.rodata_section_index.?; }, } }; - return phdr_index; + return shdr_index; } fn updateDeclCode(self: *Elf, decl_index: Module.Decl.Index, code: []const u8, stt_bits: u8) !*elf.Elf64_Sym { + const gpa = self.base.allocator; const mod = self.base.options.module.?; const decl = mod.declPtr(decl_index); @@ -2341,60 +2386,65 @@ fn updateDeclCode(self: *Elf, decl_index: Module.Decl.Index, code: []const u8, s log.debug("updateDeclCode {s}{*}", .{ decl_name, decl }); const required_alignment = decl.getAlignment(self.base.options.target); - const decl_ptr = self.decls.getPtr(decl_index).?; - if (decl_ptr.* == null) { - decl_ptr.* = try self.getDeclPhdrIndex(decl); - } - const phdr_index = decl_ptr.*.?; - const shdr_index = self.phdr_shdr_table.get(phdr_index).?; + const decl_metadata = self.decls.get(decl_index).?; + const atom_index = decl_metadata.atom; + const atom = self.getAtom(atom_index); - const local_sym = decl.link.elf.getSymbolPtr(self); - if (local_sym.st_size != 0) { - const capacity = decl.link.elf.capacity(self); + const shdr_index = decl_metadata.shdr; + if (atom.getSymbol(self).st_size != 0) { + const local_sym = atom.getSymbolPtr(self); + local_sym.st_name = try self.shstrtab.insert(gpa, decl_name); + local_sym.st_info = (elf.STB_LOCAL << 4) | stt_bits; + local_sym.st_other = 0; + local_sym.st_shndx = shdr_index; + + const capacity = atom.capacity(self); const need_realloc = code.len > capacity or !mem.isAlignedGeneric(u64, local_sym.st_value, required_alignment); + if (need_realloc) { - const vaddr = try self.growTextBlock(&decl.link.elf, code.len, required_alignment, phdr_index); + const vaddr = try self.growAtom(atom_index, code.len, required_alignment); log.debug("growing {s} from 0x{x} to 0x{x}", .{ decl_name, local_sym.st_value, vaddr }); if (vaddr != local_sym.st_value) { local_sym.st_value = vaddr; log.debug(" (writing new offset table entry)", .{}); - self.offset_table.items[decl.link.elf.offset_table_index] = vaddr; - try self.writeOffsetTableEntry(decl.link.elf.offset_table_index); + self.offset_table.items[atom.offset_table_index] = vaddr; + try self.writeOffsetTableEntry(atom.offset_table_index); } } else if (code.len < local_sym.st_size) { - self.shrinkTextBlock(&decl.link.elf, code.len, phdr_index); + self.shrinkAtom(atom_index, code.len); } local_sym.st_size = code.len; - local_sym.st_name = try self.updateString(local_sym.st_name, decl_name); - local_sym.st_info = (elf.STB_LOCAL << 4) | stt_bits; - local_sym.st_other = 0; - local_sym.st_shndx = shdr_index; - // TODO this write could be avoided if no fields of the symbol were changed. - try self.writeSymbol(decl.link.elf.getSymbolIndex().?); - } else { - const name_str_index = try self.makeString(decl_name); - const vaddr = try self.allocateTextBlock(&decl.link.elf, code.len, required_alignment, phdr_index); - errdefer self.freeTextBlock(&decl.link.elf, phdr_index); - log.debug("allocated text block for {s} at 0x{x}", .{ decl_name, vaddr }); + // TODO this write could be avoided if no fields of the symbol were changed. + try self.writeSymbol(atom.getSymbolIndex().?); + } else { + const local_sym = atom.getSymbolPtr(self); local_sym.* = .{ - .st_name = name_str_index, + .st_name = try self.shstrtab.insert(gpa, decl_name), .st_info = (elf.STB_LOCAL << 4) | stt_bits, .st_other = 0, .st_shndx = shdr_index, - .st_value = vaddr, - .st_size = code.len, + .st_value = 0, + .st_size = 0, }; - self.offset_table.items[decl.link.elf.offset_table_index] = vaddr; + const vaddr = try self.allocateAtom(atom_index, code.len, required_alignment); + errdefer self.freeAtom(atom_index); + log.debug("allocated text block for {s} at 0x{x}", .{ decl_name, vaddr }); - try self.writeSymbol(decl.link.elf.getSymbolIndex().?); - try self.writeOffsetTableEntry(decl.link.elf.offset_table_index); + self.offset_table.items[atom.offset_table_index] = vaddr; + local_sym.st_value = vaddr; + local_sym.st_size = code.len; + + try self.writeSymbol(atom.getSymbolIndex().?); + try self.writeOffsetTableEntry(atom.offset_table_index); } + const local_sym = atom.getSymbolPtr(self); + const phdr_index = self.sections.items(.phdr_index)[shdr_index]; const section_offset = local_sym.st_value - self.program_headers.items[phdr_index].p_vaddr; - const file_offset = self.sections.items[shdr_index].sh_offset + section_offset; + const file_offset = self.sections.items(.shdr)[shdr_index].sh_offset + section_offset; try self.base.file.?.pwriteAll(code, file_offset); return local_sym; @@ -2413,28 +2463,23 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven const decl_index = func.owner_decl; const decl = module.declPtr(decl_index); - const atom = &decl.link.elf; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeUnnamedConsts(decl_index); - self.freeRelocationsForTextBlock(atom); - } else { - gop.value_ptr.* = null; - } + + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + self.freeUnnamedConsts(decl_index); + Atom.freeRelocations(self, atom_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; - defer if (decl_state) |*ds| ds.deinit(); + // var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; + // defer if (decl_state) |*ds| ds.deinit(); - const res = if (decl_state) |*ds| - try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ - .dwarf = ds, - }) - else - try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); + // const res = if (decl_state) |*ds| + // try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ + // .dwarf = ds, + // }) + // else + const res = try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); const code = switch (res) { .ok => code_buffer.items, @@ -2445,15 +2490,16 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven }, }; const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_FUNC); - if (decl_state) |*ds| { - try self.dwarf.?.commitDeclState( - module, - decl_index, - local_sym.st_value, - local_sym.st_size, - ds, - ); - } + _ = local_sym; + // if (decl_state) |*ds| { + // try self.dwarf.?.commitDeclState( + // module, + // decl_index, + // local_sym.st_value, + // local_sym.st_size, + // ds, + // ); + // } // Since we updated the vaddr and the size, each corresponding export // symbol also needs to be updated. @@ -2483,41 +2529,34 @@ pub fn updateDecl(self: *Elf, module: *Module, decl_index: Module.Decl.Index) !v } } - assert(!self.unnamed_const_atoms.contains(decl_index)); - - const atom = &decl.link.elf; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeRelocationsForTextBlock(atom); - } else { - gop.value_ptr.* = null; - } + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + Atom.freeRelocations(self, atom_index); + const atom = self.getAtom(atom_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; - defer if (decl_state) |*ds| ds.deinit(); + // var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; + // defer if (decl_state) |*ds| ds.deinit(); // TODO implement .debug_info for global variables const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val; - const res = if (decl_state) |*ds| - try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .{ - .dwarf = ds, - }, .{ - .parent_atom_index = decl.link.elf.getSymbolIndex().?, - }) - else - try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .none, .{ - .parent_atom_index = decl.link.elf.getSymbolIndex().?, - }); + // const res = if (decl_state) |*ds| + // try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + // .ty = decl.ty, + // .val = decl_val, + // }, &code_buffer, .{ + // .dwarf = ds, + // }, .{ + // .parent_atom_index = atom.getSymbolIndex().?, + // }) + // else + const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .none, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }); const code = switch (res) { .ok => code_buffer.items, @@ -2529,15 +2568,16 @@ pub fn updateDecl(self: *Elf, module: *Module, decl_index: Module.Decl.Index) !v }; const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_OBJECT); - if (decl_state) |*ds| { - try self.dwarf.?.commitDeclState( - module, - decl_index, - local_sym.st_value, - local_sym.st_size, - ds, - ); - } + _ = local_sym; + // if (decl_state) |*ds| { + // try self.dwarf.?.commitDeclState( + // module, + // decl_index, + // local_sym.st_value, + // local_sym.st_size, + // ds, + // ); + // } // Since we updated the vaddr and the size, each corresponding export // symbol also needs to be updated. @@ -2545,36 +2585,31 @@ pub fn updateDecl(self: *Elf, module: *Module, decl_index: Module.Decl.Index) !v } pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module.Decl.Index) !u32 { - var code_buffer = std.ArrayList(u8).init(self.base.allocator); + const gpa = self.base.allocator; + + var code_buffer = std.ArrayList(u8).init(gpa); defer code_buffer.deinit(); const mod = self.base.options.module.?; - const decl = mod.declPtr(decl_index); - - const gop = try self.unnamed_const_atoms.getOrPut(self.base.allocator, decl_index); + const gop = try self.unnamed_const_atoms.getOrPut(gpa, decl_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } const unnamed_consts = gop.value_ptr; - const atom = try self.base.allocator.create(TextBlock); - errdefer self.base.allocator.destroy(atom); - atom.* = TextBlock.empty; - // TODO for unnamed consts we don't need GOT offset/entry allocated - try atom.ensureInitialized(self); - try self.managed_atoms.append(self.base.allocator, atom); - + const decl = mod.declPtr(decl_index); const name_str_index = blk: { const decl_name = try decl.getFullyQualifiedName(mod); - defer self.base.allocator.free(decl_name); - + defer gpa.free(decl_name); const index = unnamed_consts.items.len; - const name = try std.fmt.allocPrint(self.base.allocator, "__unnamed_{s}_{d}", .{ decl_name, index }); - defer self.base.allocator.free(name); - - break :blk try self.makeString(name); + const name = try std.fmt.allocPrint(gpa, "__unnamed_{s}_{d}", .{ decl_name, index }); + defer gpa.free(name); + break :blk try self.shstrtab.insert(gpa, name); }; - const name = self.getString(name_str_index); + const name = self.shstrtab.get(name_str_index).?; + + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .{ .none = {}, @@ -2592,28 +2627,24 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module }; const required_alignment = typed_value.ty.abiAlignment(self.base.options.target); - const phdr_index = self.phdr_load_ro_index.?; - const shdr_index = self.phdr_shdr_table.get(phdr_index).?; - const vaddr = try self.allocateTextBlock(atom, code.len, required_alignment, phdr_index); - errdefer self.freeTextBlock(atom, phdr_index); - - log.debug("allocated text block for {s} at 0x{x}", .{ name, vaddr }); - + const shdr_index = self.rodata_section_index.?; + const phdr_index = self.sections.items(.phdr_index)[shdr_index]; const local_sym = atom.getSymbolPtr(self); - local_sym.* = .{ - .st_name = name_str_index, - .st_info = (elf.STB_LOCAL << 4) | elf.STT_OBJECT, - .st_other = 0, - .st_shndx = shdr_index, - .st_value = vaddr, - .st_size = code.len, - }; + local_sym.st_name = name_str_index; + local_sym.st_info = (elf.STB_LOCAL << 4) | elf.STT_OBJECT; + local_sym.st_other = 0; + local_sym.st_shndx = shdr_index; + local_sym.st_size = code.len; + local_sym.st_value = try self.allocateAtom(atom_index, code.len, required_alignment); + errdefer self.freeAtom(atom_index); + + log.debug("allocated text block for {s} at 0x{x}", .{ name, local_sym.st_value }); try self.writeSymbol(atom.getSymbolIndex().?); - try unnamed_consts.append(self.base.allocator, atom); + try unnamed_consts.append(gpa, atom_index); const section_offset = local_sym.st_value - self.program_headers.items[phdr_index].p_vaddr; - const file_offset = self.sections.items[shdr_index].sh_offset + section_offset; + const file_offset = self.sections.items(.shdr)[shdr_index].sh_offset + section_offset; try self.base.file.?.pwriteAll(code, file_offset); return atom.getSymbolIndex().?; @@ -2635,20 +2666,16 @@ pub fn updateDeclExports( const tracy = trace(@src()); defer tracy.end(); + const gpa = self.base.allocator; + const decl = module.declPtr(decl_index); - const atom = &decl.link.elf; - - if (atom.getSymbolIndex() == null) return; - + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + const atom = self.getAtom(atom_index); const decl_sym = atom.getSymbol(self); - try self.global_symbols.ensureUnusedCapacity(self.base.allocator, exports.len); + const decl_metadata = self.decls.getPtr(decl_index).?; + const shdr_index = decl_metadata.shdr; - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (!gop.found_existing) { - gop.value_ptr.* = try self.getDeclPhdrIndex(decl); - } - const phdr_index = gop.value_ptr.*.?; - const shdr_index = self.phdr_shdr_table.get(phdr_index).?; + try self.global_symbols.ensureUnusedCapacity(gpa, exports.len); for (exports) |exp| { if (exp.options.section) |section_name| { @@ -2681,10 +2708,10 @@ pub fn updateDeclExports( }, }; const stt_bits: u8 = @truncate(u4, decl_sym.st_info); - if (exp.link.elf.sym_index) |i| { + if (decl_metadata.getExport(self, exp.options.name)) |i| { const sym = &self.global_symbols.items[i]; sym.* = .{ - .st_name = try self.updateString(sym.st_name, exp.options.name), + .st_name = try self.shstrtab.insert(gpa, exp.options.name), .st_info = (stb_bits << 4) | stt_bits, .st_other = 0, .st_shndx = shdr_index, @@ -2692,21 +2719,19 @@ pub fn updateDeclExports( .st_size = decl_sym.st_size, }; } else { - const name = try self.makeString(exp.options.name); const i = if (self.global_symbol_free_list.popOrNull()) |i| i else blk: { _ = self.global_symbols.addOneAssumeCapacity(); break :blk self.global_symbols.items.len - 1; }; + try decl_metadata.exports.append(gpa, @intCast(u32, i)); self.global_symbols.items[i] = .{ - .st_name = name, + .st_name = try self.shstrtab.insert(gpa, exp.options.name), .st_info = (stb_bits << 4) | stt_bits, .st_other = 0, .st_shndx = shdr_index, .st_value = decl_sym.st_value, .st_size = decl_sym.st_size, }; - - exp.link.elf.sym_index = @intCast(u32, i); } } } @@ -2722,17 +2747,19 @@ pub fn updateDeclLineNumber(self: *Elf, mod: *Module, decl: *const Module.Decl) log.debug("updateDeclLineNumber {s}{*}", .{ decl_name, decl }); if (self.llvm_object) |_| return; - if (self.dwarf) |*dw| { - try dw.updateDeclLineNumber(decl); - } + // if (self.dwarf) |*dw| { + // try dw.updateDeclLineNumber(decl); + // } } -pub fn deleteExport(self: *Elf, exp: Export) void { +pub fn deleteDeclExport(self: *Elf, decl_index: Module.Decl.Index, name: []const u8) void { if (self.llvm_object) |_| return; - - const sym_index = exp.sym_index orelse return; - self.global_symbol_free_list.append(self.base.allocator, sym_index) catch {}; - self.global_symbols.items[sym_index].st_info = 0; + const metadata = self.decls.getPtr(decl_index) orelse return; + const sym_index = metadata.getExportPtr(self, name) orelse return; + log.debug("deleting export '{s}'", .{name}); + self.global_symbol_free_list.append(self.base.allocator, sym_index.*) catch {}; + self.global_symbols.items[sym_index.*].st_info = 0; + sym_index.* = 0; } fn writeProgHeader(self: *Elf, index: usize) !void { @@ -2761,7 +2788,7 @@ fn writeSectHeader(self: *Elf, index: usize) !void { switch (self.ptr_width) { .p32 => { var shdr: [1]elf.Elf32_Shdr = undefined; - shdr[0] = sectHeaderTo32(self.sections.items[index]); + shdr[0] = sectHeaderTo32(self.sections.items(.shdr)[index]); if (foreign_endian) { mem.byteSwapAllFields(elf.Elf32_Shdr, &shdr[0]); } @@ -2769,7 +2796,7 @@ fn writeSectHeader(self: *Elf, index: usize) !void { return self.base.file.?.pwriteAll(mem.sliceAsBytes(&shdr), offset); }, .p64 => { - var shdr = [1]elf.Elf64_Shdr{self.sections.items[index]}; + var shdr = [1]elf.Elf64_Shdr{self.sections.items(.shdr)[index]}; if (foreign_endian) { mem.byteSwapAllFields(elf.Elf64_Shdr, &shdr[0]); } @@ -2783,11 +2810,11 @@ fn writeOffsetTableEntry(self: *Elf, index: usize) !void { const entry_size: u16 = self.archPtrWidthBytes(); if (self.offset_table_count_dirty) { const needed_size = self.offset_table.items.len * entry_size; - try self.growAllocSection(self.got_section_index.?, self.phdr_got_index.?, needed_size); + try self.growAllocSection(self.got_section_index.?, needed_size); self.offset_table_count_dirty = false; } const endian = self.base.options.target.cpu.arch.endian(); - const shdr = &self.sections.items[self.got_section_index.?]; + const shdr = &self.sections.items(.shdr)[self.got_section_index.?]; const off = shdr.sh_offset + @as(u64, entry_size) * index; switch (entry_size) { 2 => { @@ -2813,7 +2840,7 @@ fn writeSymbol(self: *Elf, index: usize) !void { const tracy = trace(@src()); defer tracy.end(); - const syms_sect = &self.sections.items[self.symtab_section_index.?]; + const syms_sect = &self.sections.items(.shdr)[self.symtab_section_index.?]; // Make sure we are not pointlessly writing symbol data that will have to get relocated // due to running out of space. if (self.local_symbols.items.len != syms_sect.sh_info) { @@ -2835,7 +2862,7 @@ fn writeSymbol(self: *Elf, index: usize) !void { .p64 => syms_sect.sh_offset + @sizeOf(elf.Elf64_Sym) * index, }; const local = self.local_symbols.items[index]; - log.debug("writing symbol {d}, '{s}' at 0x{x}", .{ index, self.getString(local.st_name), off }); + log.debug("writing symbol {d}, '{?s}' at 0x{x}", .{ index, self.shstrtab.get(local.st_name), off }); log.debug(" ({})", .{local}); switch (self.ptr_width) { .p32 => { @@ -2865,7 +2892,7 @@ fn writeSymbol(self: *Elf, index: usize) !void { } fn writeAllGlobalSymbols(self: *Elf) !void { - const syms_sect = &self.sections.items[self.symtab_section_index.?]; + const syms_sect = &self.sections.items(.shdr)[self.symtab_section_index.?]; const sym_size: u64 = switch (self.ptr_width) { .p32 => @sizeOf(elf.Elf32_Sym), .p64 => @sizeOf(elf.Elf64_Sym), @@ -3215,10 +3242,52 @@ const CsuObjects = struct { fn logSymtab(self: Elf) void { log.debug("locals:", .{}); for (self.local_symbols.items) |sym, id| { - log.debug(" {d}: {s}: @{x} in {d}", .{ id, self.getString(sym.st_name), sym.st_value, sym.st_shndx }); + log.debug(" {d}: {?s}: @{x} in {d}", .{ id, self.shstrtab.get(sym.st_name), sym.st_value, sym.st_shndx }); } log.debug("globals:", .{}); for (self.global_symbols.items) |sym, id| { - log.debug(" {d}: {s}: @{x} in {d}", .{ id, self.getString(sym.st_name), sym.st_value, sym.st_shndx }); + log.debug(" {d}: {?s}: @{x} in {d}", .{ id, self.shstrtab.get(sym.st_name), sym.st_value, sym.st_shndx }); } } + +pub fn getProgramHeader(self: *const Elf, shdr_index: u16) elf.Elf64_Phdr { + const index = self.sections.items(.phdr_index)[shdr_index]; + return self.program_headers.items[index]; +} + +pub fn getProgramHeaderPtr(self: *Elf, shdr_index: u16) *elf.Elf64_Phdr { + const index = self.sections.items(.phdr_index)[shdr_index]; + return &self.program_headers.items[index]; +} + +/// Returns pointer-to-symbol described at sym_index. +pub fn getSymbolPtr(self: *Elf, sym_index: u32) *elf.Elf64_Sym { + return &self.local_symbols.items[sym_index]; +} + +/// Returns symbol at sym_index. +pub fn getSymbol(self: *const Elf, sym_index: u32) elf.Elf64_Sym { + return self.local_symbols.items[sym_index]; +} + +/// Returns name of the symbol at sym_index. +pub fn getSymbolName(self: *const Elf, sym_index: u32) []const u8 { + const sym = self.local_symbols.items[sym_index]; + return self.shstrtab.get(sym.st_name).?; +} + +pub fn getAtom(self: *const Elf, atom_index: Atom.Index) Atom { + assert(atom_index < self.atoms.items.len); + return self.atoms.items[atom_index]; +} + +pub fn getAtomPtr(self: *Elf, atom_index: Atom.Index) *Atom { + assert(atom_index < self.atoms.items.len); + return &self.atoms.items[atom_index]; +} + +/// Returns atom if there is an atom referenced by the symbol. +/// Returns null on failure. +pub fn getAtomIndexForSymbol(self: *Elf, sym_index: u32) ?Atom.Index { + return self.atom_by_index_table.get(sym_index); +} diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig index caeb3bfbc5..79b699636f 100644 --- a/src/link/Elf/Atom.zig +++ b/src/link/Elf/Atom.zig @@ -20,44 +20,35 @@ offset_table_index: u32, /// Points to the previous and next neighbors, based on the `text_offset`. /// This can be used to find, for example, the capacity of this `TextBlock`. -prev: ?*Atom, -next: ?*Atom, +prev_index: ?Atom.Index, +next_index: ?Atom.Index, dbg_info_atom: Dwarf.Atom, -pub const empty = Atom{ - .local_sym_index = 0, - .offset_table_index = undefined, - .prev = null, - .next = null, - .dbg_info_atom = undefined, -}; +pub const Index = u32; -pub fn ensureInitialized(self: *Atom, elf_file: *Elf) !void { - if (self.getSymbolIndex() != null) return; // Already initialized - self.local_sym_index = try elf_file.allocateLocalSymbol(); - self.offset_table_index = try elf_file.allocateGotOffset(); - try elf_file.atom_by_index_table.putNoClobber(elf_file.base.allocator, self.local_sym_index, self); -} +pub const Reloc = struct { + target: u32, + offset: u64, + addend: u32, + prev_vaddr: u64, +}; pub fn getSymbolIndex(self: Atom) ?u32 { if (self.local_sym_index == 0) return null; return self.local_sym_index; } -pub fn getSymbol(self: Atom, elf_file: *Elf) elf.Elf64_Sym { - const sym_index = self.getSymbolIndex().?; - return elf_file.local_symbols.items[sym_index]; +pub fn getSymbol(self: Atom, elf_file: *const Elf) elf.Elf64_Sym { + return elf_file.getSymbol(self.getSymbolIndex().?); } pub fn getSymbolPtr(self: Atom, elf_file: *Elf) *elf.Elf64_Sym { - const sym_index = self.getSymbolIndex().?; - return &elf_file.local_symbols.items[sym_index]; + return elf_file.getSymbolPtr(self.getSymbolIndex().?); } -pub fn getName(self: Atom, elf_file: *Elf) []const u8 { - const sym = self.getSymbol(); - return elf_file.getString(sym.st_name); +pub fn getName(self: Atom, elf_file: *const Elf) []const u8 { + return elf_file.getSymbolName(self.getSymbolIndex().?); } pub fn getOffsetTableAddress(self: Atom, elf_file: *Elf) u64 { @@ -72,9 +63,10 @@ pub fn getOffsetTableAddress(self: Atom, elf_file: *Elf) u64 { /// Returns how much room there is to grow in virtual address space. /// File offset relocation happens transparently, so it is not included in /// this calculation. -pub fn capacity(self: Atom, elf_file: *Elf) u64 { +pub fn capacity(self: Atom, elf_file: *const Elf) u64 { const self_sym = self.getSymbol(elf_file); - if (self.next) |next| { + if (self.next_index) |next_index| { + const next = elf_file.getAtom(next_index); const next_sym = next.getSymbol(elf_file); return next_sym.st_value - self_sym.st_value; } else { @@ -83,9 +75,10 @@ pub fn capacity(self: Atom, elf_file: *Elf) u64 { } } -pub fn freeListEligible(self: Atom, elf_file: *Elf) bool { +pub fn freeListEligible(self: Atom, elf_file: *const Elf) bool { // No need to keep a free list node for the last block. - const next = self.next orelse return false; + const next_index = self.next_index orelse return false; + const next = elf_file.getAtom(next_index); const self_sym = self.getSymbol(elf_file); const next_sym = next.getSymbol(elf_file); const cap = next_sym.st_value - self_sym.st_value; @@ -94,3 +87,17 @@ pub fn freeListEligible(self: Atom, elf_file: *Elf) bool { const surplus = cap - ideal_cap; return surplus >= Elf.min_text_capacity; } + +pub fn addRelocation(elf_file: *Elf, atom_index: Index, reloc: Reloc) !void { + const gpa = elf_file.base.allocator; + const gop = try elf_file.relocs.getOrPut(gpa, atom_index); + if (!gop.found_existing) { + gop.value_ptr.* = .{}; + } + try gop.value_ptr.append(gpa, reloc); +} + +pub fn freeRelocations(elf_file: *Elf, atom_index: Index) void { + var removed_relocs = elf_file.relocs.fetchRemove(atom_index); + if (removed_relocs) |*relocs| relocs.value.deinit(elf_file.base.allocator); +} diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 29aed25b31..11a1119449 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -2604,9 +2604,11 @@ pub fn freeDecl(self: *MachO, decl_index: Module.Decl.Index) void { log.debug("freeDecl {*}", .{decl}); - if (self.decls.fetchSwapRemove(decl_index)) |kv| { + if (self.decls.fetchSwapRemove(decl_index)) |const_kv| { + var kv = const_kv; self.freeAtom(kv.value.atom); self.freeUnnamedConsts(decl_index); + kv.value.exports.deinit(self.base.allocator); } // if (self.d_sym) |*d_sym| { From c430e9afa7b050400b9703360a0af4ab824335ce Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Tue, 31 Jan 2023 20:27:17 +0100 Subject: [PATCH 12/65] link: make Coff atoms fully owned by the linker --- src/Module.zig | 6 +- src/Sema.zig | 2 +- src/arch/aarch64/CodeGen.zig | 42 ++-- src/arch/aarch64/Emit.zig | 6 +- src/arch/x86_64/CodeGen.zig | 16 +- src/arch/x86_64/Emit.zig | 8 +- src/link.zig | 4 +- src/link/Coff.zig | 466 +++++++++++++++++++---------------- src/link/Coff/Atom.zig | 46 ++-- src/link/Coff/Relocation.zig | 18 +- src/link/Elf.zig | 10 +- src/link/MachO.zig | 5 + 12 files changed, 352 insertions(+), 277 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index 0695a2e98a..b39fd2bab2 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5274,7 +5274,7 @@ pub fn clearDecl( // TODO instead of a union, put this memory trailing Decl objects, // and allow it to be variably sized. decl.link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = link.File.Coff.Atom.empty }, + .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, @@ -5390,7 +5390,7 @@ fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) Allocator.Error!void wasm.deleteExport(exp.link.wasm); } if (mod.comp.bin_file.cast(link.File.Coff)) |coff| { - coff.deleteExport(exp.link.coff); + coff.deleteDeclExport(decl_index, exp.options.name); } if (mod.failed_exports.fetchSwapRemove(exp)) |failed_kv| { failed_kv.value.destroy(mod.gpa); @@ -5694,7 +5694,7 @@ pub fn allocateNewDecl( .zir_decl_index = 0, .src_scope = src_scope, .link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = link.File.Coff.Atom.empty }, + .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, diff --git a/src/Sema.zig b/src/Sema.zig index 28d559f730..82321ef545 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5565,7 +5565,7 @@ pub fn analyzeExport( }, .src = src, .link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = .{} }, + .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = null }, diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index 67197c35f8..d0fba2fd0e 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -4019,15 +4019,17 @@ fn store(self: *Self, ptr: MCValue, value: MCValue, ptr_ty: Type, value_ty: Type .direct => .load_memory_ptr_direct, .import => unreachable, }; - const mod = self.bin_file.options.module.?; - const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { .macho => blk: { const macho_file = self.bin_file.cast(link.File.MachO).?; const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); break :blk macho_file.getAtom(atom).getSymbolIndex().?; }, - .coff => owner_decl.link.coff.getSymbolIndex().?, + .coff => blk: { + const coff_file = self.bin_file.cast(link.File.Coff).?; + const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk coff_file.getAtom(atom).getSymbolIndex().?; + }, else => unreachable, // unsupported target format }; _ = try self.addInst(.{ @@ -4322,11 +4324,12 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier }, }); } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { - try fn_owner_decl.link.coff.ensureInitialized(coff_file); + const atom = try coff_file.getOrCreateAtomForDecl(func.owner_decl); + const sym_index = coff_file.getAtom(atom).getSymbolIndex().?; try self.genSetReg(Type.initTag(.u64), .x30, .{ .linker_load = .{ .type = .got, - .sym_index = fn_owner_decl.link.coff.getSymbolIndex().?, + .sym_index = sym_index, }, }); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { @@ -5496,15 +5499,17 @@ fn genSetStack(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) InnerErro .direct => .load_memory_ptr_direct, .import => unreachable, }; - const mod = self.bin_file.options.module.?; - const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { .macho => blk: { const macho_file = self.bin_file.cast(link.File.MachO).?; const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); break :blk macho_file.getAtom(atom).getSymbolIndex().?; }, - .coff => owner_decl.link.coff.getSymbolIndex().?, + .coff => blk: { + const coff_file = self.bin_file.cast(link.File.Coff).?; + const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk coff_file.getAtom(atom).getSymbolIndex().?; + }, else => unreachable, // unsupported target format }; _ = try self.addInst(.{ @@ -5614,15 +5619,17 @@ fn genSetReg(self: *Self, ty: Type, reg: Register, mcv: MCValue) InnerError!void .direct => .load_memory_direct, .import => .load_memory_import, }; - const mod = self.bin_file.options.module.?; - const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { .macho => blk: { const macho_file = self.bin_file.cast(link.File.MachO).?; const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); break :blk macho_file.getAtom(atom).getSymbolIndex().?; }, - .coff => owner_decl.link.coff.getSymbolIndex().?, + .coff => blk: { + const coff_file = self.bin_file.cast(link.File.Coff).?; + const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk coff_file.getAtom(atom).getSymbolIndex().?; + }, else => unreachable, // unsupported target format }; _ = try self.addInst(.{ @@ -5812,15 +5819,17 @@ fn genSetStackArgument(self: *Self, ty: Type, stack_offset: u32, mcv: MCValue) I .direct => .load_memory_ptr_direct, .import => unreachable, }; - const mod = self.bin_file.options.module.?; - const owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = switch (self.bin_file.tag) { .macho => blk: { const macho_file = self.bin_file.cast(link.File.MachO).?; const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); break :blk macho_file.getAtom(atom).getSymbolIndex().?; }, - .coff => owner_decl.link.coff.getSymbolIndex().?, + .coff => blk: { + const coff_file = self.bin_file.cast(link.File.Coff).?; + const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk coff_file.getAtom(atom).getSymbolIndex().?; + }, else => unreachable, // unsupported target format }; _ = try self.addInst(.{ @@ -6150,10 +6159,11 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { - try decl.link.coff.ensureInitialized(coff_file); + const atom_index = try coff_file.getOrCreateAtomForDecl(decl_index); + const sym_index = coff_file.getAtom(atom_index).getSymbolIndex().?; return MCValue{ .linker_load = .{ .type = .got, - .sym_index = decl.link.coff.getSymbolIndex().?, + .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Plan9)) |p9| { try p9.seeDecl(decl_index); diff --git a/src/arch/aarch64/Emit.zig b/src/arch/aarch64/Emit.zig index f348fb70e3..3c2a81d5d1 100644 --- a/src/arch/aarch64/Emit.zig +++ b/src/arch/aarch64/Emit.zig @@ -919,7 +919,7 @@ fn mirLoadMemoryPie(emit: *Emit, inst: Mir.Inst.Index) !void { }, }); } else if (emit.bin_file.cast(link.File.Coff)) |coff_file| { - const atom = coff_file.getAtomForSymbol(.{ .sym_index = data.atom_index, .file = null }).?; + const atom_index = coff_file.getAtomIndexForSymbol(.{ .sym_index = data.atom_index, .file = null }).?; const target = switch (tag) { .load_memory_got, .load_memory_ptr_got, @@ -929,7 +929,7 @@ fn mirLoadMemoryPie(emit: *Emit, inst: Mir.Inst.Index) !void { .load_memory_import => coff_file.getGlobalByIndex(data.sym_index), else => unreachable, }; - try atom.addRelocation(coff_file, .{ + try link.File.Coff.Atom.addRelocation(coff_file, atom_index, .{ .target = target, .offset = offset, .addend = 0, @@ -946,7 +946,7 @@ fn mirLoadMemoryPie(emit: *Emit, inst: Mir.Inst.Index) !void { else => unreachable, }, }); - try atom.addRelocation(coff_file, .{ + try link.File.Coff.Atom.addRelocation(coff_file, atom_index, .{ .target = target, .offset = offset + 4, .addend = 0, diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index 23d3ca5514..b41973ea97 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -2668,13 +2668,12 @@ fn loadMemPtrIntoRegister(self: *Self, reg: Register, ptr_ty: Type, ptr: MCValue switch (ptr) { .linker_load => |load_struct| { const abi_size = @intCast(u32, ptr_ty.abiSize(self.target.*)); - const mod = self.bin_file.options.module.?; - const fn_owner_decl = mod.declPtr(self.mod_fn.owner_decl); const atom_index = if (self.bin_file.cast(link.File.MachO)) |macho_file| blk: { const atom = try macho_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); break :blk macho_file.getAtom(atom).getSymbolIndex().?; - } else if (self.bin_file.cast(link.File.Coff)) |_| blk: { - break :blk fn_owner_decl.link.coff.getSymbolIndex().?; + } else if (self.bin_file.cast(link.File.Coff)) |coff_file| blk: { + const atom = try coff_file.getOrCreateAtomForDecl(self.mod_fn.owner_decl); + break :blk coff_file.getAtom(atom).getSymbolIndex().?; } else unreachable; const flags: u2 = switch (load_struct.type) { .got => 0b00, @@ -4009,8 +4008,8 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier .data = .{ .imm = got_addr }, }); } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { - try fn_owner_decl.link.coff.ensureInitialized(coff_file); - const sym_index = fn_owner_decl.link.coff.getSymbolIndex().?; + const atom_index = try coff_file.getOrCreateAtomForDecl(func.owner_decl); + const sym_index = coff_file.getAtom(atom_index).getSymbolIndex().?; try self.genSetReg(Type.initTag(.usize), .rax, .{ .linker_load = .{ .type = .got, @@ -6733,10 +6732,11 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Coff)) |coff_file| { - try decl.link.coff.ensureInitialized(coff_file); + const atom_index = try coff_file.getOrCreateAtomForDecl(decl_index); + const sym_index = coff_file.getAtom(atom_index).getSymbolIndex().?; return MCValue{ .linker_load = .{ .type = .got, - .sym_index = decl.link.coff.getSymbolIndex().?, + .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Plan9)) |p9| { try p9.seeDecl(decl_index); diff --git a/src/arch/x86_64/Emit.zig b/src/arch/x86_64/Emit.zig index 980dbfd41e..c4f9b4eb42 100644 --- a/src/arch/x86_64/Emit.zig +++ b/src/arch/x86_64/Emit.zig @@ -1011,8 +1011,8 @@ fn mirLeaPic(emit: *Emit, inst: Mir.Inst.Index) InnerError!void { .length = 2, }); } else if (emit.bin_file.cast(link.File.Coff)) |coff_file| { - const atom = coff_file.getAtomForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; - try atom.addRelocation(coff_file, .{ + const atom_index = coff_file.getAtomIndexForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; + try link.File.Coff.Atom.addRelocation(coff_file, atom_index, .{ .type = switch (ops.flags) { 0b00 => .got, 0b01 => .direct, @@ -1152,9 +1152,9 @@ fn mirCallExtern(emit: *Emit, inst: Mir.Inst.Index) InnerError!void { }); } else if (emit.bin_file.cast(link.File.Coff)) |coff_file| { // Add relocation to the decl. - const atom = coff_file.getAtomForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; + const atom_index = coff_file.getAtomIndexForSymbol(.{ .sym_index = relocation.atom_index, .file = null }).?; const target = coff_file.getGlobalByIndex(relocation.sym_index); - try atom.addRelocation(coff_file, .{ + try link.File.Coff.Atom.addRelocation(coff_file, atom_index, .{ .type = .direct, .target = target, .offset = offset, diff --git a/src/link.zig b/src/link.zig index 09804add53..eb74615492 100644 --- a/src/link.zig +++ b/src/link.zig @@ -263,7 +263,7 @@ pub const File = struct { pub const LinkBlock = union { elf: void, - coff: Coff.Atom, + coff: void, macho: void, plan9: Plan9.DeclBlock, c: void, @@ -285,7 +285,7 @@ pub const File = struct { pub const Export = union { elf: void, - coff: Coff.Export, + coff: void, macho: void, plan9: Plan9.Export, c: void, diff --git a/src/link/Coff.zig b/src/link/Coff.zig index dee3c7c381..c062276b73 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -79,13 +79,13 @@ entry_addr: ?u32 = null, /// We store them here so that we can properly dispose of any allocated /// memory within the atom in the incremental linker. /// TODO consolidate this. -decls: std.AutoHashMapUnmanaged(Module.Decl.Index, ?u16) = .{}, +decls: std.AutoHashMapUnmanaged(Module.Decl.Index, DeclMetadata) = .{}, /// List of atoms that are either synthetic or map directly to the Zig source program. -managed_atoms: std.ArrayListUnmanaged(*Atom) = .{}, +atoms: std.ArrayListUnmanaged(Atom) = .{}, /// Table of atoms indexed by the symbol index. -atom_by_index_table: std.AutoHashMapUnmanaged(u32, *Atom) = .{}, +atom_by_index_table: std.AutoHashMapUnmanaged(u32, Atom.Index) = .{}, /// Table of unnamed constants associated with a parent `Decl`. /// We store them here so that we can free the constants whenever the `Decl` @@ -124,9 +124,9 @@ const Entry = struct { sym_index: u32, }; -const RelocTable = std.AutoHashMapUnmanaged(*Atom, std.ArrayListUnmanaged(Relocation)); -const BaseRelocationTable = std.AutoHashMapUnmanaged(*Atom, std.ArrayListUnmanaged(u32)); -const UnnamedConstTable = std.AutoHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(*Atom)); +const RelocTable = std.AutoHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(Relocation)); +const BaseRelocationTable = std.AutoHashMapUnmanaged(Atom.Index, std.ArrayListUnmanaged(u32)); +const UnnamedConstTable = std.AutoHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(Atom.Index)); const default_file_alignment: u16 = 0x200; const default_size_of_stack_reserve: u32 = 0x1000000; @@ -137,7 +137,7 @@ const default_size_of_heap_commit: u32 = 0x1000; const Section = struct { header: coff.SectionHeader, - last_atom: ?*Atom = null, + last_atom_index: ?Atom.Index = null, /// A list of atoms that have surplus capacity. This list can have false /// positives, as functions grow and shrink over time, only sometimes being added @@ -154,7 +154,34 @@ const Section = struct { /// overcapacity can be negative. A simple way to have negative overcapacity is to /// allocate a fresh atom, which will have ideal capacity, and then grow it /// by 1 byte. It will then have -1 overcapacity. - free_list: std.ArrayListUnmanaged(*Atom) = .{}, + free_list: std.ArrayListUnmanaged(Atom.Index) = .{}, +}; + +const DeclMetadata = struct { + atom: Atom.Index, + section: u16, + /// A list of all exports aliases of this Decl. + exports: std.ArrayListUnmanaged(u32) = .{}, + + fn getExport(m: DeclMetadata, coff_file: *const Coff, name: []const u8) ?u32 { + for (m.exports.items) |exp| { + if (mem.eql(u8, name, coff_file.getSymbolName(.{ + .sym_index = exp, + .file = null, + }))) return exp; + } + return null; + } + + fn getExportPtr(m: *DeclMetadata, coff_file: *Coff, name: []const u8) ?*u32 { + for (m.exports.items) |*exp| { + if (mem.eql(u8, name, coff_file.getSymbolName(.{ + .sym_index = exp.*, + .file = null, + }))) return exp; + } + return null; + } }; pub const PtrWidth = enum { @@ -170,10 +197,6 @@ pub const PtrWidth = enum { }; pub const SrcFn = void; -pub const Export = struct { - sym_index: ?u32 = null, -}; - pub const SymbolWithLoc = struct { // Index into the respective symbol table. sym_index: u32, @@ -271,11 +294,7 @@ pub fn deinit(self: *Coff) void { } self.sections.deinit(gpa); - for (self.managed_atoms.items) |atom| { - gpa.destroy(atom); - } - self.managed_atoms.deinit(gpa); - + self.atoms.deinit(gpa); self.locals.deinit(gpa); self.globals.deinit(gpa); @@ -297,7 +316,15 @@ pub fn deinit(self: *Coff) void { self.imports.deinit(gpa); self.imports_free_list.deinit(gpa); self.imports_table.deinit(gpa); - self.decls.deinit(gpa); + + { + var it = self.decls.iterator(); + while (it.next()) |entry| { + entry.value_ptr.exports.deinit(gpa); + } + self.decls.deinit(gpa); + } + self.atom_by_index_table.deinit(gpa); { @@ -461,17 +488,18 @@ fn growSectionVM(self: *Coff, sect_id: u32, needed_size: u32) !void { // TODO: enforce order by increasing VM addresses in self.sections container. // This is required by the loader anyhow as far as I can tell. for (self.sections.items(.header)[sect_id + 1 ..]) |*next_header, next_sect_id| { - const maybe_last_atom = &self.sections.items(.last_atom)[sect_id + 1 + next_sect_id]; + const maybe_last_atom_index = self.sections.items(.last_atom_index)[sect_id + 1 + next_sect_id]; next_header.virtual_address += diff; - if (maybe_last_atom.*) |last_atom| { - var atom = last_atom; + if (maybe_last_atom_index) |last_atom_index| { + var atom_index = last_atom_index; while (true) { + const atom = self.getAtom(atom_index); const sym = atom.getSymbolPtr(self); sym.value += diff; - if (atom.prev) |prev| { - atom = prev; + if (atom.prev_index) |prev_index| { + atom_index = prev_index; } else break; } } @@ -480,14 +508,15 @@ fn growSectionVM(self: *Coff, sect_id: u32, needed_size: u32) !void { header.virtual_size = increased_size; } -fn allocateAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u32 { +fn allocateAtom(self: *Coff, atom_index: Atom.Index, new_atom_size: u32, alignment: u32) !u32 { const tracy = trace(@src()); defer tracy.end(); + const atom = self.getAtom(atom_index); const sect_id = @enumToInt(atom.getSymbol(self).section_number) - 1; const header = &self.sections.items(.header)[sect_id]; const free_list = &self.sections.items(.free_list)[sect_id]; - const maybe_last_atom = &self.sections.items(.last_atom)[sect_id]; + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[sect_id]; const new_atom_ideal_capacity = if (header.isCode()) padToIdeal(new_atom_size) else new_atom_size; // We use these to indicate our intention to update metadata, placing the new atom, @@ -495,7 +524,7 @@ fn allocateAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u // It would be simpler to do it inside the for loop below, but that would cause a // problem if an error was returned later in the function. So this action // is actually carried out at the end of the function, when errors are no longer possible. - var atom_placement: ?*Atom = null; + var atom_placement: ?Atom.Index = null; var free_list_removal: ?usize = null; // First we look for an appropriately sized free list node. @@ -503,7 +532,8 @@ fn allocateAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u var vaddr = blk: { var i: usize = 0; while (i < free_list.items.len) { - const big_atom = free_list.items[i]; + const big_atom_index = free_list.items[i]; + const big_atom = self.getAtom(big_atom_index); // We now have a pointer to a live atom that has too much capacity. // Is it enough that we could fit this new atom? const sym = big_atom.getSymbol(self); @@ -531,34 +561,43 @@ fn allocateAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u const keep_free_list_node = remaining_capacity >= min_text_capacity; // Set up the metadata to be updated, after errors are no longer possible. - atom_placement = big_atom; + atom_placement = big_atom_index; if (!keep_free_list_node) { free_list_removal = i; } break :blk new_start_vaddr; - } else if (maybe_last_atom.*) |last| { + } else if (maybe_last_atom_index.*) |last_index| { + const last = self.getAtom(last_index); const last_symbol = last.getSymbol(self); const ideal_capacity = if (header.isCode()) padToIdeal(last.size) else last.size; const ideal_capacity_end_vaddr = last_symbol.value + ideal_capacity; const new_start_vaddr = mem.alignForwardGeneric(u32, ideal_capacity_end_vaddr, alignment); - atom_placement = last; + atom_placement = last_index; break :blk new_start_vaddr; } else { break :blk mem.alignForwardGeneric(u32, header.virtual_address, alignment); } }; - const expand_section = atom_placement == null or atom_placement.?.next == null; + const expand_section = if (atom_placement) |placement_index| + self.getAtom(placement_index).next_index == null + else + true; if (expand_section) { const sect_capacity = self.allocatedSize(header.pointer_to_raw_data); const needed_size: u32 = (vaddr + new_atom_size) - header.virtual_address; if (needed_size > sect_capacity) { const new_offset = self.findFreeSpace(needed_size, default_file_alignment); - const current_size = if (maybe_last_atom.*) |last_atom| blk: { + const current_size = if (maybe_last_atom_index.*) |last_atom_index| blk: { + const last_atom = self.getAtom(last_atom_index); const sym = last_atom.getSymbol(self); break :blk (sym.value + last_atom.size) - header.virtual_address; } else 0; - log.debug("moving {s} from 0x{x} to 0x{x}", .{ self.getSectionName(header), header.pointer_to_raw_data, new_offset }); + log.debug("moving {s} from 0x{x} to 0x{x}", .{ + self.getSectionName(header), + header.pointer_to_raw_data, + new_offset, + }); const amt = try self.base.file.?.copyRangeAll( header.pointer_to_raw_data, self.base.file.?, @@ -577,26 +616,34 @@ fn allocateAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u header.virtual_size = @max(header.virtual_size, needed_size); header.size_of_raw_data = needed_size; - maybe_last_atom.* = atom; + maybe_last_atom_index.* = atom_index; } - atom.size = new_atom_size; - atom.alignment = alignment; - - if (atom.prev) |prev| { - prev.next = atom.next; - } - if (atom.next) |next| { - next.prev = atom.prev; + { + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.size = new_atom_size; + atom_ptr.alignment = alignment; } - if (atom_placement) |big_atom| { - atom.prev = big_atom; - atom.next = big_atom.next; - big_atom.next = atom; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; + } + if (atom.next_index) |next_index| { + const next = self.getAtomPtr(next_index); + next.prev_index = atom.prev_index; + } + + if (atom_placement) |big_atom_index| { + const big_atom = self.getAtomPtr(big_atom_index); + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = big_atom_index; + atom_ptr.next_index = big_atom.next_index; + big_atom.next_index = atom_index; } else { - atom.prev = null; - atom.next = null; + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.prev_index = null; + atom_ptr.next_index = null; } if (free_list_removal) |i| { _ = free_list.swapRemove(i); @@ -701,24 +748,37 @@ pub fn allocateImportEntry(self: *Coff, target: SymbolWithLoc) !u32 { return index; } -fn createGotAtom(self: *Coff, target: SymbolWithLoc) !*Atom { +pub fn createAtom(self: *Coff) !Atom.Index { const gpa = self.base.allocator; - const atom = try gpa.create(Atom); - errdefer gpa.destroy(atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); + const atom_index = @intCast(Atom.Index, self.atoms.items.len); + const atom = try self.atoms.addOne(gpa); + const sym_index = try self.allocateSymbol(); + try self.atom_by_index_table.putNoClobber(gpa, sym_index, atom_index); + atom.* = .{ + .sym_index = sym_index, + .file = null, + .size = 0, + .alignment = 0, + .prev_index = null, + .next_index = null, + }; + log.debug("creating ATOM(%{d}) at index {d}", .{ sym_index, atom_index }); + return atom_index; +} + +fn createGotAtom(self: *Coff, target: SymbolWithLoc) !Atom.Index { + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = @sizeOf(u64); atom.alignment = @alignOf(u64); - try self.managed_atoms.append(gpa, atom); - const sym = atom.getSymbolPtr(self); sym.section_number = @intToEnum(coff.SectionNumber, self.got_section_index.? + 1); - sym.value = try self.allocateAtom(atom, atom.size, atom.alignment); + sym.value = try self.allocateAtom(atom_index, atom.size, atom.alignment); log.debug("allocated GOT atom at 0x{x}", .{sym.value}); - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = .direct, .target = target, .offset = 0, @@ -732,49 +792,46 @@ fn createGotAtom(self: *Coff, target: SymbolWithLoc) !*Atom { .UNDEFINED => @panic("TODO generate a binding for undefined GOT target"), .ABSOLUTE => {}, .DEBUG => unreachable, // not possible - else => try atom.addBaseRelocation(self, 0), + else => try Atom.addBaseRelocation(self, atom_index, 0), } - return atom; + return atom_index; } -fn createImportAtom(self: *Coff) !*Atom { - const gpa = self.base.allocator; - const atom = try gpa.create(Atom); - errdefer gpa.destroy(atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); +fn createImportAtom(self: *Coff) !Atom.Index { + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); atom.size = @sizeOf(u64); atom.alignment = @alignOf(u64); - try self.managed_atoms.append(gpa, atom); - const sym = atom.getSymbolPtr(self); sym.section_number = @intToEnum(coff.SectionNumber, self.idata_section_index.? + 1); - sym.value = try self.allocateAtom(atom, atom.size, atom.alignment); + sym.value = try self.allocateAtom(atom_index, atom.size, atom.alignment); log.debug("allocated import atom at 0x{x}", .{sym.value}); - return atom; + return atom_index; } -fn growAtom(self: *Coff, atom: *Atom, new_atom_size: u32, alignment: u32) !u32 { +fn growAtom(self: *Coff, atom_index: Atom.Index, new_atom_size: u32, alignment: u32) !u32 { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const align_ok = mem.alignBackwardGeneric(u32, sym.value, alignment) == sym.value; const need_realloc = !align_ok or new_atom_size > atom.capacity(self); if (!need_realloc) return sym.value; - return self.allocateAtom(atom, new_atom_size, alignment); + return self.allocateAtom(atom_index, new_atom_size, alignment); } -fn shrinkAtom(self: *Coff, atom: *Atom, new_block_size: u32) void { +fn shrinkAtom(self: *Coff, atom_index: Atom.Index, new_block_size: u32) void { _ = self; - _ = atom; + _ = atom_index; _ = new_block_size; // TODO check the new capacity, and if it crosses the size threshold into a big enough // capacity, insert a free list node for it. } -fn writeAtom(self: *Coff, atom: *Atom, code: []const u8) !void { +fn writeAtom(self: *Coff, atom_index: Atom.Index, code: []const u8) !void { + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const section = self.sections.get(@enumToInt(sym.section_number) - 1); const file_offset = section.header.pointer_to_raw_data + sym.value - section.header.virtual_address; @@ -784,18 +841,18 @@ fn writeAtom(self: *Coff, atom: *Atom, code: []const u8) !void { file_offset + code.len, }); try self.base.file.?.pwriteAll(code, file_offset); - try self.resolveRelocs(atom); + try self.resolveRelocs(atom_index); } -fn writePtrWidthAtom(self: *Coff, atom: *Atom) !void { +fn writePtrWidthAtom(self: *Coff, atom_index: Atom.Index) !void { switch (self.ptr_width) { .p32 => { var buffer: [@sizeOf(u32)]u8 = [_]u8{0} ** @sizeOf(u32); - try self.writeAtom(atom, &buffer); + try self.writeAtom(atom_index, &buffer); }, .p64 => { var buffer: [@sizeOf(u64)]u8 = [_]u8{0} ** @sizeOf(u64); - try self.writeAtom(atom, &buffer); + try self.writeAtom(atom_index, &buffer); }, } } @@ -815,7 +872,8 @@ fn markRelocsDirtyByAddress(self: *Coff, addr: u32) void { var it = self.relocs.valueIterator(); while (it.next()) |relocs| { for (relocs.items) |*reloc| { - const target_atom = reloc.getTargetAtom(self) orelse continue; + const target_atom_index = reloc.getTargetAtomIndex(self) orelse continue; + const target_atom = self.getAtom(target_atom_index); const target_sym = target_atom.getSymbol(self); if (target_sym.value < addr) continue; reloc.dirty = true; @@ -823,24 +881,26 @@ fn markRelocsDirtyByAddress(self: *Coff, addr: u32) void { } } -fn resolveRelocs(self: *Coff, atom: *Atom) !void { - const relocs = self.relocs.get(atom) orelse return; +fn resolveRelocs(self: *Coff, atom_index: Atom.Index) !void { + const relocs = self.relocs.get(atom_index) orelse return; - log.debug("relocating '{s}'", .{atom.getName(self)}); + log.debug("relocating '{s}'", .{self.getAtom(atom_index).getName(self)}); for (relocs.items) |*reloc| { if (!reloc.dirty) continue; - try reloc.resolve(atom, self); + try reloc.resolve(atom_index, self); } } -fn freeAtom(self: *Coff, atom: *Atom) void { - log.debug("freeAtom {*}", .{atom}); - - // Remove any relocs and base relocs associated with this Atom - self.freeRelocationsForAtom(atom); +fn freeAtom(self: *Coff, atom_index: Atom.Index) void { + log.debug("freeAtom {d}", .{atom_index}); const gpa = self.base.allocator; + + // Remove any relocs and base relocs associated with this Atom + Atom.freeRelocations(self, atom_index); + + const atom = self.getAtom(atom_index); const sym = atom.getSymbol(self); const sect_id = @enumToInt(sym.section_number) - 1; const free_list = &self.sections.items(.free_list)[sect_id]; @@ -849,45 +909,46 @@ fn freeAtom(self: *Coff, atom: *Atom) void { var i: usize = 0; // TODO turn free_list into a hash map while (i < free_list.items.len) { - if (free_list.items[i] == atom) { + if (free_list.items[i] == atom_index) { _ = free_list.swapRemove(i); continue; } - if (free_list.items[i] == atom.prev) { + if (free_list.items[i] == atom.prev_index) { already_have_free_list_node = true; } i += 1; } } - const maybe_last_atom = &self.sections.items(.last_atom)[sect_id]; - if (maybe_last_atom.*) |last_atom| { - if (last_atom == atom) { - if (atom.prev) |prev| { + const maybe_last_atom_index = &self.sections.items(.last_atom_index)[sect_id]; + if (maybe_last_atom_index.*) |last_atom_index| { + if (last_atom_index == atom_index) { + if (atom.prev_index) |prev_index| { // TODO shrink the section size here - maybe_last_atom.* = prev; + maybe_last_atom_index.* = prev_index; } else { - maybe_last_atom.* = null; + maybe_last_atom_index.* = null; } } } - if (atom.prev) |prev| { - prev.next = atom.next; + if (atom.prev_index) |prev_index| { + const prev = self.getAtomPtr(prev_index); + prev.next_index = atom.next_index; - if (!already_have_free_list_node and prev.freeListEligible(self)) { + if (!already_have_free_list_node and prev.*.freeListEligible(self)) { // The free list is heuristics, it doesn't have to be perfect, so we can // ignore the OOM here. - free_list.append(gpa, prev) catch {}; + free_list.append(gpa, prev_index) catch {}; } } else { - atom.prev = null; + self.getAtomPtr(atom_index).prev_index = null; } - if (atom.next) |next| { - next.prev = atom.prev; + if (atom.next_index) |next_index| { + self.getAtomPtr(next_index).prev_index = atom.prev_index; } else { - atom.next = null; + self.getAtomPtr(atom_index).next_index = null; } // Appending to free lists is allowed to fail because the free lists are heuristics based anyway. @@ -910,7 +971,7 @@ fn freeAtom(self: *Coff, atom: *Atom) void { self.locals.items[sym_index].section_number = .UNDEFINED; _ = self.atom_by_index_table.remove(sym_index); log.debug(" adding local symbol index {d} to free list", .{sym_index}); - atom.sym_index = 0; + self.getAtomPtr(atom_index).sym_index = 0; } pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, liveness: Liveness) !void { @@ -927,15 +988,10 @@ pub fn updateFunc(self: *Coff, module: *Module, func: *Module.Fn, air: Air, live const decl_index = func.owner_decl; const decl = module.declPtr(decl_index); - const atom = &decl.link.coff; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeUnnamedConsts(decl_index); - self.freeRelocationsForAtom(&decl.link.coff); - } else { - gop.value_ptr.* = null; - } + + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + self.freeUnnamedConsts(decl_index); + Atom.freeRelocations(self, atom_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); @@ -979,11 +1035,8 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In } const unnamed_consts = gop.value_ptr; - const atom = try gpa.create(Atom); - errdefer gpa.destroy(atom); - atom.* = Atom.empty; - try atom.ensureInitialized(self); - try self.managed_atoms.append(gpa, atom); + const atom_index = try self.createAtom(); + const atom = self.getAtomPtr(atom_index); const sym_name = blk: { const decl_name = try decl.getFullyQualifiedName(mod); @@ -1012,15 +1065,15 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In const required_alignment = tv.ty.abiAlignment(self.base.options.target); atom.alignment = required_alignment; atom.size = @intCast(u32, code.len); - atom.getSymbolPtr(self).value = try self.allocateAtom(atom, atom.size, atom.alignment); - errdefer self.freeAtom(atom); + atom.getSymbolPtr(self).value = try self.allocateAtom(atom_index, atom.size, atom.alignment); + errdefer self.freeAtom(atom_index); - try unnamed_consts.append(gpa, atom); + try unnamed_consts.append(gpa, atom_index); log.debug("allocated atom for {s} at 0x{x}", .{ sym_name, atom.getSymbol(self).value }); log.debug(" (required alignment 0x{x})", .{required_alignment}); - try self.writeAtom(atom, code); + try self.writeAtom(atom_index, code); return atom.getSymbolIndex().?; } @@ -1047,14 +1100,9 @@ pub fn updateDecl(self: *Coff, module: *Module, decl_index: Module.Decl.Index) ! } } - const atom = &decl.link.coff; - try atom.ensureInitialized(self); - const gop = try self.decls.getOrPut(self.base.allocator, decl_index); - if (gop.found_existing) { - self.freeRelocationsForAtom(atom); - } else { - gop.value_ptr.* = null; - } + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + Atom.freeRelocations(self, atom_index); + const atom = self.getAtom(atom_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); @@ -1064,7 +1112,7 @@ pub fn updateDecl(self: *Coff, module: *Module, decl_index: Module.Decl.Index) ! .ty = decl.ty, .val = decl_val, }, &code_buffer, .none, .{ - .parent_atom_index = decl.link.coff.getSymbolIndex().?, + .parent_atom_index = atom.getSymbolIndex().?, }); const code = switch (res) { .ok => code_buffer.items, @@ -1082,7 +1130,20 @@ pub fn updateDecl(self: *Coff, module: *Module, decl_index: Module.Decl.Index) ! return self.updateDeclExports(module, decl_index, module.getDeclExports(decl_index)); } -fn getDeclOutputSection(self: *Coff, decl: *Module.Decl) u16 { +pub fn getOrCreateAtomForDecl(self: *Coff, decl_index: Module.Decl.Index) !Atom.Index { + const gop = try self.decls.getOrPut(self.base.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = .{ + .atom = try self.createAtom(), + .section = self.getDeclOutputSection(decl_index), + .exports = .{}, + }; + } + return gop.value_ptr.atom; +} + +fn getDeclOutputSection(self: *Coff, decl_index: Module.Decl.Index) u16 { + const decl = self.base.options.module.?.declPtr(decl_index); const ty = decl.ty; const zig_ty = ty.zigTypeTag(); const val = decl.val; @@ -1117,14 +1178,11 @@ fn updateDeclCode(self: *Coff, decl_index: Module.Decl.Index, code: []const u8, log.debug("updateDeclCode {s}{*}", .{ decl_name, decl }); const required_alignment = decl.getAlignment(self.base.options.target); - const decl_ptr = self.decls.getPtr(decl_index).?; - if (decl_ptr.* == null) { - decl_ptr.* = self.getDeclOutputSection(decl); - } - const sect_index = decl_ptr.*.?; - + const decl_metadata = self.decls.get(decl_index).?; + const atom_index = decl_metadata.atom; + const atom = self.getAtom(atom_index); + const sect_index = decl_metadata.section; const code_len = @intCast(u32, code.len); - const atom = &decl.link.coff; if (atom.size != 0) { const sym = atom.getSymbolPtr(self); @@ -1135,7 +1193,7 @@ fn updateDeclCode(self: *Coff, decl_index: Module.Decl.Index, code: []const u8, const capacity = atom.capacity(self); const need_realloc = code.len > capacity or !mem.isAlignedGeneric(u64, sym.value, required_alignment); if (need_realloc) { - const vaddr = try self.growAtom(atom, code_len, required_alignment); + const vaddr = try self.growAtom(atom_index, code_len, required_alignment); log.debug("growing {s} from 0x{x} to 0x{x}", .{ decl_name, sym.value, vaddr }); log.debug(" (required alignment 0x{x}", .{required_alignment}); @@ -1143,49 +1201,43 @@ fn updateDeclCode(self: *Coff, decl_index: Module.Decl.Index, code: []const u8, sym.value = vaddr; log.debug(" (updating GOT entry)", .{}); const got_target = SymbolWithLoc{ .sym_index = atom.getSymbolIndex().?, .file = null }; - const got_atom = self.getGotAtomForSymbol(got_target).?; + const got_atom_index = self.getGotAtomIndexForSymbol(got_target).?; self.markRelocsDirtyByTarget(got_target); - try self.writePtrWidthAtom(got_atom); + try self.writePtrWidthAtom(got_atom_index); } } else if (code_len < atom.size) { - self.shrinkAtom(atom, code_len); + self.shrinkAtom(atom_index, code_len); } - atom.size = code_len; + self.getAtomPtr(atom_index).size = code_len; } else { const sym = atom.getSymbolPtr(self); try self.setSymbolName(sym, decl_name); sym.section_number = @intToEnum(coff.SectionNumber, sect_index + 1); sym.type = .{ .complex_type = complex_type, .base_type = .NULL }; - const vaddr = try self.allocateAtom(atom, code_len, required_alignment); - errdefer self.freeAtom(atom); + const vaddr = try self.allocateAtom(atom_index, code_len, required_alignment); + errdefer self.freeAtom(atom_index); log.debug("allocated atom for {s} at 0x{x}", .{ decl_name, vaddr }); - atom.size = code_len; + self.getAtomPtr(atom_index).size = code_len; sym.value = vaddr; const got_target = SymbolWithLoc{ .sym_index = atom.getSymbolIndex().?, .file = null }; const got_index = try self.allocateGotEntry(got_target); - const got_atom = try self.createGotAtom(got_target); + const got_atom_index = try self.createGotAtom(got_target); + const got_atom = self.getAtom(got_atom_index); self.got_entries.items[got_index].sym_index = got_atom.getSymbolIndex().?; - try self.writePtrWidthAtom(got_atom); + try self.writePtrWidthAtom(got_atom_index); } self.markRelocsDirtyByTarget(atom.getSymbolWithLoc()); - try self.writeAtom(atom, code); -} - -fn freeRelocationsForAtom(self: *Coff, atom: *Atom) void { - var removed_relocs = self.relocs.fetchRemove(atom); - if (removed_relocs) |*relocs| relocs.value.deinit(self.base.allocator); - var removed_base_relocs = self.base_relocs.fetchRemove(atom); - if (removed_base_relocs) |*base_relocs| base_relocs.value.deinit(self.base.allocator); + try self.writeAtom(atom_index, code); } fn freeUnnamedConsts(self: *Coff, decl_index: Module.Decl.Index) void { const gpa = self.base.allocator; const unnamed_consts = self.unnamed_const_atoms.getPtr(decl_index) orelse return; - for (unnamed_consts.items) |atom| { - self.freeAtom(atom); + for (unnamed_consts.items) |atom_index| { + self.freeAtom(atom_index); } unnamed_consts.clearAndFree(gpa); } @@ -1200,11 +1252,11 @@ pub fn freeDecl(self: *Coff, decl_index: Module.Decl.Index) void { log.debug("freeDecl {*}", .{decl}); - if (self.decls.fetchRemove(decl_index)) |kv| { - if (kv.value) |_| { - self.freeAtom(&decl.link.coff); - self.freeUnnamedConsts(decl_index); - } + if (self.decls.fetchRemove(decl_index)) |const_kv| { + var kv = const_kv; + self.freeAtom(kv.value.atom); + self.freeUnnamedConsts(decl_index); + kv.value.exports.deinit(self.base.allocator); } } @@ -1257,16 +1309,10 @@ pub fn updateDeclExports( const gpa = self.base.allocator; const decl = module.declPtr(decl_index); - const atom = &decl.link.coff; - - if (atom.getSymbolIndex() == null) return; - - const gop = try self.decls.getOrPut(gpa, decl_index); - if (!gop.found_existing) { - gop.value_ptr.* = self.getDeclOutputSection(decl); - } - + const atom_index = try self.getOrCreateAtomForDecl(decl_index); + const atom = self.getAtom(atom_index); const decl_sym = atom.getSymbol(self); + const decl_metadata = self.decls.getPtr(decl_index).?; for (exports) |exp| { log.debug("adding new export '{s}'", .{exp.options.name}); @@ -1301,9 +1347,9 @@ pub fn updateDeclExports( continue; } - const sym_index = exp.link.coff.sym_index orelse blk: { + const sym_index = decl_metadata.getExport(self, exp.options.name) orelse blk: { const sym_index = try self.allocateSymbol(); - exp.link.coff.sym_index = sym_index; + try decl_metadata.exports.append(gpa, sym_index); break :blk sym_index; }; const sym_loc = SymbolWithLoc{ .sym_index = sym_index, .file = null }; @@ -1326,16 +1372,15 @@ pub fn updateDeclExports( } } -pub fn deleteExport(self: *Coff, exp: Export) void { +pub fn deleteDeclExport(self: *Coff, decl_index: Module.Decl.Index, name: []const u8) void { if (self.llvm_object) |_| return; - const sym_index = exp.sym_index orelse return; + const metadata = self.decls.getPtr(decl_index) orelse return; + const sym_index = metadata.getExportPtr(self, name) orelse return; const gpa = self.base.allocator; - - const sym_loc = SymbolWithLoc{ .sym_index = sym_index, .file = null }; + const sym_loc = SymbolWithLoc{ .sym_index = sym_index.*, .file = null }; const sym = self.getSymbolPtr(sym_loc); - const sym_name = self.getSymbolName(sym_loc); - log.debug("deleting export '{s}'", .{sym_name}); + log.debug("deleting export '{s}'", .{name}); assert(sym.storage_class == .EXTERNAL and sym.section_number != .UNDEFINED); sym.* = .{ .name = [_]u8{0} ** 8, @@ -1345,9 +1390,9 @@ pub fn deleteExport(self: *Coff, exp: Export) void { .storage_class = .NULL, .number_of_aux_symbols = 0, }; - self.locals_free_list.append(gpa, sym_index) catch {}; + self.locals_free_list.append(gpa, sym_index.*) catch {}; - if (self.resolver.fetchRemove(sym_name)) |entry| { + if (self.resolver.fetchRemove(name)) |entry| { defer gpa.free(entry.key); self.globals_free_list.append(gpa, entry.value) catch {}; self.globals.items[entry.value] = .{ @@ -1355,6 +1400,8 @@ pub fn deleteExport(self: *Coff, exp: Export) void { .file = null, }; } + + sym_index.* = 0; } fn resolveGlobalSymbol(self: *Coff, current: SymbolWithLoc) !void { @@ -1419,9 +1466,10 @@ pub fn flushModule(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod if (self.imports_table.contains(global)) continue; const import_index = try self.allocateImportEntry(global); - const import_atom = try self.createImportAtom(); + const import_atom_index = try self.createImportAtom(); + const import_atom = self.getAtom(import_atom_index); self.imports.items[import_index].sym_index = import_atom.getSymbolIndex().?; - try self.writePtrWidthAtom(import_atom); + try self.writePtrWidthAtom(import_atom_index); } if (build_options.enable_logging) { @@ -1455,22 +1503,14 @@ pub fn flushModule(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod } } -pub fn getDeclVAddr( - self: *Coff, - decl_index: Module.Decl.Index, - reloc_info: link.File.RelocInfo, -) !u64 { - const mod = self.base.options.module.?; - const decl = mod.declPtr(decl_index); - +pub fn getDeclVAddr(self: *Coff, decl_index: Module.Decl.Index, reloc_info: link.File.RelocInfo) !u64 { assert(self.llvm_object == null); - try decl.link.coff.ensureInitialized(self); - const sym_index = decl.link.coff.getSymbolIndex().?; - - const atom = self.getAtomForSymbol(.{ .sym_index = reloc_info.parent_atom_index, .file = null }).?; + const this_atom_index = try self.getOrCreateAtomForDecl(decl_index); + const sym_index = self.getAtom(this_atom_index).getSymbolIndex().?; + const atom_index = self.getAtomIndexForSymbol(.{ .sym_index = reloc_info.parent_atom_index, .file = null }).?; const target = SymbolWithLoc{ .sym_index = sym_index, .file = null }; - try atom.addRelocation(self, .{ + try Atom.addRelocation(self, atom_index, .{ .type = .direct, .target = target, .offset = @intCast(u32, reloc_info.offset), @@ -1478,7 +1518,7 @@ pub fn getDeclVAddr( .pcrel = false, .length = 3, }); - try atom.addBaseRelocation(self, @intCast(u32, reloc_info.offset)); + try Atom.addBaseRelocation(self, atom_index, @intCast(u32, reloc_info.offset)); return 0; } @@ -1529,7 +1569,8 @@ fn writeBaseRelocations(self: *Coff) !void { var it = self.base_relocs.iterator(); while (it.next()) |entry| { - const atom = entry.key_ptr.*; + const atom_index = entry.key_ptr.*; + const atom = self.getAtom(atom_index); const offsets = entry.value_ptr.*; for (offsets.items) |offset| { @@ -1613,7 +1654,8 @@ fn writeImportTable(self: *Coff) !void { const gpa = self.base.allocator; const section = self.sections.get(self.idata_section_index.?); - const last_atom = section.last_atom orelse return; + const last_atom_index = section.last_atom_index orelse return; + const last_atom = self.getAtom(last_atom_index); const iat_rva = section.header.virtual_address; const iat_size = last_atom.getSymbol(self).value + last_atom.size * 2 - iat_rva; // account for sentinel zero pointer @@ -2051,27 +2093,37 @@ pub fn getOrPutGlobalPtr(self: *Coff, name: []const u8) !GetOrPutGlobalPtrResult return GetOrPutGlobalPtrResult{ .found_existing = false, .value_ptr = ptr }; } +pub fn getAtom(self: *const Coff, atom_index: Atom.Index) Atom { + assert(atom_index < self.atoms.items.len); + return self.atoms.items[atom_index]; +} + +pub fn getAtomPtr(self: *Coff, atom_index: Atom.Index) *Atom { + assert(atom_index < self.atoms.items.len); + return &self.atoms.items[atom_index]; +} + /// Returns atom if there is an atom referenced by the symbol described by `sym_loc` descriptor. /// Returns null on failure. -pub fn getAtomForSymbol(self: *Coff, sym_loc: SymbolWithLoc) ?*Atom { +pub fn getAtomIndexForSymbol(self: *const Coff, sym_loc: SymbolWithLoc) ?Atom.Index { assert(sym_loc.file == null); // TODO linking with object files return self.atom_by_index_table.get(sym_loc.sym_index); } /// Returns GOT atom that references `sym_loc` if one exists. /// Returns null otherwise. -pub fn getGotAtomForSymbol(self: *Coff, sym_loc: SymbolWithLoc) ?*Atom { +pub fn getGotAtomIndexForSymbol(self: *const Coff, sym_loc: SymbolWithLoc) ?Atom.Index { const got_index = self.got_entries_table.get(sym_loc) orelse return null; const got_entry = self.got_entries.items[got_index]; - return self.getAtomForSymbol(.{ .sym_index = got_entry.sym_index, .file = null }); + return self.getAtomIndexForSymbol(.{ .sym_index = got_entry.sym_index, .file = null }); } /// Returns import atom that references `sym_loc` if one exists. /// Returns null otherwise. -pub fn getImportAtomForSymbol(self: *Coff, sym_loc: SymbolWithLoc) ?*Atom { +pub fn getImportAtomIndexForSymbol(self: *const Coff, sym_loc: SymbolWithLoc) ?Atom.Index { const imports_index = self.imports_table.get(sym_loc) orelse return null; const imports_entry = self.imports.items[imports_index]; - return self.getAtomForSymbol(.{ .sym_index = imports_entry.sym_index, .file = null }); + return self.getAtomIndexForSymbol(.{ .sym_index = imports_entry.sym_index, .file = null }); } fn setSectionName(self: *Coff, header: *coff.SectionHeader, name: []const u8) !void { diff --git a/src/link/Coff/Atom.zig b/src/link/Coff/Atom.zig index 78824eac1d..1ee31cccaa 100644 --- a/src/link/Coff/Atom.zig +++ b/src/link/Coff/Atom.zig @@ -27,23 +27,10 @@ alignment: u32, /// Points to the previous and next neighbors, based on the `text_offset`. /// This can be used to find, for example, the capacity of this `Atom`. -prev: ?*Atom, -next: ?*Atom, +prev_index: ?Index, +next_index: ?Index, -pub const empty = Atom{ - .sym_index = 0, - .file = null, - .size = 0, - .alignment = 0, - .prev = null, - .next = null, -}; - -pub fn ensureInitialized(self: *Atom, coff_file: *Coff) !void { - if (self.getSymbolIndex() != null) return; // Already initialized - self.sym_index = try coff_file.allocateSymbol(); - try coff_file.atom_by_index_table.putNoClobber(coff_file.base.allocator, self.sym_index, self); -} +pub const Index = u32; pub fn getSymbolIndex(self: Atom) ?u32 { if (self.sym_index == 0) return null; @@ -85,7 +72,8 @@ pub fn getName(self: Atom, coff_file: *const Coff) []const u8 { /// Returns how much room there is to grow in virtual address space. pub fn capacity(self: Atom, coff_file: *const Coff) u32 { const self_sym = self.getSymbol(coff_file); - if (self.next) |next| { + if (self.next_index) |next_index| { + const next = coff_file.getAtom(next_index); const next_sym = next.getSymbol(coff_file); return next_sym.value - self_sym.value; } else { @@ -97,7 +85,8 @@ pub fn capacity(self: Atom, coff_file: *const Coff) u32 { pub fn freeListEligible(self: Atom, coff_file: *const Coff) bool { // No need to keep a free list node for the last atom. - const next = self.next orelse return false; + const next_index = self.next_index orelse return false; + const next = coff_file.getAtom(next_index); const self_sym = self.getSymbol(coff_file); const next_sym = next.getSymbol(coff_file); const cap = next_sym.value - self_sym.value; @@ -107,22 +96,33 @@ pub fn freeListEligible(self: Atom, coff_file: *const Coff) bool { return surplus >= Coff.min_text_capacity; } -pub fn addRelocation(self: *Atom, coff_file: *Coff, reloc: Relocation) !void { +pub fn addRelocation(coff_file: *Coff, atom_index: Index, reloc: Relocation) !void { const gpa = coff_file.base.allocator; log.debug(" (adding reloc of type {s} to target %{d})", .{ @tagName(reloc.type), reloc.target.sym_index }); - const gop = try coff_file.relocs.getOrPut(gpa, self); + const gop = try coff_file.relocs.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } try gop.value_ptr.append(gpa, reloc); } -pub fn addBaseRelocation(self: *Atom, coff_file: *Coff, offset: u32) !void { +pub fn addBaseRelocation(coff_file: *Coff, atom_index: Index, offset: u32) !void { const gpa = coff_file.base.allocator; - log.debug(" (adding base relocation at offset 0x{x} in %{d})", .{ offset, self.sym_index }); - const gop = try coff_file.base_relocs.getOrPut(gpa, self); + log.debug(" (adding base relocation at offset 0x{x} in %{d})", .{ + offset, + coff_file.getAtom(atom_index).getSymbolIndex().?, + }); + const gop = try coff_file.base_relocs.getOrPut(gpa, atom_index); if (!gop.found_existing) { gop.value_ptr.* = .{}; } try gop.value_ptr.append(gpa, offset); } + +pub fn freeRelocations(coff_file: *Coff, atom_index: Atom.Index) void { + const gpa = coff_file.base.allocator; + var removed_relocs = coff_file.relocs.fetchRemove(atom_index); + if (removed_relocs) |*relocs| relocs.value.deinit(gpa); + var removed_base_relocs = coff_file.base_relocs.fetchRemove(atom_index); + if (removed_base_relocs) |*base_relocs| base_relocs.value.deinit(gpa); +} diff --git a/src/link/Coff/Relocation.zig b/src/link/Coff/Relocation.zig index 12a34b332d..1ba1d7a1c1 100644 --- a/src/link/Coff/Relocation.zig +++ b/src/link/Coff/Relocation.zig @@ -46,33 +46,35 @@ length: u2, dirty: bool = true, /// Returns an Atom which is the target node of this relocation edge (if any). -pub fn getTargetAtom(self: Relocation, coff_file: *Coff) ?*Atom { +pub fn getTargetAtomIndex(self: Relocation, coff_file: *const Coff) ?Atom.Index { switch (self.type) { .got, .got_page, .got_pageoff, - => return coff_file.getGotAtomForSymbol(self.target), + => return coff_file.getGotAtomIndexForSymbol(self.target), .direct, .page, .pageoff, - => return coff_file.getAtomForSymbol(self.target), + => return coff_file.getAtomIndexForSymbol(self.target), .import, .import_page, .import_pageoff, - => return coff_file.getImportAtomForSymbol(self.target), + => return coff_file.getImportAtomIndexForSymbol(self.target), } } -pub fn resolve(self: *Relocation, atom: *Atom, coff_file: *Coff) !void { +pub fn resolve(self: *Relocation, atom_index: Atom.Index, coff_file: *Coff) !void { + const atom = coff_file.getAtom(atom_index); const source_sym = atom.getSymbol(coff_file); const source_section = coff_file.sections.get(@enumToInt(source_sym.section_number) - 1).header; const source_vaddr = source_sym.value + self.offset; const file_offset = source_section.pointer_to_raw_data + source_sym.value - source_section.virtual_address; - const target_atom = self.getTargetAtom(coff_file) orelse return; + const target_atom_index = self.getTargetAtomIndex(coff_file) orelse return; + const target_atom = coff_file.getAtom(target_atom_index); const target_vaddr = target_atom.getSymbol(coff_file).value; const target_vaddr_with_addend = target_vaddr + self.addend; @@ -107,7 +109,7 @@ const Context = struct { image_base: u64, }; -fn resolveAarch64(self: *Relocation, ctx: Context, coff_file: *Coff) !void { +fn resolveAarch64(self: Relocation, ctx: Context, coff_file: *Coff) !void { var buffer: [@sizeOf(u64)]u8 = undefined; switch (self.length) { 2 => { @@ -197,7 +199,7 @@ fn resolveAarch64(self: *Relocation, ctx: Context, coff_file: *Coff) !void { } } -fn resolveX86(self: *Relocation, ctx: Context, coff_file: *Coff) !void { +fn resolveX86(self: Relocation, ctx: Context, coff_file: *Coff) !void { switch (self.type) { .got_page => unreachable, .got_pageoff => unreachable, diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 0b8128aa33..747120ac5d 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -71,14 +71,14 @@ const DeclMetadata = struct { fn getExport(m: DeclMetadata, elf_file: *const Elf, name: []const u8) ?u32 { for (m.exports.items) |exp| { - if (mem.eql(u8, name, elf_file.getSymbolName(exp))) return exp; + if (mem.eql(u8, name, elf_file.getGlobalName(exp))) return exp; } return null; } fn getExportPtr(m: *DeclMetadata, elf_file: *Elf, name: []const u8) ?*u32 { for (m.exports.items) |*exp| { - if (mem.eql(u8, name, elf_file.getSymbolName(exp.*))) return exp; + if (mem.eql(u8, name, elf_file.getGlobalName(exp.*))) return exp; } return null; } @@ -3276,6 +3276,12 @@ pub fn getSymbolName(self: *const Elf, sym_index: u32) []const u8 { return self.shstrtab.get(sym.st_name).?; } +/// Returns name of the global symbol at index. +pub fn getGlobalName(self: *const Elf, index: u32) []const u8 { + const sym = self.global_symbols.items[index]; + return self.shstrtab.get(sym.st_name).?; +} + pub fn getAtom(self: *const Elf, atom_index: Atom.Index) Atom { assert(atom_index < self.atoms.items.len); return self.atoms.items[atom_index]; diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 11a1119449..42aaa3a275 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -3015,6 +3015,11 @@ fn allocateAtom(self: *MachO, atom_index: Atom.Index, new_atom_size: u64, alignm if (header.@"align" < align_pow) { header.@"align" = align_pow; } + { + const atom_ptr = self.getAtomPtr(atom_index); + atom_ptr.size = new_atom_size; + atom_ptr.alignment = @intCast(u32, alignment); + } if (atom.prev_index) |prev_index| { const prev = self.getAtomPtr(prev_index); From 063888afff75f9d91fd221d84e1b74b111304ac3 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 27 Jan 2023 19:46:45 -0700 Subject: [PATCH 13/65] std.build: implement passing options to dependency packages * introduce the concept of maps to user input options, but don't implement it for command line arg parsing yet. * remove setPreferredReleaseMode and standardReleaseOptions in favor of standardOptimizeOption which has a future-proof options parameter. --- lib/std/build.zig | 209 ++++++++++++++++++++------------ lib/std/build/LibExeObjStep.zig | 35 +----- 2 files changed, 135 insertions(+), 109 deletions(-) diff --git a/lib/std/build.zig b/lib/std/build.zig index 8137b76846..f1b60f1469 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -73,8 +73,6 @@ pub const Builder = struct { build_root: []const u8, cache_root: []const u8, global_cache_root: []const u8, - release_mode: ?std.builtin.Mode, - is_release: bool, /// zig lib dir override_lib_dir: ?[]const u8, vcpkg_root: VcpkgRoot = .unattempted, @@ -150,6 +148,7 @@ pub const Builder = struct { flag: void, scalar: []const u8, list: ArrayList([]const u8), + map: StringHashMap(*const UserValue), }; const TypeId = enum { @@ -223,8 +222,6 @@ pub const Builder = struct { .step = Step.init(.top_level, "uninstall", allocator, makeUninstall), .description = "Remove build artifacts from prefix path", }, - .release_mode = null, - .is_release = false, .override_lib_dir = null, .install_path = undefined, .args = null, @@ -291,8 +288,6 @@ pub const Builder = struct { .build_root = build_root, .cache_root = parent.cache_root, .global_cache_root = parent.global_cache_root, - .release_mode = parent.release_mode, - .is_release = parent.is_release, .override_lib_dir = parent.override_lib_dir, .debug_log_scopes = parent.debug_log_scopes, .debug_compile_errors = parent.debug_compile_errors, @@ -312,10 +307,55 @@ pub const Builder = struct { } fn applyArgs(b: *Builder, args: anytype) !void { - // TODO this function is the way that a build.zig file communicates - // options to its dependencies. It is the programmatic way to give - // command line arguments to a build.zig script. - _ = args; + inline for (@typeInfo(@TypeOf(args)).Struct.fields) |field| { + const v = @field(args, field.name); + const T = @TypeOf(v); + switch (T) { + CrossTarget => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = try v.zigTriple(b.allocator) }, + .used = false, + }); + try b.user_input_options.put("cpu", .{ + .name = "cpu", + .value = .{ .scalar = try serializeCpu(b.allocator, v.getCpu()) }, + .used = false, + }); + }, + []const u8 => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = v }, + .used = false, + }); + }, + else => switch (@typeInfo(T)) { + .Bool => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = if (v) "true" else "false" }, + .used = false, + }); + }, + .Enum => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = @tagName(v) }, + .used = false, + }); + }, + .Int => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = try std.fmt.allocPrint(b.allocator, "{d}", .{v}) }, + .used = false, + }); + }, + else => @compileError("option '" ++ field.name ++ "' has unsupported type: " ++ @typeName(T)), + }, + } + } const Hasher = std.crypto.auth.siphash.SipHash128(1, 3); // Random bytes to make unique. Refresh this with new random bytes when // implementation is modified in a non-backwards-compatible way. @@ -679,15 +719,19 @@ pub const Builder = struct { return null; } }, - .list => { - log.err("Expected -D{s} to be a boolean, but received a list.\n", .{name}); + .list, .map => { + log.err("Expected -D{s} to be a boolean, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, }, .int => switch (option_ptr.value) { - .flag => { - log.err("Expected -D{s} to be an integer, but received a boolean.\n", .{name}); + .flag, .list, .map => { + log.err("Expected -D{s} to be an integer, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, @@ -706,15 +750,12 @@ pub const Builder = struct { }; return n; }, - .list => { - log.err("Expected -D{s} to be an integer, but received a list.\n", .{name}); - self.markInvalidUserInput(); - return null; - }, }, .float => switch (option_ptr.value) { - .flag => { - log.err("Expected -D{s} to be a float, but received a boolean.\n", .{name}); + .flag, .map, .list => { + log.err("Expected -D{s} to be a float, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, @@ -726,15 +767,12 @@ pub const Builder = struct { }; return n; }, - .list => { - log.err("Expected -D{s} to be a float, but received a list.\n", .{name}); - self.markInvalidUserInput(); - return null; - }, }, .@"enum" => switch (option_ptr.value) { - .flag => { - log.err("Expected -D{s} to be a string, but received a boolean.\n", .{name}); + .flag, .map, .list => { + log.err("Expected -D{s} to be an enum, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, @@ -747,28 +785,22 @@ pub const Builder = struct { return null; } }, - .list => { - log.err("Expected -D{s} to be a string, but received a list.\n", .{name}); - self.markInvalidUserInput(); - return null; - }, }, .string => switch (option_ptr.value) { - .flag => { - log.err("Expected -D{s} to be a string, but received a boolean.\n", .{name}); - self.markInvalidUserInput(); - return null; - }, - .list => { - log.err("Expected -D{s} to be a string, but received a list.\n", .{name}); + .flag, .list, .map => { + log.err("Expected -D{s} to be a string, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, .scalar => |s| return s, }, .list => switch (option_ptr.value) { - .flag => { - log.err("Expected -D{s} to be a list, but received a boolean.\n", .{name}); + .flag, .map => { + log.err("Expected -D{s} to be a list, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); self.markInvalidUserInput(); return null; }, @@ -790,41 +822,24 @@ pub const Builder = struct { return &step_info.step; } - /// This provides the -Drelease option to the build user and does not give them the choice. - pub fn setPreferredReleaseMode(self: *Builder, mode: std.builtin.Mode) void { - if (self.release_mode != null) { - @panic("setPreferredReleaseMode must be called before standardReleaseOptions and may not be called twice"); + pub const StandardOptimizeOptionOptions = struct { + preferred_optimize_mode: ?std.builtin.Mode = null, + }; + + pub fn standardOptimizeOption(self: *Builder, options: StandardOptimizeOptionOptions) std.builtin.Mode { + if (options.preferred_optimize_mode) |mode| { + if (self.option(bool, "release", "optimize for end users") orelse false) { + return mode; + } else { + return .Debug; + } + } else { + return self.option( + std.builtin.Mode, + "optimize", + "prioritize performance, safety, or binary size (-O flag)", + ) orelse .Debug; } - const description = self.fmt("Create a release build ({s})", .{@tagName(mode)}); - self.is_release = self.option(bool, "release", description) orelse false; - self.release_mode = if (self.is_release) mode else std.builtin.Mode.Debug; - } - - /// If you call this without first calling `setPreferredReleaseMode` then it gives the build user - /// the choice of what kind of release. - pub fn standardReleaseOptions(self: *Builder) std.builtin.Mode { - if (self.release_mode) |mode| return mode; - - const release_safe = self.option(bool, "release-safe", "Optimizations on and safety on") orelse false; - const release_fast = self.option(bool, "release-fast", "Optimizations on and safety off") orelse false; - const release_small = self.option(bool, "release-small", "Size optimizations on and safety off") orelse false; - - const mode = if (release_safe and !release_fast and !release_small) - std.builtin.Mode.ReleaseSafe - else if (release_fast and !release_safe and !release_small) - std.builtin.Mode.ReleaseFast - else if (release_small and !release_fast and !release_safe) - std.builtin.Mode.ReleaseSmall - else if (!release_fast and !release_safe and !release_small) - std.builtin.Mode.Debug - else x: { - log.err("Multiple release modes (of -Drelease-safe, -Drelease-fast and -Drelease-small)\n", .{}); - self.markInvalidUserInput(); - break :x std.builtin.Mode.Debug; - }; - self.is_release = mode != .Debug; - self.release_mode = mode; - return mode; } pub const StandardTargetOptionsArgs = struct { @@ -1004,6 +1019,11 @@ pub const Builder = struct { log.warn("Option '-D{s}={s}' conflicts with flag '-D{s}'.", .{ name, value, name }); return true; }, + .map => |*map| { + _ = map; + log.warn("TODO maps as command line arguments is not implemented yet.", .{}); + return true; + }, } return false; } @@ -1026,7 +1046,7 @@ pub const Builder = struct { log.err("Flag '-D{s}' conflicts with option '-D{s}={s}'.", .{ name, name, s }); return true; }, - .list => { + .list, .map => { log.err("Flag '-D{s}' conflicts with multiple options of the same name.", .{name}); return true; }, @@ -1058,7 +1078,7 @@ pub const Builder = struct { var it = self.user_input_options.iterator(); while (it.next()) |entry| { if (!entry.value_ptr.used) { - log.err("Invalid option: -D{s}\n", .{entry.key_ptr.*}); + log.err("Invalid option: -D{s}", .{entry.key_ptr.*}); self.markInvalidUserInput(); } } @@ -1456,6 +1476,11 @@ pub const Builder = struct { ) *Dependency { const sub_builder = b.createChild(name, build_root, args) catch unreachable; sub_builder.runBuild(build_zig) catch unreachable; + + if (sub_builder.validateUserInputDidItFail()) { + std.debug.dumpCurrentStackTrace(@returnAddress()); + } + const dep = b.allocator.create(Dependency) catch unreachable; dep.* = .{ .builder = sub_builder }; return dep; @@ -1718,6 +1743,34 @@ pub const InstalledFile = struct { } }; +pub fn serializeCpu(allocator: Allocator, cpu: std.Target.Cpu) ![]const u8 { + // TODO this logic can disappear if cpu model + features becomes part of the target triple + const all_features = cpu.arch.allFeaturesList(); + var populated_cpu_features = cpu.model.features; + populated_cpu_features.populateDependencies(all_features); + + if (populated_cpu_features.eql(cpu.features)) { + // The CPU name alone is sufficient. + return cpu.model.name; + } else { + var mcpu_buffer = ArrayList(u8).init(allocator); + try mcpu_buffer.appendSlice(cpu.model.name); + + for (all_features) |feature, i_usize| { + const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); + const in_cpu_set = populated_cpu_features.isEnabled(i); + const in_actual_set = cpu.features.isEnabled(i); + if (in_cpu_set and !in_actual_set) { + try mcpu_buffer.writer().print("-{s}", .{feature.name}); + } else if (!in_cpu_set and in_actual_set) { + try mcpu_buffer.writer().print("+{s}", .{feature.name}); + } + } + + return try mcpu_buffer.toOwnedSlice(); + } +} + test "dupePkg()" { if (builtin.os.tag == .wasi) return error.SkipZigTest; diff --git a/lib/std/build/LibExeObjStep.zig b/lib/std/build/LibExeObjStep.zig index cb37b24885..b1e6f3bdac 100644 --- a/lib/std/build/LibExeObjStep.zig +++ b/lib/std/build/LibExeObjStep.zig @@ -1495,37 +1495,10 @@ fn make(step: *Step) !void { } if (!self.target.isNative()) { - try zig_args.append("-target"); - try zig_args.append(try self.target.zigTriple(builder.allocator)); - - // TODO this logic can disappear if cpu model + features becomes part of the target triple - const cross = self.target.toTarget(); - const all_features = cross.cpu.arch.allFeaturesList(); - var populated_cpu_features = cross.cpu.model.features; - populated_cpu_features.populateDependencies(all_features); - - if (populated_cpu_features.eql(cross.cpu.features)) { - // The CPU name alone is sufficient. - try zig_args.append("-mcpu"); - try zig_args.append(cross.cpu.model.name); - } else { - var mcpu_buffer = ArrayList(u8).init(builder.allocator); - - try mcpu_buffer.writer().print("-mcpu={s}", .{cross.cpu.model.name}); - - for (all_features) |feature, i_usize| { - const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); - const in_cpu_set = populated_cpu_features.isEnabled(i); - const in_actual_set = cross.cpu.features.isEnabled(i); - if (in_cpu_set and !in_actual_set) { - try mcpu_buffer.writer().print("-{s}", .{feature.name}); - } else if (!in_cpu_set and in_actual_set) { - try mcpu_buffer.writer().print("+{s}", .{feature.name}); - } - } - - try zig_args.append(try mcpu_buffer.toOwnedSlice()); - } + try zig_args.appendSlice(&.{ + "-target", try self.target.zigTriple(builder.allocator), + "-mcpu", try build.serializeCpu(builder.allocator, self.target.getCpu()), + }); if (self.target.dynamic_linker.get()) |dynamic_linker| { try zig_args.append("--dynamic-linker"); From 71ff60f1265da83e619b1b6b2488ecb448fdfd36 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 28 Jan 2023 17:14:06 -0700 Subject: [PATCH 14/65] std.build: eliminate setTarget and setBuildMode This is a breaking change that makes the API for creating build artifacts no longer have any period of time where the target and optimization mode are not set. --- lib/std/build.zig | 170 +++++++++++++++++++------------- lib/std/build/LibExeObjStep.zig | 81 +++++---------- 2 files changed, 122 insertions(+), 129 deletions(-) diff --git a/lib/std/build.zig b/lib/std/build.zig index f1b60f1469..a4ad599d93 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -414,82 +414,123 @@ pub const Builder = struct { self.h_dir = self.pathJoin(&h_list); } - fn convertOptionalPathToFileSource(path: ?[]const u8) ?FileSource { - return if (path) |p| - FileSource{ .path = p } - else - null; - } - - pub fn addExecutable(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep { - return addExecutableSource(self, name, convertOptionalPathToFileSource(root_src)); - } - - pub fn addExecutableSource(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return LibExeObjStep.createExecutable(builder, name, root_src); - } - pub fn addOptions(self: *Builder) *OptionsStep { return OptionsStep.create(self); } - pub fn addObject(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep { - return addObjectSource(self, name, convertOptionalPathToFileSource(root_src)); - } - - pub fn addObjectSource(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return LibExeObjStep.createObject(builder, name, root_src); - } - - pub fn addSharedLibrary( - self: *Builder, + pub const ExecutableOptions = struct { name: []const u8, - root_src: ?[]const u8, - kind: LibExeObjStep.SharedLibKind, - ) *LibExeObjStep { - return addSharedLibrarySource(self, name, convertOptionalPathToFileSource(root_src), kind); + root_source_file: ?FileSource, + version: ?std.builtin.Version = null, + target: CrossTarget, + optimize: std.builtin.Mode, + linkage: ?LibExeObjStep.Linkage = null, + }; + + pub fn addExecutable(b: *Builder, options: ExecutableOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + .kind = .exe, + .linkage = options.linkage, + .version = options.version, + }); } - pub fn addSharedLibrarySource( - self: *Builder, + pub const ObjectOptions = struct { name: []const u8, - root_src: ?FileSource, - kind: LibExeObjStep.SharedLibKind, - ) *LibExeObjStep { - return LibExeObjStep.createSharedLibrary(self, name, root_src, kind); + root_source_file: ?FileSource, + target: CrossTarget, + optimize: std.builtin.Mode, + }; + + pub fn addObject(b: *Builder, options: ObjectOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .target = options.target, + .optimize = options.optimize, + .kind = .obj, + }); } - pub fn addStaticLibrary(self: *Builder, name: []const u8, root_src: ?[]const u8) *LibExeObjStep { - return addStaticLibrarySource(self, name, convertOptionalPathToFileSource(root_src)); + pub const SharedLibraryOptions = struct { + name: []const u8, + root_source_file: ?FileSource, + version: ?std.builtin.Version = null, + target: CrossTarget, + optimize: std.builtin.Mode, + }; + + pub fn addSharedLibrary(b: *Builder, options: SharedLibraryOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .kind = .lib, + .linkage = .dynamic, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + }); } - pub fn addStaticLibrarySource(self: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return LibExeObjStep.createStaticLibrary(self, name, root_src); + pub const StaticLibraryOptions = struct { + name: []const u8, + root_source_file: ?FileSource = null, + target: CrossTarget, + optimize: std.builtin.Mode, + version: ?std.builtin.Version = null, + }; + + pub fn addStaticLibrary(b: *Builder, options: StaticLibraryOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .kind = .lib, + .linkage = .static, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + }); } - pub fn addTest(self: *Builder, root_src: []const u8) *LibExeObjStep { - return LibExeObjStep.createTest(self, "test", .{ .path = root_src }); + pub const TestOptions = struct { + name: []const u8 = "test", + kind: LibExeObjStep.Kind = .@"test", + root_source_file: FileSource, + target: CrossTarget, + optimize: std.builtin.Mode, + version: ?std.builtin.Version = null, + }; + + pub fn addTest(b: *Builder, options: TestOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .kind = options.kind, + .root_source_file = options.root_source_file, + .target = options.target, + .optimize = options.optimize, + }); } - pub fn addTestSource(self: *Builder, root_src: FileSource) *LibExeObjStep { - return LibExeObjStep.createTest(self, "test", root_src.dupe(self)); - } + pub const AssemblyOptions = struct { + name: []const u8, + source_file: FileSource, + target: CrossTarget, + optimize: std.builtin.Mode, + }; - pub fn addTestExe(self: *Builder, name: []const u8, root_src: []const u8) *LibExeObjStep { - return LibExeObjStep.createTestExe(self, name, .{ .path = root_src }); - } - - pub fn addTestExeSource(self: *Builder, name: []const u8, root_src: FileSource) *LibExeObjStep { - return LibExeObjStep.createTestExe(self, name, root_src.dupe(self)); - } - - pub fn addAssemble(self: *Builder, name: []const u8, src: []const u8) *LibExeObjStep { - return addAssembleSource(self, name, .{ .path = src }); - } - - pub fn addAssembleSource(self: *Builder, name: []const u8, src: FileSource) *LibExeObjStep { - const obj_step = LibExeObjStep.createObject(self, name, null); - obj_step.addAssemblyFileSource(src.dupe(self)); + pub fn addAssembly(b: *Builder, options: AssemblyOptions) *LibExeObjStep { + const obj_step = LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = null, + .target = options.target, + .optimize = options.optimize, + }); + obj_step.addAssemblyFileSource(options.source_file.dupe(b)); return obj_step; } @@ -593,17 +634,6 @@ pub const Builder = struct { return TranslateCStep.create(self, source.dupe(self)); } - pub fn version(self: *const Builder, major: u32, minor: u32, patch: u32) LibExeObjStep.SharedLibKind { - _ = self; - return .{ - .versioned = .{ - .major = major, - .minor = minor, - .patch = patch, - }, - }; - } - pub fn make(self: *Builder, step_names: []const []const u8) !void { try self.makePath(self.cache_root); diff --git a/lib/std/build/LibExeObjStep.zig b/lib/std/build/LibExeObjStep.zig index b1e6f3bdac..6ee5205b50 100644 --- a/lib/std/build/LibExeObjStep.zig +++ b/lib/std/build/LibExeObjStep.zig @@ -36,14 +36,14 @@ pub const base_id = .lib_exe_obj; step: Step, builder: *Builder, name: []const u8, -target: CrossTarget = CrossTarget{}, +target: CrossTarget, target_info: NativeTargetInfo, +optimize: std.builtin.Mode, linker_script: ?FileSource = null, version_script: ?[]const u8 = null, out_filename: []const u8, linkage: ?Linkage = null, version: ?std.builtin.Version, -build_mode: std.builtin.Mode, kind: Kind, major_only_filename: ?[]const u8, name_only_filename: ?[]const u8, @@ -271,6 +271,16 @@ pub const IncludeDir = union(enum) { config_header_step: *ConfigHeaderStep, }; +pub const Options = struct { + name: []const u8, + root_source_file: ?FileSource = null, + target: CrossTarget, + optimize: std.builtin.Mode, + kind: Kind, + linkage: ?Linkage = null, + version: ?std.builtin.Version = null, +}; + pub const Kind = enum { exe, lib, @@ -279,11 +289,6 @@ pub const Kind = enum { test_exe, }; -pub const SharedLibKind = union(enum) { - versioned: std.builtin.Version, - unversioned: void, -}; - pub const Linkage = enum { dynamic, static }; pub const EmitOption = union(enum) { @@ -302,43 +307,9 @@ pub const EmitOption = union(enum) { } }; -pub fn createSharedLibrary(builder: *Builder, name: []const u8, root_src: ?FileSource, kind: SharedLibKind) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .lib, .dynamic, switch (kind) { - .versioned => |ver| ver, - .unversioned => null, - }); -} - -pub fn createStaticLibrary(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .lib, .static, null); -} - -pub fn createObject(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .obj, null, null); -} - -pub fn createExecutable(builder: *Builder, name: []const u8, root_src: ?FileSource) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .exe, null, null); -} - -pub fn createTest(builder: *Builder, name: []const u8, root_src: FileSource) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .@"test", null, null); -} - -pub fn createTestExe(builder: *Builder, name: []const u8, root_src: FileSource) *LibExeObjStep { - return initExtraArgs(builder, name, root_src, .test_exe, null, null); -} - -fn initExtraArgs( - builder: *Builder, - name_raw: []const u8, - root_src_raw: ?FileSource, - kind: Kind, - linkage: ?Linkage, - ver: ?std.builtin.Version, -) *LibExeObjStep { - const name = builder.dupe(name_raw); - const root_src: ?FileSource = if (root_src_raw) |rsrc| rsrc.dupe(builder) else null; +pub fn create(builder: *Builder, options: Options) *LibExeObjStep { + const name = builder.dupe(options.name); + const root_src: ?FileSource = if (options.root_source_file) |rsrc| rsrc.dupe(builder) else null; if (mem.indexOf(u8, name, "/") != null or mem.indexOf(u8, name, "\\") != null) { panic("invalid name: '{s}'. It looks like a file path, but it is supposed to be the library or application name.", .{name}); } @@ -350,14 +321,15 @@ fn initExtraArgs( .builder = builder, .verbose_link = false, .verbose_cc = false, - .build_mode = std.builtin.Mode.Debug, - .linkage = linkage, - .kind = kind, + .optimize = options.optimize, + .target = options.target, + .linkage = options.linkage, + .kind = options.kind, .root_src = root_src, .name = name, .frameworks = StringHashMap(FrameworkLinkInfo).init(builder.allocator), .step = Step.init(base_id, name, builder.allocator, make), - .version = ver, + .version = options.version, .out_filename = undefined, .out_h_filename = builder.fmt("{s}.h", .{name}), .out_lib_filename = undefined, @@ -457,11 +429,6 @@ fn computeOutFileNames(self: *LibExeObjStep) void { } } -pub fn setTarget(self: *LibExeObjStep, target: CrossTarget) void { - self.target = target; - self.computeOutFileNames(); -} - pub fn setOutputDir(self: *LibExeObjStep, dir: []const u8) void { self.output_dir = self.builder.dupePath(dir); } @@ -889,10 +856,6 @@ pub fn setVerboseCC(self: *LibExeObjStep, value: bool) void { self.verbose_cc = value; } -pub fn setBuildMode(self: *LibExeObjStep, mode: std.builtin.Mode) void { - self.build_mode = mode; -} - pub fn overrideZigLibDir(self: *LibExeObjStep, dir_path: []const u8) void { self.override_lib_dir = self.builder.dupePath(dir_path); } @@ -1376,9 +1339,9 @@ fn make(step: *Step) !void { try zig_args.append(libc_file); } - switch (self.build_mode) { + switch (self.optimize) { .Debug => {}, // Skip since it's the default. - else => zig_args.append(builder.fmt("-O{s}", .{@tagName(self.build_mode)})) catch unreachable, + else => zig_args.append(builder.fmt("-O{s}", .{@tagName(self.optimize)})) catch unreachable, } try zig_args.append("--cache-dir"); From 73cf7b64291ed8b5dcb4cb52df103be08f15a347 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 30 Jan 2023 21:39:43 -0700 Subject: [PATCH 15/65] update build.zig API usage --- build.zig | 72 ++++---- doc/langref.html.in | 42 +++-- lib/init-exe/build.zig | 51 +++++- lib/init-lib/build.zig | 41 ++++- lib/std/build.zig | 19 +-- lib/std/build/TranslateCStep.zig | 40 ++++- lib/std/builtin.zig | 5 +- src/link/MachO/zld.zig | 11 +- test/link/bss/build.zig | 9 +- test/link/common_symbols/build.zig | 15 +- test/link/common_symbols_alignment/build.zig | 17 +- .../interdependent_static_c_libs/build.zig | 24 ++- test/link/macho/bugs/13056/build.zig | 8 +- test/link/macho/bugs/13457/build.zig | 11 +- test/link/macho/dead_strip/build.zig | 16 +- test/link/macho/dead_strip_dylibs/build.zig | 14 +- test/link/macho/dylib/build.zig | 19 ++- test/link/macho/empty/build.zig | 10 +- test/link/macho/entry/build.zig | 10 +- test/link/macho/headerpad/build.zig | 18 +- test/link/macho/linksection/build.zig | 13 +- test/link/macho/needed_framework/build.zig | 8 +- test/link/macho/needed_library/build.zig | 19 ++- test/link/macho/objc/build.zig | 8 +- test/link/macho/objcpp/build.zig | 8 +- test/link/macho/pagezero/build.zig | 18 +- test/link/macho/search_strategy/build.zig | 33 ++-- test/link/macho/stack_size/build.zig | 10 +- test/link/macho/strict_validation/build.zig | 11 +- test/link/macho/tls/build.zig | 19 ++- test/link/macho/unwind_info/build.zig | 20 ++- test/link/macho/uuid/build.zig | 17 +- test/link/macho/weak_framework/build.zig | 8 +- test/link/macho/weak_library/build.zig | 19 ++- test/link/static_lib_as_system_lib/build.zig | 17 +- test/link/wasm/archive/build.zig | 11 +- test/link/wasm/basic-features/build.zig | 18 +- test/link/wasm/bss/build.zig | 11 +- test/link/wasm/export-data/build.zig | 9 +- test/link/wasm/export/build.zig | 29 ++-- test/link/wasm/extern-mangle/build.zig | 11 +- test/link/wasm/extern/build.zig | 10 +- test/link/wasm/function-table/build.zig | 29 ++-- test/link/wasm/infer-features/build.zig | 29 +++- test/link/wasm/producers/build.zig | 11 +- test/link/wasm/segments/build.zig | 11 +- test/link/wasm/stack_pointer/build.zig | 11 +- test/link/wasm/type/build.zig | 11 +- test/src/compare_output.zig | 31 +++- test/src/run_translated_c.zig | 9 +- test/src/translate_c.zig | 7 +- test/standalone/brace_expansion/build.zig | 6 +- test/standalone/c_compiler/build.zig | 18 +- test/standalone/emit_asm_and_bin/build.zig | 6 +- test/standalone/empty_env/build.zig | 7 +- test/standalone/global_linkage/build.zig | 24 ++- test/standalone/install_raw_hex/build.zig | 11 +- test/standalone/issue_11595/build.zig | 11 +- test/standalone/issue_12588/build.zig | 11 +- test/standalone/issue_12706/build.zig | 11 +- test/standalone/issue_13030/build.zig | 12 +- test/standalone/issue_339/build.zig | 7 +- test/standalone/issue_5825/build.zig | 19 ++- test/standalone/issue_7030/build.zig | 11 +- test/standalone/issue_794/build.zig | 4 +- test/standalone/issue_8550/build.zig | 11 +- test/standalone/issue_9812/build.zig | 8 +- .../standalone/load_dynamic_library/build.zig | 20 ++- test/standalone/main_pkg_path/build.zig | 4 +- test/standalone/mix_c_files/build.zig | 11 +- test/standalone/mix_o_files/build.zig | 14 +- test/standalone/options/build.zig | 10 +- test/standalone/pie/build.zig | 6 +- test/standalone/pkg_import/build.zig | 13 +- test/standalone/shared_library/build.zig | 17 +- test/standalone/static_c_lib/build.zig | 15 +- test/standalone/test_runner_path/build.zig | 5 +- test/standalone/use_alias/build.zig | 6 +- test/standalone/windows_spawn/build.zig | 17 +- test/tests.zig | 156 ++++++++++-------- 80 files changed, 905 insertions(+), 494 deletions(-) diff --git a/build.zig b/build.zig index 3a7468243f..98da9f31ee 100644 --- a/build.zig +++ b/build.zig @@ -23,7 +23,7 @@ pub fn build(b: *Builder) !void { } break :t b.standardTargetOptions(.{ .default_target = default_target }); }; - const mode: std.builtin.Mode = if (release) switch (target.getCpuArch()) { + const optimize: std.builtin.OptimizeMode = if (release) switch (target.getCpuArch()) { .wasm32 => .ReleaseSmall, else => .ReleaseFast, } else .Debug; @@ -33,7 +33,12 @@ pub fn build(b: *Builder) !void { const test_step = b.step("test", "Run all the tests"); - const docgen_exe = b.addExecutable("docgen", "doc/docgen.zig"); + const docgen_exe = b.addExecutable(.{ + .name = "docgen", + .root_source_file = .{ .path = "doc/docgen.zig" }, + .target = .{}, + .optimize = .Debug, + }); docgen_exe.single_threaded = single_threaded; const rel_zig_exe = try fs.path.relative(b.allocator, b.build_root, b.zig_exe); @@ -53,10 +58,12 @@ pub fn build(b: *Builder) !void { const docs_step = b.step("docs", "Build documentation"); docs_step.dependOn(&docgen_cmd.step); - const test_cases = b.addTest("src/test.zig"); + const test_cases = b.addTest(.{ + .root_source_file = .{ .path = "src/test.zig" }, + .optimize = optimize, + }); test_cases.main_pkg_path = "."; test_cases.stack_size = stack_size; - test_cases.setBuildMode(mode); test_cases.single_threaded = single_threaded; const fmt_build_zig = b.addFmt(&[_][]const u8{"build.zig"}); @@ -149,17 +156,15 @@ pub fn build(b: *Builder) !void { const mem_leak_frames: u32 = b.option(u32, "mem-leak-frames", "How many stack frames to print when a memory leak occurs. Tests get 2x this amount.") orelse blk: { if (strip == true) break :blk @as(u32, 0); - if (mode != .Debug) break :blk 0; + if (optimize != .Debug) break :blk 0; break :blk 4; }; - const exe = addCompilerStep(b); + const exe = addCompilerStep(b, optimize, target); exe.strip = strip; exe.sanitize_thread = sanitize_thread; exe.build_id = b.option(bool, "build-id", "Include a build id note") orelse false; exe.install(); - exe.setBuildMode(mode); - exe.setTarget(target); const compile_step = b.step("compile", "Build the self-hosted compiler"); compile_step.dependOn(&exe.step); @@ -195,7 +200,7 @@ pub fn build(b: *Builder) !void { test_cases.linkLibC(); } - const is_debug = mode == .Debug; + const is_debug = optimize == .Debug; const enable_logging = b.option(bool, "log", "Enable debug logging with --debug-log") orelse is_debug; const enable_link_snapshots = b.option(bool, "link-snapshot", "Whether to enable linker state snapshots") orelse false; @@ -360,25 +365,25 @@ pub fn build(b: *Builder) !void { test_step.dependOn(test_cases_step); } - var chosen_modes: [4]builtin.Mode = undefined; + var chosen_opt_modes_buf: [4]builtin.Mode = undefined; var chosen_mode_index: usize = 0; if (!skip_debug) { - chosen_modes[chosen_mode_index] = builtin.Mode.Debug; + chosen_opt_modes_buf[chosen_mode_index] = builtin.Mode.Debug; chosen_mode_index += 1; } if (!skip_release_safe) { - chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseSafe; + chosen_opt_modes_buf[chosen_mode_index] = builtin.Mode.ReleaseSafe; chosen_mode_index += 1; } if (!skip_release_fast) { - chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseFast; + chosen_opt_modes_buf[chosen_mode_index] = builtin.Mode.ReleaseFast; chosen_mode_index += 1; } if (!skip_release_small) { - chosen_modes[chosen_mode_index] = builtin.Mode.ReleaseSmall; + chosen_opt_modes_buf[chosen_mode_index] = builtin.Mode.ReleaseSmall; chosen_mode_index += 1; } - const modes = chosen_modes[0..chosen_mode_index]; + const optimization_modes = chosen_opt_modes_buf[0..chosen_mode_index]; // run stage1 `zig fmt` on this build.zig file just to make sure it works test_step.dependOn(&fmt_build_zig.step); @@ -391,7 +396,7 @@ pub fn build(b: *Builder) !void { "test/behavior.zig", "behavior", "Run the behavior tests", - modes, + optimization_modes, skip_single_threaded, skip_non_native, skip_libc, @@ -405,7 +410,7 @@ pub fn build(b: *Builder) !void { "lib/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", - modes, + optimization_modes, true, // skip_single_threaded skip_non_native, true, // skip_libc @@ -419,7 +424,7 @@ pub fn build(b: *Builder) !void { "lib/c.zig", "universal-libc", "Run the universal libc tests", - modes, + optimization_modes, true, // skip_single_threaded skip_non_native, true, // skip_libc @@ -427,11 +432,11 @@ pub fn build(b: *Builder) !void { skip_stage2_tests or true, // TODO get these all passing )); - test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes)); + test_step.dependOn(tests.addCompareOutputTests(b, test_filter, optimization_modes)); test_step.dependOn(tests.addStandaloneTests( b, test_filter, - modes, + optimization_modes, skip_non_native, enable_macos_sdk, target, @@ -444,10 +449,10 @@ pub fn build(b: *Builder) !void { enable_symlinks_windows, )); test_step.dependOn(tests.addCAbiTests(b, skip_non_native, skip_release)); - test_step.dependOn(tests.addLinkTests(b, test_filter, modes, enable_macos_sdk, skip_stage2_tests, enable_symlinks_windows)); - test_step.dependOn(tests.addStackTraceTests(b, test_filter, modes)); - test_step.dependOn(tests.addCliTests(b, test_filter, modes)); - test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, modes)); + test_step.dependOn(tests.addLinkTests(b, test_filter, optimization_modes, enable_macos_sdk, skip_stage2_tests, enable_symlinks_windows)); + test_step.dependOn(tests.addStackTraceTests(b, test_filter, optimization_modes)); + test_step.dependOn(tests.addCliTests(b, test_filter, optimization_modes)); + test_step.dependOn(tests.addAssembleAndLinkTests(b, test_filter, optimization_modes)); test_step.dependOn(tests.addTranslateCTests(b, test_filter)); if (!skip_run_translated_c) { test_step.dependOn(tests.addRunTranslatedCTests(b, test_filter, target)); @@ -461,7 +466,7 @@ pub fn build(b: *Builder) !void { "lib/std/std.zig", "std", "Run the standard library tests", - modes, + optimization_modes, skip_single_threaded, skip_non_native, skip_libc, @@ -481,9 +486,7 @@ fn addWasiUpdateStep(b: *Builder, version: [:0]const u8) !void { }; target.cpu_features_add.addFeature(@enumToInt(std.Target.wasm.Feature.bulk_memory)); - const exe = addCompilerStep(b); - exe.setBuildMode(.ReleaseSmall); - exe.setTarget(target); + const exe = addCompilerStep(b, .ReleaseSmall, target); const exe_options = b.addOptions(); exe.addOptions("build_options", exe_options); @@ -510,8 +513,17 @@ fn addWasiUpdateStep(b: *Builder, version: [:0]const u8) !void { update_zig1_step.dependOn(&run_opt.step); } -fn addCompilerStep(b: *Builder) *std.build.LibExeObjStep { - const exe = b.addExecutable("zig", "src/main.zig"); +fn addCompilerStep( + b: *Builder, + optimize: std.builtin.OptimizeMode, + target: std.zig.CrossTarget, +) *std.build.LibExeObjStep { + const exe = b.addExecutable(.{ + .name = "zig", + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); exe.stack_size = stack_size; return exe; } diff --git a/doc/langref.html.in b/doc/langref.html.in index fd4aa8ae76..c008149f41 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -9531,8 +9531,12 @@ fn foo(comptime T: type, ptr: *T) T { const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const exe = b.addExecutable("example", "example.zig"); - exe.setBuildMode(b.standardReleaseOptions()); + const optimize = b.standardOptimizeOption(.{}); + const exe = b.addExecutable(.{ + .name = "example", + .root_source_file = .{ .path = "example.zig" }, + .optimize = optimize, + }); b.default_step.dependOn(&exe.step); } {#code_end#} @@ -10558,11 +10562,14 @@ pub fn build(b: *Builder) void { // Standard release options allow the person running `zig build` to select // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const exe = b.addExecutable("example", "src/main.zig"); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "example", + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); exe.install(); const run_cmd = exe.run(); @@ -10584,13 +10591,18 @@ pub fn build(b: *Builder) void { const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const lib = b.addStaticLibrary("example", "src/main.zig"); - lib.setBuildMode(mode); + const optimize = b.standardOptimizeOption(.{}); + const lib = b.addStaticLibrary(.{ + .name = "example", + .root_source_file = .{ .path = "src/main.zig" }, + .optimize = optimize, + }); lib.install(); - var main_tests = b.addTest("src/main.zig"); - main_tests.setBuildMode(mode); + const main_tests = b.addTest(.{ + .root_source_file = .{ .path = "src/main.zig" }, + .optimize = optimize, + }); const test_step = b.step("test", "Run library tests"); test_step.dependOn(&main_tests.step); @@ -10954,7 +10966,9 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + }); exe.addCSourceFile("test.c", &[_][]const u8{"-std=c99"}); exe.linkLibrary(lib); exe.linkSystemLibrary("c"); @@ -11016,7 +11030,9 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { const obj = b.addObject("base64", "base64.zig"); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + }); exe.addCSourceFile("test.c", &[_][]const u8{"-std=c99"}); exe.addObject(obj); exe.linkSystemLibrary("c"); diff --git a/lib/init-exe/build.zig b/lib/init-exe/build.zig index 29b50b5cc4..36e5feddec 100644 --- a/lib/init-exe/build.zig +++ b/lib/init-exe/build.zig @@ -1,5 +1,8 @@ const std = @import("std"); +// Although this function looks imperative, note that its job is to +// declaratively construct a build graph that will be executed by an external +// runner. pub fn build(b: *std.build.Builder) void { // Standard target options allows the person running `zig build` to choose // what target to build for. Here we do not override the defaults, which @@ -7,28 +10,58 @@ pub fn build(b: *std.build.Builder) void { // for restricting supported target set are available. const target = b.standardTargetOptions(.{}); - // Standard release options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. - const mode = b.standardReleaseOptions(); + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. + const optimize = b.standardOptimizeOption(); - const exe = b.addExecutable("$", "src/main.zig"); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "$", + // In this case the main source file is merely a path, however, in more + // complicated build scripts, this could be a generated file. + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); + + // This declares intent for the executable to be installed into the + // standard location when the user invokes the "install" step (the default + // step when running `zig build`). exe.install(); + // This *creates* a RunStep in the build graph, to be executed when another + // step is evaluated that depends on it. The next line below will establish + // such a dependency. const run_cmd = exe.run(); + + // By making the run step depend on the install step, it will be run from the + // installation directory rather than directly from within the cache directory. + // This is not necessary, however, if the application depends on other installed + // files, this ensures they will be present and in the expected location. run_cmd.step.dependOn(b.getInstallStep()); + + // This allows the user to pass arguments to the application in the build + // command itself, like this: `zig build run -- arg1 arg2 etc` if (b.args) |args| { run_cmd.addArgs(args); } + // This creates a build step. It will be visible in the `zig build --help` menu, + // and can be selected like this: `zig build run` + // This will evaluate the `run` step rather than the default, which is "install". const run_step = b.step("run", "Run the app"); run_step.dependOn(&run_cmd.step); - const exe_tests = b.addTest("src/main.zig"); - exe_tests.setTarget(target); - exe_tests.setBuildMode(mode); + // Creates a step for unit testing. + const exe_tests = b.addTest(.{ + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); + // Similar to creating the run step earlier, this exposes a `test` step to + // the `zig build --help` menu, providing a way for the user to request + // running the unit tests. const test_step = b.step("test", "Run unit tests"); test_step.dependOn(&exe_tests.step); } diff --git a/lib/init-lib/build.zig b/lib/init-lib/build.zig index b3876691a2..4a7b700dc2 100644 --- a/lib/init-lib/build.zig +++ b/lib/init-lib/build.zig @@ -1,17 +1,44 @@ const std = @import("std"); +// Although this function looks imperative, note that its job is to +// declaratively construct a build graph that will be executed by an external +// runner. pub fn build(b: *std.build.Builder) void { - // Standard release options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. - const mode = b.standardReleaseOptions(); + // Standard target options allows the person running `zig build` to choose + // what target to build for. Here we do not override the defaults, which + // means any target is allowed, and the default is native. Other options + // for restricting supported target set are available. + const target = b.standardTargetOptions(.{}); - const lib = b.addStaticLibrary("$", "src/main.zig"); - lib.setBuildMode(mode); + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. + const optimize = b.standardOptimizeOption(); + + const lib = b.addStaticLibrary(.{ + .name = "$", + // In this case the main source file is merely a path, however, in more + // complicated build scripts, this could be a generated file. + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); + + // This declares intent for the library to be installed into the standard + // location when the user invokes the "install" step (the default step when + // running `zig build`). lib.install(); - const main_tests = b.addTest("src/main.zig"); - main_tests.setBuildMode(mode); + // Creates a step for unit testing. + const main_tests = b.addTest(.{ + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); + // This creates a build step. It will be visible in the `zig build --help` menu, + // and can be selected like this: `zig build test` + // This will evaluate the `test` step rather than the default, which is "install". const test_step = b.step("test", "Run library tests"); test_step.dependOn(&main_tests.step); } diff --git a/lib/std/build.zig b/lib/std/build.zig index a4ad599d93..4ee00a4710 100644 --- a/lib/std/build.zig +++ b/lib/std/build.zig @@ -420,10 +420,10 @@ pub const Builder = struct { pub const ExecutableOptions = struct { name: []const u8, - root_source_file: ?FileSource, + root_source_file: ?FileSource = null, version: ?std.builtin.Version = null, - target: CrossTarget, - optimize: std.builtin.Mode, + target: CrossTarget = .{}, + optimize: std.builtin.Mode = .Debug, linkage: ?LibExeObjStep.Linkage = null, }; @@ -436,13 +436,12 @@ pub const Builder = struct { .optimize = options.optimize, .kind = .exe, .linkage = options.linkage, - .version = options.version, }); } pub const ObjectOptions = struct { name: []const u8, - root_source_file: ?FileSource, + root_source_file: ?FileSource = null, target: CrossTarget, optimize: std.builtin.Mode, }; @@ -459,7 +458,7 @@ pub const Builder = struct { pub const SharedLibraryOptions = struct { name: []const u8, - root_source_file: ?FileSource, + root_source_file: ?FileSource = null, version: ?std.builtin.Version = null, target: CrossTarget, optimize: std.builtin.Mode, @@ -501,8 +500,8 @@ pub const Builder = struct { name: []const u8 = "test", kind: LibExeObjStep.Kind = .@"test", root_source_file: FileSource, - target: CrossTarget, - optimize: std.builtin.Mode, + target: CrossTarget = .{}, + optimize: std.builtin.Mode = .Debug, version: ?std.builtin.Version = null, }; @@ -630,8 +629,8 @@ pub const Builder = struct { return FmtStep.create(self, paths); } - pub fn addTranslateC(self: *Builder, source: FileSource) *TranslateCStep { - return TranslateCStep.create(self, source.dupe(self)); + pub fn addTranslateC(self: *Builder, options: TranslateCStep.Options) *TranslateCStep { + return TranslateCStep.create(self, options); } pub fn make(self: *Builder, step_names: []const []const u8) !void { diff --git a/lib/std/build/TranslateCStep.zig b/lib/std/build/TranslateCStep.zig index 1f9bee463c..9f45d606a1 100644 --- a/lib/std/build/TranslateCStep.zig +++ b/lib/std/build/TranslateCStep.zig @@ -19,11 +19,19 @@ include_dirs: std.ArrayList([]const u8), c_macros: std.ArrayList([]const u8), output_dir: ?[]const u8, out_basename: []const u8, -target: CrossTarget = CrossTarget{}, +target: CrossTarget, +optimize: std.builtin.OptimizeMode, output_file: build.GeneratedFile, -pub fn create(builder: *Builder, source: build.FileSource) *TranslateCStep { +pub const Options = struct { + source_file: build.FileSource, + target: CrossTarget, + optimize: std.builtin.OptimizeMode, +}; + +pub fn create(builder: *Builder, options: Options) *TranslateCStep { const self = builder.allocator.create(TranslateCStep) catch unreachable; + const source = options.source_file.dupe(builder); self.* = TranslateCStep{ .step = Step.init(.translate_c, "translate-c", builder.allocator, make), .builder = builder, @@ -32,19 +40,32 @@ pub fn create(builder: *Builder, source: build.FileSource) *TranslateCStep { .c_macros = std.ArrayList([]const u8).init(builder.allocator), .output_dir = null, .out_basename = undefined, + .target = options.target, + .optimize = options.optimize, .output_file = build.GeneratedFile{ .step = &self.step }, }; source.addStepDependencies(&self.step); return self; } -pub fn setTarget(self: *TranslateCStep, target: CrossTarget) void { - self.target = target; -} +pub const AddExecutableOptions = struct { + name: ?[]const u8 = null, + version: ?std.builtin.Version = null, + target: ?CrossTarget = null, + optimize: ?std.builtin.Mode = null, + linkage: ?LibExeObjStep.Linkage = null, +}; /// Creates a step to build an executable from the translated source. -pub fn addExecutable(self: *TranslateCStep) *LibExeObjStep { - return self.builder.addExecutableSource("translated_c", build.FileSource{ .generated = &self.output_file }); +pub fn addExecutable(self: *TranslateCStep, options: AddExecutableOptions) *LibExeObjStep { + return self.builder.addExecutable(.{ + .root_source_file = .{ .generated = &self.output_file }, + .name = options.name orelse "translated_c", + .version = options.version, + .target = options.target orelse self.target, + .optimize = options.optimize orelse self.optimize, + .linkage = options.linkage, + }); } pub fn addIncludeDir(self: *TranslateCStep, include_dir: []const u8) void { @@ -82,6 +103,11 @@ fn make(step: *Step) !void { try argv_list.append(try self.target.zigTriple(self.builder.allocator)); } + switch (self.optimize) { + .Debug => {}, // Skip since it's the default. + else => try argv_list.append(self.builder.fmt("-O{s}", .{@tagName(self.optimize)})), + } + for (self.include_dirs.items) |include_dir| { try argv_list.append("-I"); try argv_list.append(include_dir); diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 4d949946d8..74c61d229b 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -131,13 +131,16 @@ pub const CodeModel = enum { /// This data structure is used by the Zig language code generation and /// therefore must be kept in sync with the compiler implementation. -pub const Mode = enum { +pub const OptimizeMode = enum { Debug, ReleaseSafe, ReleaseFast, ReleaseSmall, }; +/// Deprecated; use OptimizeMode. +pub const Mode = OptimizeMode; + /// This data structure is used by the Zig language code generation and /// therefore must be kept in sync with the compiler implementation. pub const CallingConvention = enum { diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig index 4cb346aa47..81fae399ef 100644 --- a/src/link/MachO/zld.zig +++ b/src/link/MachO/zld.zig @@ -3596,7 +3596,8 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr man.hash.addOptionalBytes(options.sysroot); try man.addOptionalFile(options.entitlements); - // We don't actually care whether it's a cache hit or miss; we just need the digest and the lock. + // We don't actually care whether it's a cache hit or miss; we just + // need the digest and the lock. _ = try man.hit(); digest = man.final(); @@ -4177,9 +4178,11 @@ pub fn linkWithZld(macho_file: *MachO, comp: *Compilation, prog_node: *std.Progr log.debug("failed to save linking hash digest file: {s}", .{@errorName(err)}); }; // Again failure here only means an unnecessary cache miss. - man.writeManifest() catch |err| { - log.debug("failed to write cache manifest when linking: {s}", .{@errorName(err)}); - }; + if (man.have_exclusive_lock) { + man.writeManifest() catch |err| { + log.debug("failed to write cache manifest when linking: {s}", .{@errorName(err)}); + }; + } // We hang on to this lock so that the output file path can be used without // other processes clobbering it. macho_file.base.lock = man.toOwnedLock(); diff --git a/test/link/bss/build.zig b/test/link/bss/build.zig index 76e9bdb305..c31fa7faf5 100644 --- a/test/link/bss/build.zig +++ b/test/link/bss/build.zig @@ -1,12 +1,15 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); - const exe = b.addExecutable("bss", "main.zig"); + const exe = b.addExecutable(.{ + .name = "bss", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + }); b.default_step.dependOn(&exe.step); - exe.setBuildMode(mode); const run = exe.run(); run.expectStdOutEqual("0, 1, 0\n"); diff --git a/test/link/common_symbols/build.zig b/test/link/common_symbols/build.zig index 2f9f892e86..068c3f9c57 100644 --- a/test/link/common_symbols/build.zig +++ b/test/link/common_symbols/build.zig @@ -1,14 +1,19 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const lib_a = b.addStaticLibrary("a", null); + const lib_a = b.addStaticLibrary(.{ + .name = "a", + .optimize = optimize, + .target = .{}, + }); lib_a.addCSourceFiles(&.{ "c.c", "a.c", "b.c" }, &.{"-fcommon"}); - lib_a.setBuildMode(mode); - const test_exe = b.addTest("main.zig"); - test_exe.setBuildMode(mode); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + }); test_exe.linkLibrary(lib_a); const test_step = b.step("test", "Test it"); diff --git a/test/link/common_symbols_alignment/build.zig b/test/link/common_symbols_alignment/build.zig index a62d86af4f..b6dd39801c 100644 --- a/test/link/common_symbols_alignment/build.zig +++ b/test/link/common_symbols_alignment/build.zig @@ -1,14 +1,21 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); - const lib_a = b.addStaticLibrary("a", null); + const lib_a = b.addStaticLibrary(.{ + .name = "a", + .optimize = optimize, + .target = target, + }); lib_a.addCSourceFiles(&.{"a.c"}, &.{"-fcommon"}); - lib_a.setBuildMode(mode); - const test_exe = b.addTest("main.zig"); - test_exe.setBuildMode(mode); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); test_exe.linkLibrary(lib_a); const test_step = b.step("test", "Test it"); diff --git a/test/link/interdependent_static_c_libs/build.zig b/test/link/interdependent_static_c_libs/build.zig index bd1b6100da..50a214490d 100644 --- a/test/link/interdependent_static_c_libs/build.zig +++ b/test/link/interdependent_static_c_libs/build.zig @@ -1,20 +1,30 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); - const lib_a = b.addStaticLibrary("a", null); + const lib_a = b.addStaticLibrary(.{ + .name = "a", + .optimize = optimize, + .target = target, + }); lib_a.addCSourceFile("a.c", &[_][]const u8{}); - lib_a.setBuildMode(mode); lib_a.addIncludePath("."); - const lib_b = b.addStaticLibrary("b", null); + const lib_b = b.addStaticLibrary(.{ + .name = "b", + .optimize = optimize, + .target = target, + }); lib_b.addCSourceFile("b.c", &[_][]const u8{}); - lib_b.setBuildMode(mode); lib_b.addIncludePath("."); - const test_exe = b.addTest("main.zig"); - test_exe.setBuildMode(mode); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); test_exe.linkLibrary(lib_a); test_exe.linkLibrary(lib_b); test_exe.addIncludePath("."); diff --git a/test/link/macho/bugs/13056/build.zig b/test/link/macho/bugs/13056/build.zig index 751a7c4db6..a65cd60766 100644 --- a/test/link/macho/bugs/13056/build.zig +++ b/test/link/macho/bugs/13056/build.zig @@ -2,7 +2,7 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const target_info = std.zig.system.NativeTargetInfo.detect(target) catch unreachable; @@ -11,7 +11,10 @@ pub fn build(b: *Builder) void { const test_step = b.step("test", "Test the program"); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); b.default_step.dependOn(&exe.step); exe.addIncludePath(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/include" }) catch unreachable); exe.addIncludePath(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/include/c++/v1" }) catch unreachable); @@ -20,7 +23,6 @@ pub fn build(b: *Builder) void { "-nostdinc++", }); exe.addObjectFile(std.fs.path.join(b.allocator, &.{ sdk.path, "/usr/lib/libc++.tbd" }) catch unreachable); - exe.setBuildMode(mode); const run_cmd = exe.run(); run_cmd.expectStdErrEqual("x: 5\n"); diff --git a/test/link/macho/bugs/13457/build.zig b/test/link/macho/bugs/13457/build.zig index 2de8c01c6a..4c1ce89261 100644 --- a/test/link/macho/bugs/13457/build.zig +++ b/test/link/macho/bugs/13457/build.zig @@ -3,14 +3,17 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); - const exe = b.addExecutable("test", "main.zig"); - exe.setBuildMode(mode); - exe.setTarget(target); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); const run = exe.runEmulatable(); test_step.dependOn(&run.step); diff --git a/test/link/macho/dead_strip/build.zig b/test/link/macho/dead_strip/build.zig index 25759f5619..a4c3575e45 100644 --- a/test/link/macho/dead_strip/build.zig +++ b/test/link/macho/dead_strip/build.zig @@ -3,7 +3,7 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); @@ -11,7 +11,7 @@ pub fn build(b: *Builder) void { { // Without -dead_strip, we expect `iAmUnused` symbol present - const exe = createScenario(b, mode, target); + const exe = createScenario(b, optimize, target); const check = exe.checkObject(.macho); check.checkInSymtab(); @@ -24,7 +24,7 @@ pub fn build(b: *Builder) void { { // With -dead_strip, no `iAmUnused` symbol should be present - const exe = createScenario(b, mode, target); + const exe = createScenario(b, optimize, target); exe.link_gc_sections = true; const check = exe.checkObject(.macho); @@ -37,11 +37,13 @@ pub fn build(b: *Builder) void { } } -fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *LibExeObjectStep { - const exe = b.addExecutable("test", null); +fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setBuildMode(mode); - exe.setTarget(target); exe.linkLibC(); return exe; } diff --git a/test/link/macho/dead_strip_dylibs/build.zig b/test/link/macho/dead_strip_dylibs/build.zig index efdaf191bd..0127b575fc 100644 --- a/test/link/macho/dead_strip_dylibs/build.zig +++ b/test/link/macho/dead_strip_dylibs/build.zig @@ -3,14 +3,14 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); { // Without -dead_strip_dylibs we expect `-la` to include liba.dylib in the final executable - const exe = createScenario(b, mode); + const exe = createScenario(b, optimize); const check = exe.checkObject(.macho); check.checkStart("cmd LOAD_DYLIB"); @@ -27,7 +27,7 @@ pub fn build(b: *Builder) void { { // With -dead_strip_dylibs, we should include liba.dylib as it's unreachable - const exe = createScenario(b, mode); + const exe = createScenario(b, optimize); exe.dead_strip_dylibs = true; const run_cmd = exe.run(); @@ -36,10 +36,12 @@ pub fn build(b: *Builder) void { } } -fn createScenario(b: *Builder, mode: std.builtin.Mode) *LibExeObjectStep { - const exe = b.addExecutable("test", null); +fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setBuildMode(mode); exe.linkLibC(); exe.linkFramework("Cocoa"); return exe; diff --git a/test/link/macho/dylib/build.zig b/test/link/macho/dylib/build.zig index a5baf255c6..acd27a507f 100644 --- a/test/link/macho/dylib/build.zig +++ b/test/link/macho/dylib/build.zig @@ -2,15 +2,18 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); - dylib.setBuildMode(mode); - dylib.setTarget(target); + const dylib = b.addSharedLibrary(.{ + .name = "a", + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); dylib.addCSourceFile("a.c", &.{}); dylib.linkLibC(); dylib.install(); @@ -24,9 +27,11 @@ pub fn build(b: *Builder) void { test_step.dependOn(&check_dylib.step); - const exe = b.addExecutable("main", null); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "main", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &.{}); exe.linkSystemLibrary("a"); exe.linkLibC(); diff --git a/test/link/macho/empty/build.zig b/test/link/macho/empty/build.zig index ab016fd4bd..8b2d047371 100644 --- a/test/link/macho/empty/build.zig +++ b/test/link/macho/empty/build.zig @@ -2,17 +2,19 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); exe.addCSourceFile("empty.c", &[0][]const u8{}); - exe.setBuildMode(mode); - exe.setTarget(target); exe.linkLibC(); const run_cmd = std.build.EmulatableRunStep.create(b, "run", exe); diff --git a/test/link/macho/entry/build.zig b/test/link/macho/entry/build.zig index 0ecca14aa2..87e4d1b5da 100644 --- a/test/link/macho/entry/build.zig +++ b/test/link/macho/entry/build.zig @@ -2,14 +2,16 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const exe = b.addExecutable("main", null); - exe.setTarget(.{ .os_tag = .macos }); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "main", + .optimize = optimize, + .target = .{ .os_tag = .macos }, + }); exe.addCSourceFile("main.c", &.{}); exe.linkLibC(); exe.entry_symbol_name = "_non_main"; diff --git a/test/link/macho/headerpad/build.zig b/test/link/macho/headerpad/build.zig index 0730a01d44..74efb5d580 100644 --- a/test/link/macho/headerpad/build.zig +++ b/test/link/macho/headerpad/build.zig @@ -4,14 +4,14 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); { // Test -headerpad_max_install_names - const exe = simpleExe(b, mode); + const exe = simpleExe(b, optimize); exe.headerpad_max_install_names = true; const check = exe.checkObject(.macho); @@ -36,7 +36,7 @@ pub fn build(b: *Builder) void { { // Test -headerpad - const exe = simpleExe(b, mode); + const exe = simpleExe(b, optimize); exe.headerpad_size = 0x10000; const check = exe.checkObject(.macho); @@ -52,7 +52,7 @@ pub fn build(b: *Builder) void { { // Test both flags with -headerpad overriding -headerpad_max_install_names - const exe = simpleExe(b, mode); + const exe = simpleExe(b, optimize); exe.headerpad_max_install_names = true; exe.headerpad_size = 0x10000; @@ -69,7 +69,7 @@ pub fn build(b: *Builder) void { { // Test both flags with -headerpad_max_install_names overriding -headerpad - const exe = simpleExe(b, mode); + const exe = simpleExe(b, optimize); exe.headerpad_size = 0x1000; exe.headerpad_max_install_names = true; @@ -94,9 +94,11 @@ pub fn build(b: *Builder) void { } } -fn simpleExe(b: *Builder, mode: std.builtin.Mode) *LibExeObjectStep { - const exe = b.addExecutable("main", null); - exe.setBuildMode(mode); +fn simpleExe(b: *Builder, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { + const exe = b.addExecutable(.{ + .name = "main", + .optimize = optimize, + }); exe.addCSourceFile("main.c", &.{}); exe.linkLibC(); exe.linkFramework("CoreFoundation"); diff --git a/test/link/macho/linksection/build.zig b/test/link/macho/linksection/build.zig index 9204499803..eebb31a21e 100644 --- a/test/link/macho/linksection/build.zig +++ b/test/link/macho/linksection/build.zig @@ -1,15 +1,18 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = std.zig.CrossTarget{ .os_tag = .macos }; const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const obj = b.addObject("test", "main.zig"); - obj.setBuildMode(mode); - obj.setTarget(target); + const obj = b.addObject(.{ + .name = "test", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); const check = obj.checkObject(.macho); @@ -19,7 +22,7 @@ pub fn build(b: *std.build.Builder) void { check.checkInSymtab(); check.checkNext("{*} (__TEXT,__TestFn) external _testFn"); - if (mode == .Debug) { + if (optimize == .Debug) { check.checkInSymtab(); check.checkNext("{*} (__TEXT,__TestGenFnA) _main.testGenericFn__anon_{*}"); } diff --git a/test/link/macho/needed_framework/build.zig b/test/link/macho/needed_framework/build.zig index 4315935941..33965a9272 100644 --- a/test/link/macho/needed_framework/build.zig +++ b/test/link/macho/needed_framework/build.zig @@ -3,16 +3,18 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); // -dead_strip_dylibs // -needed_framework Cocoa - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setBuildMode(mode); exe.linkLibC(); exe.linkFrameworkNeeded("Cocoa"); exe.dead_strip_dylibs = true; diff --git a/test/link/macho/needed_library/build.zig b/test/link/macho/needed_library/build.zig index a314fd2201..137239d292 100644 --- a/test/link/macho/needed_library/build.zig +++ b/test/link/macho/needed_library/build.zig @@ -3,25 +3,30 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); - const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); - dylib.setTarget(target); - dylib.setBuildMode(mode); + const dylib = b.addSharedLibrary(.{ + .name = "a", + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); dylib.addCSourceFile("a.c", &.{}); dylib.linkLibC(); dylib.install(); // -dead_strip_dylibs // -needed-la - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setBuildMode(mode); - exe.setTarget(target); exe.linkLibC(); exe.linkSystemLibraryNeeded("a"); exe.addLibraryPath(b.pathFromRoot("zig-out/lib")); diff --git a/test/link/macho/objc/build.zig b/test/link/macho/objc/build.zig index d7fd872f77..9c38739a5c 100644 --- a/test/link/macho/objc/build.zig +++ b/test/link/macho/objc/build.zig @@ -2,15 +2,17 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); exe.addIncludePath("."); exe.addCSourceFile("Foo.m", &[0][]const u8{}); exe.addCSourceFile("test.m", &[0][]const u8{}); - exe.setBuildMode(mode); exe.linkLibC(); // TODO when we figure out how to ship framework stubs for cross-compilation, // populate paths to the sysroot here. diff --git a/test/link/macho/objcpp/build.zig b/test/link/macho/objcpp/build.zig index 767578e225..f4c88b2862 100644 --- a/test/link/macho/objcpp/build.zig +++ b/test/link/macho/objcpp/build.zig @@ -2,16 +2,18 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); b.default_step.dependOn(&exe.step); exe.addIncludePath("."); exe.addCSourceFile("Foo.mm", &[0][]const u8{}); exe.addCSourceFile("test.mm", &[0][]const u8{}); - exe.setBuildMode(mode); exe.linkLibCpp(); // TODO when we figure out how to ship framework stubs for cross-compilation, // populate paths to the sysroot here. diff --git a/test/link/macho/pagezero/build.zig b/test/link/macho/pagezero/build.zig index 5a7044d960..f61aa34a93 100644 --- a/test/link/macho/pagezero/build.zig +++ b/test/link/macho/pagezero/build.zig @@ -2,16 +2,18 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); { - const exe = b.addExecutable("pagezero", null); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "pagezero", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &.{}); exe.linkLibC(); exe.pagezero_size = 0x4000; @@ -29,9 +31,11 @@ pub fn build(b: *Builder) void { } { - const exe = b.addExecutable("no_pagezero", null); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "no_pagezero", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &.{}); exe.linkLibC(); exe.pagezero_size = 0; diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig index e556b5bb23..db894b6ae3 100644 --- a/test/link/macho/search_strategy/build.zig +++ b/test/link/macho/search_strategy/build.zig @@ -3,7 +3,7 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test"); @@ -11,7 +11,7 @@ pub fn build(b: *Builder) void { { // -search_dylibs_first - const exe = createScenario(b, mode, target); + const exe = createScenario(b, optimize, target); exe.search_strategy = .dylibs_first; const check = exe.checkObject(.macho); @@ -26,7 +26,7 @@ pub fn build(b: *Builder) void { { // -search_paths_first - const exe = createScenario(b, mode, target); + const exe = createScenario(b, optimize, target); exe.search_strategy = .paths_first; const run = std.build.EmulatableRunStep.create(b, "run", exe); @@ -36,10 +36,12 @@ pub fn build(b: *Builder) void { } } -fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *LibExeObjectStep { - const static = b.addStaticLibrary("a", null); - static.setTarget(target); - static.setBuildMode(mode); +fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { + const static = b.addStaticLibrary(.{ + .name = "a", + .optimize = optimize, + .target = target, + }); static.addCSourceFile("a.c", &.{}); static.linkLibC(); static.override_dest_dir = std.build.InstallDir{ @@ -47,9 +49,12 @@ fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarg }; static.install(); - const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); - dylib.setTarget(target); - dylib.setBuildMode(mode); + const dylib = b.addSharedLibrary(.{ + .name = "a", + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); dylib.addCSourceFile("a.c", &.{}); dylib.linkLibC(); dylib.override_dest_dir = std.build.InstallDir{ @@ -57,9 +62,11 @@ fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarg }; dylib.install(); - const exe = b.addExecutable("main", null); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "main", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &.{}); exe.linkSystemLibraryName("a"); exe.linkLibC(); diff --git a/test/link/macho/stack_size/build.zig b/test/link/macho/stack_size/build.zig index 91c44baf52..74e9a86e94 100644 --- a/test/link/macho/stack_size/build.zig +++ b/test/link/macho/stack_size/build.zig @@ -2,15 +2,17 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const exe = b.addExecutable("main", null); - exe.setTarget(target); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "main", + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("main.c", &.{}); exe.linkLibC(); exe.stack_size = 0x100000000; diff --git a/test/link/macho/strict_validation/build.zig b/test/link/macho/strict_validation/build.zig index 0ea150252c..b6baf63c11 100644 --- a/test/link/macho/strict_validation/build.zig +++ b/test/link/macho/strict_validation/build.zig @@ -4,15 +4,18 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const exe = b.addExecutable("main", "main.zig"); - exe.setBuildMode(mode); - exe.setTarget(target); + const exe = b.addExecutable(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); exe.linkLibC(); const check_exe = exe.checkObject(.macho); diff --git a/test/link/macho/tls/build.zig b/test/link/macho/tls/build.zig index 031a05cedf..9b2fe952bf 100644 --- a/test/link/macho/tls/build.zig +++ b/test/link/macho/tls/build.zig @@ -2,18 +2,23 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; - const lib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); - lib.setBuildMode(mode); - lib.setTarget(target); + const lib = b.addSharedLibrary(.{ + .name = "a", + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); lib.addCSourceFile("a.c", &.{}); lib.linkLibC(); - const test_exe = b.addTest("main.zig"); - test_exe.setBuildMode(mode); - test_exe.setTarget(target); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); test_exe.linkLibrary(lib); test_exe.linkLibC(); diff --git a/test/link/macho/unwind_info/build.zig b/test/link/macho/unwind_info/build.zig index cc00854465..dbbdbb3e51 100644 --- a/test/link/macho/unwind_info/build.zig +++ b/test/link/macho/unwind_info/build.zig @@ -4,23 +4,23 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); - testUnwindInfo(b, test_step, mode, target, false); - testUnwindInfo(b, test_step, mode, target, true); + testUnwindInfo(b, test_step, optimize, target, false); + testUnwindInfo(b, test_step, optimize, target, true); } fn testUnwindInfo( b: *Builder, test_step: *std.build.Step, - mode: std.builtin.Mode, + optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, dead_strip: bool, ) void { - const exe = createScenario(b, mode, target); + const exe = createScenario(b, optimize, target); exe.link_gc_sections = dead_strip; const check = exe.checkObject(.macho); @@ -52,8 +52,12 @@ fn testUnwindInfo( test_step.dependOn(&run_cmd.step); } -fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *LibExeObjectStep { - const exe = b.addExecutable("test", null); +fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + .target = target, + }); b.default_step.dependOn(&exe.step); exe.addIncludePath("."); exe.addCSourceFiles(&[_][]const u8{ @@ -61,8 +65,6 @@ fn createScenario(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarg "simple_string.cpp", "simple_string_owner.cpp", }, &[0][]const u8{}); - exe.setBuildMode(mode); - exe.setTarget(target); exe.linkLibCpp(); return exe; } diff --git a/test/link/macho/uuid/build.zig b/test/link/macho/uuid/build.zig index 314febdb20..86ff99e8b1 100644 --- a/test/link/macho/uuid/build.zig +++ b/test/link/macho/uuid/build.zig @@ -29,21 +29,21 @@ pub fn build(b: *Builder) void { fn testUuid( b: *Builder, test_step: *std.build.Step, - mode: std.builtin.Mode, + optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, comptime exp: []const u8, ) void { // The calculated UUID value is independent of debug info and so it should // stay the same across builds. { - const dylib = simpleDylib(b, mode, target); + const dylib = simpleDylib(b, optimize, target); const check_dylib = dylib.checkObject(.macho); check_dylib.checkStart("cmd UUID"); check_dylib.checkNext("uuid " ++ exp); test_step.dependOn(&check_dylib.step); } { - const dylib = simpleDylib(b, mode, target); + const dylib = simpleDylib(b, optimize, target); dylib.strip = true; const check_dylib = dylib.checkObject(.macho); check_dylib.checkStart("cmd UUID"); @@ -52,10 +52,13 @@ fn testUuid( } } -fn simpleDylib(b: *Builder, mode: std.builtin.Mode, target: std.zig.CrossTarget) *LibExeObjectStep { - const dylib = b.addSharedLibrary("test", null, b.version(1, 0, 0)); - dylib.setTarget(target); - dylib.setBuildMode(mode); +fn simpleDylib(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { + const dylib = b.addSharedLibrary(.{ + .name = "test", + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); dylib.addCSourceFile("test.c", &.{}); dylib.linkLibC(); return dylib; diff --git a/test/link/macho/weak_framework/build.zig b/test/link/macho/weak_framework/build.zig index 44675a15f8..f8460c4e82 100644 --- a/test/link/macho/weak_framework/build.zig +++ b/test/link/macho/weak_framework/build.zig @@ -3,14 +3,16 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setBuildMode(mode); exe.linkLibC(); exe.linkFrameworkWeak("Cocoa"); diff --git a/test/link/macho/weak_library/build.zig b/test/link/macho/weak_library/build.zig index 79f67bd7df..229d965e48 100644 --- a/test/link/macho/weak_library/build.zig +++ b/test/link/macho/weak_library/build.zig @@ -3,23 +3,28 @@ const Builder = std.build.Builder; const LibExeObjectStep = std.build.LibExeObjStep; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; const test_step = b.step("test", "Test the program"); test_step.dependOn(b.getInstallStep()); - const dylib = b.addSharedLibrary("a", null, b.version(1, 0, 0)); - dylib.setTarget(target); - dylib.setBuildMode(mode); + const dylib = b.addSharedLibrary(.{ + .name = "a", + .version = .{ .major = 1, .minor = 0, .patch = 0 }, + .target = target, + .optimize = optimize, + }); dylib.addCSourceFile("a.c", &.{}); dylib.linkLibC(); dylib.install(); - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .target = target, + .optimize = optimize, + }); exe.addCSourceFile("main.c", &[0][]const u8{}); - exe.setTarget(target); - exe.setBuildMode(mode); exe.linkLibC(); exe.linkSystemLibraryWeak("a"); exe.addLibraryPath(b.pathFromRoot("zig-out/lib")); diff --git a/test/link/static_lib_as_system_lib/build.zig b/test/link/static_lib_as_system_lib/build.zig index f39f3fac2a..895cdcf316 100644 --- a/test/link/static_lib_as_system_lib/build.zig +++ b/test/link/static_lib_as_system_lib/build.zig @@ -2,16 +2,23 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); + const target = b.standardTargetOptions(.{}); - const lib_a = b.addStaticLibrary("a", null); + const lib_a = b.addStaticLibrary(.{ + .name = "a", + .optimize = optimize, + .target = target, + }); lib_a.addCSourceFile("a.c", &[_][]const u8{}); - lib_a.setBuildMode(mode); lib_a.addIncludePath("."); lib_a.install(); - const test_exe = b.addTest("main.zig"); - test_exe.setBuildMode(mode); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); test_exe.linkSystemLibrary("a"); // force linking liba.a as -la test_exe.addSystemIncludePath("."); const search_path = std.fs.path.join(b.allocator, &[_][]const u8{ b.install_path, "lib" }) catch unreachable; diff --git a/test/link/wasm/archive/build.zig b/test/link/wasm/archive/build.zig index 7efa88999a..7401ba22dc 100644 --- a/test/link/wasm/archive/build.zig +++ b/test/link/wasm/archive/build.zig @@ -2,16 +2,17 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); // The code in question will pull-in compiler-rt, // and therefore link with its archive file. - const lib = b.addSharedLibrary("main", "main.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/link/wasm/basic-features/build.zig b/test/link/wasm/basic-features/build.zig index 2c565f9263..69e88aefae 100644 --- a/test/link/wasm/basic-features/build.zig +++ b/test/link/wasm/basic-features/build.zig @@ -1,14 +1,18 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { - const mode = b.standardReleaseOptions(); - // Library with explicitly set cpu features - const lib = b.addSharedLibrary("lib", "main.zig", .unversioned); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - lib.target.cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp }; - lib.target.cpu_features_add.addFeature(0); // index 0 == atomics (see std.Target.wasm.Features) - lib.setBuildMode(mode); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + .target = .{ + .cpu_arch = .wasm32, + .cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp }, + .cpu_features_add = std.Target.wasm.featureSet(&.{.atomics}), + .os_tag = .freestanding, + }, + }); lib.use_llvm = false; lib.use_lld = false; diff --git a/test/link/wasm/bss/build.zig b/test/link/wasm/bss/build.zig index e234a3f402..6b29fd0dc3 100644 --- a/test/link/wasm/bss/build.zig +++ b/test/link/wasm/bss/build.zig @@ -2,14 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/link/wasm/export-data/build.zig b/test/link/wasm/export-data/build.zig index 283566dab3..8eab283ec2 100644 --- a/test/link/wasm/export-data/build.zig +++ b/test/link/wasm/export-data/build.zig @@ -5,9 +5,12 @@ pub fn build(b: *Builder) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(.ReleaseSafe); // to make the output deterministic in address positions - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .optimize = .ReleaseSafe, // to make the output deterministic in address positions + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + }); lib.use_lld = false; lib.export_symbol_names = &.{ "foo", "bar" }; lib.global_base = 0; // put data section at address 0 to make data symbols easier to parse diff --git a/test/link/wasm/export/build.zig b/test/link/wasm/export/build.zig index 181e77e296..2b9a91d728 100644 --- a/test/link/wasm/export/build.zig +++ b/test/link/wasm/export/build.zig @@ -1,24 +1,33 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const no_export = b.addSharedLibrary("no-export", "main.zig", .unversioned); - no_export.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - no_export.setBuildMode(mode); + const no_export = b.addSharedLibrary(.{ + .name = "no-export", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + }); no_export.use_llvm = false; no_export.use_lld = false; - const dynamic_export = b.addSharedLibrary("dynamic", "main.zig", .unversioned); - dynamic_export.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - dynamic_export.setBuildMode(mode); + const dynamic_export = b.addSharedLibrary(.{ + .name = "dynamic", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + }); dynamic_export.rdynamic = true; dynamic_export.use_llvm = false; dynamic_export.use_lld = false; - const force_export = b.addSharedLibrary("force", "main.zig", .unversioned); - force_export.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - force_export.setBuildMode(mode); + const force_export = b.addSharedLibrary(.{ + .name = "force", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + }); force_export.export_symbol_names = &.{"foo"}; force_export.use_llvm = false; force_export.use_lld = false; diff --git a/test/link/wasm/extern-mangle/build.zig b/test/link/wasm/extern-mangle/build.zig index ae46117f18..71bb986dff 100644 --- a/test/link/wasm/extern-mangle/build.zig +++ b/test/link/wasm/extern-mangle/build.zig @@ -2,14 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.import_symbols = true; // import `a` and `b` lib.rdynamic = true; // export `foo` lib.install(); diff --git a/test/link/wasm/extern/build.zig b/test/link/wasm/extern/build.zig index 88cce88d98..800c76a31c 100644 --- a/test/link/wasm/extern/build.zig +++ b/test/link/wasm/extern/build.zig @@ -1,10 +1,12 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { - const mode = b.standardReleaseOptions(); - const exe = b.addExecutable("extern", "main.zig"); - exe.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .wasi }); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "extern", + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + .target = .{ .cpu_arch = .wasm32, .os_tag = .wasi }, + }); exe.addCSourceFile("foo.c", &.{}); exe.use_llvm = false; exe.use_lld = false; diff --git a/test/link/wasm/function-table/build.zig b/test/link/wasm/function-table/build.zig index f7572bd6b1..804aaf0b09 100644 --- a/test/link/wasm/function-table/build.zig +++ b/test/link/wasm/function-table/build.zig @@ -2,28 +2,37 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const import_table = b.addSharedLibrary("lib", "lib.zig", .unversioned); - import_table.setBuildMode(mode); - import_table.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const import_table = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = optimize, + }); import_table.use_llvm = false; import_table.use_lld = false; import_table.import_table = true; - const export_table = b.addSharedLibrary("lib", "lib.zig", .unversioned); - export_table.setBuildMode(mode); - export_table.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const export_table = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = optimize, + }); export_table.use_llvm = false; export_table.use_lld = false; export_table.export_table = true; - const regular_table = b.addSharedLibrary("lib", "lib.zig", .unversioned); - regular_table.setBuildMode(mode); - regular_table.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const regular_table = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = optimize, + }); regular_table.use_llvm = false; regular_table.use_lld = false; diff --git a/test/link/wasm/infer-features/build.zig b/test/link/wasm/infer-features/build.zig index b50caf7264..147fb55fda 100644 --- a/test/link/wasm/infer-features/build.zig +++ b/test/link/wasm/infer-features/build.zig @@ -1,21 +1,32 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); // Wasm Object file which we will use to infer the features from - const c_obj = b.addObject("c_obj", null); - c_obj.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - c_obj.target.cpu_model = .{ .explicit = &std.Target.wasm.cpu.bleeding_edge }; + const c_obj = b.addObject(.{ + .name = "c_obj", + .optimize = optimize, + .target = .{ + .cpu_arch = .wasm32, + .cpu_model = .{ .explicit = &std.Target.wasm.cpu.bleeding_edge }, + .os_tag = .freestanding, + }, + }); c_obj.addCSourceFile("foo.c", &.{}); - c_obj.setBuildMode(mode); // Wasm library that doesn't have any features specified. This will // infer its featureset from other linked object files. - const lib = b.addSharedLibrary("lib", "main.zig", .unversioned); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); - lib.target.cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp }; - lib.setBuildMode(mode); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = .{ + .cpu_arch = .wasm32, + .cpu_model = .{ .explicit = &std.Target.wasm.cpu.mvp }, + .os_tag = .freestanding, + }, + }); lib.use_llvm = false; lib.use_lld = false; lib.addObject(c_obj); diff --git a/test/link/wasm/producers/build.zig b/test/link/wasm/producers/build.zig index 7557b4fa41..57ee6acd18 100644 --- a/test/link/wasm/producers/build.zig +++ b/test/link/wasm/producers/build.zig @@ -3,14 +3,15 @@ const builtin = @import("builtin"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/link/wasm/segments/build.zig b/test/link/wasm/segments/build.zig index 1b2cdf87ab..8f7d9e0583 100644 --- a/test/link/wasm/segments/build.zig +++ b/test/link/wasm/segments/build.zig @@ -2,14 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/link/wasm/stack_pointer/build.zig b/test/link/wasm/stack_pointer/build.zig index 5b67c3caa3..42971c607d 100644 --- a/test/link/wasm/stack_pointer/build.zig +++ b/test/link/wasm/stack_pointer/build.zig @@ -2,14 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/link/wasm/type/build.zig b/test/link/wasm/type/build.zig index fbae6dc741..7fa3849083 100644 --- a/test/link/wasm/type/build.zig +++ b/test/link/wasm/type/build.zig @@ -2,14 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); - const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); - const lib = b.addSharedLibrary("lib", "lib.zig", .unversioned); - lib.setBuildMode(mode); - lib.setTarget(.{ .cpu_arch = .wasm32, .os_tag = .freestanding }); + const lib = b.addSharedLibrary(.{ + .name = "lib", + .root_source_file = .{ .path = "lib.zig" }, + .target = .{ .cpu_arch = .wasm32, .os_tag = .freestanding }, + .optimize = b.standardOptimizeOption(.{}), + }); lib.use_llvm = false; lib.use_lld = false; lib.strip = false; diff --git a/test/src/compare_output.zig b/test/src/compare_output.zig index 538e4023f0..a885faaadf 100644 --- a/test/src/compare_output.zig +++ b/test/src/compare_output.zig @@ -6,14 +6,14 @@ const ArrayList = std.ArrayList; const fmt = std.fmt; const mem = std.mem; const fs = std.fs; -const Mode = std.builtin.Mode; +const OptimizeMode = std.builtin.OptimizeMode; pub const CompareOutputContext = struct { b: *build.Builder, step: *build.Step, test_index: usize, test_filter: ?[]const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, const Special = enum { None, @@ -102,7 +102,11 @@ pub const CompareOutputContext = struct { if (mem.indexOf(u8, annotated_case_name, filter) == null) return; } - const exe = b.addExecutable("test", null); + const exe = b.addExecutable(.{ + .name = "test", + .target = .{}, + .optimize = .Debug, + }); exe.addAssemblyFileSource(write_src.getFileSource(case.sources.items[0].filename).?); const run = exe.run(); @@ -113,19 +117,23 @@ pub const CompareOutputContext = struct { self.step.dependOn(&run.step); }, Special.None => { - for (self.modes) |mode| { + for (self.optimize_modes) |optimize| { const annotated_case_name = fmt.allocPrint(self.b.allocator, "{s} {s} ({s})", .{ "compare-output", case.name, - @tagName(mode), + @tagName(optimize), }) catch unreachable; if (self.test_filter) |filter| { if (mem.indexOf(u8, annotated_case_name, filter) == null) continue; } const basename = case.sources.items[0].filename; - const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = write_src.getFileSource(basename).?, + .optimize = optimize, + .target = .{}, + }); if (case.link_libc) { exe.linkSystemLibrary("c"); } @@ -139,13 +147,20 @@ pub const CompareOutputContext = struct { } }, Special.RuntimeSafety => { + // TODO iterate over self.optimize_modes and test this in both + // debug and release safe mode const annotated_case_name = fmt.allocPrint(self.b.allocator, "safety {s}", .{case.name}) catch unreachable; if (self.test_filter) |filter| { if (mem.indexOf(u8, annotated_case_name, filter) == null) return; } const basename = case.sources.items[0].filename; - const exe = b.addExecutableSource("test", write_src.getFileSource(basename).?); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = write_src.getFileSource(basename).?, + .target = .{}, + .optimize = .Debug, + }); if (case.link_libc) { exe.linkSystemLibrary("c"); } diff --git a/test/src/run_translated_c.zig b/test/src/run_translated_c.zig index 0204272f97..0c54655b32 100644 --- a/test/src/run_translated_c.zig +++ b/test/src/run_translated_c.zig @@ -85,11 +85,14 @@ pub const RunTranslatedCContext = struct { for (case.sources.items) |src_file| { write_src.add(src_file.filename, src_file.source); } - const translate_c = b.addTranslateC(write_src.getFileSource(case.sources.items[0].filename).?); + const translate_c = b.addTranslateC(.{ + .source_file = write_src.getFileSource(case.sources.items[0].filename).?, + .target = .{}, + .optimize = .Debug, + }); translate_c.step.name = b.fmt("{s} translate-c", .{annotated_case_name}); - const exe = translate_c.addExecutable(); - exe.setTarget(self.target); + const exe = translate_c.addExecutable(.{}); exe.step.name = b.fmt("{s} build-exe", .{annotated_case_name}); exe.linkLibC(); const run = exe.run(); diff --git a/test/src/translate_c.zig b/test/src/translate_c.zig index f0f6f30c57..ad5fbb7091 100644 --- a/test/src/translate_c.zig +++ b/test/src/translate_c.zig @@ -108,10 +108,13 @@ pub const TranslateCContext = struct { write_src.add(src_file.filename, src_file.source); } - const translate_c = b.addTranslateC(write_src.getFileSource(case.sources.items[0].filename).?); + const translate_c = b.addTranslateC(.{ + .source_file = write_src.getFileSource(case.sources.items[0].filename).?, + .target = case.target, + .optimize = .Debug, + }); translate_c.step.name = annotated_case_name; - translate_c.setTarget(case.target); const check_file = translate_c.addCheckFile(case.expected_lines.items); diff --git a/test/standalone/brace_expansion/build.zig b/test/standalone/brace_expansion/build.zig index 64f3c08583..89250ff96f 100644 --- a/test/standalone/brace_expansion/build.zig +++ b/test/standalone/brace_expansion/build.zig @@ -1,8 +1,10 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const main = b.addTest("main.zig"); - main.setBuildMode(b.standardReleaseOptions()); + const main = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + }); const test_step = b.step("test", "Test it"); test_step.dependOn(&main.step); diff --git a/test/standalone/c_compiler/build.zig b/test/standalone/c_compiler/build.zig index 240d535182..6959f810d6 100644 --- a/test/standalone/c_compiler/build.zig +++ b/test/standalone/c_compiler/build.zig @@ -12,23 +12,27 @@ fn isRunnableTarget(t: CrossTarget) bool { } pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); const test_step = b.step("test", "Test the program"); - const exe_c = b.addExecutable("test_c", null); + const exe_c = b.addExecutable(.{ + .name = "test_c", + .optimize = optimize, + .target = target, + }); b.default_step.dependOn(&exe_c.step); exe_c.addCSourceFile("test.c", &[0][]const u8{}); - exe_c.setBuildMode(mode); - exe_c.setTarget(target); exe_c.linkLibC(); - const exe_cpp = b.addExecutable("test_cpp", null); + const exe_cpp = b.addExecutable(.{ + .name = "test_cpp", + .optimize = optimize, + .target = target, + }); b.default_step.dependOn(&exe_cpp.step); exe_cpp.addCSourceFile("test.cpp", &[0][]const u8{}); - exe_cpp.setBuildMode(mode); - exe_cpp.setTarget(target); exe_cpp.linkLibCpp(); switch (target.getOsTag()) { diff --git a/test/standalone/emit_asm_and_bin/build.zig b/test/standalone/emit_asm_and_bin/build.zig index 43b7bb791d..b8cbd5fc17 100644 --- a/test/standalone/emit_asm_and_bin/build.zig +++ b/test/standalone/emit_asm_and_bin/build.zig @@ -1,8 +1,10 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const main = b.addTest("main.zig"); - main.setBuildMode(b.standardReleaseOptions()); + const main = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + }); main.emit_asm = .{ .emit_to = b.pathFromRoot("main.s") }; main.emit_bin = .{ .emit_to = b.pathFromRoot("main") }; diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig index 2a184dcd2e..ecdd74aa90 100644 --- a/test/standalone/empty_env/build.zig +++ b/test/standalone/empty_env/build.zig @@ -1,8 +1,11 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const main = b.addExecutable("main", "main.zig"); - main.setBuildMode(b.standardReleaseOptions()); + const main = b.addExecutable(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + }); const run = main.run(); run.clearEnvironment(); diff --git a/test/standalone/global_linkage/build.zig b/test/standalone/global_linkage/build.zig index e13c0e8873..3064c6cc08 100644 --- a/test/standalone/global_linkage/build.zig +++ b/test/standalone/global_linkage/build.zig @@ -1,16 +1,26 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const obj1 = b.addStaticLibrary("obj1", "obj1.zig"); - obj1.setBuildMode(mode); + const obj1 = b.addStaticLibrary(.{ + .name = "obj1", + .root_source_file = .{ .path = "obj1.zig" }, + .optimize = optimize, + .target = .{}, + }); - const obj2 = b.addStaticLibrary("obj2", "obj2.zig"); - obj2.setBuildMode(mode); + const obj2 = b.addStaticLibrary(.{ + .name = "obj2", + .root_source_file = .{ .path = "obj2.zig" }, + .optimize = optimize, + .target = .{}, + }); - const main = b.addTest("main.zig"); - main.setBuildMode(mode); + const main = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + }); main.linkLibrary(obj1); main.linkLibrary(obj2); diff --git a/test/standalone/install_raw_hex/build.zig b/test/standalone/install_raw_hex/build.zig index 0038c4c298..94016b1d74 100644 --- a/test/standalone/install_raw_hex/build.zig +++ b/test/standalone/install_raw_hex/build.zig @@ -10,11 +10,14 @@ pub fn build(b: *std.build.Builder) void { .abi = .gnueabihf, }; - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const elf = b.addExecutable("zig-nrf52-blink.elf", "main.zig"); - elf.setTarget(target); - elf.setBuildMode(mode); + const elf = b.addExecutable(.{ + .name = "zig-nrf52-blink.elf", + .root_source_file = .{ .path = "main.zig" }, + .target = target, + .optimize = optimize, + }); const test_step = b.step("test", "Test the program"); b.default_step.dependOn(test_step); diff --git a/test/standalone/issue_11595/build.zig b/test/standalone/issue_11595/build.zig index d636f63ebc..b0310947f6 100644 --- a/test/standalone/issue_11595/build.zig +++ b/test/standalone/issue_11595/build.zig @@ -12,11 +12,15 @@ fn isRunnableTarget(t: CrossTarget) bool { } pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const exe = b.addExecutable("zigtest", "main.zig"); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "zigtest", + .root_source_file = .{ .path = "main.zig" }, + .target = target, + .optimize = optimize, + }); exe.install(); const c_sources = [_][]const u8{ @@ -39,7 +43,6 @@ pub fn build(b: *Builder) void { exe.defineCMacro("QUX", "\"Q\" \"UX\""); exe.defineCMacro("QUUX", "\"QU\\\"UX\""); - exe.setTarget(target); b.default_step.dependOn(&exe.step); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/issue_12588/build.zig b/test/standalone/issue_12588/build.zig index 02fa5e1680..27a23d5a76 100644 --- a/test/standalone/issue_12588/build.zig +++ b/test/standalone/issue_12588/build.zig @@ -2,12 +2,15 @@ const std = @import("std"); const Builder = std.build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const obj = b.addObject("main", "main.zig"); - obj.setBuildMode(mode); - obj.setTarget(target); + const obj = b.addObject(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); obj.emit_llvm_ir = .{ .emit_to = b.pathFromRoot("main.ll") }; obj.emit_llvm_bc = .{ .emit_to = b.pathFromRoot("main.bc") }; obj.emit_bin = .no_emit; diff --git a/test/standalone/issue_12706/build.zig b/test/standalone/issue_12706/build.zig index d84160a4f4..e3c40d34c6 100644 --- a/test/standalone/issue_12706/build.zig +++ b/test/standalone/issue_12706/build.zig @@ -12,11 +12,15 @@ fn isRunnableTarget(t: CrossTarget) bool { } pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const exe = b.addExecutable("main", "main.zig"); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); exe.install(); const c_sources = [_][]const u8{ @@ -26,7 +30,6 @@ pub fn build(b: *Builder) void { exe.addCSourceFiles(&c_sources, &.{}); exe.linkLibC(); - exe.setTarget(target); b.default_step.dependOn(&exe.step); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/issue_13030/build.zig b/test/standalone/issue_13030/build.zig index 8c05e47cf6..510c7610d9 100644 --- a/test/standalone/issue_13030/build.zig +++ b/test/standalone/issue_13030/build.zig @@ -4,13 +4,15 @@ const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const obj = b.addObject("main", "main.zig"); - obj.setBuildMode(mode); - - obj.setTarget(target); + const obj = b.addObject(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); b.default_step.dependOn(&obj.step); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/issue_339/build.zig b/test/standalone/issue_339/build.zig index 733b3729c1..34c555cfdb 100644 --- a/test/standalone/issue_339/build.zig +++ b/test/standalone/issue_339/build.zig @@ -1,7 +1,12 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const obj = b.addObject("test", "test.zig"); + const obj = b.addObject(.{ + .name = "test", + .root_source_file = .{ .path = "test.zig" }, + .target = b.standardTargetOptions(.{}), + .optimize = b.standardOptimizeOption(.{}), + }); const test_step = b.step("test", "Test the program"); test_step.dependOn(&obj.step); diff --git a/test/standalone/issue_5825/build.zig b/test/standalone/issue_5825/build.zig index 8f43ae1358..8d7acc3e9a 100644 --- a/test/standalone/issue_5825/build.zig +++ b/test/standalone/issue_5825/build.zig @@ -6,17 +6,22 @@ pub fn build(b: *Builder) void { .os_tag = .windows, .abi = .msvc, }; - const mode = b.standardReleaseOptions(); - const obj = b.addObject("issue_5825", "main.zig"); - obj.setTarget(target); - obj.setBuildMode(mode); + const optimize = b.standardOptimizeOption(.{}); + const obj = b.addObject(.{ + .name = "issue_5825", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); - const exe = b.addExecutable("issue_5825", null); + const exe = b.addExecutable(.{ + .name = "issue_5825", + .optimize = optimize, + .target = target, + }); exe.subsystem = .Console; exe.linkSystemLibrary("kernel32"); exe.linkSystemLibrary("ntdll"); - exe.setTarget(target); - exe.setBuildMode(mode); exe.addObject(obj); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/issue_7030/build.zig b/test/standalone/issue_7030/build.zig index ab3677370a..41a646abe8 100644 --- a/test/standalone/issue_7030/build.zig +++ b/test/standalone/issue_7030/build.zig @@ -1,10 +1,13 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const exe = b.addExecutable("issue_7030", "main.zig"); - exe.setTarget(.{ - .cpu_arch = .wasm32, - .os_tag = .freestanding, + const exe = b.addExecutable(.{ + .name = "issue_7030", + .root_source_file = .{ .path = "main.zig" }, + .target = .{ + .cpu_arch = .wasm32, + .os_tag = .freestanding, + }, }); exe.install(); b.default_step.dependOn(&exe.step); diff --git a/test/standalone/issue_794/build.zig b/test/standalone/issue_794/build.zig index ece74f0e98..59ff7ea9ab 100644 --- a/test/standalone/issue_794/build.zig +++ b/test/standalone/issue_794/build.zig @@ -1,7 +1,9 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const test_artifact = b.addTest("main.zig"); + const test_artifact = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + }); test_artifact.addIncludePath("a_directory"); b.default_step.dependOn(&test_artifact.step); diff --git a/test/standalone/issue_8550/build.zig b/test/standalone/issue_8550/build.zig index 03e8d04bfb..233f701661 100644 --- a/test/standalone/issue_8550/build.zig +++ b/test/standalone/issue_8550/build.zig @@ -8,12 +8,15 @@ pub fn build(b: *std.build.Builder) !void { .explicit = &std.Target.arm.cpu.arm1176jz_s, }, }; - const mode = b.standardReleaseOptions(); - const kernel = b.addExecutable("kernel", "./main.zig"); + const optimize = b.standardOptimizeOption(.{}); + const kernel = b.addExecutable(.{ + .name = "kernel", + .root_source_file = .{ .path = "./main.zig" }, + .optimize = optimize, + .target = target, + }); kernel.addObjectFile("./boot.S"); kernel.setLinkerScriptPath(.{ .path = "./linker.ld" }); - kernel.setBuildMode(mode); - kernel.setTarget(target); kernel.install(); const test_step = b.step("test", "Test it"); diff --git a/test/standalone/issue_9812/build.zig b/test/standalone/issue_9812/build.zig index 677c589a84..50eefe846c 100644 --- a/test/standalone/issue_9812/build.zig +++ b/test/standalone/issue_9812/build.zig @@ -1,9 +1,11 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) !void { - const mode = b.standardReleaseOptions(); - const zip_add = b.addTest("main.zig"); - zip_add.setBuildMode(mode); + const optimize = b.standardOptimizeOption(.{}); + const zip_add = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + }); zip_add.addCSourceFile("vendor/kuba-zip/zip.c", &[_][]const u8{ "-std=c99", "-fno-sanitize=undefined", diff --git a/test/standalone/load_dynamic_library/build.zig b/test/standalone/load_dynamic_library/build.zig index 109c742c6f..1aca02bc71 100644 --- a/test/standalone/load_dynamic_library/build.zig +++ b/test/standalone/load_dynamic_library/build.zig @@ -1,13 +1,23 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const opts = b.standardReleaseOptions(); + const target = b.standardTargetOptions(.{}); + const optimize = b.standardOptimizeOption(.{}); - const lib = b.addSharedLibrary("add", "add.zig", b.version(1, 0, 0)); - lib.setBuildMode(opts); + const lib = b.addSharedLibrary(.{ + .name = "add", + .root_source_file = .{ .path = "add.zig" }, + .version = .{ .major = 1, .minor = 0 }, + .optimize = optimize, + .target = target, + }); - const main = b.addExecutable("main", "main.zig"); - main.setBuildMode(opts); + const main = b.addExecutable(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); const run = main.run(); run.addArtifactArg(lib); diff --git a/test/standalone/main_pkg_path/build.zig b/test/standalone/main_pkg_path/build.zig index c4ac18f967..baee74052e 100644 --- a/test/standalone/main_pkg_path/build.zig +++ b/test/standalone/main_pkg_path/build.zig @@ -1,7 +1,9 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const test_exe = b.addTest("a/test.zig"); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "a/test.zig" }, + }); test_exe.setMainPkgPath("."); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/mix_c_files/build.zig b/test/standalone/mix_c_files/build.zig index 68486ea18d..ad69f05ff6 100644 --- a/test/standalone/mix_c_files/build.zig +++ b/test/standalone/mix_c_files/build.zig @@ -12,14 +12,17 @@ fn isRunnableTarget(t: CrossTarget) bool { } pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const exe = b.addExecutable("test", "main.zig"); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + .target = target, + }); exe.addCSourceFile("test.c", &[_][]const u8{"-std=c11"}); - exe.setBuildMode(mode); exe.linkLibC(); - exe.setTarget(target); b.default_step.dependOn(&exe.step); const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/mix_o_files/build.zig b/test/standalone/mix_o_files/build.zig index d498e2e20a..de37265388 100644 --- a/test/standalone/mix_o_files/build.zig +++ b/test/standalone/mix_o_files/build.zig @@ -1,9 +1,19 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const obj = b.addObject("base64", "base64.zig"); + const optimize = b.standardOptimizeOption(.{}); - const exe = b.addExecutable("test", null); + const obj = b.addObject(.{ + .name = "base64", + .root_source_file = .{ .path = "base64.zig" }, + .optimize = optimize, + .target = .{}, + }); + + const exe = b.addExecutable(.{ + .name = "test", + .optimize = optimize, + }); exe.addCSourceFile("test.c", &[_][]const u8{"-std=c99"}); exe.addObject(obj); exe.linkSystemLibrary("c"); diff --git a/test/standalone/options/build.zig b/test/standalone/options/build.zig index 087aceff01..87a584a887 100644 --- a/test/standalone/options/build.zig +++ b/test/standalone/options/build.zig @@ -2,11 +2,13 @@ const std = @import("std"); pub fn build(b: *std.build.Builder) void { const target = b.standardTargetOptions(.{}); - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const main = b.addTest("src/main.zig"); - main.setTarget(target); - main.setBuildMode(mode); + const main = b.addTest(.{ + .root_source_file = .{ .path = "src/main.zig" }, + .target = target, + .optimize = optimize, + }); const options = b.addOptions(); main.addOptions("build_options", options); diff --git a/test/standalone/pie/build.zig b/test/standalone/pie/build.zig index d008fd31c9..3f0b8b9f2f 100644 --- a/test/standalone/pie/build.zig +++ b/test/standalone/pie/build.zig @@ -1,8 +1,10 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const main = b.addTest("main.zig"); - main.setBuildMode(b.standardReleaseOptions()); + const main = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + }); main.pie = true; const test_step = b.step("test", "Test the program"); diff --git a/test/standalone/pkg_import/build.zig b/test/standalone/pkg_import/build.zig index 7529d106f9..8dcfaeded0 100644 --- a/test/standalone/pkg_import/build.zig +++ b/test/standalone/pkg_import/build.zig @@ -1,13 +1,14 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const exe = b.addExecutable("test", "test.zig"); - exe.addPackagePath("my_pkg", "pkg.zig"); + const optimize = b.standardOptimizeOption(.{}); - // This is duplicated to test that you are allowed to call - // b.standardReleaseOptions() twice. - exe.setBuildMode(b.standardReleaseOptions()); - exe.setBuildMode(b.standardReleaseOptions()); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = .{ .path = "test.zig" }, + .optimize = optimize, + }); + exe.addPackagePath("my_pkg", "pkg.zig"); const run = exe.run(); diff --git a/test/standalone/shared_library/build.zig b/test/standalone/shared_library/build.zig index 18188311c7..135be095bc 100644 --- a/test/standalone/shared_library/build.zig +++ b/test/standalone/shared_library/build.zig @@ -1,12 +1,21 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { + const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); - const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); - lib.setTarget(target); + const lib = b.addSharedLibrary(.{ + .name = "mathtest", + .root_source_file = .{ .path = "mathtest.zig" }, + .version = .{ .major = 1, .minor = 0 }, + .target = target, + .optimize = optimize, + }); - const exe = b.addExecutable("test", null); - exe.setTarget(target); + const exe = b.addExecutable(.{ + .name = "test", + .target = target, + .optimize = optimize, + }); exe.addCSourceFile("test.c", &[_][]const u8{"-std=c99"}); exe.linkLibrary(lib); exe.linkSystemLibrary("c"); diff --git a/test/standalone/static_c_lib/build.zig b/test/standalone/static_c_lib/build.zig index c64ae48dba..81b4349e20 100644 --- a/test/standalone/static_c_lib/build.zig +++ b/test/standalone/static_c_lib/build.zig @@ -1,15 +1,20 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const foo = b.addStaticLibrary("foo", null); + const foo = b.addStaticLibrary(.{ + .name = "foo", + .optimize = optimize, + .target = .{}, + }); foo.addCSourceFile("foo.c", &[_][]const u8{}); - foo.setBuildMode(mode); foo.addIncludePath("."); - const test_exe = b.addTest("foo.zig"); - test_exe.setBuildMode(mode); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "foo.zig" }, + .optimize = optimize, + }); test_exe.linkLibrary(foo); test_exe.addIncludePath("."); diff --git a/test/standalone/test_runner_path/build.zig b/test/standalone/test_runner_path/build.zig index 738cac9783..9b02da50c1 100644 --- a/test/standalone/test_runner_path/build.zig +++ b/test/standalone/test_runner_path/build.zig @@ -1,7 +1,10 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const test_exe = b.addTestExe("test", "test.zig"); + const test_exe = b.addTest(.{ + .root_source_file = .{ .path = "test.zig" }, + .kind = .test_exe, + }); test_exe.test_runner = "test_runner.zig"; const test_run = test_exe.run(); diff --git a/test/standalone/use_alias/build.zig b/test/standalone/use_alias/build.zig index da4e8bef4b..d2ca90f3ab 100644 --- a/test/standalone/use_alias/build.zig +++ b/test/standalone/use_alias/build.zig @@ -1,8 +1,10 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const main = b.addTest("main.zig"); - main.setBuildMode(b.standardReleaseOptions()); + const main = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .optimize = b.standardOptimizeOption(.{}), + }); main.addIncludePath("."); const test_step = b.step("test", "Test it"); diff --git a/test/standalone/windows_spawn/build.zig b/test/standalone/windows_spawn/build.zig index 10a1132d3a..de58a602c3 100644 --- a/test/standalone/windows_spawn/build.zig +++ b/test/standalone/windows_spawn/build.zig @@ -1,13 +1,20 @@ const Builder = @import("std").build.Builder; pub fn build(b: *Builder) void { - const mode = b.standardReleaseOptions(); + const optimize = b.standardOptimizeOption(.{}); - const hello = b.addExecutable("hello", "hello.zig"); - hello.setBuildMode(mode); + const hello = b.addExecutable(.{ + .name = "hello", + .root_source_file = .{ .path = "hello.zig" }, + .optimize = optimize, + }); + + const main = b.addExecutable(.{ + .name = "main", + .root_source_file = .{ .path = "main.zig" }, + .optimize = optimize, + }); - const main = b.addExecutable("main", "main.zig"); - main.setBuildMode(mode); const run = main.run(); run.addArtifactArg(hello); diff --git a/test/tests.zig b/test/tests.zig index 8e972b9ba6..575550be02 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -8,7 +8,7 @@ const fs = std.fs; const mem = std.mem; const fmt = std.fmt; const ArrayList = std.ArrayList; -const Mode = std.builtin.Mode; +const OptimizeMode = std.builtin.OptimizeMode; const LibExeObjStep = build.LibExeObjStep; const Allocator = mem.Allocator; const ExecError = build.Builder.ExecError; @@ -30,7 +30,7 @@ pub const CompareOutputContext = @import("src/compare_output.zig").CompareOutput const TestTarget = struct { target: CrossTarget = @as(CrossTarget, .{}), - mode: std.builtin.Mode = .Debug, + optimize_mode: std.builtin.OptimizeMode = .Debug, link_libc: bool = false, single_threaded: bool = false, disable_native: bool = false, @@ -423,38 +423,38 @@ const test_targets = blk: { // Do the release tests last because they take a long time .{ - .mode = .ReleaseFast, + .optimize_mode = .ReleaseFast, }, .{ .link_libc = true, - .mode = .ReleaseFast, + .optimize_mode = .ReleaseFast, }, .{ - .mode = .ReleaseFast, + .optimize_mode = .ReleaseFast, .single_threaded = true, }, .{ - .mode = .ReleaseSafe, + .optimize_mode = .ReleaseSafe, }, .{ .link_libc = true, - .mode = .ReleaseSafe, + .optimize_mode = .ReleaseSafe, }, .{ - .mode = .ReleaseSafe, + .optimize_mode = .ReleaseSafe, .single_threaded = true, }, .{ - .mode = .ReleaseSmall, + .optimize_mode = .ReleaseSmall, }, .{ .link_libc = true, - .mode = .ReleaseSmall, + .optimize_mode = .ReleaseSmall, }, .{ - .mode = .ReleaseSmall, + .optimize_mode = .ReleaseSmall, .single_threaded = true, }, }; @@ -462,14 +462,14 @@ const test_targets = blk: { const max_stdout_size = 1 * 1024 * 1024; // 1 MB -pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step { +pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { const cases = b.allocator.create(CompareOutputContext) catch unreachable; cases.* = CompareOutputContext{ .b = b, .step = b.step("test-compare-output", "Run the compare output tests"), .test_index = 0, .test_filter = test_filter, - .modes = modes, + .optimize_modes = optimize_modes, }; compare_output.addCases(cases); @@ -477,14 +477,14 @@ pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, modes: return cases.step; } -pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step { +pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { const cases = b.allocator.create(StackTracesContext) catch unreachable; cases.* = StackTracesContext{ .b = b, .step = b.step("test-stack-traces", "Run the stack trace tests"), .test_index = 0, .test_filter = test_filter, - .modes = modes, + .optimize_modes = optimize_modes, }; stack_traces.addCases(cases); @@ -495,7 +495,7 @@ pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, modes: [] pub fn addStandaloneTests( b: *build.Builder, test_filter: ?[]const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, skip_non_native: bool, enable_macos_sdk: bool, target: std.zig.CrossTarget, @@ -513,7 +513,7 @@ pub fn addStandaloneTests( .step = b.step("test-standalone", "Run the standalone tests"), .test_index = 0, .test_filter = test_filter, - .modes = modes, + .optimize_modes = optimize_modes, .skip_non_native = skip_non_native, .enable_macos_sdk = enable_macos_sdk, .target = target, @@ -534,7 +534,7 @@ pub fn addStandaloneTests( pub fn addLinkTests( b: *build.Builder, test_filter: ?[]const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, enable_macos_sdk: bool, omit_stage2: bool, enable_symlinks_windows: bool, @@ -545,7 +545,7 @@ pub fn addLinkTests( .step = b.step("test-link", "Run the linker tests"), .test_index = 0, .test_filter = test_filter, - .modes = modes, + .optimize_modes = optimize_modes, .skip_non_native = true, .enable_macos_sdk = enable_macos_sdk, .target = .{}, @@ -556,12 +556,17 @@ pub fn addLinkTests( return cases.step; } -pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step { +pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { _ = test_filter; - _ = modes; + _ = optimize_modes; const step = b.step("test-cli", "Test the command line interface"); - const exe = b.addExecutable("test-cli", "test/cli.zig"); + const exe = b.addExecutable(.{ + .name = "test-cli", + .root_source_file = .{ .path = "test/cli.zig" }, + .target = .{}, + .optimize = .Debug, + }); const run_cmd = exe.run(); run_cmd.addArgs(&[_][]const u8{ fs.realpathAlloc(b.allocator, b.zig_exe) catch unreachable, @@ -572,14 +577,14 @@ pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const M return step; } -pub fn addAssembleAndLinkTests(b: *build.Builder, test_filter: ?[]const u8, modes: []const Mode) *build.Step { +pub fn addAssembleAndLinkTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { const cases = b.allocator.create(CompareOutputContext) catch unreachable; cases.* = CompareOutputContext{ .b = b, .step = b.step("test-asm-link", "Run the assemble and link tests"), .test_index = 0, .test_filter = test_filter, - .modes = modes, + .optimize_modes = optimize_modes, }; assemble_and_link.addCases(cases); @@ -640,7 +645,7 @@ pub fn addPkgTests( root_src: []const u8, name: []const u8, desc: []const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, skip_single_threaded: bool, skip_non_native: bool, skip_libc: bool, @@ -677,8 +682,8 @@ pub fn addPkgTests( else => if (skip_stage2) continue, }; - const want_this_mode = for (modes) |m| { - if (m == test_target.mode) break true; + const want_this_mode = for (optimize_modes) |m| { + if (m == test_target.optimize_mode) break true; } else false; if (!want_this_mode) continue; @@ -691,21 +696,23 @@ pub fn addPkgTests( const triple_prefix = test_target.target.zigTriple(b.allocator) catch unreachable; - const these_tests = b.addTest(root_src); + const these_tests = b.addTest(.{ + .root_source_file = .{ .path = root_src }, + .optimize = test_target.optimize_mode, + .target = test_target.target, + }); const single_threaded_txt = if (test_target.single_threaded) "single" else "multi"; const backend_txt = if (test_target.backend) |backend| @tagName(backend) else "default"; these_tests.setNamePrefix(b.fmt("{s}-{s}-{s}-{s}-{s}-{s} ", .{ name, triple_prefix, - @tagName(test_target.mode), + @tagName(test_target.optimize_mode), libc_prefix, single_threaded_txt, backend_txt, })); these_tests.single_threaded = test_target.single_threaded; these_tests.setFilter(test_filter); - these_tests.setBuildMode(test_target.mode); - these_tests.setTarget(test_target.target); if (test_target.link_libc) { these_tests.linkSystemLibrary("c"); } @@ -739,9 +746,9 @@ pub const StackTracesContext = struct { step: *build.Step, test_index: usize, test_filter: ?[]const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, - const Expect = [@typeInfo(Mode).Enum.fields.len][]const u8; + const Expect = [@typeInfo(OptimizeMode).Enum.fields.len][]const u8; pub fn addCase(self: *StackTracesContext, config: anytype) void { if (@hasField(@TypeOf(config), "exclude")) { @@ -755,26 +762,26 @@ pub const StackTracesContext = struct { const exclude_os: []const std.Target.Os.Tag = &config.exclude_os; for (exclude_os) |os| if (os == builtin.os.tag) return; } - for (self.modes) |mode| { - switch (mode) { + for (self.optimize_modes) |optimize_mode| { + switch (optimize_mode) { .Debug => { if (@hasField(@TypeOf(config), "Debug")) { - self.addExpect(config.name, config.source, mode, config.Debug); + self.addExpect(config.name, config.source, optimize_mode, config.Debug); } }, .ReleaseSafe => { if (@hasField(@TypeOf(config), "ReleaseSafe")) { - self.addExpect(config.name, config.source, mode, config.ReleaseSafe); + self.addExpect(config.name, config.source, optimize_mode, config.ReleaseSafe); } }, .ReleaseFast => { if (@hasField(@TypeOf(config), "ReleaseFast")) { - self.addExpect(config.name, config.source, mode, config.ReleaseFast); + self.addExpect(config.name, config.source, optimize_mode, config.ReleaseFast); } }, .ReleaseSmall => { if (@hasField(@TypeOf(config), "ReleaseSmall")) { - self.addExpect(config.name, config.source, mode, config.ReleaseSmall); + self.addExpect(config.name, config.source, optimize_mode, config.ReleaseSmall); } }, } @@ -785,7 +792,7 @@ pub const StackTracesContext = struct { self: *StackTracesContext, name: []const u8, source: []const u8, - mode: Mode, + optimize_mode: OptimizeMode, mode_config: anytype, ) void { if (@hasField(@TypeOf(mode_config), "exclude")) { @@ -803,7 +810,7 @@ pub const StackTracesContext = struct { const annotated_case_name = fmt.allocPrint(self.b.allocator, "{s} {s} ({s})", .{ "stack-trace", name, - @tagName(mode), + @tagName(optimize_mode), }) catch unreachable; if (self.test_filter) |filter| { if (mem.indexOf(u8, annotated_case_name, filter) == null) return; @@ -812,14 +819,18 @@ pub const StackTracesContext = struct { const b = self.b; const src_basename = "source.zig"; const write_src = b.addWriteFile(src_basename, source); - const exe = b.addExecutableSource("test", write_src.getFileSource(src_basename).?); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = write_src.getFileSource(src_basename).?, + .optimize = optimize_mode, + .target = .{}, + }); const run_and_compare = RunAndCompareStep.create( self, exe, annotated_case_name, - mode, + optimize_mode, mode_config.expect, ); @@ -833,7 +844,7 @@ pub const StackTracesContext = struct { context: *StackTracesContext, exe: *LibExeObjStep, name: []const u8, - mode: Mode, + optimize_mode: OptimizeMode, expect_output: []const u8, test_index: usize, @@ -841,7 +852,7 @@ pub const StackTracesContext = struct { context: *StackTracesContext, exe: *LibExeObjStep, name: []const u8, - mode: Mode, + optimize_mode: OptimizeMode, expect_output: []const u8, ) *RunAndCompareStep { const allocator = context.b.allocator; @@ -851,7 +862,7 @@ pub const StackTracesContext = struct { .context = context, .exe = exe, .name = name, - .mode = mode, + .optimize_mode = optimize_mode, .expect_output = expect_output, .test_index = context.test_index, }; @@ -932,7 +943,7 @@ pub const StackTracesContext = struct { // process result // - keep only basename of source file path // - replace address with symbolic string - // - replace function name with symbolic string when mode != .Debug + // - replace function name with symbolic string when optimize_mode != .Debug // - skip empty lines const got: []const u8 = got_result: { var buf = ArrayList(u8).init(b.allocator); @@ -968,7 +979,7 @@ pub const StackTracesContext = struct { // emit substituted line try buf.appendSlice(line[pos + 1 .. marks[2] + delims[2].len]); try buf.appendSlice(" [address]"); - if (self.mode == .Debug) { + if (self.optimize_mode == .Debug) { // On certain platforms (windows) or possibly depending on how we choose to link main // the object file extension may be present so we simply strip any extension. if (mem.indexOfScalar(u8, line[marks[4]..marks[5]], '.')) |idot| { @@ -1007,7 +1018,7 @@ pub const StandaloneContext = struct { step: *build.Step, test_index: usize, test_filter: ?[]const u8, - modes: []const Mode, + optimize_modes: []const OptimizeMode, skip_non_native: bool, enable_macos_sdk: bool, target: std.zig.CrossTarget, @@ -1087,13 +1098,13 @@ pub const StandaloneContext = struct { } } - const modes = if (features.build_modes) self.modes else &[1]Mode{.Debug}; - for (modes) |mode| { - const arg = switch (mode) { + const optimize_modes = if (features.build_modes) self.optimize_modes else &[1]OptimizeMode{.Debug}; + for (optimize_modes) |optimize_mode| { + const arg = switch (optimize_mode) { .Debug => "", - .ReleaseFast => "-Drelease-fast", - .ReleaseSafe => "-Drelease-safe", - .ReleaseSmall => "-Drelease-small", + .ReleaseFast => "-Doptimize=ReleaseFast", + .ReleaseSafe => "-Doptimize=ReleaseSafe", + .ReleaseSmall => "-Doptimize=ReleaseSmall", }; const zig_args_base_len = zig_args.items.len; if (arg.len > 0) @@ -1101,7 +1112,7 @@ pub const StandaloneContext = struct { defer zig_args.resize(zig_args_base_len) catch unreachable; const run_cmd = b.addSystemCommand(zig_args.items); - const log_step = b.addLog("PASS {s} ({s})", .{ annotated_case_name, @tagName(mode) }); + const log_step = b.addLog("PASS {s} ({s})", .{ annotated_case_name, @tagName(optimize_mode) }); log_step.step.dependOn(&run_cmd.step); self.step.dependOn(&log_step.step); @@ -1111,17 +1122,21 @@ pub const StandaloneContext = struct { pub fn addAllArgs(self: *StandaloneContext, root_src: []const u8, link_libc: bool) void { const b = self.b; - for (self.modes) |mode| { + for (self.optimize_modes) |optimize| { const annotated_case_name = fmt.allocPrint(self.b.allocator, "build {s} ({s})", .{ root_src, - @tagName(mode), + @tagName(optimize), }) catch unreachable; if (self.test_filter) |filter| { if (mem.indexOf(u8, annotated_case_name, filter) == null) continue; } - const exe = b.addExecutable("test", root_src); - exe.setBuildMode(mode); + const exe = b.addExecutable(.{ + .name = "test", + .root_source_file = .{ .path = root_src }, + .optimize = optimize, + .target = .{}, + }); if (link_libc) { exe.linkSystemLibrary("c"); } @@ -1247,8 +1262,8 @@ pub const GenHContext = struct { pub fn addCase(self: *GenHContext, case: *const TestCase) void { const b = self.b; - const mode = std.builtin.Mode.Debug; - const annotated_case_name = fmt.allocPrint(self.b.allocator, "gen-h {s} ({s})", .{ case.name, @tagName(mode) }) catch unreachable; + const optimize_mode = std.builtin.OptimizeMode.Debug; + const annotated_case_name = fmt.allocPrint(self.b.allocator, "gen-h {s} ({s})", .{ case.name, @tagName(optimize_mode) }) catch unreachable; if (self.test_filter) |filter| { if (mem.indexOf(u8, annotated_case_name, filter) == null) return; } @@ -1259,7 +1274,7 @@ pub const GenHContext = struct { } const obj = b.addObjectFromWriteFileStep("test", write_src, case.sources.items[0].filename); - obj.setBuildMode(mode); + obj.setBuildMode(optimize_mode); const cmp_h = GenHCmpOutputStep.create(self, obj, annotated_case_name, case); @@ -1336,14 +1351,16 @@ const c_abi_targets = [_]CrossTarget{ pub fn addCAbiTests(b: *build.Builder, skip_non_native: bool, skip_release: bool) *build.Step { const step = b.step("test-c-abi", "Run the C ABI tests"); - const modes: [2]Mode = .{ .Debug, .ReleaseFast }; + const optimize_modes: [2]OptimizeMode = .{ .Debug, .ReleaseFast }; - for (modes[0 .. @as(u8, 1) + @boolToInt(!skip_release)]) |mode| for (c_abi_targets) |c_abi_target| { + for (optimize_modes[0 .. @as(u8, 1) + @boolToInt(!skip_release)]) |optimize_mode| for (c_abi_targets) |c_abi_target| { if (skip_non_native and !c_abi_target.isNative()) continue; - const test_step = b.addTest("test/c_abi/main.zig"); - test_step.setTarget(c_abi_target); + const test_step = b.addTest(.{ + .root_source_file = .{ .path = "test/c_abi/main.zig" }, + .optimize = optimize_mode, + }); if (c_abi_target.abi != null and c_abi_target.abi.?.isMusl()) { // TODO NativeTargetInfo insists on dynamically linking musl // for some reason? @@ -1351,7 +1368,6 @@ pub fn addCAbiTests(b: *build.Builder, skip_non_native: bool, skip_release: bool } test_step.linkLibC(); test_step.addCSourceFile("test/c_abi/cfuncs.c", &.{"-std=c99"}); - test_step.setBuildMode(mode); if (c_abi_target.isWindows() and (c_abi_target.getCpuArch() == .x86 or builtin.target.os.tag == .linux)) { // LTO currently incorrectly strips stdcall name-mangled functions @@ -1363,7 +1379,7 @@ pub fn addCAbiTests(b: *build.Builder, skip_non_native: bool, skip_release: bool test_step.setNamePrefix(b.fmt("{s}-{s}-{s} ", .{ "test-c-abi", triple_prefix, - @tagName(mode), + @tagName(optimize_mode), })); step.dependOn(&test_step.step); From 36e2d992dd8c45ca89a51d508c6c413cff5ad2cd Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 00:19:51 -0700 Subject: [PATCH 16/65] combine std.build and std.build.Builder into std.Build I've been wanting to do this for along time. --- build.zig | 31 +- doc/langref.html.in | 20 +- lib/build_runner.zig | 9 +- lib/init-exe/build.zig | 2 +- lib/init-lib/build.zig | 2 +- lib/std/Build.zig | 1771 ++++++++++++++++ lib/std/{build => Build}/CheckFileStep.zig | 12 +- lib/std/{build => Build}/CheckObjectStep.zig | 18 +- lib/std/{build => Build}/ConfigHeaderStep.zig | 9 +- .../{build => Build}/EmulatableRunStep.zig | 12 +- lib/std/{build => Build}/FmtStep.zig | 11 +- .../{build => Build}/InstallArtifactStep.zig | 21 +- lib/std/{build => Build}/InstallDirStep.zig | 14 +- lib/std/{build => Build}/InstallFileStep.zig | 14 +- lib/std/{build => Build}/InstallRawStep.zig | 24 +- lib/std/{build => Build}/LibExeObjStep.zig | 62 +- lib/std/{build => Build}/LogStep.zig | 8 +- lib/std/{build => Build}/OptionsStep.zig | 18 +- lib/std/{build => Build}/RemoveDirStep.zig | 8 +- lib/std/{build => Build}/RunStep.zig | 26 +- lib/std/Build/Step.zig | 97 + lib/std/{build => Build}/TranslateCStep.zig | 22 +- lib/std/{build => Build}/WriteFileStep.zig | 16 +- lib/std/build.zig | 1863 ----------------- lib/std/std.zig | 8 +- test/link/bss/build.zig | 4 +- test/link/common_symbols/build.zig | 4 +- test/link/common_symbols_alignment/build.zig | 4 +- .../interdependent_static_c_libs/build.zig | 4 +- test/link/macho/bugs/13056/build.zig | 3 +- test/link/macho/bugs/13457/build.zig | 5 +- test/link/macho/dead_strip/build.zig | 7 +- test/link/macho/dead_strip_dylibs/build.zig | 7 +- test/link/macho/dylib/build.zig | 3 +- test/link/macho/empty/build.zig | 5 +- test/link/macho/entry/build.zig | 3 +- test/link/macho/headerpad/build.zig | 7 +- test/link/macho/linksection/build.zig | 2 +- test/link/macho/needed_framework/build.zig | 5 +- test/link/macho/needed_library/build.zig | 5 +- test/link/macho/objc/build.zig | 5 +- test/link/macho/objcpp/build.zig | 3 +- test/link/macho/pagezero/build.zig | 3 +- test/link/macho/search_strategy/build.zig | 13 +- test/link/macho/stack_size/build.zig | 3 +- test/link/macho/strict_validation/build.zig | 5 +- test/link/macho/tls/build.zig | 3 +- test/link/macho/unwind_info/build.zig | 11 +- test/link/macho/uuid/build.zig | 11 +- test/link/macho/weak_framework/build.zig | 5 +- test/link/macho/weak_library/build.zig | 5 +- test/link/static_lib_as_system_lib/build.zig | 3 +- test/link/wasm/archive/build.zig | 3 +- test/link/wasm/basic-features/build.zig | 2 +- test/link/wasm/bss/build.zig | 3 +- test/link/wasm/export-data/build.zig | 3 +- test/link/wasm/export/build.zig | 2 +- test/link/wasm/extern-mangle/build.zig | 3 +- test/link/wasm/extern/build.zig | 2 +- test/link/wasm/function-table/build.zig | 3 +- test/link/wasm/infer-features/build.zig | 2 +- test/link/wasm/producers/build.zig | 3 +- test/link/wasm/segments/build.zig | 3 +- test/link/wasm/stack_pointer/build.zig | 3 +- test/link/wasm/type/build.zig | 3 +- test/src/compare_output.zig | 5 +- test/src/run_translated_c.zig | 5 +- test/src/translate_c.zig | 5 +- test/standalone/brace_expansion/build.zig | 4 +- test/standalone/c_compiler/build.zig | 5 +- test/standalone/emit_asm_and_bin/build.zig | 4 +- test/standalone/empty_env/build.zig | 4 +- test/standalone/global_linkage/build.zig | 4 +- test/standalone/install_raw_hex/build.zig | 4 +- test/standalone/issue_11595/build.zig | 5 +- test/standalone/issue_12588/build.zig | 3 +- test/standalone/issue_12706/build.zig | 5 +- test/standalone/issue_13030/build.zig | 3 +- test/standalone/issue_339/build.zig | 4 +- test/standalone/issue_5825/build.zig | 4 +- test/standalone/issue_7030/build.zig | 4 +- test/standalone/issue_794/build.zig | 4 +- test/standalone/issue_8550/build.zig | 2 +- test/standalone/issue_9812/build.zig | 2 +- .../standalone/load_dynamic_library/build.zig | 4 +- test/standalone/main_pkg_path/build.zig | 4 +- test/standalone/mix_c_files/build.zig | 5 +- test/standalone/mix_o_files/build.zig | 4 +- test/standalone/options/build.zig | 2 +- test/standalone/pie/build.zig | 4 +- test/standalone/pkg_import/build.zig | 4 +- test/standalone/shared_library/build.zig | 4 +- test/standalone/static_c_lib/build.zig | 4 +- test/standalone/test_runner_path/build.zig | 4 +- test/standalone/use_alias/build.zig | 4 +- test/standalone/windows_spawn/build.zig | 4 +- test/tests.zig | 60 +- 97 files changed, 2197 insertions(+), 2257 deletions(-) create mode 100644 lib/std/Build.zig rename lib/std/{build => Build}/CheckFileStep.zig (88%) rename lib/std/{build => Build}/CheckObjectStep.zig (98%) rename lib/std/{build => Build}/ConfigHeaderStep.zig (97%) rename lib/std/{build => Build}/EmulatableRunStep.zig (96%) rename lib/std/{build => Build}/FmtStep.zig (75%) rename lib/std/{build => Build}/InstallArtifactStep.zig (88%) rename lib/std/{build => Build}/InstallDirStep.zig (92%) rename lib/std/{build => Build}/InstallFileStep.zig (82%) rename lib/std/{build => Build}/InstallRawStep.zig (84%) rename lib/std/{build => Build}/LibExeObjStep.zig (97%) rename lib/std/{build => Build}/LogStep.zig (72%) rename lib/std/{build => Build}/OptionsStep.zig (97%) rename lib/std/{build => Build}/RemoveDirStep.zig (79%) rename lib/std/{build => Build}/RunStep.zig (94%) create mode 100644 lib/std/Build/Step.zig rename lib/std/{build => Build}/TranslateCStep.zig (90%) rename lib/std/{build => Build}/WriteFileStep.zig (91%) delete mode 100644 lib/std/build.zig diff --git a/build.zig b/build.zig index 98da9f31ee..6b6c384fc4 100644 --- a/build.zig +++ b/build.zig @@ -1,19 +1,18 @@ const std = @import("std"); const builtin = std.builtin; -const Builder = std.build.Builder; const tests = @import("test/tests.zig"); const BufMap = std.BufMap; const mem = std.mem; const ArrayList = std.ArrayList; const io = std.io; const fs = std.fs; -const InstallDirectoryOptions = std.build.InstallDirectoryOptions; +const InstallDirectoryOptions = std.Build.InstallDirectoryOptions; const assert = std.debug.assert; const zig_version = std.builtin.Version{ .major = 0, .minor = 11, .patch = 0 }; const stack_size = 32 * 1024 * 1024; -pub fn build(b: *Builder) !void { +pub fn build(b: *std.Build) !void { const release = b.option(bool, "release", "Build in release mode") orelse false; const only_c = b.option(bool, "only-c", "Translate the Zig compiler to C code, with only the C backend enabled") orelse false; const target = t: { @@ -477,7 +476,7 @@ pub fn build(b: *Builder) !void { try addWasiUpdateStep(b, version); } -fn addWasiUpdateStep(b: *Builder, version: [:0]const u8) !void { +fn addWasiUpdateStep(b: *std.Build, version: [:0]const u8) !void { const semver = try std.SemanticVersion.parse(version); var target: std.zig.CrossTarget = .{ @@ -514,10 +513,10 @@ fn addWasiUpdateStep(b: *Builder, version: [:0]const u8) !void { } fn addCompilerStep( - b: *Builder, + b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, -) *std.build.LibExeObjStep { +) *std.Build.LibExeObjStep { const exe = b.addExecutable(.{ .name = "zig", .root_source_file = .{ .path = "src/main.zig" }, @@ -543,9 +542,9 @@ const exe_cflags = [_][]const u8{ }; fn addCmakeCfgOptionsToExe( - b: *Builder, + b: *std.Build, cfg: CMakeConfig, - exe: *std.build.LibExeObjStep, + exe: *std.Build.LibExeObjStep, use_zig_libcxx: bool, ) !void { if (exe.target.isDarwin()) { @@ -624,7 +623,7 @@ fn addCmakeCfgOptionsToExe( } } -fn addStaticLlvmOptionsToExe(exe: *std.build.LibExeObjStep) !void { +fn addStaticLlvmOptionsToExe(exe: *std.Build.LibExeObjStep) !void { // Adds the Zig C++ sources which both stage1 and stage2 need. // // We need this because otherwise zig_clang_cc1_main.cpp ends up pulling @@ -661,9 +660,9 @@ fn addStaticLlvmOptionsToExe(exe: *std.build.LibExeObjStep) !void { } fn addCxxKnownPath( - b: *Builder, + b: *std.Build, ctx: CMakeConfig, - exe: *std.build.LibExeObjStep, + exe: *std.Build.LibExeObjStep, objname: []const u8, errtxt: ?[]const u8, need_cpp_includes: bool, @@ -696,7 +695,7 @@ fn addCxxKnownPath( } } -fn addCMakeLibraryList(exe: *std.build.LibExeObjStep, list: []const u8) void { +fn addCMakeLibraryList(exe: *std.Build.LibExeObjStep, list: []const u8) void { var it = mem.tokenize(u8, list, ";"); while (it.next()) |lib| { if (mem.startsWith(u8, lib, "-l")) { @@ -710,7 +709,7 @@ fn addCMakeLibraryList(exe: *std.build.LibExeObjStep, list: []const u8) void { } const CMakeConfig = struct { - llvm_linkage: std.build.LibExeObjStep.Linkage, + llvm_linkage: std.Build.LibExeObjStep.Linkage, cmake_binary_dir: []const u8, cmake_prefix_path: []const u8, cmake_static_library_prefix: []const u8, @@ -727,7 +726,7 @@ const CMakeConfig = struct { const max_config_h_bytes = 1 * 1024 * 1024; -fn findConfigH(b: *Builder, config_h_path_option: ?[]const u8) ?[]const u8 { +fn findConfigH(b: *std.Build, config_h_path_option: ?[]const u8) ?[]const u8 { if (config_h_path_option) |path| { var config_h_or_err = fs.cwd().openFile(path, .{}); if (config_h_or_err) |*file| { @@ -773,7 +772,7 @@ fn findConfigH(b: *Builder, config_h_path_option: ?[]const u8) ?[]const u8 { } else unreachable; // TODO should not need `else unreachable`. } -fn parseConfigH(b: *Builder, config_h_text: []const u8) ?CMakeConfig { +fn parseConfigH(b: *std.Build, config_h_text: []const u8) ?CMakeConfig { var ctx: CMakeConfig = .{ .llvm_linkage = undefined, .cmake_binary_dir = undefined, @@ -862,7 +861,7 @@ fn parseConfigH(b: *Builder, config_h_text: []const u8) ?CMakeConfig { return ctx; } -fn toNativePathSep(b: *Builder, s: []const u8) []u8 { +fn toNativePathSep(b: *std.Build, s: []const u8) []u8 { const duplicated = b.allocator.dupe(u8, s) catch unreachable; for (duplicated) |*byte| switch (byte.*) { '/' => byte.* = fs.path.sep, diff --git a/doc/langref.html.in b/doc/langref.html.in index c008149f41..1163ad0200 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -9528,9 +9528,9 @@ fn foo(comptime T: type, ptr: *T) T { To add standard build options to a build.zig file:

{#code_begin|syntax|build#} -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ .name = "example", @@ -10551,9 +10551,9 @@ const separator = if (builtin.os.tag == .windows) '\\' else '/';

This build.zig file is automatically generated by zig init-exe.

{#code_begin|syntax|build_executable#} -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { // Standard target options allows the person running `zig build` to choose // what target to build for. Here we do not override the defaults, which // means any target is allowed, and the default is native. Other options @@ -10588,9 +10588,9 @@ pub fn build(b: *Builder) void {

This build.zig file is automatically generated by zig init-lib.

{#code_begin|syntax|build_library#} -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const lib = b.addStaticLibrary(.{ .name = "example", @@ -10961,9 +10961,9 @@ int main(int argc, char **argv) { } {#end_syntax_block#} {#code_begin|syntax|build_c#} -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); const exe = b.addExecutable(.{ @@ -11025,9 +11025,9 @@ int main(int argc, char **argv) { } {#end_syntax_block#} {#code_begin|syntax|build_object#} -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const obj = b.addObject("base64", "base64.zig"); const exe = b.addExecutable(.{ diff --git a/lib/build_runner.zig b/lib/build_runner.zig index 4df2eb1d62..189b118787 100644 --- a/lib/build_runner.zig +++ b/lib/build_runner.zig @@ -3,7 +3,6 @@ const std = @import("std"); const builtin = @import("builtin"); const io = std.io; const fmt = std.fmt; -const Builder = std.build.Builder; const mem = std.mem; const process = std.process; const ArrayList = std.ArrayList; @@ -42,7 +41,7 @@ pub fn main() !void { return error.InvalidArgs; }; - const builder = try Builder.create( + const builder = try std.Build.create( allocator, zig_exe, build_root, @@ -58,7 +57,7 @@ pub fn main() !void { const stdout_stream = io.getStdOut().writer(); var install_prefix: ?[]const u8 = null; - var dir_list = Builder.DirList{}; + var dir_list = std.Build.DirList{}; // before arg parsing, check for the NO_COLOR environment variable // if it exists, default the color setting to .off @@ -230,7 +229,7 @@ pub fn main() !void { }; } -fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void { +fn usage(builder: *std.Build, already_ran_build: bool, out_stream: anytype) !void { // run the build script to collect the options if (!already_ran_build) { builder.resolveInstallPrefix(null, .{}); @@ -330,7 +329,7 @@ fn usage(builder: *Builder, already_ran_build: bool, out_stream: anytype) !void ); } -fn usageAndErr(builder: *Builder, already_ran_build: bool, out_stream: anytype) void { +fn usageAndErr(builder: *std.Build, already_ran_build: bool, out_stream: anytype) void { usage(builder, already_ran_build, out_stream) catch {}; process.exit(1); } diff --git a/lib/init-exe/build.zig b/lib/init-exe/build.zig index 36e5feddec..b88515b403 100644 --- a/lib/init-exe/build.zig +++ b/lib/init-exe/build.zig @@ -3,7 +3,7 @@ const std = @import("std"); // Although this function looks imperative, note that its job is to // declaratively construct a build graph that will be executed by an external // runner. -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { // Standard target options allows the person running `zig build` to choose // what target to build for. Here we do not override the defaults, which // means any target is allowed, and the default is native. Other options diff --git a/lib/init-lib/build.zig b/lib/init-lib/build.zig index 4a7b700dc2..5ebb55373f 100644 --- a/lib/init-lib/build.zig +++ b/lib/init-lib/build.zig @@ -3,7 +3,7 @@ const std = @import("std"); // Although this function looks imperative, note that its job is to // declaratively construct a build graph that will be executed by an external // runner. -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { // Standard target options allows the person running `zig build` to choose // what target to build for. Here we do not override the defaults, which // means any target is allowed, and the default is native. Other options diff --git a/lib/std/Build.zig b/lib/std/Build.zig new file mode 100644 index 0000000000..a3c579c743 --- /dev/null +++ b/lib/std/Build.zig @@ -0,0 +1,1771 @@ +const std = @import("std.zig"); +const builtin = @import("builtin"); +const io = std.io; +const fs = std.fs; +const mem = std.mem; +const debug = std.debug; +const panic = std.debug.panic; +const assert = debug.assert; +const log = std.log; +const ArrayList = std.ArrayList; +const StringHashMap = std.StringHashMap; +const Allocator = mem.Allocator; +const process = std.process; +const EnvMap = std.process.EnvMap; +const fmt_lib = std.fmt; +const File = std.fs.File; +const CrossTarget = std.zig.CrossTarget; +const NativeTargetInfo = std.zig.system.NativeTargetInfo; +const Sha256 = std.crypto.hash.sha2.Sha256; +const Build = @This(); + +pub const Step = @import("Build/Step.zig"); +pub const CheckFileStep = @import("Build/CheckFileStep.zig"); +pub const CheckObjectStep = @import("Build/CheckObjectStep.zig"); +pub const ConfigHeaderStep = @import("Build/ConfigHeaderStep.zig"); +pub const EmulatableRunStep = @import("Build/EmulatableRunStep.zig"); +pub const FmtStep = @import("Build/FmtStep.zig"); +pub const InstallArtifactStep = @import("Build/InstallArtifactStep.zig"); +pub const InstallDirStep = @import("Build/InstallDirStep.zig"); +pub const InstallFileStep = @import("Build/InstallFileStep.zig"); +pub const InstallRawStep = @import("Build/InstallRawStep.zig"); +pub const LibExeObjStep = @import("Build/LibExeObjStep.zig"); +pub const LogStep = @import("Build/LogStep.zig"); +pub const OptionsStep = @import("Build/OptionsStep.zig"); +pub const RemoveDirStep = @import("Build/RemoveDirStep.zig"); +pub const RunStep = @import("Build/RunStep.zig"); +pub const TranslateCStep = @import("Build/TranslateCStep.zig"); +pub const WriteFileStep = @import("Build/WriteFileStep.zig"); + +install_tls: TopLevelStep, +uninstall_tls: TopLevelStep, +allocator: Allocator, +user_input_options: UserInputOptionsMap, +available_options_map: AvailableOptionsMap, +available_options_list: ArrayList(AvailableOption), +verbose: bool, +verbose_link: bool, +verbose_cc: bool, +verbose_air: bool, +verbose_llvm_ir: bool, +verbose_cimport: bool, +verbose_llvm_cpu_features: bool, +/// The purpose of executing the command is for a human to read compile errors from the terminal +prominent_compile_errors: bool, +color: enum { auto, on, off } = .auto, +reference_trace: ?u32 = null, +invalid_user_input: bool, +zig_exe: []const u8, +default_step: *Step, +env_map: *EnvMap, +top_level_steps: ArrayList(*TopLevelStep), +install_prefix: []const u8, +dest_dir: ?[]const u8, +lib_dir: []const u8, +exe_dir: []const u8, +h_dir: []const u8, +install_path: []const u8, +sysroot: ?[]const u8 = null, +search_prefixes: ArrayList([]const u8), +libc_file: ?[]const u8 = null, +installed_files: ArrayList(InstalledFile), +/// Path to the directory containing build.zig. +build_root: []const u8, +cache_root: []const u8, +global_cache_root: []const u8, +/// zig lib dir +override_lib_dir: ?[]const u8, +vcpkg_root: VcpkgRoot = .unattempted, +pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null, +args: ?[][]const u8 = null, +debug_log_scopes: []const []const u8 = &.{}, +debug_compile_errors: bool = false, + +/// Experimental. Use system Darling installation to run cross compiled macOS build artifacts. +enable_darling: bool = false, +/// Use system QEMU installation to run cross compiled foreign architecture build artifacts. +enable_qemu: bool = false, +/// Darwin. Use Rosetta to run x86_64 macOS build artifacts on arm64 macOS. +enable_rosetta: bool = false, +/// Use system Wasmtime installation to run cross compiled wasm/wasi build artifacts. +enable_wasmtime: bool = false, +/// Use system Wine installation to run cross compiled Windows build artifacts. +enable_wine: bool = false, +/// After following the steps in https://github.com/ziglang/zig/wiki/Updating-libc#glibc, +/// this will be the directory $glibc-build-dir/install/glibcs +/// Given the example of the aarch64 target, this is the directory +/// that contains the path `aarch64-linux-gnu/lib/ld-linux-aarch64.so.1`. +glibc_runtimes_dir: ?[]const u8 = null, + +/// Information about the native target. Computed before build() is invoked. +host: NativeTargetInfo, + +dep_prefix: []const u8 = "", + +pub const ExecError = error{ + ReadFailure, + ExitCodeFailure, + ProcessTerminated, + ExecNotSupported, +} || std.ChildProcess.SpawnError; + +pub const PkgConfigError = error{ + PkgConfigCrashed, + PkgConfigFailed, + PkgConfigNotInstalled, + PkgConfigInvalidOutput, +}; + +pub const PkgConfigPkg = struct { + name: []const u8, + desc: []const u8, +}; + +pub const CStd = enum { + C89, + C99, + C11, +}; + +const UserInputOptionsMap = StringHashMap(UserInputOption); +const AvailableOptionsMap = StringHashMap(AvailableOption); + +const AvailableOption = struct { + name: []const u8, + type_id: TypeId, + description: []const u8, + /// If the `type_id` is `enum` this provides the list of enum options + enum_options: ?[]const []const u8, +}; + +const UserInputOption = struct { + name: []const u8, + value: UserValue, + used: bool, +}; + +const UserValue = union(enum) { + flag: void, + scalar: []const u8, + list: ArrayList([]const u8), + map: StringHashMap(*const UserValue), +}; + +const TypeId = enum { + bool, + int, + float, + @"enum", + string, + list, +}; + +const TopLevelStep = struct { + pub const base_id = .top_level; + + step: Step, + description: []const u8, +}; + +pub const DirList = struct { + lib_dir: ?[]const u8 = null, + exe_dir: ?[]const u8 = null, + include_dir: ?[]const u8 = null, +}; + +pub fn create( + allocator: Allocator, + zig_exe: []const u8, + build_root: []const u8, + cache_root: []const u8, + global_cache_root: []const u8, +) !*Build { + const env_map = try allocator.create(EnvMap); + env_map.* = try process.getEnvMap(allocator); + + const host = try NativeTargetInfo.detect(.{}); + + const self = try allocator.create(Build); + self.* = Build{ + .zig_exe = zig_exe, + .build_root = build_root, + .cache_root = try fs.path.relative(allocator, build_root, cache_root), + .global_cache_root = global_cache_root, + .verbose = false, + .verbose_link = false, + .verbose_cc = false, + .verbose_air = false, + .verbose_llvm_ir = false, + .verbose_cimport = false, + .verbose_llvm_cpu_features = false, + .prominent_compile_errors = false, + .invalid_user_input = false, + .allocator = allocator, + .user_input_options = UserInputOptionsMap.init(allocator), + .available_options_map = AvailableOptionsMap.init(allocator), + .available_options_list = ArrayList(AvailableOption).init(allocator), + .top_level_steps = ArrayList(*TopLevelStep).init(allocator), + .default_step = undefined, + .env_map = env_map, + .search_prefixes = ArrayList([]const u8).init(allocator), + .install_prefix = undefined, + .lib_dir = undefined, + .exe_dir = undefined, + .h_dir = undefined, + .dest_dir = env_map.get("DESTDIR"), + .installed_files = ArrayList(InstalledFile).init(allocator), + .install_tls = TopLevelStep{ + .step = Step.initNoOp(.top_level, "install", allocator), + .description = "Copy build artifacts to prefix path", + }, + .uninstall_tls = TopLevelStep{ + .step = Step.init(.top_level, "uninstall", allocator, makeUninstall), + .description = "Remove build artifacts from prefix path", + }, + .override_lib_dir = null, + .install_path = undefined, + .args = null, + .host = host, + }; + try self.top_level_steps.append(&self.install_tls); + try self.top_level_steps.append(&self.uninstall_tls); + self.default_step = &self.install_tls.step; + return self; +} + +fn createChild( + parent: *Build, + dep_name: []const u8, + build_root: []const u8, + args: anytype, +) !*Build { + const child = try createChildOnly(parent, dep_name, build_root); + try applyArgs(child, args); + return child; +} + +fn createChildOnly(parent: *Build, dep_name: []const u8, build_root: []const u8) !*Build { + const allocator = parent.allocator; + const child = try allocator.create(Build); + child.* = .{ + .allocator = allocator, + .install_tls = .{ + .step = Step.initNoOp(.top_level, "install", allocator), + .description = "Copy build artifacts to prefix path", + }, + .uninstall_tls = .{ + .step = Step.init(.top_level, "uninstall", allocator, makeUninstall), + .description = "Remove build artifacts from prefix path", + }, + .user_input_options = UserInputOptionsMap.init(allocator), + .available_options_map = AvailableOptionsMap.init(allocator), + .available_options_list = ArrayList(AvailableOption).init(allocator), + .verbose = parent.verbose, + .verbose_link = parent.verbose_link, + .verbose_cc = parent.verbose_cc, + .verbose_air = parent.verbose_air, + .verbose_llvm_ir = parent.verbose_llvm_ir, + .verbose_cimport = parent.verbose_cimport, + .verbose_llvm_cpu_features = parent.verbose_llvm_cpu_features, + .prominent_compile_errors = parent.prominent_compile_errors, + .color = parent.color, + .reference_trace = parent.reference_trace, + .invalid_user_input = false, + .zig_exe = parent.zig_exe, + .default_step = undefined, + .env_map = parent.env_map, + .top_level_steps = ArrayList(*TopLevelStep).init(allocator), + .install_prefix = undefined, + .dest_dir = parent.dest_dir, + .lib_dir = parent.lib_dir, + .exe_dir = parent.exe_dir, + .h_dir = parent.h_dir, + .install_path = parent.install_path, + .sysroot = parent.sysroot, + .search_prefixes = ArrayList([]const u8).init(allocator), + .libc_file = parent.libc_file, + .installed_files = ArrayList(InstalledFile).init(allocator), + .build_root = build_root, + .cache_root = parent.cache_root, + .global_cache_root = parent.global_cache_root, + .override_lib_dir = parent.override_lib_dir, + .debug_log_scopes = parent.debug_log_scopes, + .debug_compile_errors = parent.debug_compile_errors, + .enable_darling = parent.enable_darling, + .enable_qemu = parent.enable_qemu, + .enable_rosetta = parent.enable_rosetta, + .enable_wasmtime = parent.enable_wasmtime, + .enable_wine = parent.enable_wine, + .glibc_runtimes_dir = parent.glibc_runtimes_dir, + .host = parent.host, + .dep_prefix = parent.fmt("{s}{s}.", .{ parent.dep_prefix, dep_name }), + }; + try child.top_level_steps.append(&child.install_tls); + try child.top_level_steps.append(&child.uninstall_tls); + child.default_step = &child.install_tls.step; + return child; +} + +fn applyArgs(b: *Build, args: anytype) !void { + inline for (@typeInfo(@TypeOf(args)).Struct.fields) |field| { + const v = @field(args, field.name); + const T = @TypeOf(v); + switch (T) { + CrossTarget => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = try v.zigTriple(b.allocator) }, + .used = false, + }); + try b.user_input_options.put("cpu", .{ + .name = "cpu", + .value = .{ .scalar = try serializeCpu(b.allocator, v.getCpu()) }, + .used = false, + }); + }, + []const u8 => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = v }, + .used = false, + }); + }, + else => switch (@typeInfo(T)) { + .Bool => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = if (v) "true" else "false" }, + .used = false, + }); + }, + .Enum => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = @tagName(v) }, + .used = false, + }); + }, + .Int => { + try b.user_input_options.put(field.name, .{ + .name = field.name, + .value = .{ .scalar = try std.fmt.allocPrint(b.allocator, "{d}", .{v}) }, + .used = false, + }); + }, + else => @compileError("option '" ++ field.name ++ "' has unsupported type: " ++ @typeName(T)), + }, + } + } + const Hasher = std.crypto.auth.siphash.SipHash128(1, 3); + // Random bytes to make unique. Refresh this with new random bytes when + // implementation is modified in a non-backwards-compatible way. + var hash = Hasher.init("ZaEsvQ5ClaA2IdH9"); + hash.update(b.dep_prefix); + // TODO additionally update the hash with `args`. + + var digest: [16]u8 = undefined; + hash.final(&digest); + var hash_basename: [digest.len * 2]u8 = undefined; + _ = std.fmt.bufPrint(&hash_basename, "{s}", .{std.fmt.fmtSliceHexLower(&digest)}) catch + unreachable; + + const install_prefix = b.pathJoin(&.{ b.cache_root, "i", &hash_basename }); + b.resolveInstallPrefix(install_prefix, .{}); +} + +pub fn destroy(self: *Build) void { + self.env_map.deinit(); + self.top_level_steps.deinit(); + self.allocator.destroy(self); +} + +/// This function is intended to be called by lib/build_runner.zig, not a build.zig file. +pub fn resolveInstallPrefix(self: *Build, install_prefix: ?[]const u8, dir_list: DirList) void { + if (self.dest_dir) |dest_dir| { + self.install_prefix = install_prefix orelse "/usr"; + self.install_path = self.pathJoin(&.{ dest_dir, self.install_prefix }); + } else { + self.install_prefix = install_prefix orelse + (self.pathJoin(&.{ self.build_root, "zig-out" })); + self.install_path = self.install_prefix; + } + + var lib_list = [_][]const u8{ self.install_path, "lib" }; + var exe_list = [_][]const u8{ self.install_path, "bin" }; + var h_list = [_][]const u8{ self.install_path, "include" }; + + if (dir_list.lib_dir) |dir| { + if (std.fs.path.isAbsolute(dir)) lib_list[0] = self.dest_dir orelse ""; + lib_list[1] = dir; + } + + if (dir_list.exe_dir) |dir| { + if (std.fs.path.isAbsolute(dir)) exe_list[0] = self.dest_dir orelse ""; + exe_list[1] = dir; + } + + if (dir_list.include_dir) |dir| { + if (std.fs.path.isAbsolute(dir)) h_list[0] = self.dest_dir orelse ""; + h_list[1] = dir; + } + + self.lib_dir = self.pathJoin(&lib_list); + self.exe_dir = self.pathJoin(&exe_list); + self.h_dir = self.pathJoin(&h_list); +} + +pub fn addOptions(self: *Build) *OptionsStep { + return OptionsStep.create(self); +} + +pub const ExecutableOptions = struct { + name: []const u8, + root_source_file: ?FileSource = null, + version: ?std.builtin.Version = null, + target: CrossTarget = .{}, + optimize: std.builtin.Mode = .Debug, + linkage: ?LibExeObjStep.Linkage = null, +}; + +pub fn addExecutable(b: *Build, options: ExecutableOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + .kind = .exe, + .linkage = options.linkage, + }); +} + +pub const ObjectOptions = struct { + name: []const u8, + root_source_file: ?FileSource = null, + target: CrossTarget, + optimize: std.builtin.Mode, +}; + +pub fn addObject(b: *Build, options: ObjectOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .target = options.target, + .optimize = options.optimize, + .kind = .obj, + }); +} + +pub const SharedLibraryOptions = struct { + name: []const u8, + root_source_file: ?FileSource = null, + version: ?std.builtin.Version = null, + target: CrossTarget, + optimize: std.builtin.Mode, +}; + +pub fn addSharedLibrary(b: *Build, options: SharedLibraryOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .kind = .lib, + .linkage = .dynamic, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + }); +} + +pub const StaticLibraryOptions = struct { + name: []const u8, + root_source_file: ?FileSource = null, + target: CrossTarget, + optimize: std.builtin.Mode, + version: ?std.builtin.Version = null, +}; + +pub fn addStaticLibrary(b: *Build, options: StaticLibraryOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = options.root_source_file, + .kind = .lib, + .linkage = .static, + .version = options.version, + .target = options.target, + .optimize = options.optimize, + }); +} + +pub const TestOptions = struct { + name: []const u8 = "test", + kind: LibExeObjStep.Kind = .@"test", + root_source_file: FileSource, + target: CrossTarget = .{}, + optimize: std.builtin.Mode = .Debug, + version: ?std.builtin.Version = null, +}; + +pub fn addTest(b: *Build, options: TestOptions) *LibExeObjStep { + return LibExeObjStep.create(b, .{ + .name = options.name, + .kind = options.kind, + .root_source_file = options.root_source_file, + .target = options.target, + .optimize = options.optimize, + }); +} + +pub const AssemblyOptions = struct { + name: []const u8, + source_file: FileSource, + target: CrossTarget, + optimize: std.builtin.Mode, +}; + +pub fn addAssembly(b: *Build, options: AssemblyOptions) *LibExeObjStep { + const obj_step = LibExeObjStep.create(b, .{ + .name = options.name, + .root_source_file = null, + .target = options.target, + .optimize = options.optimize, + }); + obj_step.addAssemblyFileSource(options.source_file.dupe(b)); + return obj_step; +} + +/// Initializes a RunStep with argv, which must at least have the path to the +/// executable. More command line arguments can be added with `addArg`, +/// `addArgs`, and `addArtifactArg`. +/// Be careful using this function, as it introduces a system dependency. +/// To run an executable built with zig build, see `LibExeObjStep.run`. +pub fn addSystemCommand(self: *Build, argv: []const []const u8) *RunStep { + assert(argv.len >= 1); + const run_step = RunStep.create(self, self.fmt("run {s}", .{argv[0]})); + run_step.addArgs(argv); + return run_step; +} + +pub fn addConfigHeader( + b: *Build, + source: FileSource, + style: ConfigHeaderStep.Style, + values: anytype, +) *ConfigHeaderStep { + const config_header_step = ConfigHeaderStep.create(b, source, style); + config_header_step.addValues(values); + return config_header_step; +} + +/// Allocator.dupe without the need to handle out of memory. +pub fn dupe(self: *Build, bytes: []const u8) []u8 { + return self.allocator.dupe(u8, bytes) catch unreachable; +} + +/// Duplicates an array of strings without the need to handle out of memory. +pub fn dupeStrings(self: *Build, strings: []const []const u8) [][]u8 { + const array = self.allocator.alloc([]u8, strings.len) catch unreachable; + for (strings) |s, i| { + array[i] = self.dupe(s); + } + return array; +} + +/// Duplicates a path and converts all slashes to the OS's canonical path separator. +pub fn dupePath(self: *Build, bytes: []const u8) []u8 { + const the_copy = self.dupe(bytes); + for (the_copy) |*byte| { + switch (byte.*) { + '/', '\\' => byte.* = fs.path.sep, + else => {}, + } + } + return the_copy; +} + +/// Duplicates a package recursively. +pub fn dupePkg(self: *Build, package: Pkg) Pkg { + var the_copy = Pkg{ + .name = self.dupe(package.name), + .source = package.source.dupe(self), + }; + + if (package.dependencies) |dependencies| { + const new_dependencies = self.allocator.alloc(Pkg, dependencies.len) catch unreachable; + the_copy.dependencies = new_dependencies; + + for (dependencies) |dep_package, i| { + new_dependencies[i] = self.dupePkg(dep_package); + } + } + return the_copy; +} + +pub fn addWriteFile(self: *Build, file_path: []const u8, data: []const u8) *WriteFileStep { + const write_file_step = self.addWriteFiles(); + write_file_step.add(file_path, data); + return write_file_step; +} + +pub fn addWriteFiles(self: *Build) *WriteFileStep { + const write_file_step = self.allocator.create(WriteFileStep) catch unreachable; + write_file_step.* = WriteFileStep.init(self); + return write_file_step; +} + +pub fn addLog(self: *Build, comptime format: []const u8, args: anytype) *LogStep { + const data = self.fmt(format, args); + const log_step = self.allocator.create(LogStep) catch unreachable; + log_step.* = LogStep.init(self, data); + return log_step; +} + +pub fn addRemoveDirTree(self: *Build, dir_path: []const u8) *RemoveDirStep { + const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable; + remove_dir_step.* = RemoveDirStep.init(self, dir_path); + return remove_dir_step; +} + +pub fn addFmt(self: *Build, paths: []const []const u8) *FmtStep { + return FmtStep.create(self, paths); +} + +pub fn addTranslateC(self: *Build, options: TranslateCStep.Options) *TranslateCStep { + return TranslateCStep.create(self, options); +} + +pub fn make(self: *Build, step_names: []const []const u8) !void { + try self.makePath(self.cache_root); + + var wanted_steps = ArrayList(*Step).init(self.allocator); + defer wanted_steps.deinit(); + + if (step_names.len == 0) { + try wanted_steps.append(self.default_step); + } else { + for (step_names) |step_name| { + const s = try self.getTopLevelStepByName(step_name); + try wanted_steps.append(s); + } + } + + for (wanted_steps.items) |s| { + try self.makeOneStep(s); + } +} + +pub fn getInstallStep(self: *Build) *Step { + return &self.install_tls.step; +} + +pub fn getUninstallStep(self: *Build) *Step { + return &self.uninstall_tls.step; +} + +fn makeUninstall(uninstall_step: *Step) anyerror!void { + const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step); + const self = @fieldParentPtr(Build, "uninstall_tls", uninstall_tls); + + for (self.installed_files.items) |installed_file| { + const full_path = self.getInstallPath(installed_file.dir, installed_file.path); + if (self.verbose) { + log.info("rm {s}", .{full_path}); + } + fs.cwd().deleteTree(full_path) catch {}; + } + + // TODO remove empty directories +} + +fn makeOneStep(self: *Build, s: *Step) anyerror!void { + if (s.loop_flag) { + log.err("Dependency loop detected:\n {s}", .{s.name}); + return error.DependencyLoopDetected; + } + s.loop_flag = true; + + for (s.dependencies.items) |dep| { + self.makeOneStep(dep) catch |err| { + if (err == error.DependencyLoopDetected) { + log.err(" {s}", .{s.name}); + } + return err; + }; + } + + s.loop_flag = false; + + try s.make(); +} + +fn getTopLevelStepByName(self: *Build, name: []const u8) !*Step { + for (self.top_level_steps.items) |top_level_step| { + if (mem.eql(u8, top_level_step.step.name, name)) { + return &top_level_step.step; + } + } + log.err("Cannot run step '{s}' because it does not exist", .{name}); + return error.InvalidStepName; +} + +pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_raw: []const u8) ?T { + const name = self.dupe(name_raw); + const description = self.dupe(description_raw); + const type_id = comptime typeToEnum(T); + const enum_options = if (type_id == .@"enum") blk: { + const fields = comptime std.meta.fields(T); + var options = ArrayList([]const u8).initCapacity(self.allocator, fields.len) catch unreachable; + + inline for (fields) |field| { + options.appendAssumeCapacity(field.name); + } + + break :blk options.toOwnedSlice() catch unreachable; + } else null; + const available_option = AvailableOption{ + .name = name, + .type_id = type_id, + .description = description, + .enum_options = enum_options, + }; + if ((self.available_options_map.fetchPut(name, available_option) catch unreachable) != null) { + panic("Option '{s}' declared twice", .{name}); + } + self.available_options_list.append(available_option) catch unreachable; + + const option_ptr = self.user_input_options.getPtr(name) orelse return null; + option_ptr.used = true; + switch (type_id) { + .bool => switch (option_ptr.value) { + .flag => return true, + .scalar => |s| { + if (mem.eql(u8, s, "true")) { + return true; + } else if (mem.eql(u8, s, "false")) { + return false; + } else { + log.err("Expected -D{s} to be a boolean, but received '{s}'\n", .{ name, s }); + self.markInvalidUserInput(); + return null; + } + }, + .list, .map => { + log.err("Expected -D{s} to be a boolean, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + }, + .int => switch (option_ptr.value) { + .flag, .list, .map => { + log.err("Expected -D{s} to be an integer, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + .scalar => |s| { + const n = std.fmt.parseInt(T, s, 10) catch |err| switch (err) { + error.Overflow => { + log.err("-D{s} value {s} cannot fit into type {s}.\n", .{ name, s, @typeName(T) }); + self.markInvalidUserInput(); + return null; + }, + else => { + log.err("Expected -D{s} to be an integer of type {s}.\n", .{ name, @typeName(T) }); + self.markInvalidUserInput(); + return null; + }, + }; + return n; + }, + }, + .float => switch (option_ptr.value) { + .flag, .map, .list => { + log.err("Expected -D{s} to be a float, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + .scalar => |s| { + const n = std.fmt.parseFloat(T, s) catch { + log.err("Expected -D{s} to be a float of type {s}.\n", .{ name, @typeName(T) }); + self.markInvalidUserInput(); + return null; + }; + return n; + }, + }, + .@"enum" => switch (option_ptr.value) { + .flag, .map, .list => { + log.err("Expected -D{s} to be an enum, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + .scalar => |s| { + if (std.meta.stringToEnum(T, s)) |enum_lit| { + return enum_lit; + } else { + log.err("Expected -D{s} to be of type {s}.\n", .{ name, @typeName(T) }); + self.markInvalidUserInput(); + return null; + } + }, + }, + .string => switch (option_ptr.value) { + .flag, .list, .map => { + log.err("Expected -D{s} to be a string, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + .scalar => |s| return s, + }, + .list => switch (option_ptr.value) { + .flag, .map => { + log.err("Expected -D{s} to be a list, but received a {s}.\n", .{ + name, @tagName(option_ptr.value), + }); + self.markInvalidUserInput(); + return null; + }, + .scalar => |s| { + return self.allocator.dupe([]const u8, &[_][]const u8{s}) catch unreachable; + }, + .list => |lst| return lst.items, + }, + } +} + +pub fn step(self: *Build, name: []const u8, description: []const u8) *Step { + const step_info = self.allocator.create(TopLevelStep) catch unreachable; + step_info.* = TopLevelStep{ + .step = Step.initNoOp(.top_level, name, self.allocator), + .description = self.dupe(description), + }; + self.top_level_steps.append(step_info) catch unreachable; + return &step_info.step; +} + +pub const StandardOptimizeOptionOptions = struct { + preferred_optimize_mode: ?std.builtin.Mode = null, +}; + +pub fn standardOptimizeOption(self: *Build, options: StandardOptimizeOptionOptions) std.builtin.Mode { + if (options.preferred_optimize_mode) |mode| { + if (self.option(bool, "release", "optimize for end users") orelse false) { + return mode; + } else { + return .Debug; + } + } else { + return self.option( + std.builtin.Mode, + "optimize", + "prioritize performance, safety, or binary size (-O flag)", + ) orelse .Debug; + } +} + +pub const StandardTargetOptionsArgs = struct { + whitelist: ?[]const CrossTarget = null, + + default_target: CrossTarget = CrossTarget{}, +}; + +/// Exposes standard `zig build` options for choosing a target. +pub fn standardTargetOptions(self: *Build, args: StandardTargetOptionsArgs) CrossTarget { + const maybe_triple = self.option( + []const u8, + "target", + "The CPU architecture, OS, and ABI to build for", + ); + const mcpu = self.option([]const u8, "cpu", "Target CPU features to add or subtract"); + + if (maybe_triple == null and mcpu == null) { + return args.default_target; + } + + const triple = maybe_triple orelse "native"; + + var diags: CrossTarget.ParseOptions.Diagnostics = .{}; + const selected_target = CrossTarget.parse(.{ + .arch_os_abi = triple, + .cpu_features = mcpu, + .diagnostics = &diags, + }) catch |err| switch (err) { + error.UnknownCpuModel => { + log.err("Unknown CPU: '{s}'\nAvailable CPUs for architecture '{s}':", .{ + diags.cpu_name.?, + @tagName(diags.arch.?), + }); + for (diags.arch.?.allCpuModels()) |cpu| { + log.err(" {s}", .{cpu.name}); + } + self.markInvalidUserInput(); + return args.default_target; + }, + error.UnknownCpuFeature => { + log.err( + \\Unknown CPU feature: '{s}' + \\Available CPU features for architecture '{s}': + \\ + , .{ + diags.unknown_feature_name.?, + @tagName(diags.arch.?), + }); + for (diags.arch.?.allFeaturesList()) |feature| { + log.err(" {s}: {s}", .{ feature.name, feature.description }); + } + self.markInvalidUserInput(); + return args.default_target; + }, + error.UnknownOperatingSystem => { + log.err( + \\Unknown OS: '{s}' + \\Available operating systems: + \\ + , .{diags.os_name.?}); + inline for (std.meta.fields(std.Target.Os.Tag)) |field| { + log.err(" {s}", .{field.name}); + } + self.markInvalidUserInput(); + return args.default_target; + }, + else => |e| { + log.err("Unable to parse target '{s}': {s}\n", .{ triple, @errorName(e) }); + self.markInvalidUserInput(); + return args.default_target; + }, + }; + + const selected_canonicalized_triple = selected_target.zigTriple(self.allocator) catch unreachable; + + if (args.whitelist) |list| whitelist_check: { + // Make sure it's a match of one of the list. + var mismatch_triple = true; + var mismatch_cpu_features = true; + var whitelist_item = CrossTarget{}; + for (list) |t| { + mismatch_cpu_features = true; + mismatch_triple = true; + + const t_triple = t.zigTriple(self.allocator) catch unreachable; + if (mem.eql(u8, t_triple, selected_canonicalized_triple)) { + mismatch_triple = false; + whitelist_item = t; + if (t.getCpuFeatures().isSuperSetOf(selected_target.getCpuFeatures())) { + mismatch_cpu_features = false; + break :whitelist_check; + } else { + break; + } + } + } + if (mismatch_triple) { + log.err("Chosen target '{s}' does not match one of the supported targets:", .{ + selected_canonicalized_triple, + }); + for (list) |t| { + const t_triple = t.zigTriple(self.allocator) catch unreachable; + log.err(" {s}", .{t_triple}); + } + } else { + assert(mismatch_cpu_features); + const whitelist_cpu = whitelist_item.getCpu(); + const selected_cpu = selected_target.getCpu(); + log.err("Chosen CPU model '{s}' does not match one of the supported targets:", .{ + selected_cpu.model.name, + }); + log.err(" Supported feature Set: ", .{}); + const all_features = whitelist_cpu.arch.allFeaturesList(); + var populated_cpu_features = whitelist_cpu.model.features; + populated_cpu_features.populateDependencies(all_features); + for (all_features) |feature, i_usize| { + const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); + const in_cpu_set = populated_cpu_features.isEnabled(i); + if (in_cpu_set) { + log.err("{s} ", .{feature.name}); + } + } + log.err(" Remove: ", .{}); + for (all_features) |feature, i_usize| { + const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); + const in_cpu_set = populated_cpu_features.isEnabled(i); + const in_actual_set = selected_cpu.features.isEnabled(i); + if (in_actual_set and !in_cpu_set) { + log.err("{s} ", .{feature.name}); + } + } + } + self.markInvalidUserInput(); + return args.default_target; + } + + return selected_target; +} + +pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const u8) !bool { + const name = self.dupe(name_raw); + const value = self.dupe(value_raw); + const gop = try self.user_input_options.getOrPut(name); + if (!gop.found_existing) { + gop.value_ptr.* = UserInputOption{ + .name = name, + .value = .{ .scalar = value }, + .used = false, + }; + return false; + } + + // option already exists + switch (gop.value_ptr.value) { + .scalar => |s| { + // turn it into a list + var list = ArrayList([]const u8).init(self.allocator); + list.append(s) catch unreachable; + list.append(value) catch unreachable; + self.user_input_options.put(name, .{ + .name = name, + .value = .{ .list = list }, + .used = false, + }) catch unreachable; + }, + .list => |*list| { + // append to the list + list.append(value) catch unreachable; + self.user_input_options.put(name, .{ + .name = name, + .value = .{ .list = list.* }, + .used = false, + }) catch unreachable; + }, + .flag => { + log.warn("Option '-D{s}={s}' conflicts with flag '-D{s}'.", .{ name, value, name }); + return true; + }, + .map => |*map| { + _ = map; + log.warn("TODO maps as command line arguments is not implemented yet.", .{}); + return true; + }, + } + return false; +} + +pub fn addUserInputFlag(self: *Build, name_raw: []const u8) !bool { + const name = self.dupe(name_raw); + const gop = try self.user_input_options.getOrPut(name); + if (!gop.found_existing) { + gop.value_ptr.* = .{ + .name = name, + .value = .{ .flag = {} }, + .used = false, + }; + return false; + } + + // option already exists + switch (gop.value_ptr.value) { + .scalar => |s| { + log.err("Flag '-D{s}' conflicts with option '-D{s}={s}'.", .{ name, name, s }); + return true; + }, + .list, .map => { + log.err("Flag '-D{s}' conflicts with multiple options of the same name.", .{name}); + return true; + }, + .flag => {}, + } + return false; +} + +fn typeToEnum(comptime T: type) TypeId { + return switch (@typeInfo(T)) { + .Int => .int, + .Float => .float, + .Bool => .bool, + .Enum => .@"enum", + else => switch (T) { + []const u8 => .string, + []const []const u8 => .list, + else => @compileError("Unsupported type: " ++ @typeName(T)), + }, + }; +} + +fn markInvalidUserInput(self: *Build) void { + self.invalid_user_input = true; +} + +pub fn validateUserInputDidItFail(self: *Build) bool { + // make sure all args are used + var it = self.user_input_options.iterator(); + while (it.next()) |entry| { + if (!entry.value_ptr.used) { + log.err("Invalid option: -D{s}", .{entry.key_ptr.*}); + self.markInvalidUserInput(); + } + } + + return self.invalid_user_input; +} + +pub fn spawnChild(self: *Build, argv: []const []const u8) !void { + return self.spawnChildEnvMap(null, self.env_map, argv); +} + +fn printCmd(cwd: ?[]const u8, argv: []const []const u8) void { + if (cwd) |yes_cwd| std.debug.print("cd {s} && ", .{yes_cwd}); + for (argv) |arg| { + std.debug.print("{s} ", .{arg}); + } + std.debug.print("\n", .{}); +} + +pub fn spawnChildEnvMap(self: *Build, cwd: ?[]const u8, env_map: *const EnvMap, argv: []const []const u8) !void { + if (self.verbose) { + printCmd(cwd, argv); + } + + if (!std.process.can_spawn) + return error.ExecNotSupported; + + var child = std.ChildProcess.init(argv, self.allocator); + child.cwd = cwd; + child.env_map = env_map; + + const term = child.spawnAndWait() catch |err| { + log.err("Unable to spawn {s}: {s}", .{ argv[0], @errorName(err) }); + return err; + }; + + switch (term) { + .Exited => |code| { + if (code != 0) { + log.err("The following command exited with error code {}:", .{code}); + printCmd(cwd, argv); + return error.UncleanExit; + } + }, + else => { + log.err("The following command terminated unexpectedly:", .{}); + printCmd(cwd, argv); + + return error.UncleanExit; + }, + } +} + +pub fn makePath(self: *Build, path: []const u8) !void { + fs.cwd().makePath(self.pathFromRoot(path)) catch |err| { + log.err("Unable to create path {s}: {s}", .{ path, @errorName(err) }); + return err; + }; +} + +pub fn installArtifact(self: *Build, artifact: *LibExeObjStep) void { + self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step); +} + +pub fn addInstallArtifact(self: *Build, artifact: *LibExeObjStep) *InstallArtifactStep { + return InstallArtifactStep.create(self, artifact); +} + +///`dest_rel_path` is relative to prefix path +pub fn installFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void { + self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .prefix, dest_rel_path).step); +} + +pub fn installDirectory(self: *Build, options: InstallDirectoryOptions) void { + self.getInstallStep().dependOn(&self.addInstallDirectory(options).step); +} + +///`dest_rel_path` is relative to bin path +pub fn installBinFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void { + self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .bin, dest_rel_path).step); +} + +///`dest_rel_path` is relative to lib path +pub fn installLibFile(self: *Build, src_path: []const u8, dest_rel_path: []const u8) void { + self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .lib, dest_rel_path).step); +} + +/// Output format (BIN vs Intel HEX) determined by filename +pub fn installRaw(self: *Build, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { + const raw = self.addInstallRaw(artifact, dest_filename, options); + self.getInstallStep().dependOn(&raw.step); + return raw; +} + +///`dest_rel_path` is relative to install prefix path +pub fn addInstallFile(self: *Build, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { + return self.addInstallFileWithDir(source.dupe(self), .prefix, dest_rel_path); +} + +///`dest_rel_path` is relative to bin path +pub fn addInstallBinFile(self: *Build, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { + return self.addInstallFileWithDir(source.dupe(self), .bin, dest_rel_path); +} + +///`dest_rel_path` is relative to lib path +pub fn addInstallLibFile(self: *Build, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { + return self.addInstallFileWithDir(source.dupe(self), .lib, dest_rel_path); +} + +pub fn addInstallHeaderFile(b: *Build, src_path: []const u8, dest_rel_path: []const u8) *InstallFileStep { + return b.addInstallFileWithDir(.{ .path = src_path }, .header, dest_rel_path); +} + +pub fn addInstallRaw(self: *Build, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { + return InstallRawStep.create(self, artifact, dest_filename, options); +} + +pub fn addInstallFileWithDir( + self: *Build, + source: FileSource, + install_dir: InstallDir, + dest_rel_path: []const u8, +) *InstallFileStep { + if (dest_rel_path.len == 0) { + panic("dest_rel_path must be non-empty", .{}); + } + const install_step = self.allocator.create(InstallFileStep) catch unreachable; + install_step.* = InstallFileStep.init(self, source.dupe(self), install_dir, dest_rel_path); + return install_step; +} + +pub fn addInstallDirectory(self: *Build, options: InstallDirectoryOptions) *InstallDirStep { + const install_step = self.allocator.create(InstallDirStep) catch unreachable; + install_step.* = InstallDirStep.init(self, options); + return install_step; +} + +pub fn pushInstalledFile(self: *Build, dir: InstallDir, dest_rel_path: []const u8) void { + const file = InstalledFile{ + .dir = dir, + .path = dest_rel_path, + }; + self.installed_files.append(file.dupe(self)) catch unreachable; +} + +pub fn updateFile(self: *Build, source_path: []const u8, dest_path: []const u8) !void { + if (self.verbose) { + log.info("cp {s} {s} ", .{ source_path, dest_path }); + } + const cwd = fs.cwd(); + const prev_status = try fs.Dir.updateFile(cwd, source_path, cwd, dest_path, .{}); + if (self.verbose) switch (prev_status) { + .stale => log.info("# installed", .{}), + .fresh => log.info("# up-to-date", .{}), + }; +} + +pub fn truncateFile(self: *Build, dest_path: []const u8) !void { + if (self.verbose) { + log.info("truncate {s}", .{dest_path}); + } + const cwd = fs.cwd(); + var src_file = cwd.createFile(dest_path, .{}) catch |err| switch (err) { + error.FileNotFound => blk: { + if (fs.path.dirname(dest_path)) |dirname| { + try cwd.makePath(dirname); + } + break :blk try cwd.createFile(dest_path, .{}); + }, + else => |e| return e, + }; + src_file.close(); +} + +pub fn pathFromRoot(self: *Build, rel_path: []const u8) []u8 { + return fs.path.resolve(self.allocator, &[_][]const u8{ self.build_root, rel_path }) catch unreachable; +} + +/// Shorthand for `std.fs.path.join(Build.allocator, paths) catch unreachable` +pub fn pathJoin(self: *Build, paths: []const []const u8) []u8 { + return fs.path.join(self.allocator, paths) catch unreachable; +} + +pub fn fmt(self: *Build, comptime format: []const u8, args: anytype) []u8 { + return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable; +} + +pub fn findProgram(self: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 { + // TODO report error for ambiguous situations + const exe_extension = @as(CrossTarget, .{}).exeFileExt(); + for (self.search_prefixes.items) |search_prefix| { + for (names) |name| { + if (fs.path.isAbsolute(name)) { + return name; + } + const full_path = self.pathJoin(&.{ + search_prefix, + "bin", + self.fmt("{s}{s}", .{ name, exe_extension }), + }); + return fs.realpathAlloc(self.allocator, full_path) catch continue; + } + } + if (self.env_map.get("PATH")) |PATH| { + for (names) |name| { + if (fs.path.isAbsolute(name)) { + return name; + } + var it = mem.tokenize(u8, PATH, &[_]u8{fs.path.delimiter}); + while (it.next()) |path| { + const full_path = self.pathJoin(&.{ + path, + self.fmt("{s}{s}", .{ name, exe_extension }), + }); + return fs.realpathAlloc(self.allocator, full_path) catch continue; + } + } + } + for (names) |name| { + if (fs.path.isAbsolute(name)) { + return name; + } + for (paths) |path| { + const full_path = self.pathJoin(&.{ + path, + self.fmt("{s}{s}", .{ name, exe_extension }), + }); + return fs.realpathAlloc(self.allocator, full_path) catch continue; + } + } + return error.FileNotFound; +} + +pub fn execAllowFail( + self: *Build, + argv: []const []const u8, + out_code: *u8, + stderr_behavior: std.ChildProcess.StdIo, +) ExecError![]u8 { + assert(argv.len != 0); + + if (!std.process.can_spawn) + return error.ExecNotSupported; + + const max_output_size = 400 * 1024; + var child = std.ChildProcess.init(argv, self.allocator); + child.stdin_behavior = .Ignore; + child.stdout_behavior = .Pipe; + child.stderr_behavior = stderr_behavior; + child.env_map = self.env_map; + + try child.spawn(); + + const stdout = child.stdout.?.reader().readAllAlloc(self.allocator, max_output_size) catch { + return error.ReadFailure; + }; + errdefer self.allocator.free(stdout); + + const term = try child.wait(); + switch (term) { + .Exited => |code| { + if (code != 0) { + out_code.* = @truncate(u8, code); + return error.ExitCodeFailure; + } + return stdout; + }, + .Signal, .Stopped, .Unknown => |code| { + out_code.* = @truncate(u8, code); + return error.ProcessTerminated; + }, + } +} + +pub fn execFromStep(self: *Build, argv: []const []const u8, src_step: ?*Step) ![]u8 { + assert(argv.len != 0); + + if (self.verbose) { + printCmd(null, argv); + } + + if (!std.process.can_spawn) { + if (src_step) |s| log.err("{s}...", .{s.name}); + log.err("Unable to spawn the following command: cannot spawn child process", .{}); + printCmd(null, argv); + std.os.abort(); + } + + var code: u8 = undefined; + return self.execAllowFail(argv, &code, .Inherit) catch |err| switch (err) { + error.ExecNotSupported => { + if (src_step) |s| log.err("{s}...", .{s.name}); + log.err("Unable to spawn the following command: cannot spawn child process", .{}); + printCmd(null, argv); + std.os.abort(); + }, + error.FileNotFound => { + if (src_step) |s| log.err("{s}...", .{s.name}); + log.err("Unable to spawn the following command: file not found", .{}); + printCmd(null, argv); + std.os.exit(@truncate(u8, code)); + }, + error.ExitCodeFailure => { + if (src_step) |s| log.err("{s}...", .{s.name}); + if (self.prominent_compile_errors) { + log.err("The step exited with error code {d}", .{code}); + } else { + log.err("The following command exited with error code {d}:", .{code}); + printCmd(null, argv); + } + + std.os.exit(@truncate(u8, code)); + }, + error.ProcessTerminated => { + if (src_step) |s| log.err("{s}...", .{s.name}); + log.err("The following command terminated unexpectedly:", .{}); + printCmd(null, argv); + std.os.exit(@truncate(u8, code)); + }, + else => |e| return e, + }; +} + +pub fn exec(self: *Build, argv: []const []const u8) ![]u8 { + return self.execFromStep(argv, null); +} + +pub fn addSearchPrefix(self: *Build, search_prefix: []const u8) void { + self.search_prefixes.append(self.dupePath(search_prefix)) catch unreachable; +} + +pub fn getInstallPath(self: *Build, dir: InstallDir, dest_rel_path: []const u8) []const u8 { + assert(!fs.path.isAbsolute(dest_rel_path)); // Install paths must be relative to the prefix + const base_dir = switch (dir) { + .prefix => self.install_path, + .bin => self.exe_dir, + .lib => self.lib_dir, + .header => self.h_dir, + .custom => |path| self.pathJoin(&.{ self.install_path, path }), + }; + return fs.path.resolve( + self.allocator, + &[_][]const u8{ base_dir, dest_rel_path }, + ) catch unreachable; +} + +pub const Dependency = struct { + builder: *Build, + + pub fn artifact(d: *Dependency, name: []const u8) *LibExeObjStep { + var found: ?*LibExeObjStep = null; + for (d.builder.install_tls.step.dependencies.items) |dep_step| { + const inst = dep_step.cast(InstallArtifactStep) orelse continue; + if (mem.eql(u8, inst.artifact.name, name)) { + if (found != null) panic("artifact name '{s}' is ambiguous", .{name}); + found = inst.artifact; + } + } + return found orelse { + for (d.builder.install_tls.step.dependencies.items) |dep_step| { + const inst = dep_step.cast(InstallArtifactStep) orelse continue; + log.info("available artifact: '{s}'", .{inst.artifact.name}); + } + panic("unable to find artifact '{s}'", .{name}); + }; + } +}; + +pub fn dependency(b: *Build, name: []const u8, args: anytype) *Dependency { + const build_runner = @import("root"); + const deps = build_runner.dependencies; + + inline for (@typeInfo(deps.imports).Struct.decls) |decl| { + if (mem.startsWith(u8, decl.name, b.dep_prefix) and + mem.endsWith(u8, decl.name, name) and + decl.name.len == b.dep_prefix.len + name.len) + { + const build_zig = @field(deps.imports, decl.name); + const build_root = @field(deps.build_root, decl.name); + return dependencyInner(b, name, build_root, build_zig, args); + } + } + + const full_path = b.pathFromRoot("build.zig.ini"); + std.debug.print("no dependency named '{s}' in '{s}'\n", .{ name, full_path }); + std.process.exit(1); +} + +fn dependencyInner( + b: *Build, + name: []const u8, + build_root: []const u8, + comptime build_zig: type, + args: anytype, +) *Dependency { + const sub_builder = b.createChild(name, build_root, args) catch unreachable; + sub_builder.runBuild(build_zig) catch unreachable; + + if (sub_builder.validateUserInputDidItFail()) { + std.debug.dumpCurrentStackTrace(@returnAddress()); + } + + const dep = b.allocator.create(Dependency) catch unreachable; + dep.* = .{ .builder = sub_builder }; + return dep; +} + +pub fn runBuild(b: *Build, build_zig: anytype) anyerror!void { + switch (@typeInfo(@typeInfo(@TypeOf(build_zig.build)).Fn.return_type.?)) { + .Void => build_zig.build(b), + .ErrorUnion => try build_zig.build(b), + else => @compileError("expected return type of build to be 'void' or '!void'"), + } +} + +test "builder.findProgram compiles" { + if (builtin.os.tag == .wasi) return error.SkipZigTest; + + var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); + defer arena.deinit(); + + const builder = try Build.create( + arena.allocator(), + "zig", + "zig-cache", + "zig-cache", + "zig-cache", + ); + defer builder.destroy(); + _ = builder.findProgram(&[_][]const u8{}, &[_][]const u8{}) catch null; +} + +pub const Pkg = struct { + name: []const u8, + source: FileSource, + dependencies: ?[]const Pkg = null, +}; + +/// A file that is generated by a build step. +/// This struct is an interface that is meant to be used with `@fieldParentPtr` to implement the actual path logic. +pub const GeneratedFile = struct { + /// The step that generates the file + step: *Step, + + /// The path to the generated file. Must be either absolute or relative to the build root. + /// This value must be set in the `fn make()` of the `step` and must not be `null` afterwards. + path: ?[]const u8 = null, + + pub fn getPath(self: GeneratedFile) []const u8 { + return self.path orelse std.debug.panic( + "getPath() was called on a GeneratedFile that wasn't build yet. Is there a missing Step dependency on step '{s}'?", + .{self.step.name}, + ); + } +}; + +/// A file source is a reference to an existing or future file. +/// +pub const FileSource = union(enum) { + /// A plain file path, relative to build root or absolute. + path: []const u8, + + /// A file that is generated by an interface. Those files usually are + /// not available until built by a build step. + generated: *const GeneratedFile, + + /// Returns a new file source that will have a relative path to the build root guaranteed. + /// This should be preferred over setting `.path` directly as it documents that the files are in the project directory. + pub fn relative(path: []const u8) FileSource { + std.debug.assert(!std.fs.path.isAbsolute(path)); + return FileSource{ .path = path }; + } + + /// Returns a string that can be shown to represent the file source. + /// Either returns the path or `"generated"`. + pub fn getDisplayName(self: FileSource) []const u8 { + return switch (self) { + .path => self.path, + .generated => "generated", + }; + } + + /// Adds dependencies this file source implies to the given step. + pub fn addStepDependencies(self: FileSource, other_step: *Step) void { + switch (self) { + .path => {}, + .generated => |gen| other_step.dependOn(gen.step), + } + } + + /// Should only be called during make(), returns a path relative to the build root or absolute. + pub fn getPath(self: FileSource, builder: *Build) []const u8 { + const path = switch (self) { + .path => |p| builder.pathFromRoot(p), + .generated => |gen| gen.getPath(), + }; + return path; + } + + /// Duplicates the file source for a given builder. + pub fn dupe(self: FileSource, b: *Build) FileSource { + return switch (self) { + .path => |p| .{ .path = b.dupePath(p) }, + .generated => |gen| .{ .generated = gen }, + }; + } +}; + +/// Allocates a new string for assigning a value to a named macro. +/// If the value is omitted, it is set to 1. +/// `name` and `value` need not live longer than the function call. +pub fn constructCMacro(allocator: Allocator, name: []const u8, value: ?[]const u8) []const u8 { + var macro = allocator.alloc( + u8, + name.len + if (value) |value_slice| value_slice.len + 1 else 0, + ) catch |err| if (err == error.OutOfMemory) @panic("Out of memory") else unreachable; + mem.copy(u8, macro, name); + if (value) |value_slice| { + macro[name.len] = '='; + mem.copy(u8, macro[name.len + 1 ..], value_slice); + } + return macro; +} + +/// deprecated: use `InstallDirStep.Options` +pub const InstallDirectoryOptions = InstallDirStep.Options; + +pub const VcpkgRoot = union(VcpkgRootStatus) { + unattempted: void, + not_found: void, + found: []const u8, +}; + +pub const VcpkgRootStatus = enum { + unattempted, + not_found, + found, +}; + +pub const InstallDir = union(enum) { + prefix: void, + lib: void, + bin: void, + header: void, + /// A path relative to the prefix + custom: []const u8, + + /// Duplicates the install directory including the path if set to custom. + pub fn dupe(self: InstallDir, builder: *Build) InstallDir { + if (self == .custom) { + // Written with this temporary to avoid RLS problems + const duped_path = builder.dupe(self.custom); + return .{ .custom = duped_path }; + } else { + return self; + } + } +}; + +pub const InstalledFile = struct { + dir: InstallDir, + path: []const u8, + + /// Duplicates the installed file path and directory. + pub fn dupe(self: InstalledFile, builder: *Build) InstalledFile { + return .{ + .dir = self.dir.dupe(builder), + .path = builder.dupe(self.path), + }; + } +}; + +pub fn serializeCpu(allocator: Allocator, cpu: std.Target.Cpu) ![]const u8 { + // TODO this logic can disappear if cpu model + features becomes part of the target triple + const all_features = cpu.arch.allFeaturesList(); + var populated_cpu_features = cpu.model.features; + populated_cpu_features.populateDependencies(all_features); + + if (populated_cpu_features.eql(cpu.features)) { + // The CPU name alone is sufficient. + return cpu.model.name; + } else { + var mcpu_buffer = ArrayList(u8).init(allocator); + try mcpu_buffer.appendSlice(cpu.model.name); + + for (all_features) |feature, i_usize| { + const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); + const in_cpu_set = populated_cpu_features.isEnabled(i); + const in_actual_set = cpu.features.isEnabled(i); + if (in_cpu_set and !in_actual_set) { + try mcpu_buffer.writer().print("-{s}", .{feature.name}); + } else if (!in_cpu_set and in_actual_set) { + try mcpu_buffer.writer().print("+{s}", .{feature.name}); + } + } + + return try mcpu_buffer.toOwnedSlice(); + } +} + +test "dupePkg()" { + if (builtin.os.tag == .wasi) return error.SkipZigTest; + + var arena = std.heap.ArenaAllocator.init(std.testing.allocator); + defer arena.deinit(); + var builder = try Build.create( + arena.allocator(), + "test", + "test", + "test", + "test", + ); + defer builder.destroy(); + + var pkg_dep = Pkg{ + .name = "pkg_dep", + .source = .{ .path = "/not/a/pkg_dep.zig" }, + }; + var pkg_top = Pkg{ + .name = "pkg_top", + .source = .{ .path = "/not/a/pkg_top.zig" }, + .dependencies = &[_]Pkg{pkg_dep}, + }; + const duped = builder.dupePkg(pkg_top); + + const original_deps = pkg_top.dependencies.?; + const dupe_deps = duped.dependencies.?; + + // probably the same top level package details + try std.testing.expectEqualStrings(pkg_top.name, duped.name); + + // probably the same dependencies + try std.testing.expectEqual(original_deps.len, dupe_deps.len); + try std.testing.expectEqual(original_deps[0].name, pkg_dep.name); + + // could segfault otherwise if pointers in duplicated package's fields are + // the same as those in stack allocated package's fields + try std.testing.expect(dupe_deps.ptr != original_deps.ptr); + try std.testing.expect(duped.name.ptr != pkg_top.name.ptr); + try std.testing.expect(duped.source.path.ptr != pkg_top.source.path.ptr); + try std.testing.expect(dupe_deps[0].name.ptr != pkg_dep.name.ptr); + try std.testing.expect(dupe_deps[0].source.path.ptr != pkg_dep.source.path.ptr); +} + +test { + _ = CheckFileStep; + _ = CheckObjectStep; + _ = EmulatableRunStep; + _ = FmtStep; + _ = InstallArtifactStep; + _ = InstallDirStep; + _ = InstallFileStep; + _ = InstallRawStep; + _ = LibExeObjStep; + _ = LogStep; + _ = OptionsStep; + _ = RemoveDirStep; + _ = RunStep; + _ = TranslateCStep; + _ = WriteFileStep; +} diff --git a/lib/std/build/CheckFileStep.zig b/lib/std/Build/CheckFileStep.zig similarity index 88% rename from lib/std/build/CheckFileStep.zig rename to lib/std/Build/CheckFileStep.zig index 2c06ab9279..3b8cfe5263 100644 --- a/lib/std/build/CheckFileStep.zig +++ b/lib/std/Build/CheckFileStep.zig @@ -1,7 +1,5 @@ const std = @import("../std.zig"); -const build = std.build; -const Step = build.Step; -const Builder = build.Builder; +const Step = std.Build.Step; const fs = std.fs; const mem = std.mem; @@ -10,14 +8,14 @@ const CheckFileStep = @This(); pub const base_id = .check_file; step: Step, -builder: *Builder, +builder: *std.Build, expected_matches: []const []const u8, -source: build.FileSource, +source: std.Build.FileSource, max_bytes: usize = 20 * 1024 * 1024, pub fn create( - builder: *Builder, - source: build.FileSource, + builder: *std.Build, + source: std.Build.FileSource, expected_matches: []const []const u8, ) *CheckFileStep { const self = builder.allocator.create(CheckFileStep) catch unreachable; diff --git a/lib/std/build/CheckObjectStep.zig b/lib/std/Build/CheckObjectStep.zig similarity index 98% rename from lib/std/build/CheckObjectStep.zig rename to lib/std/Build/CheckObjectStep.zig index 4ef350b418..7907be1787 100644 --- a/lib/std/build/CheckObjectStep.zig +++ b/lib/std/Build/CheckObjectStep.zig @@ -1,6 +1,5 @@ const std = @import("../std.zig"); const assert = std.debug.assert; -const build = std.build; const fs = std.fs; const macho = std.macho; const math = std.math; @@ -10,21 +9,20 @@ const testing = std.testing; const CheckObjectStep = @This(); const Allocator = mem.Allocator; -const Builder = build.Builder; -const Step = build.Step; -const EmulatableRunStep = build.EmulatableRunStep; +const Step = std.Build.Step; +const EmulatableRunStep = std.Build.EmulatableRunStep; pub const base_id = .check_object; step: Step, -builder: *Builder, -source: build.FileSource, +builder: *std.Build, +source: std.Build.FileSource, max_bytes: usize = 20 * 1024 * 1024, checks: std.ArrayList(Check), dump_symtab: bool = false, obj_format: std.Target.ObjectFormat, -pub fn create(builder: *Builder, source: build.FileSource, obj_format: std.Target.ObjectFormat) *CheckObjectStep { +pub fn create(builder: *std.Build, source: std.Build.FileSource, obj_format: std.Target.ObjectFormat) *CheckObjectStep { const gpa = builder.allocator; const self = gpa.create(CheckObjectStep) catch unreachable; self.* = .{ @@ -44,7 +42,7 @@ pub fn runAndCompare(self: *CheckObjectStep) *EmulatableRunStep { const dependencies_len = self.step.dependencies.items.len; assert(dependencies_len > 0); const exe_step = self.step.dependencies.items[dependencies_len - 1]; - const exe = exe_step.cast(std.build.LibExeObjStep).?; + const exe = exe_step.cast(std.Build.LibExeObjStep).?; const emulatable_step = EmulatableRunStep.create(self.builder, "EmulatableRun", exe); emulatable_step.step.dependOn(&self.step); return emulatable_step; @@ -216,10 +214,10 @@ const ComputeCompareExpected = struct { }; const Check = struct { - builder: *Builder, + builder: *std.Build, actions: std.ArrayList(Action), - fn create(b: *Builder) Check { + fn create(b: *std.Build) Check { return .{ .builder = b, .actions = std.ArrayList(Action).init(b.allocator), diff --git a/lib/std/build/ConfigHeaderStep.zig b/lib/std/Build/ConfigHeaderStep.zig similarity index 97% rename from lib/std/build/ConfigHeaderStep.zig rename to lib/std/Build/ConfigHeaderStep.zig index 400c06525e..b961227c9c 100644 --- a/lib/std/build/ConfigHeaderStep.zig +++ b/lib/std/Build/ConfigHeaderStep.zig @@ -1,7 +1,6 @@ const std = @import("../std.zig"); const ConfigHeaderStep = @This(); -const Step = std.build.Step; -const Builder = std.build.Builder; +const Step = std.Build.Step; pub const base_id: Step.Id = .config_header; @@ -24,15 +23,15 @@ pub const Value = union(enum) { }; step: Step, -builder: *Builder, -source: std.build.FileSource, +builder: *std.Build, +source: std.Build.FileSource, style: Style, values: std.StringHashMap(Value), max_bytes: usize = 2 * 1024 * 1024, output_dir: []const u8, output_basename: []const u8, -pub fn create(builder: *Builder, source: std.build.FileSource, style: Style) *ConfigHeaderStep { +pub fn create(builder: *std.Build, source: std.Build.FileSource, style: Style) *ConfigHeaderStep { const self = builder.allocator.create(ConfigHeaderStep) catch @panic("OOM"); const name = builder.fmt("configure header {s}", .{source.getDisplayName()}); self.* = .{ diff --git a/lib/std/build/EmulatableRunStep.zig b/lib/std/Build/EmulatableRunStep.zig similarity index 96% rename from lib/std/build/EmulatableRunStep.zig rename to lib/std/Build/EmulatableRunStep.zig index 52ce8edfac..b7b12d791f 100644 --- a/lib/std/build/EmulatableRunStep.zig +++ b/lib/std/Build/EmulatableRunStep.zig @@ -5,11 +5,9 @@ //! without having to verify if it's possible to be ran against. const std = @import("../std.zig"); -const build = std.build; -const Step = std.build.Step; -const Builder = std.build.Builder; -const LibExeObjStep = std.build.LibExeObjStep; -const RunStep = std.build.RunStep; +const Step = std.Build.Step; +const LibExeObjStep = std.Build.LibExeObjStep; +const RunStep = std.Build.RunStep; const fs = std.fs; const process = std.process; @@ -22,7 +20,7 @@ pub const base_id = .emulatable_run; const max_stdout_size = 1 * 1024 * 1024; // 1 MiB step: Step, -builder: *Builder, +builder: *std.Build, /// The artifact (executable) to be run by this step exe: *LibExeObjStep, @@ -47,7 +45,7 @@ hide_foreign_binaries_warning: bool, /// binary through emulation when any of the emulation options such as `enable_rosetta` are set to true. /// When set to false, and the binary is foreign, running the executable is skipped. /// Asserts given artifact is an executable. -pub fn create(builder: *Builder, name: []const u8, artifact: *LibExeObjStep) *EmulatableRunStep { +pub fn create(builder: *std.Build, name: []const u8, artifact: *LibExeObjStep) *EmulatableRunStep { std.debug.assert(artifact.kind == .exe or artifact.kind == .test_exe); const self = builder.allocator.create(EmulatableRunStep) catch unreachable; diff --git a/lib/std/build/FmtStep.zig b/lib/std/Build/FmtStep.zig similarity index 75% rename from lib/std/build/FmtStep.zig rename to lib/std/Build/FmtStep.zig index 62923623f2..44a93dee66 100644 --- a/lib/std/build/FmtStep.zig +++ b/lib/std/Build/FmtStep.zig @@ -1,19 +1,14 @@ const std = @import("../std.zig"); -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; -const BufMap = std.BufMap; -const mem = std.mem; - +const Step = std.Build.Step; const FmtStep = @This(); pub const base_id = .fmt; step: Step, -builder: *Builder, +builder: *std.Build, argv: [][]const u8, -pub fn create(builder: *Builder, paths: []const []const u8) *FmtStep { +pub fn create(builder: *std.Build, paths: []const []const u8) *FmtStep { const self = builder.allocator.create(FmtStep) catch unreachable; const name = "zig fmt"; self.* = FmtStep{ diff --git a/lib/std/build/InstallArtifactStep.zig b/lib/std/Build/InstallArtifactStep.zig similarity index 88% rename from lib/std/build/InstallArtifactStep.zig rename to lib/std/Build/InstallArtifactStep.zig index 537b8c8fd9..929b30e935 100644 --- a/lib/std/build/InstallArtifactStep.zig +++ b/lib/std/Build/InstallArtifactStep.zig @@ -1,26 +1,23 @@ const std = @import("../std.zig"); -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; -const LibExeObjStep = std.build.LibExeObjStep; -const InstallDir = std.build.InstallDir; +const Step = std.Build.Step; +const LibExeObjStep = std.Build.LibExeObjStep; +const InstallDir = std.Build.InstallDir; +const InstallArtifactStep = @This(); pub const base_id = .install_artifact; step: Step, -builder: *Builder, +builder: *std.Build, artifact: *LibExeObjStep, dest_dir: InstallDir, pdb_dir: ?InstallDir, h_dir: ?InstallDir, -const Self = @This(); - -pub fn create(builder: *Builder, artifact: *LibExeObjStep) *Self { +pub fn create(builder: *std.Build, artifact: *LibExeObjStep) *InstallArtifactStep { if (artifact.install_step) |s| return s; - const self = builder.allocator.create(Self) catch unreachable; - self.* = Self{ + const self = builder.allocator.create(InstallArtifactStep) catch unreachable; + self.* = InstallArtifactStep{ .builder = builder, .step = Step.init(.install_artifact, builder.fmt("install {s}", .{artifact.step.name}), builder.allocator, make), .artifact = artifact, @@ -64,7 +61,7 @@ pub fn create(builder: *Builder, artifact: *LibExeObjStep) *Self { } fn make(step: *Step) !void { - const self = @fieldParentPtr(Self, "step", step); + const self = @fieldParentPtr(InstallArtifactStep, "step", step); const builder = self.builder; const full_dest_path = builder.getInstallPath(self.dest_dir, self.artifact.out_filename); diff --git a/lib/std/build/InstallDirStep.zig b/lib/std/Build/InstallDirStep.zig similarity index 92% rename from lib/std/build/InstallDirStep.zig rename to lib/std/Build/InstallDirStep.zig index 0a41e1aaef..41dbb3e35a 100644 --- a/lib/std/build/InstallDirStep.zig +++ b/lib/std/Build/InstallDirStep.zig @@ -1,19 +1,17 @@ const std = @import("../std.zig"); const mem = std.mem; const fs = std.fs; -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; -const InstallDir = std.build.InstallDir; +const Step = std.Build.Step; +const InstallDir = std.Build.InstallDir; const InstallDirStep = @This(); const log = std.log; step: Step, -builder: *Builder, +builder: *std.Build, options: Options, /// This is used by the build system when a file being installed comes from one /// package but is being installed by another. -override_source_builder: ?*Builder = null, +override_source_builder: ?*std.Build = null, pub const base_id = .install_dir; @@ -31,7 +29,7 @@ pub const Options = struct { /// `@import("test.zig")` would be a compile error. blank_extensions: []const []const u8 = &.{}, - fn dupe(self: Options, b: *Builder) Options { + fn dupe(self: Options, b: *std.Build) Options { return .{ .source_dir = b.dupe(self.source_dir), .install_dir = self.install_dir.dupe(b), @@ -43,7 +41,7 @@ pub const Options = struct { }; pub fn init( - builder: *Builder, + builder: *std.Build, options: Options, ) InstallDirStep { builder.pushInstalledFile(options.install_dir, options.install_subdir); diff --git a/lib/std/build/InstallFileStep.zig b/lib/std/Build/InstallFileStep.zig similarity index 82% rename from lib/std/build/InstallFileStep.zig rename to lib/std/Build/InstallFileStep.zig index 37203e64c5..8c8d8ad2d4 100644 --- a/lib/std/build/InstallFileStep.zig +++ b/lib/std/Build/InstallFileStep.zig @@ -1,24 +1,22 @@ const std = @import("../std.zig"); -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; -const FileSource = std.build.FileSource; -const InstallDir = std.build.InstallDir; +const Step = std.Build.Step; +const FileSource = std.Build.FileSource; +const InstallDir = std.Build.InstallDir; const InstallFileStep = @This(); pub const base_id = .install_file; step: Step, -builder: *Builder, +builder: *std.Build, source: FileSource, dir: InstallDir, dest_rel_path: []const u8, /// This is used by the build system when a file being installed comes from one /// package but is being installed by another. -override_source_builder: ?*Builder = null, +override_source_builder: ?*std.Build = null, pub fn init( - builder: *Builder, + builder: *std.Build, source: FileSource, dir: InstallDir, dest_rel_path: []const u8, diff --git a/lib/std/build/InstallRawStep.zig b/lib/std/Build/InstallRawStep.zig similarity index 84% rename from lib/std/build/InstallRawStep.zig rename to lib/std/Build/InstallRawStep.zig index e8266dff5a..08d646ff88 100644 --- a/lib/std/build/InstallRawStep.zig +++ b/lib/std/Build/InstallRawStep.zig @@ -7,11 +7,10 @@ const InstallRawStep = @This(); const Allocator = std.mem.Allocator; const ArenaAllocator = std.heap.ArenaAllocator; const ArrayListUnmanaged = std.ArrayListUnmanaged; -const Builder = std.build.Builder; const File = std.fs.File; -const InstallDir = std.build.InstallDir; -const LibExeObjStep = std.build.LibExeObjStep; -const Step = std.build.Step; +const InstallDir = std.Build.InstallDir; +const LibExeObjStep = std.Build.LibExeObjStep; +const Step = std.Build.Step; const elf = std.elf; const fs = std.fs; const io = std.io; @@ -25,12 +24,12 @@ pub const RawFormat = enum { }; step: Step, -builder: *Builder, +builder: *std.Build, artifact: *LibExeObjStep, dest_dir: InstallDir, dest_filename: []const u8, options: CreateOptions, -output_file: std.build.GeneratedFile, +output_file: std.Build.GeneratedFile, pub const CreateOptions = struct { format: ?RawFormat = null, @@ -39,7 +38,12 @@ pub const CreateOptions = struct { pad_to: ?u64 = null, }; -pub fn create(builder: *Builder, artifact: *LibExeObjStep, dest_filename: []const u8, options: CreateOptions) *InstallRawStep { +pub fn create( + builder: *std.Build, + artifact: *LibExeObjStep, + dest_filename: []const u8, + options: CreateOptions, +) *InstallRawStep { const self = builder.allocator.create(InstallRawStep) catch unreachable; self.* = InstallRawStep{ .step = Step.init(.install_raw, builder.fmt("install raw binary {s}", .{artifact.step.name}), builder.allocator, make), @@ -53,7 +57,7 @@ pub fn create(builder: *Builder, artifact: *LibExeObjStep, dest_filename: []cons }, .dest_filename = dest_filename, .options = options, - .output_file = std.build.GeneratedFile{ .step = &self.step }, + .output_file = std.Build.GeneratedFile{ .step = &self.step }, }; self.step.dependOn(&artifact.step); @@ -61,8 +65,8 @@ pub fn create(builder: *Builder, artifact: *LibExeObjStep, dest_filename: []cons return self; } -pub fn getOutputSource(self: *const InstallRawStep) std.build.FileSource { - return std.build.FileSource{ .generated = &self.output_file }; +pub fn getOutputSource(self: *const InstallRawStep) std.Build.FileSource { + return std.Build.FileSource{ .generated = &self.output_file }; } fn make(step: *Step) !void { diff --git a/lib/std/build/LibExeObjStep.zig b/lib/std/Build/LibExeObjStep.zig similarity index 97% rename from lib/std/build/LibExeObjStep.zig rename to lib/std/Build/LibExeObjStep.zig index 6ee5205b50..af9d34440d 100644 --- a/lib/std/build/LibExeObjStep.zig +++ b/lib/std/Build/LibExeObjStep.zig @@ -9,32 +9,30 @@ const ArrayList = std.ArrayList; const StringHashMap = std.StringHashMap; const Sha256 = std.crypto.hash.sha2.Sha256; const Allocator = mem.Allocator; -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; +const Step = std.Build.Step; const CrossTarget = std.zig.CrossTarget; const NativeTargetInfo = std.zig.system.NativeTargetInfo; -const FileSource = std.build.FileSource; -const PkgConfigPkg = Builder.PkgConfigPkg; -const PkgConfigError = Builder.PkgConfigError; -const ExecError = Builder.ExecError; -const Pkg = std.build.Pkg; -const VcpkgRoot = std.build.VcpkgRoot; -const InstallDir = std.build.InstallDir; -const InstallArtifactStep = std.build.InstallArtifactStep; -const GeneratedFile = std.build.GeneratedFile; -const InstallRawStep = std.build.InstallRawStep; -const EmulatableRunStep = std.build.EmulatableRunStep; -const CheckObjectStep = std.build.CheckObjectStep; -const RunStep = std.build.RunStep; -const OptionsStep = std.build.OptionsStep; -const ConfigHeaderStep = std.build.ConfigHeaderStep; +const FileSource = std.Build.FileSource; +const PkgConfigPkg = std.Build.PkgConfigPkg; +const PkgConfigError = std.Build.PkgConfigError; +const ExecError = std.Build.ExecError; +const Pkg = std.Build.Pkg; +const VcpkgRoot = std.Build.VcpkgRoot; +const InstallDir = std.Build.InstallDir; +const InstallArtifactStep = std.Build.InstallArtifactStep; +const GeneratedFile = std.Build.GeneratedFile; +const InstallRawStep = std.Build.InstallRawStep; +const EmulatableRunStep = std.Build.EmulatableRunStep; +const CheckObjectStep = std.Build.CheckObjectStep; +const RunStep = std.Build.RunStep; +const OptionsStep = std.Build.OptionsStep; +const ConfigHeaderStep = std.Build.ConfigHeaderStep; const LibExeObjStep = @This(); pub const base_id = .lib_exe_obj; step: Step, -builder: *Builder, +builder: *std.Build, name: []const u8, target: CrossTarget, target_info: NativeTargetInfo, @@ -84,7 +82,7 @@ initial_memory: ?u64 = null, max_memory: ?u64 = null, shared_memory: bool = false, global_base: ?u64 = null, -c_std: Builder.CStd, +c_std: std.Build.CStd, override_lib_dir: ?[]const u8, main_pkg_path: ?[]const u8, exec_cmd_args: ?[]const ?[]const u8, @@ -108,7 +106,7 @@ object_src: []const u8, link_objects: ArrayList(LinkObject), include_dirs: ArrayList(IncludeDir), c_macros: ArrayList([]const u8), -installed_headers: ArrayList(*std.build.Step), +installed_headers: ArrayList(*Step), output_dir: ?[]const u8, is_linking_libc: bool = false, is_linking_libcpp: bool = false, @@ -226,7 +224,7 @@ pub const CSourceFile = struct { source: FileSource, args: []const []const u8, - pub fn dupe(self: CSourceFile, b: *Builder) CSourceFile { + pub fn dupe(self: CSourceFile, b: *std.Build) CSourceFile { return .{ .source = self.source.dupe(b), .args = b.dupeStrings(self.args), @@ -297,7 +295,7 @@ pub const EmitOption = union(enum) { emit: void, emit_to: []const u8, - fn getArg(self: @This(), b: *Builder, arg_name: []const u8) ?[]const u8 { + fn getArg(self: @This(), b: *std.Build, arg_name: []const u8) ?[]const u8 { return switch (self) { .no_emit => b.fmt("-fno-{s}", .{arg_name}), .default => null, @@ -307,7 +305,7 @@ pub const EmitOption = union(enum) { } }; -pub fn create(builder: *Builder, options: Options) *LibExeObjStep { +pub fn create(builder: *std.Build, options: Options) *LibExeObjStep { const name = builder.dupe(options.name); const root_src: ?FileSource = if (options.root_source_file) |rsrc| rsrc.dupe(builder) else null; if (mem.indexOf(u8, name, "/") != null or mem.indexOf(u8, name, "\\") != null) { @@ -343,9 +341,9 @@ pub fn create(builder: *Builder, options: Options) *LibExeObjStep { .lib_paths = ArrayList([]const u8).init(builder.allocator), .rpaths = ArrayList([]const u8).init(builder.allocator), .framework_dirs = ArrayList([]const u8).init(builder.allocator), - .installed_headers = ArrayList(*std.build.Step).init(builder.allocator), + .installed_headers = ArrayList(*Step).init(builder.allocator), .object_src = undefined, - .c_std = Builder.CStd.C99, + .c_std = std.Build.CStd.C99, .override_lib_dir = null, .main_pkg_path = null, .exec_cmd_args = null, @@ -461,7 +459,7 @@ pub fn installHeadersDirectory( pub fn installHeadersDirectoryOptions( a: *LibExeObjStep, - options: std.build.InstallDirStep.Options, + options: std.Build.InstallDirStep.Options, ) void { const install_dir = a.builder.addInstallDirectory(options); a.builder.getInstallStep().dependOn(&install_dir.step); @@ -600,7 +598,7 @@ pub fn linkLibCpp(self: *LibExeObjStep) void { /// If the value is omitted, it is set to 1. /// `name` and `value` need not live longer than the function call. pub fn defineCMacro(self: *LibExeObjStep, name: []const u8, value: ?[]const u8) void { - const macro = std.build.constructCMacro(self.builder.allocator, name, value); + const macro = std.Build.constructCMacro(self.builder.allocator, name, value); self.c_macros.append(macro) catch unreachable; } @@ -1460,7 +1458,7 @@ fn make(step: *Step) !void { if (!self.target.isNative()) { try zig_args.appendSlice(&.{ "-target", try self.target.zigTriple(builder.allocator), - "-mcpu", try build.serializeCpu(builder.allocator, self.target.getCpu()), + "-mcpu", try std.Build.serializeCpu(builder.allocator, self.target.getCpu()), }); if (self.target.dynamic_linker.get()) |dynamic_linker| { @@ -1902,7 +1900,7 @@ pub fn doAtomicSymLinks(allocator: Allocator, output_path: []const u8, filename_ }; } -fn execPkgConfigList(self: *Builder, out_code: *u8) (PkgConfigError || ExecError)![]const PkgConfigPkg { +fn execPkgConfigList(self: *std.Build, out_code: *u8) (PkgConfigError || ExecError)![]const PkgConfigPkg { const stdout = try self.execAllowFail(&[_][]const u8{ "pkg-config", "--list-all" }, out_code, .Ignore); var list = ArrayList(PkgConfigPkg).init(self.allocator); errdefer list.deinit(); @@ -1918,7 +1916,7 @@ fn execPkgConfigList(self: *Builder, out_code: *u8) (PkgConfigError || ExecError return list.toOwnedSlice(); } -fn getPkgConfigList(self: *Builder) ![]const PkgConfigPkg { +fn getPkgConfigList(self: *std.Build) ![]const PkgConfigPkg { if (self.pkg_config_pkg_list) |res| { return res; } @@ -1948,7 +1946,7 @@ test "addPackage" { var arena = std.heap.ArenaAllocator.init(std.testing.allocator); defer arena.deinit(); - var builder = try Builder.create( + var builder = try std.Build.create( arena.allocator(), "test", "test", diff --git a/lib/std/build/LogStep.zig b/lib/std/Build/LogStep.zig similarity index 72% rename from lib/std/build/LogStep.zig rename to lib/std/Build/LogStep.zig index fd937b00f9..6d51df8cbd 100644 --- a/lib/std/build/LogStep.zig +++ b/lib/std/Build/LogStep.zig @@ -1,17 +1,15 @@ const std = @import("../std.zig"); const log = std.log; -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; +const Step = std.Build.Step; const LogStep = @This(); pub const base_id = .log; step: Step, -builder: *Builder, +builder: *std.Build, data: []const u8, -pub fn init(builder: *Builder, data: []const u8) LogStep { +pub fn init(builder: *std.Build, data: []const u8) LogStep { return LogStep{ .builder = builder, .step = Step.init(.log, builder.fmt("log {s}", .{data}), builder.allocator, make), diff --git a/lib/std/build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig similarity index 97% rename from lib/std/build/OptionsStep.zig rename to lib/std/Build/OptionsStep.zig index fb06cc2179..3d26807411 100644 --- a/lib/std/build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -1,12 +1,10 @@ const std = @import("../std.zig"); const builtin = @import("builtin"); -const build = std.build; const fs = std.fs; -const Step = build.Step; -const Builder = build.Builder; -const GeneratedFile = build.GeneratedFile; -const LibExeObjStep = build.LibExeObjStep; -const FileSource = build.FileSource; +const Step = std.Build.Step; +const GeneratedFile = std.Build.GeneratedFile; +const LibExeObjStep = std.Build.LibExeObjStep; +const FileSource = std.Build.FileSource; const OptionsStep = @This(); @@ -14,13 +12,13 @@ pub const base_id = .options; step: Step, generated_file: GeneratedFile, -builder: *Builder, +builder: *std.Build, contents: std.ArrayList(u8), artifact_args: std.ArrayList(OptionArtifactArg), file_source_args: std.ArrayList(OptionFileSourceArg), -pub fn create(builder: *Builder) *OptionsStep { +pub fn create(builder: *std.Build) *OptionsStep { const self = builder.allocator.create(OptionsStep) catch unreachable; self.* = .{ .builder = builder, @@ -202,7 +200,7 @@ pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *LibExe self.step.dependOn(&artifact.step); } -pub fn getPackage(self: *OptionsStep, package_name: []const u8) build.Pkg { +pub fn getPackage(self: *OptionsStep, package_name: []const u8) std.Build.Pkg { return .{ .name = package_name, .source = self.getSource() }; } @@ -281,7 +279,7 @@ test "OptionsStep" { var arena = std.heap.ArenaAllocator.init(std.testing.allocator); defer arena.deinit(); - var builder = try Builder.create( + var builder = try std.Build.create( arena.allocator(), "test", "test", diff --git a/lib/std/build/RemoveDirStep.zig b/lib/std/Build/RemoveDirStep.zig similarity index 79% rename from lib/std/build/RemoveDirStep.zig rename to lib/std/Build/RemoveDirStep.zig index 959414e54f..f3b71dcec1 100644 --- a/lib/std/build/RemoveDirStep.zig +++ b/lib/std/Build/RemoveDirStep.zig @@ -1,18 +1,16 @@ const std = @import("../std.zig"); const log = std.log; const fs = std.fs; -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; +const Step = std.Build.Step; const RemoveDirStep = @This(); pub const base_id = .remove_dir; step: Step, -builder: *Builder, +builder: *std.Build, dir_path: []const u8, -pub fn init(builder: *Builder, dir_path: []const u8) RemoveDirStep { +pub fn init(builder: *std.Build, dir_path: []const u8) RemoveDirStep { return RemoveDirStep{ .builder = builder, .step = Step.init(.remove_dir, builder.fmt("RemoveDir {s}", .{dir_path}), builder.allocator, make), diff --git a/lib/std/build/RunStep.zig b/lib/std/Build/RunStep.zig similarity index 94% rename from lib/std/build/RunStep.zig rename to lib/std/Build/RunStep.zig index 5183a328cd..83e4f7f66c 100644 --- a/lib/std/build/RunStep.zig +++ b/lib/std/Build/RunStep.zig @@ -1,17 +1,15 @@ const std = @import("../std.zig"); const builtin = @import("builtin"); -const build = std.build; -const Step = build.Step; -const Builder = build.Builder; -const LibExeObjStep = build.LibExeObjStep; -const WriteFileStep = build.WriteFileStep; +const Step = std.Build.Step; +const LibExeObjStep = std.Build.LibExeObjStep; +const WriteFileStep = std.Build.WriteFileStep; const fs = std.fs; const mem = std.mem; const process = std.process; const ArrayList = std.ArrayList; const EnvMap = process.EnvMap; const Allocator = mem.Allocator; -const ExecError = build.Builder.ExecError; +const ExecError = std.Build.ExecError; const max_stdout_size = 1 * 1024 * 1024; // 1 MiB @@ -20,7 +18,7 @@ const RunStep = @This(); pub const base_id: Step.Id = .run; step: Step, -builder: *Builder, +builder: *std.Build, /// See also addArg and addArgs to modifying this directly argv: ArrayList(Arg), @@ -51,11 +49,11 @@ pub const StdIoAction = union(enum) { pub const Arg = union(enum) { artifact: *LibExeObjStep, - file_source: build.FileSource, + file_source: std.Build.FileSource, bytes: []u8, }; -pub fn create(builder: *Builder, name: []const u8) *RunStep { +pub fn create(builder: *std.Build, name: []const u8) *RunStep { const self = builder.allocator.create(RunStep) catch unreachable; self.* = RunStep{ .builder = builder, @@ -73,7 +71,7 @@ pub fn addArtifactArg(self: *RunStep, artifact: *LibExeObjStep) void { self.step.dependOn(&artifact.step); } -pub fn addFileSourceArg(self: *RunStep, file_source: build.FileSource) void { +pub fn addFileSourceArg(self: *RunStep, file_source: std.Build.FileSource) void { self.argv.append(Arg{ .file_source = file_source.dupe(self.builder), }) catch unreachable; @@ -101,7 +99,7 @@ pub fn addPathDir(self: *RunStep, search_path: []const u8) void { } /// For internal use only, users of `RunStep` should use `addPathDir` directly. -pub fn addPathDirInternal(step: *Step, builder: *Builder, search_path: []const u8) void { +pub fn addPathDirInternal(step: *Step, builder: *std.Build, search_path: []const u8) void { const env_map = getEnvMapInternal(step, builder.allocator); const key = "PATH"; @@ -122,7 +120,7 @@ pub fn getEnvMap(self: *RunStep) *EnvMap { fn getEnvMapInternal(step: *Step, allocator: Allocator) *EnvMap { const maybe_env_map = switch (step.id) { .run => step.cast(RunStep).?.env_map, - .emulatable_run => step.cast(build.EmulatableRunStep).?.env_map, + .emulatable_run => step.cast(std.Build.EmulatableRunStep).?.env_map, else => unreachable, }; return maybe_env_map orelse { @@ -195,7 +193,7 @@ fn make(step: *Step) !void { pub fn runCommand( argv: []const []const u8, - builder: *Builder, + builder: *std.Build, expected_exit_code: ?u8, stdout_action: StdIoAction, stderr_action: StdIoAction, @@ -363,7 +361,7 @@ fn addPathForDynLibs(self: *RunStep, artifact: *LibExeObjStep) void { /// This should only be used for internal usage, this is called automatically /// for the user. -pub fn addPathForDynLibsInternal(step: *Step, builder: *Builder, artifact: *LibExeObjStep) void { +pub fn addPathForDynLibsInternal(step: *Step, builder: *std.Build, artifact: *LibExeObjStep) void { for (artifact.link_objects.items) |link_object| { switch (link_object) { .other_step => |other| { diff --git a/lib/std/Build/Step.zig b/lib/std/Build/Step.zig new file mode 100644 index 0000000000..86d6645c29 --- /dev/null +++ b/lib/std/Build/Step.zig @@ -0,0 +1,97 @@ +id: Id, +name: []const u8, +makeFn: *const fn (self: *Step) anyerror!void, +dependencies: std.ArrayList(*Step), +loop_flag: bool, +done_flag: bool, + +pub const Id = enum { + top_level, + lib_exe_obj, + install_artifact, + install_file, + install_dir, + log, + remove_dir, + fmt, + translate_c, + write_file, + run, + emulatable_run, + check_file, + check_object, + config_header, + install_raw, + options, + custom, + + pub fn Type(comptime id: Id) type { + return switch (id) { + .top_level => Build.TopLevelStep, + .lib_exe_obj => Build.LibExeObjStep, + .install_artifact => Build.InstallArtifactStep, + .install_file => Build.InstallFileStep, + .install_dir => Build.InstallDirStep, + .log => Build.LogStep, + .remove_dir => Build.RemoveDirStep, + .fmt => Build.FmtStep, + .translate_c => Build.TranslateCStep, + .write_file => Build.WriteFileStep, + .run => Build.RunStep, + .emulatable_run => Build.EmulatableRunStep, + .check_file => Build.CheckFileStep, + .check_object => Build.CheckObjectStep, + .config_header => Build.ConfigHeaderStep, + .install_raw => Build.InstallRawStep, + .options => Build.OptionsStep, + .custom => @compileError("no type available for custom step"), + }; + } +}; + +pub fn init( + id: Id, + name: []const u8, + allocator: Allocator, + makeFn: *const fn (self: *Step) anyerror!void, +) Step { + return Step{ + .id = id, + .name = allocator.dupe(u8, name) catch unreachable, + .makeFn = makeFn, + .dependencies = std.ArrayList(*Step).init(allocator), + .loop_flag = false, + .done_flag = false, + }; +} + +pub fn initNoOp(id: Id, name: []const u8, allocator: Allocator) Step { + return init(id, name, allocator, makeNoOp); +} + +pub fn make(self: *Step) !void { + if (self.done_flag) return; + + try self.makeFn(self); + self.done_flag = true; +} + +pub fn dependOn(self: *Step, other: *Step) void { + self.dependencies.append(other) catch unreachable; +} + +fn makeNoOp(self: *Step) anyerror!void { + _ = self; +} + +pub fn cast(step: *Step, comptime T: type) ?*T { + if (step.id == T.base_id) { + return @fieldParentPtr(T, "step", step); + } + return null; +} + +const Step = @This(); +const std = @import("../std.zig"); +const Build = std.Build; +const Allocator = std.mem.Allocator; diff --git a/lib/std/build/TranslateCStep.zig b/lib/std/Build/TranslateCStep.zig similarity index 90% rename from lib/std/build/TranslateCStep.zig rename to lib/std/Build/TranslateCStep.zig index 9f45d606a1..5404747846 100644 --- a/lib/std/build/TranslateCStep.zig +++ b/lib/std/Build/TranslateCStep.zig @@ -1,9 +1,7 @@ const std = @import("../std.zig"); -const build = std.build; -const Step = build.Step; -const Builder = build.Builder; -const LibExeObjStep = build.LibExeObjStep; -const CheckFileStep = build.CheckFileStep; +const Step = std.Build.Step; +const LibExeObjStep = std.Build.LibExeObjStep; +const CheckFileStep = std.Build.CheckFileStep; const fs = std.fs; const mem = std.mem; const CrossTarget = std.zig.CrossTarget; @@ -13,23 +11,23 @@ const TranslateCStep = @This(); pub const base_id = .translate_c; step: Step, -builder: *Builder, -source: build.FileSource, +builder: *std.Build, +source: std.Build.FileSource, include_dirs: std.ArrayList([]const u8), c_macros: std.ArrayList([]const u8), output_dir: ?[]const u8, out_basename: []const u8, target: CrossTarget, optimize: std.builtin.OptimizeMode, -output_file: build.GeneratedFile, +output_file: std.Build.GeneratedFile, pub const Options = struct { - source_file: build.FileSource, + source_file: std.Build.FileSource, target: CrossTarget, optimize: std.builtin.OptimizeMode, }; -pub fn create(builder: *Builder, options: Options) *TranslateCStep { +pub fn create(builder: *std.Build, options: Options) *TranslateCStep { const self = builder.allocator.create(TranslateCStep) catch unreachable; const source = options.source_file.dupe(builder); self.* = TranslateCStep{ @@ -42,7 +40,7 @@ pub fn create(builder: *Builder, options: Options) *TranslateCStep { .out_basename = undefined, .target = options.target, .optimize = options.optimize, - .output_file = build.GeneratedFile{ .step = &self.step }, + .output_file = std.Build.GeneratedFile{ .step = &self.step }, }; source.addStepDependencies(&self.step); return self; @@ -79,7 +77,7 @@ pub fn addCheckFile(self: *TranslateCStep, expected_matches: []const []const u8) /// If the value is omitted, it is set to 1. /// `name` and `value` need not live longer than the function call. pub fn defineCMacro(self: *TranslateCStep, name: []const u8, value: ?[]const u8) void { - const macro = build.constructCMacro(self.builder.allocator, name, value); + const macro = std.Build.constructCMacro(self.builder.allocator, name, value); self.c_macros.append(macro) catch unreachable; } diff --git a/lib/std/build/WriteFileStep.zig b/lib/std/Build/WriteFileStep.zig similarity index 91% rename from lib/std/build/WriteFileStep.zig rename to lib/std/Build/WriteFileStep.zig index 4faae8f74e..59ac568221 100644 --- a/lib/std/build/WriteFileStep.zig +++ b/lib/std/Build/WriteFileStep.zig @@ -1,7 +1,5 @@ const std = @import("../std.zig"); -const build = @import("../build.zig"); -const Step = build.Step; -const Builder = build.Builder; +const Step = std.Build.Step; const fs = std.fs; const ArrayList = std.ArrayList; @@ -10,17 +8,17 @@ const WriteFileStep = @This(); pub const base_id = .write_file; step: Step, -builder: *Builder, +builder: *std.Build, output_dir: []const u8, files: std.TailQueue(File), pub const File = struct { - source: build.GeneratedFile, + source: std.Build.GeneratedFile, basename: []const u8, bytes: []const u8, }; -pub fn init(builder: *Builder) WriteFileStep { +pub fn init(builder: *std.Build) WriteFileStep { return WriteFileStep{ .builder = builder, .step = Step.init(.write_file, "writefile", builder.allocator, make), @@ -33,7 +31,7 @@ pub fn add(self: *WriteFileStep, basename: []const u8, bytes: []const u8) void { const node = self.builder.allocator.create(std.TailQueue(File).Node) catch unreachable; node.* = .{ .data = .{ - .source = build.GeneratedFile{ .step = &self.step }, + .source = std.Build.GeneratedFile{ .step = &self.step }, .basename = self.builder.dupePath(basename), .bytes = self.builder.dupe(bytes), }, @@ -43,11 +41,11 @@ pub fn add(self: *WriteFileStep, basename: []const u8, bytes: []const u8) void { } /// Gets a file source for the given basename. If the file does not exist, returns `null`. -pub fn getFileSource(step: *WriteFileStep, basename: []const u8) ?build.FileSource { +pub fn getFileSource(step: *WriteFileStep, basename: []const u8) ?std.Build.FileSource { var it = step.files.first; while (it) |node| : (it = node.next) { if (std.mem.eql(u8, node.data.basename, basename)) - return build.FileSource{ .generated = &node.data.source }; + return std.Build.FileSource{ .generated = &node.data.source }; } return null; } diff --git a/lib/std/build.zig b/lib/std/build.zig deleted file mode 100644 index 4ee00a4710..0000000000 --- a/lib/std/build.zig +++ /dev/null @@ -1,1863 +0,0 @@ -const std = @import("std.zig"); -const builtin = @import("builtin"); -const io = std.io; -const fs = std.fs; -const mem = std.mem; -const debug = std.debug; -const panic = std.debug.panic; -const assert = debug.assert; -const log = std.log; -const ArrayList = std.ArrayList; -const StringHashMap = std.StringHashMap; -const Allocator = mem.Allocator; -const process = std.process; -const EnvMap = std.process.EnvMap; -const fmt_lib = std.fmt; -const File = std.fs.File; -const CrossTarget = std.zig.CrossTarget; -const NativeTargetInfo = std.zig.system.NativeTargetInfo; -const Sha256 = std.crypto.hash.sha2.Sha256; -const ThisModule = @This(); - -pub const CheckFileStep = @import("build/CheckFileStep.zig"); -pub const CheckObjectStep = @import("build/CheckObjectStep.zig"); -pub const ConfigHeaderStep = @import("build/ConfigHeaderStep.zig"); -pub const EmulatableRunStep = @import("build/EmulatableRunStep.zig"); -pub const FmtStep = @import("build/FmtStep.zig"); -pub const InstallArtifactStep = @import("build/InstallArtifactStep.zig"); -pub const InstallDirStep = @import("build/InstallDirStep.zig"); -pub const InstallFileStep = @import("build/InstallFileStep.zig"); -pub const InstallRawStep = @import("build/InstallRawStep.zig"); -pub const LibExeObjStep = @import("build/LibExeObjStep.zig"); -pub const LogStep = @import("build/LogStep.zig"); -pub const OptionsStep = @import("build/OptionsStep.zig"); -pub const RemoveDirStep = @import("build/RemoveDirStep.zig"); -pub const RunStep = @import("build/RunStep.zig"); -pub const TranslateCStep = @import("build/TranslateCStep.zig"); -pub const WriteFileStep = @import("build/WriteFileStep.zig"); - -pub const Builder = struct { - install_tls: TopLevelStep, - uninstall_tls: TopLevelStep, - allocator: Allocator, - user_input_options: UserInputOptionsMap, - available_options_map: AvailableOptionsMap, - available_options_list: ArrayList(AvailableOption), - verbose: bool, - verbose_link: bool, - verbose_cc: bool, - verbose_air: bool, - verbose_llvm_ir: bool, - verbose_cimport: bool, - verbose_llvm_cpu_features: bool, - /// The purpose of executing the command is for a human to read compile errors from the terminal - prominent_compile_errors: bool, - color: enum { auto, on, off } = .auto, - reference_trace: ?u32 = null, - invalid_user_input: bool, - zig_exe: []const u8, - default_step: *Step, - env_map: *EnvMap, - top_level_steps: ArrayList(*TopLevelStep), - install_prefix: []const u8, - dest_dir: ?[]const u8, - lib_dir: []const u8, - exe_dir: []const u8, - h_dir: []const u8, - install_path: []const u8, - sysroot: ?[]const u8 = null, - search_prefixes: ArrayList([]const u8), - libc_file: ?[]const u8 = null, - installed_files: ArrayList(InstalledFile), - /// Path to the directory containing build.zig. - build_root: []const u8, - cache_root: []const u8, - global_cache_root: []const u8, - /// zig lib dir - override_lib_dir: ?[]const u8, - vcpkg_root: VcpkgRoot = .unattempted, - pkg_config_pkg_list: ?(PkgConfigError![]const PkgConfigPkg) = null, - args: ?[][]const u8 = null, - debug_log_scopes: []const []const u8 = &.{}, - debug_compile_errors: bool = false, - - /// Experimental. Use system Darling installation to run cross compiled macOS build artifacts. - enable_darling: bool = false, - /// Use system QEMU installation to run cross compiled foreign architecture build artifacts. - enable_qemu: bool = false, - /// Darwin. Use Rosetta to run x86_64 macOS build artifacts on arm64 macOS. - enable_rosetta: bool = false, - /// Use system Wasmtime installation to run cross compiled wasm/wasi build artifacts. - enable_wasmtime: bool = false, - /// Use system Wine installation to run cross compiled Windows build artifacts. - enable_wine: bool = false, - /// After following the steps in https://github.com/ziglang/zig/wiki/Updating-libc#glibc, - /// this will be the directory $glibc-build-dir/install/glibcs - /// Given the example of the aarch64 target, this is the directory - /// that contains the path `aarch64-linux-gnu/lib/ld-linux-aarch64.so.1`. - glibc_runtimes_dir: ?[]const u8 = null, - - /// Information about the native target. Computed before build() is invoked. - host: NativeTargetInfo, - - dep_prefix: []const u8 = "", - - pub const ExecError = error{ - ReadFailure, - ExitCodeFailure, - ProcessTerminated, - ExecNotSupported, - } || std.ChildProcess.SpawnError; - - pub const PkgConfigError = error{ - PkgConfigCrashed, - PkgConfigFailed, - PkgConfigNotInstalled, - PkgConfigInvalidOutput, - }; - - pub const PkgConfigPkg = struct { - name: []const u8, - desc: []const u8, - }; - - pub const CStd = enum { - C89, - C99, - C11, - }; - - const UserInputOptionsMap = StringHashMap(UserInputOption); - const AvailableOptionsMap = StringHashMap(AvailableOption); - - const AvailableOption = struct { - name: []const u8, - type_id: TypeId, - description: []const u8, - /// If the `type_id` is `enum` this provides the list of enum options - enum_options: ?[]const []const u8, - }; - - const UserInputOption = struct { - name: []const u8, - value: UserValue, - used: bool, - }; - - const UserValue = union(enum) { - flag: void, - scalar: []const u8, - list: ArrayList([]const u8), - map: StringHashMap(*const UserValue), - }; - - const TypeId = enum { - bool, - int, - float, - @"enum", - string, - list, - }; - - const TopLevelStep = struct { - pub const base_id = .top_level; - - step: Step, - description: []const u8, - }; - - pub const DirList = struct { - lib_dir: ?[]const u8 = null, - exe_dir: ?[]const u8 = null, - include_dir: ?[]const u8 = null, - }; - - pub fn create( - allocator: Allocator, - zig_exe: []const u8, - build_root: []const u8, - cache_root: []const u8, - global_cache_root: []const u8, - ) !*Builder { - const env_map = try allocator.create(EnvMap); - env_map.* = try process.getEnvMap(allocator); - - const host = try NativeTargetInfo.detect(.{}); - - const self = try allocator.create(Builder); - self.* = Builder{ - .zig_exe = zig_exe, - .build_root = build_root, - .cache_root = try fs.path.relative(allocator, build_root, cache_root), - .global_cache_root = global_cache_root, - .verbose = false, - .verbose_link = false, - .verbose_cc = false, - .verbose_air = false, - .verbose_llvm_ir = false, - .verbose_cimport = false, - .verbose_llvm_cpu_features = false, - .prominent_compile_errors = false, - .invalid_user_input = false, - .allocator = allocator, - .user_input_options = UserInputOptionsMap.init(allocator), - .available_options_map = AvailableOptionsMap.init(allocator), - .available_options_list = ArrayList(AvailableOption).init(allocator), - .top_level_steps = ArrayList(*TopLevelStep).init(allocator), - .default_step = undefined, - .env_map = env_map, - .search_prefixes = ArrayList([]const u8).init(allocator), - .install_prefix = undefined, - .lib_dir = undefined, - .exe_dir = undefined, - .h_dir = undefined, - .dest_dir = env_map.get("DESTDIR"), - .installed_files = ArrayList(InstalledFile).init(allocator), - .install_tls = TopLevelStep{ - .step = Step.initNoOp(.top_level, "install", allocator), - .description = "Copy build artifacts to prefix path", - }, - .uninstall_tls = TopLevelStep{ - .step = Step.init(.top_level, "uninstall", allocator, makeUninstall), - .description = "Remove build artifacts from prefix path", - }, - .override_lib_dir = null, - .install_path = undefined, - .args = null, - .host = host, - }; - try self.top_level_steps.append(&self.install_tls); - try self.top_level_steps.append(&self.uninstall_tls); - self.default_step = &self.install_tls.step; - return self; - } - - fn createChild( - parent: *Builder, - dep_name: []const u8, - build_root: []const u8, - args: anytype, - ) !*Builder { - const child = try createChildOnly(parent, dep_name, build_root); - try applyArgs(child, args); - return child; - } - - fn createChildOnly(parent: *Builder, dep_name: []const u8, build_root: []const u8) !*Builder { - const allocator = parent.allocator; - const child = try allocator.create(Builder); - child.* = .{ - .allocator = allocator, - .install_tls = .{ - .step = Step.initNoOp(.top_level, "install", allocator), - .description = "Copy build artifacts to prefix path", - }, - .uninstall_tls = .{ - .step = Step.init(.top_level, "uninstall", allocator, makeUninstall), - .description = "Remove build artifacts from prefix path", - }, - .user_input_options = UserInputOptionsMap.init(allocator), - .available_options_map = AvailableOptionsMap.init(allocator), - .available_options_list = ArrayList(AvailableOption).init(allocator), - .verbose = parent.verbose, - .verbose_link = parent.verbose_link, - .verbose_cc = parent.verbose_cc, - .verbose_air = parent.verbose_air, - .verbose_llvm_ir = parent.verbose_llvm_ir, - .verbose_cimport = parent.verbose_cimport, - .verbose_llvm_cpu_features = parent.verbose_llvm_cpu_features, - .prominent_compile_errors = parent.prominent_compile_errors, - .color = parent.color, - .reference_trace = parent.reference_trace, - .invalid_user_input = false, - .zig_exe = parent.zig_exe, - .default_step = undefined, - .env_map = parent.env_map, - .top_level_steps = ArrayList(*TopLevelStep).init(allocator), - .install_prefix = undefined, - .dest_dir = parent.dest_dir, - .lib_dir = parent.lib_dir, - .exe_dir = parent.exe_dir, - .h_dir = parent.h_dir, - .install_path = parent.install_path, - .sysroot = parent.sysroot, - .search_prefixes = ArrayList([]const u8).init(allocator), - .libc_file = parent.libc_file, - .installed_files = ArrayList(InstalledFile).init(allocator), - .build_root = build_root, - .cache_root = parent.cache_root, - .global_cache_root = parent.global_cache_root, - .override_lib_dir = parent.override_lib_dir, - .debug_log_scopes = parent.debug_log_scopes, - .debug_compile_errors = parent.debug_compile_errors, - .enable_darling = parent.enable_darling, - .enable_qemu = parent.enable_qemu, - .enable_rosetta = parent.enable_rosetta, - .enable_wasmtime = parent.enable_wasmtime, - .enable_wine = parent.enable_wine, - .glibc_runtimes_dir = parent.glibc_runtimes_dir, - .host = parent.host, - .dep_prefix = parent.fmt("{s}{s}.", .{ parent.dep_prefix, dep_name }), - }; - try child.top_level_steps.append(&child.install_tls); - try child.top_level_steps.append(&child.uninstall_tls); - child.default_step = &child.install_tls.step; - return child; - } - - fn applyArgs(b: *Builder, args: anytype) !void { - inline for (@typeInfo(@TypeOf(args)).Struct.fields) |field| { - const v = @field(args, field.name); - const T = @TypeOf(v); - switch (T) { - CrossTarget => { - try b.user_input_options.put(field.name, .{ - .name = field.name, - .value = .{ .scalar = try v.zigTriple(b.allocator) }, - .used = false, - }); - try b.user_input_options.put("cpu", .{ - .name = "cpu", - .value = .{ .scalar = try serializeCpu(b.allocator, v.getCpu()) }, - .used = false, - }); - }, - []const u8 => { - try b.user_input_options.put(field.name, .{ - .name = field.name, - .value = .{ .scalar = v }, - .used = false, - }); - }, - else => switch (@typeInfo(T)) { - .Bool => { - try b.user_input_options.put(field.name, .{ - .name = field.name, - .value = .{ .scalar = if (v) "true" else "false" }, - .used = false, - }); - }, - .Enum => { - try b.user_input_options.put(field.name, .{ - .name = field.name, - .value = .{ .scalar = @tagName(v) }, - .used = false, - }); - }, - .Int => { - try b.user_input_options.put(field.name, .{ - .name = field.name, - .value = .{ .scalar = try std.fmt.allocPrint(b.allocator, "{d}", .{v}) }, - .used = false, - }); - }, - else => @compileError("option '" ++ field.name ++ "' has unsupported type: " ++ @typeName(T)), - }, - } - } - const Hasher = std.crypto.auth.siphash.SipHash128(1, 3); - // Random bytes to make unique. Refresh this with new random bytes when - // implementation is modified in a non-backwards-compatible way. - var hash = Hasher.init("ZaEsvQ5ClaA2IdH9"); - hash.update(b.dep_prefix); - // TODO additionally update the hash with `args`. - - var digest: [16]u8 = undefined; - hash.final(&digest); - var hash_basename: [digest.len * 2]u8 = undefined; - _ = std.fmt.bufPrint(&hash_basename, "{s}", .{std.fmt.fmtSliceHexLower(&digest)}) catch - unreachable; - - const install_prefix = b.pathJoin(&.{ b.cache_root, "i", &hash_basename }); - b.resolveInstallPrefix(install_prefix, .{}); - } - - pub fn destroy(self: *Builder) void { - self.env_map.deinit(); - self.top_level_steps.deinit(); - self.allocator.destroy(self); - } - - /// This function is intended to be called by lib/build_runner.zig, not a build.zig file. - pub fn resolveInstallPrefix(self: *Builder, install_prefix: ?[]const u8, dir_list: DirList) void { - if (self.dest_dir) |dest_dir| { - self.install_prefix = install_prefix orelse "/usr"; - self.install_path = self.pathJoin(&.{ dest_dir, self.install_prefix }); - } else { - self.install_prefix = install_prefix orelse - (self.pathJoin(&.{ self.build_root, "zig-out" })); - self.install_path = self.install_prefix; - } - - var lib_list = [_][]const u8{ self.install_path, "lib" }; - var exe_list = [_][]const u8{ self.install_path, "bin" }; - var h_list = [_][]const u8{ self.install_path, "include" }; - - if (dir_list.lib_dir) |dir| { - if (std.fs.path.isAbsolute(dir)) lib_list[0] = self.dest_dir orelse ""; - lib_list[1] = dir; - } - - if (dir_list.exe_dir) |dir| { - if (std.fs.path.isAbsolute(dir)) exe_list[0] = self.dest_dir orelse ""; - exe_list[1] = dir; - } - - if (dir_list.include_dir) |dir| { - if (std.fs.path.isAbsolute(dir)) h_list[0] = self.dest_dir orelse ""; - h_list[1] = dir; - } - - self.lib_dir = self.pathJoin(&lib_list); - self.exe_dir = self.pathJoin(&exe_list); - self.h_dir = self.pathJoin(&h_list); - } - - pub fn addOptions(self: *Builder) *OptionsStep { - return OptionsStep.create(self); - } - - pub const ExecutableOptions = struct { - name: []const u8, - root_source_file: ?FileSource = null, - version: ?std.builtin.Version = null, - target: CrossTarget = .{}, - optimize: std.builtin.Mode = .Debug, - linkage: ?LibExeObjStep.Linkage = null, - }; - - pub fn addExecutable(b: *Builder, options: ExecutableOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ - .name = options.name, - .root_source_file = options.root_source_file, - .version = options.version, - .target = options.target, - .optimize = options.optimize, - .kind = .exe, - .linkage = options.linkage, - }); - } - - pub const ObjectOptions = struct { - name: []const u8, - root_source_file: ?FileSource = null, - target: CrossTarget, - optimize: std.builtin.Mode, - }; - - pub fn addObject(b: *Builder, options: ObjectOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ - .name = options.name, - .root_source_file = options.root_source_file, - .target = options.target, - .optimize = options.optimize, - .kind = .obj, - }); - } - - pub const SharedLibraryOptions = struct { - name: []const u8, - root_source_file: ?FileSource = null, - version: ?std.builtin.Version = null, - target: CrossTarget, - optimize: std.builtin.Mode, - }; - - pub fn addSharedLibrary(b: *Builder, options: SharedLibraryOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ - .name = options.name, - .root_source_file = options.root_source_file, - .kind = .lib, - .linkage = .dynamic, - .version = options.version, - .target = options.target, - .optimize = options.optimize, - }); - } - - pub const StaticLibraryOptions = struct { - name: []const u8, - root_source_file: ?FileSource = null, - target: CrossTarget, - optimize: std.builtin.Mode, - version: ?std.builtin.Version = null, - }; - - pub fn addStaticLibrary(b: *Builder, options: StaticLibraryOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ - .name = options.name, - .root_source_file = options.root_source_file, - .kind = .lib, - .linkage = .static, - .version = options.version, - .target = options.target, - .optimize = options.optimize, - }); - } - - pub const TestOptions = struct { - name: []const u8 = "test", - kind: LibExeObjStep.Kind = .@"test", - root_source_file: FileSource, - target: CrossTarget = .{}, - optimize: std.builtin.Mode = .Debug, - version: ?std.builtin.Version = null, - }; - - pub fn addTest(b: *Builder, options: TestOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ - .name = options.name, - .kind = options.kind, - .root_source_file = options.root_source_file, - .target = options.target, - .optimize = options.optimize, - }); - } - - pub const AssemblyOptions = struct { - name: []const u8, - source_file: FileSource, - target: CrossTarget, - optimize: std.builtin.Mode, - }; - - pub fn addAssembly(b: *Builder, options: AssemblyOptions) *LibExeObjStep { - const obj_step = LibExeObjStep.create(b, .{ - .name = options.name, - .root_source_file = null, - .target = options.target, - .optimize = options.optimize, - }); - obj_step.addAssemblyFileSource(options.source_file.dupe(b)); - return obj_step; - } - - /// Initializes a RunStep with argv, which must at least have the path to the - /// executable. More command line arguments can be added with `addArg`, - /// `addArgs`, and `addArtifactArg`. - /// Be careful using this function, as it introduces a system dependency. - /// To run an executable built with zig build, see `LibExeObjStep.run`. - pub fn addSystemCommand(self: *Builder, argv: []const []const u8) *RunStep { - assert(argv.len >= 1); - const run_step = RunStep.create(self, self.fmt("run {s}", .{argv[0]})); - run_step.addArgs(argv); - return run_step; - } - - pub fn addConfigHeader( - b: *Builder, - source: FileSource, - style: ConfigHeaderStep.Style, - values: anytype, - ) *ConfigHeaderStep { - const config_header_step = ConfigHeaderStep.create(b, source, style); - config_header_step.addValues(values); - return config_header_step; - } - - /// Allocator.dupe without the need to handle out of memory. - pub fn dupe(self: *Builder, bytes: []const u8) []u8 { - return self.allocator.dupe(u8, bytes) catch unreachable; - } - - /// Duplicates an array of strings without the need to handle out of memory. - pub fn dupeStrings(self: *Builder, strings: []const []const u8) [][]u8 { - const array = self.allocator.alloc([]u8, strings.len) catch unreachable; - for (strings) |s, i| { - array[i] = self.dupe(s); - } - return array; - } - - /// Duplicates a path and converts all slashes to the OS's canonical path separator. - pub fn dupePath(self: *Builder, bytes: []const u8) []u8 { - const the_copy = self.dupe(bytes); - for (the_copy) |*byte| { - switch (byte.*) { - '/', '\\' => byte.* = fs.path.sep, - else => {}, - } - } - return the_copy; - } - - /// Duplicates a package recursively. - pub fn dupePkg(self: *Builder, package: Pkg) Pkg { - var the_copy = Pkg{ - .name = self.dupe(package.name), - .source = package.source.dupe(self), - }; - - if (package.dependencies) |dependencies| { - const new_dependencies = self.allocator.alloc(Pkg, dependencies.len) catch unreachable; - the_copy.dependencies = new_dependencies; - - for (dependencies) |dep_package, i| { - new_dependencies[i] = self.dupePkg(dep_package); - } - } - return the_copy; - } - - pub fn addWriteFile(self: *Builder, file_path: []const u8, data: []const u8) *WriteFileStep { - const write_file_step = self.addWriteFiles(); - write_file_step.add(file_path, data); - return write_file_step; - } - - pub fn addWriteFiles(self: *Builder) *WriteFileStep { - const write_file_step = self.allocator.create(WriteFileStep) catch unreachable; - write_file_step.* = WriteFileStep.init(self); - return write_file_step; - } - - pub fn addLog(self: *Builder, comptime format: []const u8, args: anytype) *LogStep { - const data = self.fmt(format, args); - const log_step = self.allocator.create(LogStep) catch unreachable; - log_step.* = LogStep.init(self, data); - return log_step; - } - - pub fn addRemoveDirTree(self: *Builder, dir_path: []const u8) *RemoveDirStep { - const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable; - remove_dir_step.* = RemoveDirStep.init(self, dir_path); - return remove_dir_step; - } - - pub fn addFmt(self: *Builder, paths: []const []const u8) *FmtStep { - return FmtStep.create(self, paths); - } - - pub fn addTranslateC(self: *Builder, options: TranslateCStep.Options) *TranslateCStep { - return TranslateCStep.create(self, options); - } - - pub fn make(self: *Builder, step_names: []const []const u8) !void { - try self.makePath(self.cache_root); - - var wanted_steps = ArrayList(*Step).init(self.allocator); - defer wanted_steps.deinit(); - - if (step_names.len == 0) { - try wanted_steps.append(self.default_step); - } else { - for (step_names) |step_name| { - const s = try self.getTopLevelStepByName(step_name); - try wanted_steps.append(s); - } - } - - for (wanted_steps.items) |s| { - try self.makeOneStep(s); - } - } - - pub fn getInstallStep(self: *Builder) *Step { - return &self.install_tls.step; - } - - pub fn getUninstallStep(self: *Builder) *Step { - return &self.uninstall_tls.step; - } - - fn makeUninstall(uninstall_step: *Step) anyerror!void { - const uninstall_tls = @fieldParentPtr(TopLevelStep, "step", uninstall_step); - const self = @fieldParentPtr(Builder, "uninstall_tls", uninstall_tls); - - for (self.installed_files.items) |installed_file| { - const full_path = self.getInstallPath(installed_file.dir, installed_file.path); - if (self.verbose) { - log.info("rm {s}", .{full_path}); - } - fs.cwd().deleteTree(full_path) catch {}; - } - - // TODO remove empty directories - } - - fn makeOneStep(self: *Builder, s: *Step) anyerror!void { - if (s.loop_flag) { - log.err("Dependency loop detected:\n {s}", .{s.name}); - return error.DependencyLoopDetected; - } - s.loop_flag = true; - - for (s.dependencies.items) |dep| { - self.makeOneStep(dep) catch |err| { - if (err == error.DependencyLoopDetected) { - log.err(" {s}", .{s.name}); - } - return err; - }; - } - - s.loop_flag = false; - - try s.make(); - } - - fn getTopLevelStepByName(self: *Builder, name: []const u8) !*Step { - for (self.top_level_steps.items) |top_level_step| { - if (mem.eql(u8, top_level_step.step.name, name)) { - return &top_level_step.step; - } - } - log.err("Cannot run step '{s}' because it does not exist", .{name}); - return error.InvalidStepName; - } - - pub fn option(self: *Builder, comptime T: type, name_raw: []const u8, description_raw: []const u8) ?T { - const name = self.dupe(name_raw); - const description = self.dupe(description_raw); - const type_id = comptime typeToEnum(T); - const enum_options = if (type_id == .@"enum") blk: { - const fields = comptime std.meta.fields(T); - var options = ArrayList([]const u8).initCapacity(self.allocator, fields.len) catch unreachable; - - inline for (fields) |field| { - options.appendAssumeCapacity(field.name); - } - - break :blk options.toOwnedSlice() catch unreachable; - } else null; - const available_option = AvailableOption{ - .name = name, - .type_id = type_id, - .description = description, - .enum_options = enum_options, - }; - if ((self.available_options_map.fetchPut(name, available_option) catch unreachable) != null) { - panic("Option '{s}' declared twice", .{name}); - } - self.available_options_list.append(available_option) catch unreachable; - - const option_ptr = self.user_input_options.getPtr(name) orelse return null; - option_ptr.used = true; - switch (type_id) { - .bool => switch (option_ptr.value) { - .flag => return true, - .scalar => |s| { - if (mem.eql(u8, s, "true")) { - return true; - } else if (mem.eql(u8, s, "false")) { - return false; - } else { - log.err("Expected -D{s} to be a boolean, but received '{s}'\n", .{ name, s }); - self.markInvalidUserInput(); - return null; - } - }, - .list, .map => { - log.err("Expected -D{s} to be a boolean, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - }, - .int => switch (option_ptr.value) { - .flag, .list, .map => { - log.err("Expected -D{s} to be an integer, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - .scalar => |s| { - const n = std.fmt.parseInt(T, s, 10) catch |err| switch (err) { - error.Overflow => { - log.err("-D{s} value {s} cannot fit into type {s}.\n", .{ name, s, @typeName(T) }); - self.markInvalidUserInput(); - return null; - }, - else => { - log.err("Expected -D{s} to be an integer of type {s}.\n", .{ name, @typeName(T) }); - self.markInvalidUserInput(); - return null; - }, - }; - return n; - }, - }, - .float => switch (option_ptr.value) { - .flag, .map, .list => { - log.err("Expected -D{s} to be a float, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - .scalar => |s| { - const n = std.fmt.parseFloat(T, s) catch { - log.err("Expected -D{s} to be a float of type {s}.\n", .{ name, @typeName(T) }); - self.markInvalidUserInput(); - return null; - }; - return n; - }, - }, - .@"enum" => switch (option_ptr.value) { - .flag, .map, .list => { - log.err("Expected -D{s} to be an enum, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - .scalar => |s| { - if (std.meta.stringToEnum(T, s)) |enum_lit| { - return enum_lit; - } else { - log.err("Expected -D{s} to be of type {s}.\n", .{ name, @typeName(T) }); - self.markInvalidUserInput(); - return null; - } - }, - }, - .string => switch (option_ptr.value) { - .flag, .list, .map => { - log.err("Expected -D{s} to be a string, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - .scalar => |s| return s, - }, - .list => switch (option_ptr.value) { - .flag, .map => { - log.err("Expected -D{s} to be a list, but received a {s}.\n", .{ - name, @tagName(option_ptr.value), - }); - self.markInvalidUserInput(); - return null; - }, - .scalar => |s| { - return self.allocator.dupe([]const u8, &[_][]const u8{s}) catch unreachable; - }, - .list => |lst| return lst.items, - }, - } - } - - pub fn step(self: *Builder, name: []const u8, description: []const u8) *Step { - const step_info = self.allocator.create(TopLevelStep) catch unreachable; - step_info.* = TopLevelStep{ - .step = Step.initNoOp(.top_level, name, self.allocator), - .description = self.dupe(description), - }; - self.top_level_steps.append(step_info) catch unreachable; - return &step_info.step; - } - - pub const StandardOptimizeOptionOptions = struct { - preferred_optimize_mode: ?std.builtin.Mode = null, - }; - - pub fn standardOptimizeOption(self: *Builder, options: StandardOptimizeOptionOptions) std.builtin.Mode { - if (options.preferred_optimize_mode) |mode| { - if (self.option(bool, "release", "optimize for end users") orelse false) { - return mode; - } else { - return .Debug; - } - } else { - return self.option( - std.builtin.Mode, - "optimize", - "prioritize performance, safety, or binary size (-O flag)", - ) orelse .Debug; - } - } - - pub const StandardTargetOptionsArgs = struct { - whitelist: ?[]const CrossTarget = null, - - default_target: CrossTarget = CrossTarget{}, - }; - - /// Exposes standard `zig build` options for choosing a target. - pub fn standardTargetOptions(self: *Builder, args: StandardTargetOptionsArgs) CrossTarget { - const maybe_triple = self.option( - []const u8, - "target", - "The CPU architecture, OS, and ABI to build for", - ); - const mcpu = self.option([]const u8, "cpu", "Target CPU features to add or subtract"); - - if (maybe_triple == null and mcpu == null) { - return args.default_target; - } - - const triple = maybe_triple orelse "native"; - - var diags: CrossTarget.ParseOptions.Diagnostics = .{}; - const selected_target = CrossTarget.parse(.{ - .arch_os_abi = triple, - .cpu_features = mcpu, - .diagnostics = &diags, - }) catch |err| switch (err) { - error.UnknownCpuModel => { - log.err("Unknown CPU: '{s}'\nAvailable CPUs for architecture '{s}':", .{ - diags.cpu_name.?, - @tagName(diags.arch.?), - }); - for (diags.arch.?.allCpuModels()) |cpu| { - log.err(" {s}", .{cpu.name}); - } - self.markInvalidUserInput(); - return args.default_target; - }, - error.UnknownCpuFeature => { - log.err( - \\Unknown CPU feature: '{s}' - \\Available CPU features for architecture '{s}': - \\ - , .{ - diags.unknown_feature_name.?, - @tagName(diags.arch.?), - }); - for (diags.arch.?.allFeaturesList()) |feature| { - log.err(" {s}: {s}", .{ feature.name, feature.description }); - } - self.markInvalidUserInput(); - return args.default_target; - }, - error.UnknownOperatingSystem => { - log.err( - \\Unknown OS: '{s}' - \\Available operating systems: - \\ - , .{diags.os_name.?}); - inline for (std.meta.fields(std.Target.Os.Tag)) |field| { - log.err(" {s}", .{field.name}); - } - self.markInvalidUserInput(); - return args.default_target; - }, - else => |e| { - log.err("Unable to parse target '{s}': {s}\n", .{ triple, @errorName(e) }); - self.markInvalidUserInput(); - return args.default_target; - }, - }; - - const selected_canonicalized_triple = selected_target.zigTriple(self.allocator) catch unreachable; - - if (args.whitelist) |list| whitelist_check: { - // Make sure it's a match of one of the list. - var mismatch_triple = true; - var mismatch_cpu_features = true; - var whitelist_item = CrossTarget{}; - for (list) |t| { - mismatch_cpu_features = true; - mismatch_triple = true; - - const t_triple = t.zigTriple(self.allocator) catch unreachable; - if (mem.eql(u8, t_triple, selected_canonicalized_triple)) { - mismatch_triple = false; - whitelist_item = t; - if (t.getCpuFeatures().isSuperSetOf(selected_target.getCpuFeatures())) { - mismatch_cpu_features = false; - break :whitelist_check; - } else { - break; - } - } - } - if (mismatch_triple) { - log.err("Chosen target '{s}' does not match one of the supported targets:", .{ - selected_canonicalized_triple, - }); - for (list) |t| { - const t_triple = t.zigTriple(self.allocator) catch unreachable; - log.err(" {s}", .{t_triple}); - } - } else { - assert(mismatch_cpu_features); - const whitelist_cpu = whitelist_item.getCpu(); - const selected_cpu = selected_target.getCpu(); - log.err("Chosen CPU model '{s}' does not match one of the supported targets:", .{ - selected_cpu.model.name, - }); - log.err(" Supported feature Set: ", .{}); - const all_features = whitelist_cpu.arch.allFeaturesList(); - var populated_cpu_features = whitelist_cpu.model.features; - populated_cpu_features.populateDependencies(all_features); - for (all_features) |feature, i_usize| { - const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); - const in_cpu_set = populated_cpu_features.isEnabled(i); - if (in_cpu_set) { - log.err("{s} ", .{feature.name}); - } - } - log.err(" Remove: ", .{}); - for (all_features) |feature, i_usize| { - const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); - const in_cpu_set = populated_cpu_features.isEnabled(i); - const in_actual_set = selected_cpu.features.isEnabled(i); - if (in_actual_set and !in_cpu_set) { - log.err("{s} ", .{feature.name}); - } - } - } - self.markInvalidUserInput(); - return args.default_target; - } - - return selected_target; - } - - pub fn addUserInputOption(self: *Builder, name_raw: []const u8, value_raw: []const u8) !bool { - const name = self.dupe(name_raw); - const value = self.dupe(value_raw); - const gop = try self.user_input_options.getOrPut(name); - if (!gop.found_existing) { - gop.value_ptr.* = UserInputOption{ - .name = name, - .value = .{ .scalar = value }, - .used = false, - }; - return false; - } - - // option already exists - switch (gop.value_ptr.value) { - .scalar => |s| { - // turn it into a list - var list = ArrayList([]const u8).init(self.allocator); - list.append(s) catch unreachable; - list.append(value) catch unreachable; - self.user_input_options.put(name, .{ - .name = name, - .value = .{ .list = list }, - .used = false, - }) catch unreachable; - }, - .list => |*list| { - // append to the list - list.append(value) catch unreachable; - self.user_input_options.put(name, .{ - .name = name, - .value = .{ .list = list.* }, - .used = false, - }) catch unreachable; - }, - .flag => { - log.warn("Option '-D{s}={s}' conflicts with flag '-D{s}'.", .{ name, value, name }); - return true; - }, - .map => |*map| { - _ = map; - log.warn("TODO maps as command line arguments is not implemented yet.", .{}); - return true; - }, - } - return false; - } - - pub fn addUserInputFlag(self: *Builder, name_raw: []const u8) !bool { - const name = self.dupe(name_raw); - const gop = try self.user_input_options.getOrPut(name); - if (!gop.found_existing) { - gop.value_ptr.* = .{ - .name = name, - .value = .{ .flag = {} }, - .used = false, - }; - return false; - } - - // option already exists - switch (gop.value_ptr.value) { - .scalar => |s| { - log.err("Flag '-D{s}' conflicts with option '-D{s}={s}'.", .{ name, name, s }); - return true; - }, - .list, .map => { - log.err("Flag '-D{s}' conflicts with multiple options of the same name.", .{name}); - return true; - }, - .flag => {}, - } - return false; - } - - fn typeToEnum(comptime T: type) TypeId { - return switch (@typeInfo(T)) { - .Int => .int, - .Float => .float, - .Bool => .bool, - .Enum => .@"enum", - else => switch (T) { - []const u8 => .string, - []const []const u8 => .list, - else => @compileError("Unsupported type: " ++ @typeName(T)), - }, - }; - } - - fn markInvalidUserInput(self: *Builder) void { - self.invalid_user_input = true; - } - - pub fn validateUserInputDidItFail(self: *Builder) bool { - // make sure all args are used - var it = self.user_input_options.iterator(); - while (it.next()) |entry| { - if (!entry.value_ptr.used) { - log.err("Invalid option: -D{s}", .{entry.key_ptr.*}); - self.markInvalidUserInput(); - } - } - - return self.invalid_user_input; - } - - pub fn spawnChild(self: *Builder, argv: []const []const u8) !void { - return self.spawnChildEnvMap(null, self.env_map, argv); - } - - fn printCmd(cwd: ?[]const u8, argv: []const []const u8) void { - if (cwd) |yes_cwd| std.debug.print("cd {s} && ", .{yes_cwd}); - for (argv) |arg| { - std.debug.print("{s} ", .{arg}); - } - std.debug.print("\n", .{}); - } - - pub fn spawnChildEnvMap(self: *Builder, cwd: ?[]const u8, env_map: *const EnvMap, argv: []const []const u8) !void { - if (self.verbose) { - printCmd(cwd, argv); - } - - if (!std.process.can_spawn) - return error.ExecNotSupported; - - var child = std.ChildProcess.init(argv, self.allocator); - child.cwd = cwd; - child.env_map = env_map; - - const term = child.spawnAndWait() catch |err| { - log.err("Unable to spawn {s}: {s}", .{ argv[0], @errorName(err) }); - return err; - }; - - switch (term) { - .Exited => |code| { - if (code != 0) { - log.err("The following command exited with error code {}:", .{code}); - printCmd(cwd, argv); - return error.UncleanExit; - } - }, - else => { - log.err("The following command terminated unexpectedly:", .{}); - printCmd(cwd, argv); - - return error.UncleanExit; - }, - } - } - - pub fn makePath(self: *Builder, path: []const u8) !void { - fs.cwd().makePath(self.pathFromRoot(path)) catch |err| { - log.err("Unable to create path {s}: {s}", .{ path, @errorName(err) }); - return err; - }; - } - - pub fn installArtifact(self: *Builder, artifact: *LibExeObjStep) void { - self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step); - } - - pub fn addInstallArtifact(self: *Builder, artifact: *LibExeObjStep) *InstallArtifactStep { - return InstallArtifactStep.create(self, artifact); - } - - ///`dest_rel_path` is relative to prefix path - pub fn installFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void { - self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .prefix, dest_rel_path).step); - } - - pub fn installDirectory(self: *Builder, options: InstallDirectoryOptions) void { - self.getInstallStep().dependOn(&self.addInstallDirectory(options).step); - } - - ///`dest_rel_path` is relative to bin path - pub fn installBinFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void { - self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .bin, dest_rel_path).step); - } - - ///`dest_rel_path` is relative to lib path - pub fn installLibFile(self: *Builder, src_path: []const u8, dest_rel_path: []const u8) void { - self.getInstallStep().dependOn(&self.addInstallFileWithDir(.{ .path = src_path }, .lib, dest_rel_path).step); - } - - /// Output format (BIN vs Intel HEX) determined by filename - pub fn installRaw(self: *Builder, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { - const raw = self.addInstallRaw(artifact, dest_filename, options); - self.getInstallStep().dependOn(&raw.step); - return raw; - } - - ///`dest_rel_path` is relative to install prefix path - pub fn addInstallFile(self: *Builder, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { - return self.addInstallFileWithDir(source.dupe(self), .prefix, dest_rel_path); - } - - ///`dest_rel_path` is relative to bin path - pub fn addInstallBinFile(self: *Builder, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { - return self.addInstallFileWithDir(source.dupe(self), .bin, dest_rel_path); - } - - ///`dest_rel_path` is relative to lib path - pub fn addInstallLibFile(self: *Builder, source: FileSource, dest_rel_path: []const u8) *InstallFileStep { - return self.addInstallFileWithDir(source.dupe(self), .lib, dest_rel_path); - } - - pub fn addInstallHeaderFile(b: *Builder, src_path: []const u8, dest_rel_path: []const u8) *InstallFileStep { - return b.addInstallFileWithDir(.{ .path = src_path }, .header, dest_rel_path); - } - - pub fn addInstallRaw(self: *Builder, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { - return InstallRawStep.create(self, artifact, dest_filename, options); - } - - pub fn addInstallFileWithDir( - self: *Builder, - source: FileSource, - install_dir: InstallDir, - dest_rel_path: []const u8, - ) *InstallFileStep { - if (dest_rel_path.len == 0) { - panic("dest_rel_path must be non-empty", .{}); - } - const install_step = self.allocator.create(InstallFileStep) catch unreachable; - install_step.* = InstallFileStep.init(self, source.dupe(self), install_dir, dest_rel_path); - return install_step; - } - - pub fn addInstallDirectory(self: *Builder, options: InstallDirectoryOptions) *InstallDirStep { - const install_step = self.allocator.create(InstallDirStep) catch unreachable; - install_step.* = InstallDirStep.init(self, options); - return install_step; - } - - pub fn pushInstalledFile(self: *Builder, dir: InstallDir, dest_rel_path: []const u8) void { - const file = InstalledFile{ - .dir = dir, - .path = dest_rel_path, - }; - self.installed_files.append(file.dupe(self)) catch unreachable; - } - - pub fn updateFile(self: *Builder, source_path: []const u8, dest_path: []const u8) !void { - if (self.verbose) { - log.info("cp {s} {s} ", .{ source_path, dest_path }); - } - const cwd = fs.cwd(); - const prev_status = try fs.Dir.updateFile(cwd, source_path, cwd, dest_path, .{}); - if (self.verbose) switch (prev_status) { - .stale => log.info("# installed", .{}), - .fresh => log.info("# up-to-date", .{}), - }; - } - - pub fn truncateFile(self: *Builder, dest_path: []const u8) !void { - if (self.verbose) { - log.info("truncate {s}", .{dest_path}); - } - const cwd = fs.cwd(); - var src_file = cwd.createFile(dest_path, .{}) catch |err| switch (err) { - error.FileNotFound => blk: { - if (fs.path.dirname(dest_path)) |dirname| { - try cwd.makePath(dirname); - } - break :blk try cwd.createFile(dest_path, .{}); - }, - else => |e| return e, - }; - src_file.close(); - } - - pub fn pathFromRoot(self: *Builder, rel_path: []const u8) []u8 { - return fs.path.resolve(self.allocator, &[_][]const u8{ self.build_root, rel_path }) catch unreachable; - } - - /// Shorthand for `std.fs.path.join(builder.allocator, paths) catch unreachable` - pub fn pathJoin(self: *Builder, paths: []const []const u8) []u8 { - return fs.path.join(self.allocator, paths) catch unreachable; - } - - pub fn fmt(self: *Builder, comptime format: []const u8, args: anytype) []u8 { - return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable; - } - - pub fn findProgram(self: *Builder, names: []const []const u8, paths: []const []const u8) ![]const u8 { - // TODO report error for ambiguous situations - const exe_extension = @as(CrossTarget, .{}).exeFileExt(); - for (self.search_prefixes.items) |search_prefix| { - for (names) |name| { - if (fs.path.isAbsolute(name)) { - return name; - } - const full_path = self.pathJoin(&.{ - search_prefix, - "bin", - self.fmt("{s}{s}", .{ name, exe_extension }), - }); - return fs.realpathAlloc(self.allocator, full_path) catch continue; - } - } - if (self.env_map.get("PATH")) |PATH| { - for (names) |name| { - if (fs.path.isAbsolute(name)) { - return name; - } - var it = mem.tokenize(u8, PATH, &[_]u8{fs.path.delimiter}); - while (it.next()) |path| { - const full_path = self.pathJoin(&.{ - path, - self.fmt("{s}{s}", .{ name, exe_extension }), - }); - return fs.realpathAlloc(self.allocator, full_path) catch continue; - } - } - } - for (names) |name| { - if (fs.path.isAbsolute(name)) { - return name; - } - for (paths) |path| { - const full_path = self.pathJoin(&.{ - path, - self.fmt("{s}{s}", .{ name, exe_extension }), - }); - return fs.realpathAlloc(self.allocator, full_path) catch continue; - } - } - return error.FileNotFound; - } - - pub fn execAllowFail( - self: *Builder, - argv: []const []const u8, - out_code: *u8, - stderr_behavior: std.ChildProcess.StdIo, - ) ExecError![]u8 { - assert(argv.len != 0); - - if (!std.process.can_spawn) - return error.ExecNotSupported; - - const max_output_size = 400 * 1024; - var child = std.ChildProcess.init(argv, self.allocator); - child.stdin_behavior = .Ignore; - child.stdout_behavior = .Pipe; - child.stderr_behavior = stderr_behavior; - child.env_map = self.env_map; - - try child.spawn(); - - const stdout = child.stdout.?.reader().readAllAlloc(self.allocator, max_output_size) catch { - return error.ReadFailure; - }; - errdefer self.allocator.free(stdout); - - const term = try child.wait(); - switch (term) { - .Exited => |code| { - if (code != 0) { - out_code.* = @truncate(u8, code); - return error.ExitCodeFailure; - } - return stdout; - }, - .Signal, .Stopped, .Unknown => |code| { - out_code.* = @truncate(u8, code); - return error.ProcessTerminated; - }, - } - } - - pub fn execFromStep(self: *Builder, argv: []const []const u8, src_step: ?*Step) ![]u8 { - assert(argv.len != 0); - - if (self.verbose) { - printCmd(null, argv); - } - - if (!std.process.can_spawn) { - if (src_step) |s| log.err("{s}...", .{s.name}); - log.err("Unable to spawn the following command: cannot spawn child process", .{}); - printCmd(null, argv); - std.os.abort(); - } - - var code: u8 = undefined; - return self.execAllowFail(argv, &code, .Inherit) catch |err| switch (err) { - error.ExecNotSupported => { - if (src_step) |s| log.err("{s}...", .{s.name}); - log.err("Unable to spawn the following command: cannot spawn child process", .{}); - printCmd(null, argv); - std.os.abort(); - }, - error.FileNotFound => { - if (src_step) |s| log.err("{s}...", .{s.name}); - log.err("Unable to spawn the following command: file not found", .{}); - printCmd(null, argv); - std.os.exit(@truncate(u8, code)); - }, - error.ExitCodeFailure => { - if (src_step) |s| log.err("{s}...", .{s.name}); - if (self.prominent_compile_errors) { - log.err("The step exited with error code {d}", .{code}); - } else { - log.err("The following command exited with error code {d}:", .{code}); - printCmd(null, argv); - } - - std.os.exit(@truncate(u8, code)); - }, - error.ProcessTerminated => { - if (src_step) |s| log.err("{s}...", .{s.name}); - log.err("The following command terminated unexpectedly:", .{}); - printCmd(null, argv); - std.os.exit(@truncate(u8, code)); - }, - else => |e| return e, - }; - } - - pub fn exec(self: *Builder, argv: []const []const u8) ![]u8 { - return self.execFromStep(argv, null); - } - - pub fn addSearchPrefix(self: *Builder, search_prefix: []const u8) void { - self.search_prefixes.append(self.dupePath(search_prefix)) catch unreachable; - } - - pub fn getInstallPath(self: *Builder, dir: InstallDir, dest_rel_path: []const u8) []const u8 { - assert(!fs.path.isAbsolute(dest_rel_path)); // Install paths must be relative to the prefix - const base_dir = switch (dir) { - .prefix => self.install_path, - .bin => self.exe_dir, - .lib => self.lib_dir, - .header => self.h_dir, - .custom => |path| self.pathJoin(&.{ self.install_path, path }), - }; - return fs.path.resolve( - self.allocator, - &[_][]const u8{ base_dir, dest_rel_path }, - ) catch unreachable; - } - - pub const Dependency = struct { - builder: *Builder, - - pub fn artifact(d: *Dependency, name: []const u8) *LibExeObjStep { - var found: ?*LibExeObjStep = null; - for (d.builder.install_tls.step.dependencies.items) |dep_step| { - const inst = dep_step.cast(InstallArtifactStep) orelse continue; - if (mem.eql(u8, inst.artifact.name, name)) { - if (found != null) panic("artifact name '{s}' is ambiguous", .{name}); - found = inst.artifact; - } - } - return found orelse { - for (d.builder.install_tls.step.dependencies.items) |dep_step| { - const inst = dep_step.cast(InstallArtifactStep) orelse continue; - log.info("available artifact: '{s}'", .{inst.artifact.name}); - } - panic("unable to find artifact '{s}'", .{name}); - }; - } - }; - - pub fn dependency(b: *Builder, name: []const u8, args: anytype) *Dependency { - const build_runner = @import("root"); - const deps = build_runner.dependencies; - - inline for (@typeInfo(deps.imports).Struct.decls) |decl| { - if (mem.startsWith(u8, decl.name, b.dep_prefix) and - mem.endsWith(u8, decl.name, name) and - decl.name.len == b.dep_prefix.len + name.len) - { - const build_zig = @field(deps.imports, decl.name); - const build_root = @field(deps.build_root, decl.name); - return dependencyInner(b, name, build_root, build_zig, args); - } - } - - const full_path = b.pathFromRoot("build.zig.ini"); - std.debug.print("no dependency named '{s}' in '{s}'\n", .{ name, full_path }); - std.process.exit(1); - } - - fn dependencyInner( - b: *Builder, - name: []const u8, - build_root: []const u8, - comptime build_zig: type, - args: anytype, - ) *Dependency { - const sub_builder = b.createChild(name, build_root, args) catch unreachable; - sub_builder.runBuild(build_zig) catch unreachable; - - if (sub_builder.validateUserInputDidItFail()) { - std.debug.dumpCurrentStackTrace(@returnAddress()); - } - - const dep = b.allocator.create(Dependency) catch unreachable; - dep.* = .{ .builder = sub_builder }; - return dep; - } - - pub fn runBuild(b: *Builder, build_zig: anytype) anyerror!void { - switch (@typeInfo(@typeInfo(@TypeOf(build_zig.build)).Fn.return_type.?)) { - .Void => build_zig.build(b), - .ErrorUnion => try build_zig.build(b), - else => @compileError("expected return type of build to be 'void' or '!void'"), - } - } -}; - -test "builder.findProgram compiles" { - if (builtin.os.tag == .wasi) return error.SkipZigTest; - - var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); - defer arena.deinit(); - - const builder = try Builder.create( - arena.allocator(), - "zig", - "zig-cache", - "zig-cache", - "zig-cache", - ); - defer builder.destroy(); - _ = builder.findProgram(&[_][]const u8{}, &[_][]const u8{}) catch null; -} - -pub const Pkg = struct { - name: []const u8, - source: FileSource, - dependencies: ?[]const Pkg = null, -}; - -/// A file that is generated by a build step. -/// This struct is an interface that is meant to be used with `@fieldParentPtr` to implement the actual path logic. -pub const GeneratedFile = struct { - /// The step that generates the file - step: *Step, - - /// The path to the generated file. Must be either absolute or relative to the build root. - /// This value must be set in the `fn make()` of the `step` and must not be `null` afterwards. - path: ?[]const u8 = null, - - pub fn getPath(self: GeneratedFile) []const u8 { - return self.path orelse std.debug.panic( - "getPath() was called on a GeneratedFile that wasn't build yet. Is there a missing Step dependency on step '{s}'?", - .{self.step.name}, - ); - } -}; - -/// A file source is a reference to an existing or future file. -/// -pub const FileSource = union(enum) { - /// A plain file path, relative to build root or absolute. - path: []const u8, - - /// A file that is generated by an interface. Those files usually are - /// not available until built by a build step. - generated: *const GeneratedFile, - - /// Returns a new file source that will have a relative path to the build root guaranteed. - /// This should be preferred over setting `.path` directly as it documents that the files are in the project directory. - pub fn relative(path: []const u8) FileSource { - std.debug.assert(!std.fs.path.isAbsolute(path)); - return FileSource{ .path = path }; - } - - /// Returns a string that can be shown to represent the file source. - /// Either returns the path or `"generated"`. - pub fn getDisplayName(self: FileSource) []const u8 { - return switch (self) { - .path => self.path, - .generated => "generated", - }; - } - - /// Adds dependencies this file source implies to the given step. - pub fn addStepDependencies(self: FileSource, step: *Step) void { - switch (self) { - .path => {}, - .generated => |gen| step.dependOn(gen.step), - } - } - - /// Should only be called during make(), returns a path relative to the build root or absolute. - pub fn getPath(self: FileSource, builder: *Builder) []const u8 { - const path = switch (self) { - .path => |p| builder.pathFromRoot(p), - .generated => |gen| gen.getPath(), - }; - return path; - } - - /// Duplicates the file source for a given builder. - pub fn dupe(self: FileSource, b: *Builder) FileSource { - return switch (self) { - .path => |p| .{ .path = b.dupePath(p) }, - .generated => |gen| .{ .generated = gen }, - }; - } -}; - -/// Allocates a new string for assigning a value to a named macro. -/// If the value is omitted, it is set to 1. -/// `name` and `value` need not live longer than the function call. -pub fn constructCMacro(allocator: Allocator, name: []const u8, value: ?[]const u8) []const u8 { - var macro = allocator.alloc( - u8, - name.len + if (value) |value_slice| value_slice.len + 1 else 0, - ) catch |err| if (err == error.OutOfMemory) @panic("Out of memory") else unreachable; - mem.copy(u8, macro, name); - if (value) |value_slice| { - macro[name.len] = '='; - mem.copy(u8, macro[name.len + 1 ..], value_slice); - } - return macro; -} - -/// deprecated: use `InstallDirStep.Options` -pub const InstallDirectoryOptions = InstallDirStep.Options; - -pub const Step = struct { - id: Id, - name: []const u8, - makeFn: MakeFn, - dependencies: ArrayList(*Step), - loop_flag: bool, - done_flag: bool, - - const MakeFn = *const fn (self: *Step) anyerror!void; - - pub const Id = enum { - top_level, - lib_exe_obj, - install_artifact, - install_file, - install_dir, - log, - remove_dir, - fmt, - translate_c, - write_file, - run, - emulatable_run, - check_file, - check_object, - config_header, - install_raw, - options, - custom, - - pub fn Type(comptime id: Id) type { - return switch (id) { - .top_level => Builder.TopLevelStep, - .lib_exe_obj => LibExeObjStep, - .install_artifact => InstallArtifactStep, - .install_file => InstallFileStep, - .install_dir => InstallDirStep, - .log => LogStep, - .remove_dir => RemoveDirStep, - .fmt => FmtStep, - .translate_c => TranslateCStep, - .write_file => WriteFileStep, - .run => RunStep, - .emulatable_run => EmulatableRunStep, - .check_file => CheckFileStep, - .check_object => CheckObjectStep, - .config_header => ConfigHeaderStep, - .install_raw => InstallRawStep, - .options => OptionsStep, - .custom => @compileError("no type available for custom step"), - }; - } - }; - - pub fn init(id: Id, name: []const u8, allocator: Allocator, makeFn: MakeFn) Step { - return Step{ - .id = id, - .name = allocator.dupe(u8, name) catch unreachable, - .makeFn = makeFn, - .dependencies = ArrayList(*Step).init(allocator), - .loop_flag = false, - .done_flag = false, - }; - } - pub fn initNoOp(id: Id, name: []const u8, allocator: Allocator) Step { - return init(id, name, allocator, makeNoOp); - } - - pub fn make(self: *Step) !void { - if (self.done_flag) return; - - try self.makeFn(self); - self.done_flag = true; - } - - pub fn dependOn(self: *Step, other: *Step) void { - self.dependencies.append(other) catch unreachable; - } - - fn makeNoOp(self: *Step) anyerror!void { - _ = self; - } - - pub fn cast(step: *Step, comptime T: type) ?*T { - if (step.id == T.base_id) { - return @fieldParentPtr(T, "step", step); - } - return null; - } -}; - -pub const VcpkgRoot = union(VcpkgRootStatus) { - unattempted: void, - not_found: void, - found: []const u8, -}; - -pub const VcpkgRootStatus = enum { - unattempted, - not_found, - found, -}; - -pub const InstallDir = union(enum) { - prefix: void, - lib: void, - bin: void, - header: void, - /// A path relative to the prefix - custom: []const u8, - - /// Duplicates the install directory including the path if set to custom. - pub fn dupe(self: InstallDir, builder: *Builder) InstallDir { - if (self == .custom) { - // Written with this temporary to avoid RLS problems - const duped_path = builder.dupe(self.custom); - return .{ .custom = duped_path }; - } else { - return self; - } - } -}; - -pub const InstalledFile = struct { - dir: InstallDir, - path: []const u8, - - /// Duplicates the installed file path and directory. - pub fn dupe(self: InstalledFile, builder: *Builder) InstalledFile { - return .{ - .dir = self.dir.dupe(builder), - .path = builder.dupe(self.path), - }; - } -}; - -pub fn serializeCpu(allocator: Allocator, cpu: std.Target.Cpu) ![]const u8 { - // TODO this logic can disappear if cpu model + features becomes part of the target triple - const all_features = cpu.arch.allFeaturesList(); - var populated_cpu_features = cpu.model.features; - populated_cpu_features.populateDependencies(all_features); - - if (populated_cpu_features.eql(cpu.features)) { - // The CPU name alone is sufficient. - return cpu.model.name; - } else { - var mcpu_buffer = ArrayList(u8).init(allocator); - try mcpu_buffer.appendSlice(cpu.model.name); - - for (all_features) |feature, i_usize| { - const i = @intCast(std.Target.Cpu.Feature.Set.Index, i_usize); - const in_cpu_set = populated_cpu_features.isEnabled(i); - const in_actual_set = cpu.features.isEnabled(i); - if (in_cpu_set and !in_actual_set) { - try mcpu_buffer.writer().print("-{s}", .{feature.name}); - } else if (!in_cpu_set and in_actual_set) { - try mcpu_buffer.writer().print("+{s}", .{feature.name}); - } - } - - return try mcpu_buffer.toOwnedSlice(); - } -} - -test "dupePkg()" { - if (builtin.os.tag == .wasi) return error.SkipZigTest; - - var arena = std.heap.ArenaAllocator.init(std.testing.allocator); - defer arena.deinit(); - var builder = try Builder.create( - arena.allocator(), - "test", - "test", - "test", - "test", - ); - defer builder.destroy(); - - var pkg_dep = Pkg{ - .name = "pkg_dep", - .source = .{ .path = "/not/a/pkg_dep.zig" }, - }; - var pkg_top = Pkg{ - .name = "pkg_top", - .source = .{ .path = "/not/a/pkg_top.zig" }, - .dependencies = &[_]Pkg{pkg_dep}, - }; - const dupe = builder.dupePkg(pkg_top); - - const original_deps = pkg_top.dependencies.?; - const dupe_deps = dupe.dependencies.?; - - // probably the same top level package details - try std.testing.expectEqualStrings(pkg_top.name, dupe.name); - - // probably the same dependencies - try std.testing.expectEqual(original_deps.len, dupe_deps.len); - try std.testing.expectEqual(original_deps[0].name, pkg_dep.name); - - // could segfault otherwise if pointers in duplicated package's fields are - // the same as those in stack allocated package's fields - try std.testing.expect(dupe_deps.ptr != original_deps.ptr); - try std.testing.expect(dupe.name.ptr != pkg_top.name.ptr); - try std.testing.expect(dupe.source.path.ptr != pkg_top.source.path.ptr); - try std.testing.expect(dupe_deps[0].name.ptr != pkg_dep.name.ptr); - try std.testing.expect(dupe_deps[0].source.path.ptr != pkg_dep.source.path.ptr); -} - -test { - _ = CheckFileStep; - _ = CheckObjectStep; - _ = EmulatableRunStep; - _ = FmtStep; - _ = InstallArtifactStep; - _ = InstallDirStep; - _ = InstallFileStep; - _ = InstallRawStep; - _ = LibExeObjStep; - _ = LogStep; - _ = OptionsStep; - _ = RemoveDirStep; - _ = RunStep; - _ = TranslateCStep; - _ = WriteFileStep; -} diff --git a/lib/std/std.zig b/lib/std/std.zig index ba52784b45..e0318ceb43 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -9,6 +9,7 @@ pub const AutoArrayHashMapUnmanaged = array_hash_map.AutoArrayHashMapUnmanaged; pub const AutoHashMap = hash_map.AutoHashMap; pub const AutoHashMapUnmanaged = hash_map.AutoHashMapUnmanaged; pub const BoundedArray = @import("bounded_array.zig").BoundedArray; +pub const Build = @import("Build.zig"); pub const BufMap = @import("buf_map.zig").BufMap; pub const BufSet = @import("buf_set.zig").BufSet; pub const ChildProcess = @import("child_process.zig").ChildProcess; @@ -49,7 +50,6 @@ pub const array_hash_map = @import("array_hash_map.zig"); pub const atomic = @import("atomic.zig"); pub const base64 = @import("base64.zig"); pub const bit_set = @import("bit_set.zig"); -pub const build = @import("build.zig"); pub const builtin = @import("builtin.zig"); pub const c = @import("c.zig"); pub const coff = @import("coff.zig"); @@ -96,6 +96,12 @@ pub const wasm = @import("wasm.zig"); pub const zig = @import("zig.zig"); pub const start = @import("start.zig"); +///// Deprecated. Use `std.Build` instead. +//pub const build = struct { +// /// Deprecated. Use `std.Build` instead. +// pub const Builder = Build; +//}; + const root = @import("root"); const options_override = if (@hasDecl(root, "std_options")) root.std_options else struct {}; diff --git a/test/link/bss/build.zig b/test/link/bss/build.zig index c31fa7faf5..0df9c1d323 100644 --- a/test/link/bss/build.zig +++ b/test/link/bss/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); diff --git a/test/link/common_symbols/build.zig b/test/link/common_symbols/build.zig index 068c3f9c57..ee9dd94ebd 100644 --- a/test/link/common_symbols/build.zig +++ b/test/link/common_symbols/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const lib_a = b.addStaticLibrary(.{ diff --git a/test/link/common_symbols_alignment/build.zig b/test/link/common_symbols_alignment/build.zig index b6dd39801c..f6efdc784b 100644 --- a/test/link/common_symbols_alignment/build.zig +++ b/test/link/common_symbols_alignment/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/link/interdependent_static_c_libs/build.zig b/test/link/interdependent_static_c_libs/build.zig index 50a214490d..d8962a8e08 100644 --- a/test/link/interdependent_static_c_libs/build.zig +++ b/test/link/interdependent_static_c_libs/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/link/macho/bugs/13056/build.zig b/test/link/macho/bugs/13056/build.zig index a65cd60766..662fd25c92 100644 --- a/test/link/macho/bugs/13056/build.zig +++ b/test/link/macho/bugs/13056/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/bugs/13457/build.zig b/test/link/macho/bugs/13457/build.zig index 4c1ce89261..6ca1f31b86 100644 --- a/test/link/macho/bugs/13457/build.zig +++ b/test/link/macho/bugs/13457/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/dead_strip/build.zig b/test/link/macho/dead_strip/build.zig index a4c3575e45..b6c3002492 100644 --- a/test/link/macho/dead_strip/build.zig +++ b/test/link/macho/dead_strip/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; @@ -37,7 +36,7 @@ pub fn build(b: *Builder) void { } } -fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/dead_strip_dylibs/build.zig b/test/link/macho/dead_strip_dylibs/build.zig index 0127b575fc..f61b30ca4a 100644 --- a/test/link/macho/dead_strip_dylibs/build.zig +++ b/test/link/macho/dead_strip_dylibs/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); @@ -36,7 +35,7 @@ pub fn build(b: *Builder) void { } } -fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { +fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/dylib/build.zig b/test/link/macho/dylib/build.zig index acd27a507f..7a1e2d862c 100644 --- a/test/link/macho/dylib/build.zig +++ b/test/link/macho/dylib/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/empty/build.zig b/test/link/macho/empty/build.zig index 8b2d047371..586da1511b 100644 --- a/test/link/macho/empty/build.zig +++ b/test/link/macho/empty/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; @@ -17,7 +16,7 @@ pub fn build(b: *Builder) void { exe.addCSourceFile("empty.c", &[0][]const u8{}); exe.linkLibC(); - const run_cmd = std.build.EmulatableRunStep.create(b, "run", exe); + const run_cmd = std.Build.EmulatableRunStep.create(b, "run", exe); run_cmd.expectStdOutEqual("Hello!\n"); test_step.dependOn(&run_cmd.step); } diff --git a/test/link/macho/entry/build.zig b/test/link/macho/entry/build.zig index 87e4d1b5da..4504da9c6c 100644 --- a/test/link/macho/entry/build.zig +++ b/test/link/macho/entry/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); diff --git a/test/link/macho/headerpad/build.zig b/test/link/macho/headerpad/build.zig index 74efb5d580..2b3c6abb8a 100644 --- a/test/link/macho/headerpad/build.zig +++ b/test/link/macho/headerpad/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); @@ -94,7 +93,7 @@ pub fn build(b: *Builder) void { } } -fn simpleExe(b: *Builder, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { +fn simpleExe(b: *std.Build, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { const exe = b.addExecutable(.{ .name = "main", .optimize = optimize, diff --git a/test/link/macho/linksection/build.zig b/test/link/macho/linksection/build.zig index eebb31a21e..227d4eeb63 100644 --- a/test/link/macho/linksection/build.zig +++ b/test/link/macho/linksection/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = std.zig.CrossTarget{ .os_tag = .macos }; diff --git a/test/link/macho/needed_framework/build.zig b/test/link/macho/needed_framework/build.zig index 33965a9272..62b70b21f1 100644 --- a/test/link/macho/needed_framework/build.zig +++ b/test/link/macho/needed_framework/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); diff --git a/test/link/macho/needed_library/build.zig b/test/link/macho/needed_library/build.zig index 137239d292..cdad94357b 100644 --- a/test/link/macho/needed_library/build.zig +++ b/test/link/macho/needed_library/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/objc/build.zig b/test/link/macho/objc/build.zig index 9c38739a5c..10d293baab 100644 --- a/test/link/macho/objc/build.zig +++ b/test/link/macho/objc/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); @@ -18,6 +17,6 @@ pub fn build(b: *Builder) void { // populate paths to the sysroot here. exe.linkFramework("Foundation"); - const run_cmd = std.build.EmulatableRunStep.create(b, "run", exe); + const run_cmd = std.Build.EmulatableRunStep.create(b, "run", exe); test_step.dependOn(&run_cmd.step); } diff --git a/test/link/macho/objcpp/build.zig b/test/link/macho/objcpp/build.zig index f4c88b2862..2a3459be50 100644 --- a/test/link/macho/objcpp/build.zig +++ b/test/link/macho/objcpp/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); diff --git a/test/link/macho/pagezero/build.zig b/test/link/macho/pagezero/build.zig index f61aa34a93..0a8471b919 100644 --- a/test/link/macho/pagezero/build.zig +++ b/test/link/macho/pagezero/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig index db894b6ae3..eeda89446b 100644 --- a/test/link/macho/search_strategy/build.zig +++ b/test/link/macho/search_strategy/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; @@ -29,14 +28,14 @@ pub fn build(b: *Builder) void { const exe = createScenario(b, optimize, target); exe.search_strategy = .paths_first; - const run = std.build.EmulatableRunStep.create(b, "run", exe); + const run = std.Build.EmulatableRunStep.create(b, "run", exe); run.cwd = b.pathFromRoot("."); run.expectStdOutEqual("Hello world"); test_step.dependOn(&run.step); } } -fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { const static = b.addStaticLibrary(.{ .name = "a", .optimize = optimize, @@ -44,7 +43,7 @@ fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.z }); static.addCSourceFile("a.c", &.{}); static.linkLibC(); - static.override_dest_dir = std.build.InstallDir{ + static.override_dest_dir = std.Build.InstallDir{ .custom = "static", }; static.install(); @@ -57,7 +56,7 @@ fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.z }); dylib.addCSourceFile("a.c", &.{}); dylib.linkLibC(); - dylib.override_dest_dir = std.build.InstallDir{ + dylib.override_dest_dir = std.Build.InstallDir{ .custom = "dynamic", }; dylib.install(); diff --git a/test/link/macho/stack_size/build.zig b/test/link/macho/stack_size/build.zig index 74e9a86e94..3529a134eb 100644 --- a/test/link/macho/stack_size/build.zig +++ b/test/link/macho/stack_size/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/strict_validation/build.zig b/test/link/macho/strict_validation/build.zig index b6baf63c11..6eabc02b5f 100644 --- a/test/link/macho/strict_validation/build.zig +++ b/test/link/macho/strict_validation/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/tls/build.zig b/test/link/macho/tls/build.zig index 9b2fe952bf..c77588cb5d 100644 --- a/test/link/macho/tls/build.zig +++ b/test/link/macho/tls/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/macho/unwind_info/build.zig b/test/link/macho/unwind_info/build.zig index dbbdbb3e51..e43c002e2e 100644 --- a/test/link/macho/unwind_info/build.zig +++ b/test/link/macho/unwind_info/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; @@ -14,8 +13,8 @@ pub fn build(b: *Builder) void { } fn testUnwindInfo( - b: *Builder, - test_step: *std.build.Step, + b: *std.Build, + test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, dead_strip: bool, @@ -52,7 +51,7 @@ fn testUnwindInfo( test_step.dependOn(&run_cmd.step); } -fn createScenario(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/uuid/build.zig b/test/link/macho/uuid/build.zig index 86ff99e8b1..62c288f1a0 100644 --- a/test/link/macho/uuid/build.zig +++ b/test/link/macho/uuid/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); @@ -27,8 +26,8 @@ pub fn build(b: *Builder) void { } fn testUuid( - b: *Builder, - test_step: *std.build.Step, + b: *std.Build, + test_step: *std.Build.Step, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, comptime exp: []const u8, @@ -52,7 +51,7 @@ fn testUuid( } } -fn simpleDylib(b: *Builder, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn simpleDylib(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { const dylib = b.addSharedLibrary(.{ .name = "test", .version = .{ .major = 1, .minor = 0 }, diff --git a/test/link/macho/weak_framework/build.zig b/test/link/macho/weak_framework/build.zig index f8460c4e82..5be66991dd 100644 --- a/test/link/macho/weak_framework/build.zig +++ b/test/link/macho/weak_framework/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test the program"); diff --git a/test/link/macho/weak_library/build.zig b/test/link/macho/weak_library/build.zig index 229d965e48..505ab5ae96 100644 --- a/test/link/macho/weak_library/build.zig +++ b/test/link/macho/weak_library/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); -const Builder = std.build.Builder; -const LibExeObjectStep = std.build.LibExeObjStep; +const LibExeObjectStep = std.Build.LibExeObjStep; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target: std.zig.CrossTarget = .{ .os_tag = .macos }; diff --git a/test/link/static_lib_as_system_lib/build.zig b/test/link/static_lib_as_system_lib/build.zig index 895cdcf316..b6cf32d711 100644 --- a/test/link/static_lib_as_system_lib/build.zig +++ b/test/link/static_lib_as_system_lib/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/link/wasm/archive/build.zig b/test/link/wasm/archive/build.zig index 7401ba22dc..342c4c08d1 100644 --- a/test/link/wasm/archive/build.zig +++ b/test/link/wasm/archive/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/basic-features/build.zig b/test/link/wasm/basic-features/build.zig index 69e88aefae..9f57066518 100644 --- a/test/link/wasm/basic-features/build.zig +++ b/test/link/wasm/basic-features/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { // Library with explicitly set cpu features const lib = b.addSharedLibrary(.{ .name = "lib", diff --git a/test/link/wasm/bss/build.zig b/test/link/wasm/bss/build.zig index 6b29fd0dc3..1017e70a71 100644 --- a/test/link/wasm/bss/build.zig +++ b/test/link/wasm/bss/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/export-data/build.zig b/test/link/wasm/export-data/build.zig index 8eab283ec2..95caf42dd0 100644 --- a/test/link/wasm/export-data/build.zig +++ b/test/link/wasm/export-data/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/export/build.zig b/test/link/wasm/export/build.zig index 2b9a91d728..69c34a320e 100644 --- a/test/link/wasm/export/build.zig +++ b/test/link/wasm/export/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const no_export = b.addSharedLibrary(.{ diff --git a/test/link/wasm/extern-mangle/build.zig b/test/link/wasm/extern-mangle/build.zig index 71bb986dff..19913e6eca 100644 --- a/test/link/wasm/extern-mangle/build.zig +++ b/test/link/wasm/extern-mangle/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/extern/build.zig b/test/link/wasm/extern/build.zig index 800c76a31c..569d94091a 100644 --- a/test/link/wasm/extern/build.zig +++ b/test/link/wasm/extern/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const exe = b.addExecutable(.{ .name = "extern", .root_source_file = .{ .path = "main.zig" }, diff --git a/test/link/wasm/function-table/build.zig b/test/link/wasm/function-table/build.zig index 804aaf0b09..4c25d0d860 100644 --- a/test/link/wasm/function-table/build.zig +++ b/test/link/wasm/function-table/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const test_step = b.step("test", "Test"); diff --git a/test/link/wasm/infer-features/build.zig b/test/link/wasm/infer-features/build.zig index 147fb55fda..d6d706a33d 100644 --- a/test/link/wasm/infer-features/build.zig +++ b/test/link/wasm/infer-features/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); // Wasm Object file which we will use to infer the features from diff --git a/test/link/wasm/producers/build.zig b/test/link/wasm/producers/build.zig index 57ee6acd18..2589b0dfcf 100644 --- a/test/link/wasm/producers/build.zig +++ b/test/link/wasm/producers/build.zig @@ -1,8 +1,7 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/segments/build.zig b/test/link/wasm/segments/build.zig index 8f7d9e0583..76160e905f 100644 --- a/test/link/wasm/segments/build.zig +++ b/test/link/wasm/segments/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/stack_pointer/build.zig b/test/link/wasm/stack_pointer/build.zig index 42971c607d..95c7643880 100644 --- a/test/link/wasm/stack_pointer/build.zig +++ b/test/link/wasm/stack_pointer/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/link/wasm/type/build.zig b/test/link/wasm/type/build.zig index 7fa3849083..816b57ccab 100644 --- a/test/link/wasm/type/build.zig +++ b/test/link/wasm/type/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); test_step.dependOn(b.getInstallStep()); diff --git a/test/src/compare_output.zig b/test/src/compare_output.zig index a885faaadf..edd48321c9 100644 --- a/test/src/compare_output.zig +++ b/test/src/compare_output.zig @@ -1,7 +1,6 @@ // This is the implementation of the test harness. // For the actual test cases, see test/compare_output.zig. const std = @import("std"); -const build = std.build; const ArrayList = std.ArrayList; const fmt = std.fmt; const mem = std.mem; @@ -9,8 +8,8 @@ const fs = std.fs; const OptimizeMode = std.builtin.OptimizeMode; pub const CompareOutputContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *std.Build.Step, test_index: usize, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode, diff --git a/test/src/run_translated_c.zig b/test/src/run_translated_c.zig index 0c54655b32..2103172ed6 100644 --- a/test/src/run_translated_c.zig +++ b/test/src/run_translated_c.zig @@ -1,15 +1,14 @@ // This is the implementation of the test harness for running translated // C code. For the actual test cases, see test/run_translated_c.zig. const std = @import("std"); -const build = std.build; const ArrayList = std.ArrayList; const fmt = std.fmt; const mem = std.mem; const fs = std.fs; pub const RunTranslatedCContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *std.Build.Step, test_index: usize, test_filter: ?[]const u8, target: std.zig.CrossTarget, diff --git a/test/src/translate_c.zig b/test/src/translate_c.zig index ad5fbb7091..e275ee57ee 100644 --- a/test/src/translate_c.zig +++ b/test/src/translate_c.zig @@ -1,7 +1,6 @@ // This is the implementation of the test harness. // For the actual test cases, see test/translate_c.zig. const std = @import("std"); -const build = std.build; const ArrayList = std.ArrayList; const fmt = std.fmt; const mem = std.mem; @@ -9,8 +8,8 @@ const fs = std.fs; const CrossTarget = std.zig.CrossTarget; pub const TranslateCContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *std.Build.Step, test_index: usize, test_filter: ?[]const u8, diff --git a/test/standalone/brace_expansion/build.zig b/test/standalone/brace_expansion/build.zig index 89250ff96f..7c32a09bef 100644 --- a/test/standalone/brace_expansion/build.zig +++ b/test/standalone/brace_expansion/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const main = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, .optimize = b.standardOptimizeOption(.{}), diff --git a/test/standalone/c_compiler/build.zig b/test/standalone/c_compiler/build.zig index 6959f810d6..dce999d4a2 100644 --- a/test/standalone/c_compiler/build.zig +++ b/test/standalone/c_compiler/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; -// TODO integrate this with the std.build executor API +// TODO integrate this with the std.Build executor API fn isRunnableTarget(t: CrossTarget) bool { if (t.isNative()) return true; @@ -11,7 +10,7 @@ fn isRunnableTarget(t: CrossTarget) bool { t.getCpuArch() == builtin.cpu.arch); } -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/emit_asm_and_bin/build.zig b/test/standalone/emit_asm_and_bin/build.zig index b8cbd5fc17..5345f0f538 100644 --- a/test/standalone/emit_asm_and_bin/build.zig +++ b/test/standalone/emit_asm_and_bin/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const main = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, .optimize = b.standardOptimizeOption(.{}), diff --git a/test/standalone/empty_env/build.zig b/test/standalone/empty_env/build.zig index ecdd74aa90..c4b4846141 100644 --- a/test/standalone/empty_env/build.zig +++ b/test/standalone/empty_env/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const main = b.addExecutable(.{ .name = "main", .root_source_file = .{ .path = "main.zig" }, diff --git a/test/standalone/global_linkage/build.zig b/test/standalone/global_linkage/build.zig index 3064c6cc08..9f79c80fcf 100644 --- a/test/standalone/global_linkage/build.zig +++ b/test/standalone/global_linkage/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const obj1 = b.addStaticLibrary(.{ diff --git a/test/standalone/install_raw_hex/build.zig b/test/standalone/install_raw_hex/build.zig index 94016b1d74..b0f938a344 100644 --- a/test/standalone/install_raw_hex/build.zig +++ b/test/standalone/install_raw_hex/build.zig @@ -1,8 +1,8 @@ const builtin = @import("builtin"); const std = @import("std"); -const CheckFileStep = std.build.CheckFileStep; +const CheckFileStep = std.Build.CheckFileStep; -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const target = .{ .cpu_arch = .thumb, .cpu_model = .{ .explicit = &std.Target.arm.cpu.cortex_m4 }, diff --git a/test/standalone/issue_11595/build.zig b/test/standalone/issue_11595/build.zig index b0310947f6..c335fb73da 100644 --- a/test/standalone/issue_11595/build.zig +++ b/test/standalone/issue_11595/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; -// TODO integrate this with the std.build executor API +// TODO integrate this with the std.Build executor API fn isRunnableTarget(t: CrossTarget) bool { if (t.isNative()) return true; @@ -11,7 +10,7 @@ fn isRunnableTarget(t: CrossTarget) bool { t.getCpuArch() == builtin.cpu.arch); } -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/issue_12588/build.zig b/test/standalone/issue_12588/build.zig index 27a23d5a76..9f14c53e38 100644 --- a/test/standalone/issue_12588/build.zig +++ b/test/standalone/issue_12588/build.zig @@ -1,7 +1,6 @@ const std = @import("std"); -const Builder = std.build.Builder; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/issue_12706/build.zig b/test/standalone/issue_12706/build.zig index e3c40d34c6..9d616477a2 100644 --- a/test/standalone/issue_12706/build.zig +++ b/test/standalone/issue_12706/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; -// TODO integrate this with the std.build executor API +// TODO integrate this with the std.Build executor API fn isRunnableTarget(t: CrossTarget) bool { if (t.isNative()) return true; @@ -11,7 +10,7 @@ fn isRunnableTarget(t: CrossTarget) bool { t.getCpuArch() == builtin.cpu.arch); } -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/issue_13030/build.zig b/test/standalone/issue_13030/build.zig index 510c7610d9..258d9b7db8 100644 --- a/test/standalone/issue_13030/build.zig +++ b/test/standalone/issue_13030/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/issue_339/build.zig b/test/standalone/issue_339/build.zig index 34c555cfdb..62ac128aab 100644 --- a/test/standalone/issue_339/build.zig +++ b/test/standalone/issue_339/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const obj = b.addObject(.{ .name = "test", .root_source_file = .{ .path = "test.zig" }, diff --git a/test/standalone/issue_5825/build.zig b/test/standalone/issue_5825/build.zig index 8d7acc3e9a..89272280d4 100644 --- a/test/standalone/issue_5825/build.zig +++ b/test/standalone/issue_5825/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const target = .{ .cpu_arch = .x86_64, .os_tag = .windows, diff --git a/test/standalone/issue_7030/build.zig b/test/standalone/issue_7030/build.zig index 41a646abe8..dc535318cc 100644 --- a/test/standalone/issue_7030/build.zig +++ b/test/standalone/issue_7030/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const exe = b.addExecutable(.{ .name = "issue_7030", .root_source_file = .{ .path = "main.zig" }, diff --git a/test/standalone/issue_794/build.zig b/test/standalone/issue_794/build.zig index 59ff7ea9ab..3089a28fd0 100644 --- a/test/standalone/issue_794/build.zig +++ b/test/standalone/issue_794/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_artifact = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, }); diff --git a/test/standalone/issue_8550/build.zig b/test/standalone/issue_8550/build.zig index 233f701661..c3303d55db 100644 --- a/test/standalone/issue_8550/build.zig +++ b/test/standalone/issue_8550/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) !void { +pub fn build(b: *std.Build) !void { const target = std.zig.CrossTarget{ .os_tag = .freestanding, .cpu_arch = .arm, diff --git a/test/standalone/issue_9812/build.zig b/test/standalone/issue_9812/build.zig index 50eefe846c..4ca55ce999 100644 --- a/test/standalone/issue_9812/build.zig +++ b/test/standalone/issue_9812/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) !void { +pub fn build(b: *std.Build) !void { const optimize = b.standardOptimizeOption(.{}); const zip_add = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, diff --git a/test/standalone/load_dynamic_library/build.zig b/test/standalone/load_dynamic_library/build.zig index 1aca02bc71..44fc37893c 100644 --- a/test/standalone/load_dynamic_library/build.zig +++ b/test/standalone/load_dynamic_library/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); diff --git a/test/standalone/main_pkg_path/build.zig b/test/standalone/main_pkg_path/build.zig index baee74052e..f9919d5ab5 100644 --- a/test/standalone/main_pkg_path/build.zig +++ b/test/standalone/main_pkg_path/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_exe = b.addTest(.{ .root_source_file = .{ .path = "a/test.zig" }, }); diff --git a/test/standalone/mix_c_files/build.zig b/test/standalone/mix_c_files/build.zig index ad69f05ff6..f2dfb2093f 100644 --- a/test/standalone/mix_c_files/build.zig +++ b/test/standalone/mix_c_files/build.zig @@ -1,9 +1,8 @@ const std = @import("std"); const builtin = @import("builtin"); -const Builder = std.build.Builder; const CrossTarget = std.zig.CrossTarget; -// TODO integrate this with the std.build executor API +// TODO integrate this with the std.Build executor API fn isRunnableTarget(t: CrossTarget) bool { if (t.isNative()) return true; @@ -11,7 +10,7 @@ fn isRunnableTarget(t: CrossTarget) bool { t.getCpuArch() == builtin.cpu.arch); } -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); diff --git a/test/standalone/mix_o_files/build.zig b/test/standalone/mix_o_files/build.zig index de37265388..2708343aa5 100644 --- a/test/standalone/mix_o_files/build.zig +++ b/test/standalone/mix_o_files/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const obj = b.addObject(.{ diff --git a/test/standalone/options/build.zig b/test/standalone/options/build.zig index 87a584a887..3f1e823359 100644 --- a/test/standalone/options/build.zig +++ b/test/standalone/options/build.zig @@ -1,6 +1,6 @@ const std = @import("std"); -pub fn build(b: *std.build.Builder) void { +pub fn build(b: *std.Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); diff --git a/test/standalone/pie/build.zig b/test/standalone/pie/build.zig index 3f0b8b9f2f..d51ea27328 100644 --- a/test/standalone/pie/build.zig +++ b/test/standalone/pie/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const main = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, .optimize = b.standardOptimizeOption(.{}), diff --git a/test/standalone/pkg_import/build.zig b/test/standalone/pkg_import/build.zig index 8dcfaeded0..5fbc8a67ae 100644 --- a/test/standalone/pkg_import/build.zig +++ b/test/standalone/pkg_import/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ diff --git a/test/standalone/shared_library/build.zig b/test/standalone/shared_library/build.zig index 135be095bc..91f7c8a06a 100644 --- a/test/standalone/shared_library/build.zig +++ b/test/standalone/shared_library/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const target = b.standardTargetOptions(.{}); const lib = b.addSharedLibrary(.{ diff --git a/test/standalone/static_c_lib/build.zig b/test/standalone/static_c_lib/build.zig index 81b4349e20..9937888843 100644 --- a/test/standalone/static_c_lib/build.zig +++ b/test/standalone/static_c_lib/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const foo = b.addStaticLibrary(.{ diff --git a/test/standalone/test_runner_path/build.zig b/test/standalone/test_runner_path/build.zig index 9b02da50c1..f073c55d4a 100644 --- a/test/standalone/test_runner_path/build.zig +++ b/test/standalone/test_runner_path/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const test_exe = b.addTest(.{ .root_source_file = .{ .path = "test.zig" }, .kind = .test_exe, diff --git a/test/standalone/use_alias/build.zig b/test/standalone/use_alias/build.zig index d2ca90f3ab..89e07efb22 100644 --- a/test/standalone/use_alias/build.zig +++ b/test/standalone/use_alias/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const main = b.addTest(.{ .root_source_file = .{ .path = "main.zig" }, .optimize = b.standardOptimizeOption(.{}), diff --git a/test/standalone/windows_spawn/build.zig b/test/standalone/windows_spawn/build.zig index de58a602c3..3ebde5a50c 100644 --- a/test/standalone/windows_spawn/build.zig +++ b/test/standalone/windows_spawn/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const std = @import("std"); -pub fn build(b: *Builder) void { +pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); const hello = b.addExecutable(.{ diff --git a/test/tests.zig b/test/tests.zig index 575550be02..de25528dde 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -1,7 +1,6 @@ const std = @import("std"); const builtin = @import("builtin"); const debug = std.debug; -const build = std.build; const CrossTarget = std.zig.CrossTarget; const io = std.io; const fs = std.fs; @@ -9,9 +8,10 @@ const mem = std.mem; const fmt = std.fmt; const ArrayList = std.ArrayList; const OptimizeMode = std.builtin.OptimizeMode; -const LibExeObjStep = build.LibExeObjStep; +const LibExeObjStep = std.Build.LibExeObjStep; const Allocator = mem.Allocator; -const ExecError = build.Builder.ExecError; +const ExecError = std.Build.ExecError; +const Step = std.Build.Step; // Cases const compare_output = @import("compare_output.zig"); @@ -462,7 +462,7 @@ const test_targets = blk: { const max_stdout_size = 1 * 1024 * 1024; // 1 MB -pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { +pub fn addCompareOutputTests(b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *Step { const cases = b.allocator.create(CompareOutputContext) catch unreachable; cases.* = CompareOutputContext{ .b = b, @@ -477,7 +477,7 @@ pub fn addCompareOutputTests(b: *build.Builder, test_filter: ?[]const u8, optimi return cases.step; } -pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { +pub fn addStackTraceTests(b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *Step { const cases = b.allocator.create(StackTracesContext) catch unreachable; cases.* = StackTracesContext{ .b = b, @@ -493,7 +493,7 @@ pub fn addStackTraceTests(b: *build.Builder, test_filter: ?[]const u8, optimize_ } pub fn addStandaloneTests( - b: *build.Builder, + b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode, skip_non_native: bool, @@ -506,7 +506,7 @@ pub fn addStandaloneTests( enable_wasmtime: bool, enable_wine: bool, enable_symlinks_windows: bool, -) *build.Step { +) *Step { const cases = b.allocator.create(StandaloneContext) catch unreachable; cases.* = StandaloneContext{ .b = b, @@ -532,13 +532,13 @@ pub fn addStandaloneTests( } pub fn addLinkTests( - b: *build.Builder, + b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode, enable_macos_sdk: bool, omit_stage2: bool, enable_symlinks_windows: bool, -) *build.Step { +) *Step { const cases = b.allocator.create(StandaloneContext) catch unreachable; cases.* = StandaloneContext{ .b = b, @@ -556,7 +556,7 @@ pub fn addLinkTests( return cases.step; } -pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { +pub fn addCliTests(b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *Step { _ = test_filter; _ = optimize_modes; const step = b.step("test-cli", "Test the command line interface"); @@ -577,7 +577,7 @@ pub fn addCliTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: return step; } -pub fn addAssembleAndLinkTests(b: *build.Builder, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *build.Step { +pub fn addAssembleAndLinkTests(b: *std.Build, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode) *Step { const cases = b.allocator.create(CompareOutputContext) catch unreachable; cases.* = CompareOutputContext{ .b = b, @@ -592,7 +592,7 @@ pub fn addAssembleAndLinkTests(b: *build.Builder, test_filter: ?[]const u8, opti return cases.step; } -pub fn addTranslateCTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step { +pub fn addTranslateCTests(b: *std.Build, test_filter: ?[]const u8) *Step { const cases = b.allocator.create(TranslateCContext) catch unreachable; cases.* = TranslateCContext{ .b = b, @@ -607,10 +607,10 @@ pub fn addTranslateCTests(b: *build.Builder, test_filter: ?[]const u8) *build.St } pub fn addRunTranslatedCTests( - b: *build.Builder, + b: *std.Build, test_filter: ?[]const u8, target: std.zig.CrossTarget, -) *build.Step { +) *Step { const cases = b.allocator.create(RunTranslatedCContext) catch unreachable; cases.* = .{ .b = b, @@ -625,7 +625,7 @@ pub fn addRunTranslatedCTests( return cases.step; } -pub fn addGenHTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step { +pub fn addGenHTests(b: *std.Build, test_filter: ?[]const u8) *Step { const cases = b.allocator.create(GenHContext) catch unreachable; cases.* = GenHContext{ .b = b, @@ -640,7 +640,7 @@ pub fn addGenHTests(b: *build.Builder, test_filter: ?[]const u8) *build.Step { } pub fn addPkgTests( - b: *build.Builder, + b: *std.Build, test_filter: ?[]const u8, root_src: []const u8, name: []const u8, @@ -651,7 +651,7 @@ pub fn addPkgTests( skip_libc: bool, skip_stage1: bool, skip_stage2: bool, -) *build.Step { +) *Step { const step = b.step(b.fmt("test-{s}", .{name}), desc); for (test_targets) |test_target| { @@ -742,8 +742,8 @@ pub fn addPkgTests( } pub const StackTracesContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *Step, test_index: usize, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode, @@ -840,7 +840,7 @@ pub const StackTracesContext = struct { const RunAndCompareStep = struct { pub const base_id = .custom; - step: build.Step, + step: Step, context: *StackTracesContext, exe: *LibExeObjStep, name: []const u8, @@ -858,7 +858,7 @@ pub const StackTracesContext = struct { const allocator = context.b.allocator; const ptr = allocator.create(RunAndCompareStep) catch unreachable; ptr.* = RunAndCompareStep{ - .step = build.Step.init(.custom, "StackTraceCompareOutputStep", allocator, make), + .step = Step.init(.custom, "StackTraceCompareOutputStep", allocator, make), .context = context, .exe = exe, .name = name, @@ -871,7 +871,7 @@ pub const StackTracesContext = struct { return ptr; } - fn make(step: *build.Step) !void { + fn make(step: *Step) !void { const self = @fieldParentPtr(RunAndCompareStep, "step", step); const b = self.context.b; @@ -1014,8 +1014,8 @@ pub const StackTracesContext = struct { }; pub const StandaloneContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *Step, test_index: usize, test_filter: ?[]const u8, optimize_modes: []const OptimizeMode, @@ -1150,8 +1150,8 @@ pub const StandaloneContext = struct { }; pub const GenHContext = struct { - b: *build.Builder, - step: *build.Step, + b: *std.Build, + step: *Step, test_index: usize, test_filter: ?[]const u8, @@ -1178,7 +1178,7 @@ pub const GenHContext = struct { }; const GenHCmpOutputStep = struct { - step: build.Step, + step: Step, context: *GenHContext, obj: *LibExeObjStep, name: []const u8, @@ -1194,7 +1194,7 @@ pub const GenHContext = struct { const allocator = context.b.allocator; const ptr = allocator.create(GenHCmpOutputStep) catch unreachable; ptr.* = GenHCmpOutputStep{ - .step = build.Step.init(.Custom, "ParseCCmpOutput", allocator, make), + .step = Step.init(.Custom, "ParseCCmpOutput", allocator, make), .context = context, .obj = obj, .name = name, @@ -1206,7 +1206,7 @@ pub const GenHContext = struct { return ptr; } - fn make(step: *build.Step) !void { + fn make(step: *Step) !void { const self = @fieldParentPtr(GenHCmpOutputStep, "step", step); const b = self.context.b; @@ -1348,7 +1348,7 @@ const c_abi_targets = [_]CrossTarget{ }, }; -pub fn addCAbiTests(b: *build.Builder, skip_non_native: bool, skip_release: bool) *build.Step { +pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *Step { const step = b.step("test-c-abi", "Run the C ABI tests"); const optimize_modes: [2]OptimizeMode = .{ .Debug, .ReleaseFast }; From 60c4befad39a1e1689872bc78dd1b8f8d5c34887 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 00:20:37 -0700 Subject: [PATCH 17/65] build.zig: remove dead list of unused source files --- build.zig | 160 ------------------------------------------------------ 1 file changed, 160 deletions(-) diff --git a/build.zig b/build.zig index 6b6c384fc4..713eac6517 100644 --- a/build.zig +++ b/build.zig @@ -870,166 +870,6 @@ fn toNativePathSep(b: *std.Build, s: []const u8) []u8 { return duplicated; } -const softfloat_sources = [_][]const u8{ - "deps/SoftFloat-3e/source/8086/f128M_isSignalingNaN.c", - "deps/SoftFloat-3e/source/8086/extF80M_isSignalingNaN.c", - "deps/SoftFloat-3e/source/8086/s_commonNaNToF128M.c", - "deps/SoftFloat-3e/source/8086/s_commonNaNToExtF80M.c", - "deps/SoftFloat-3e/source/8086/s_commonNaNToF16UI.c", - "deps/SoftFloat-3e/source/8086/s_commonNaNToF32UI.c", - "deps/SoftFloat-3e/source/8086/s_commonNaNToF64UI.c", - "deps/SoftFloat-3e/source/8086/s_f128MToCommonNaN.c", - "deps/SoftFloat-3e/source/8086/s_extF80MToCommonNaN.c", - "deps/SoftFloat-3e/source/8086/s_f16UIToCommonNaN.c", - "deps/SoftFloat-3e/source/8086/s_f32UIToCommonNaN.c", - "deps/SoftFloat-3e/source/8086/s_f64UIToCommonNaN.c", - "deps/SoftFloat-3e/source/8086/s_propagateNaNF128M.c", - "deps/SoftFloat-3e/source/8086/s_propagateNaNExtF80M.c", - "deps/SoftFloat-3e/source/8086/s_propagateNaNF16UI.c", - "deps/SoftFloat-3e/source/8086/softfloat_raiseFlags.c", - "deps/SoftFloat-3e/source/f128M_add.c", - "deps/SoftFloat-3e/source/f128M_div.c", - "deps/SoftFloat-3e/source/f128M_eq.c", - "deps/SoftFloat-3e/source/f128M_eq_signaling.c", - "deps/SoftFloat-3e/source/f128M_le.c", - "deps/SoftFloat-3e/source/f128M_le_quiet.c", - "deps/SoftFloat-3e/source/f128M_lt.c", - "deps/SoftFloat-3e/source/f128M_lt_quiet.c", - "deps/SoftFloat-3e/source/f128M_mul.c", - "deps/SoftFloat-3e/source/f128M_mulAdd.c", - "deps/SoftFloat-3e/source/f128M_rem.c", - "deps/SoftFloat-3e/source/f128M_roundToInt.c", - "deps/SoftFloat-3e/source/f128M_sqrt.c", - "deps/SoftFloat-3e/source/f128M_sub.c", - "deps/SoftFloat-3e/source/f128M_to_f16.c", - "deps/SoftFloat-3e/source/f128M_to_f32.c", - "deps/SoftFloat-3e/source/f128M_to_f64.c", - "deps/SoftFloat-3e/source/f128M_to_extF80M.c", - "deps/SoftFloat-3e/source/f128M_to_i32.c", - "deps/SoftFloat-3e/source/f128M_to_i32_r_minMag.c", - "deps/SoftFloat-3e/source/f128M_to_i64.c", - "deps/SoftFloat-3e/source/f128M_to_i64_r_minMag.c", - "deps/SoftFloat-3e/source/f128M_to_ui32.c", - "deps/SoftFloat-3e/source/f128M_to_ui32_r_minMag.c", - "deps/SoftFloat-3e/source/f128M_to_ui64.c", - "deps/SoftFloat-3e/source/f128M_to_ui64_r_minMag.c", - "deps/SoftFloat-3e/source/extF80M_add.c", - "deps/SoftFloat-3e/source/extF80M_div.c", - "deps/SoftFloat-3e/source/extF80M_eq.c", - "deps/SoftFloat-3e/source/extF80M_le.c", - "deps/SoftFloat-3e/source/extF80M_lt.c", - "deps/SoftFloat-3e/source/extF80M_mul.c", - "deps/SoftFloat-3e/source/extF80M_rem.c", - "deps/SoftFloat-3e/source/extF80M_roundToInt.c", - "deps/SoftFloat-3e/source/extF80M_sqrt.c", - "deps/SoftFloat-3e/source/extF80M_sub.c", - "deps/SoftFloat-3e/source/extF80M_to_f16.c", - "deps/SoftFloat-3e/source/extF80M_to_f32.c", - "deps/SoftFloat-3e/source/extF80M_to_f64.c", - "deps/SoftFloat-3e/source/extF80M_to_f128M.c", - "deps/SoftFloat-3e/source/f16_add.c", - "deps/SoftFloat-3e/source/f16_div.c", - "deps/SoftFloat-3e/source/f16_eq.c", - "deps/SoftFloat-3e/source/f16_isSignalingNaN.c", - "deps/SoftFloat-3e/source/f16_lt.c", - "deps/SoftFloat-3e/source/f16_mul.c", - "deps/SoftFloat-3e/source/f16_mulAdd.c", - "deps/SoftFloat-3e/source/f16_rem.c", - "deps/SoftFloat-3e/source/f16_roundToInt.c", - "deps/SoftFloat-3e/source/f16_sqrt.c", - "deps/SoftFloat-3e/source/f16_sub.c", - "deps/SoftFloat-3e/source/f16_to_extF80M.c", - "deps/SoftFloat-3e/source/f16_to_f128M.c", - "deps/SoftFloat-3e/source/f16_to_f64.c", - "deps/SoftFloat-3e/source/f32_to_extF80M.c", - "deps/SoftFloat-3e/source/f32_to_f128M.c", - "deps/SoftFloat-3e/source/f64_to_extF80M.c", - "deps/SoftFloat-3e/source/f64_to_f128M.c", - "deps/SoftFloat-3e/source/f64_to_f16.c", - "deps/SoftFloat-3e/source/i32_to_f128M.c", - "deps/SoftFloat-3e/source/s_add256M.c", - "deps/SoftFloat-3e/source/s_addCarryM.c", - "deps/SoftFloat-3e/source/s_addComplCarryM.c", - "deps/SoftFloat-3e/source/s_addF128M.c", - "deps/SoftFloat-3e/source/s_addExtF80M.c", - "deps/SoftFloat-3e/source/s_addM.c", - "deps/SoftFloat-3e/source/s_addMagsF16.c", - "deps/SoftFloat-3e/source/s_addMagsF32.c", - "deps/SoftFloat-3e/source/s_addMagsF64.c", - "deps/SoftFloat-3e/source/s_approxRecip32_1.c", - "deps/SoftFloat-3e/source/s_approxRecipSqrt32_1.c", - "deps/SoftFloat-3e/source/s_approxRecipSqrt_1Ks.c", - "deps/SoftFloat-3e/source/s_approxRecip_1Ks.c", - "deps/SoftFloat-3e/source/s_compare128M.c", - "deps/SoftFloat-3e/source/s_compare96M.c", - "deps/SoftFloat-3e/source/s_compareNonnormExtF80M.c", - "deps/SoftFloat-3e/source/s_countLeadingZeros16.c", - "deps/SoftFloat-3e/source/s_countLeadingZeros32.c", - "deps/SoftFloat-3e/source/s_countLeadingZeros64.c", - "deps/SoftFloat-3e/source/s_countLeadingZeros8.c", - "deps/SoftFloat-3e/source/s_eq128.c", - "deps/SoftFloat-3e/source/s_invalidF128M.c", - "deps/SoftFloat-3e/source/s_invalidExtF80M.c", - "deps/SoftFloat-3e/source/s_isNaNF128M.c", - "deps/SoftFloat-3e/source/s_le128.c", - "deps/SoftFloat-3e/source/s_lt128.c", - "deps/SoftFloat-3e/source/s_mul128MTo256M.c", - "deps/SoftFloat-3e/source/s_mul64To128M.c", - "deps/SoftFloat-3e/source/s_mulAddF128M.c", - "deps/SoftFloat-3e/source/s_mulAddF16.c", - "deps/SoftFloat-3e/source/s_mulAddF32.c", - "deps/SoftFloat-3e/source/s_mulAddF64.c", - "deps/SoftFloat-3e/source/s_negXM.c", - "deps/SoftFloat-3e/source/s_normExtF80SigM.c", - "deps/SoftFloat-3e/source/s_normRoundPackMToF128M.c", - "deps/SoftFloat-3e/source/s_normRoundPackMToExtF80M.c", - "deps/SoftFloat-3e/source/s_normRoundPackToF16.c", - "deps/SoftFloat-3e/source/s_normRoundPackToF32.c", - "deps/SoftFloat-3e/source/s_normRoundPackToF64.c", - "deps/SoftFloat-3e/source/s_normSubnormalF128SigM.c", - "deps/SoftFloat-3e/source/s_normSubnormalF16Sig.c", - "deps/SoftFloat-3e/source/s_normSubnormalF32Sig.c", - "deps/SoftFloat-3e/source/s_normSubnormalF64Sig.c", - "deps/SoftFloat-3e/source/s_remStepMBy32.c", - "deps/SoftFloat-3e/source/s_roundMToI64.c", - "deps/SoftFloat-3e/source/s_roundMToUI64.c", - "deps/SoftFloat-3e/source/s_roundPackMToExtF80M.c", - "deps/SoftFloat-3e/source/s_roundPackMToF128M.c", - "deps/SoftFloat-3e/source/s_roundPackToF16.c", - "deps/SoftFloat-3e/source/s_roundPackToF32.c", - "deps/SoftFloat-3e/source/s_roundPackToF64.c", - "deps/SoftFloat-3e/source/s_roundToI32.c", - "deps/SoftFloat-3e/source/s_roundToI64.c", - "deps/SoftFloat-3e/source/s_roundToUI32.c", - "deps/SoftFloat-3e/source/s_roundToUI64.c", - "deps/SoftFloat-3e/source/s_shiftLeftM.c", - "deps/SoftFloat-3e/source/s_shiftNormSigF128M.c", - "deps/SoftFloat-3e/source/s_shiftRightJam256M.c", - "deps/SoftFloat-3e/source/s_shiftRightJam32.c", - "deps/SoftFloat-3e/source/s_shiftRightJam64.c", - "deps/SoftFloat-3e/source/s_shiftRightJamM.c", - "deps/SoftFloat-3e/source/s_shiftRightM.c", - "deps/SoftFloat-3e/source/s_shortShiftLeft64To96M.c", - "deps/SoftFloat-3e/source/s_shortShiftLeftM.c", - "deps/SoftFloat-3e/source/s_shortShiftRightExtendM.c", - "deps/SoftFloat-3e/source/s_shortShiftRightJam64.c", - "deps/SoftFloat-3e/source/s_shortShiftRightJamM.c", - "deps/SoftFloat-3e/source/s_shortShiftRightM.c", - "deps/SoftFloat-3e/source/s_sub1XM.c", - "deps/SoftFloat-3e/source/s_sub256M.c", - "deps/SoftFloat-3e/source/s_subM.c", - "deps/SoftFloat-3e/source/s_subMagsF16.c", - "deps/SoftFloat-3e/source/s_subMagsF32.c", - "deps/SoftFloat-3e/source/s_subMagsF64.c", - "deps/SoftFloat-3e/source/s_tryPropagateNaNF128M.c", - "deps/SoftFloat-3e/source/s_tryPropagateNaNExtF80M.c", - "deps/SoftFloat-3e/source/softfloat_state.c", - "deps/SoftFloat-3e/source/ui32_to_f128M.c", - "deps/SoftFloat-3e/source/ui64_to_f128M.c", - "deps/SoftFloat-3e/source/ui32_to_extF80M.c", - "deps/SoftFloat-3e/source/ui64_to_extF80M.c", -}; - const zig_cpp_sources = [_][]const u8{ // These are planned to stay even when we are self-hosted. "src/zig_llvm.cpp", From 5129fae4e8fdb68db1efdff20679b13487501691 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 00:33:45 -0700 Subject: [PATCH 18/65] std.Build: accept host Target in create() And only detect native target in LibExeObjStep once, in create(). --- lib/build_runner.zig | 3 +++ lib/std/Build.zig | 10 ++++++++-- lib/std/Build/LibExeObjStep.zig | 8 ++++---- lib/std/Build/OptionsStep.zig | 4 ++++ 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/lib/build_runner.zig b/lib/build_runner.zig index 189b118787..f2b2eba950 100644 --- a/lib/build_runner.zig +++ b/lib/build_runner.zig @@ -41,12 +41,15 @@ pub fn main() !void { return error.InvalidArgs; }; + const host = try std.zig.system.NativeTargetInfo.detect(.{}); + const builder = try std.Build.create( allocator, zig_exe, build_root, cache_root, global_cache_root, + host, ); defer builder.destroy(); diff --git a/lib/std/Build.zig b/lib/std/Build.zig index a3c579c743..c0152ef6f1 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -179,12 +179,11 @@ pub fn create( build_root: []const u8, cache_root: []const u8, global_cache_root: []const u8, + host: NativeTargetInfo, ) !*Build { const env_map = try allocator.create(EnvMap); env_map.* = try process.getEnvMap(allocator); - const host = try NativeTargetInfo.detect(.{}); - const self = try allocator.create(Build); self.* = Build{ .zig_exe = zig_exe, @@ -1529,12 +1528,15 @@ test "builder.findProgram compiles" { var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator); defer arena.deinit(); + const host = try NativeTargetInfo.detect(.{}); + const builder = try Build.create( arena.allocator(), "zig", "zig-cache", "zig-cache", "zig-cache", + host, ); defer builder.destroy(); _ = builder.findProgram(&[_][]const u8{}, &[_][]const u8{}) catch null; @@ -1713,12 +1715,16 @@ test "dupePkg()" { var arena = std.heap.ArenaAllocator.init(std.testing.allocator); defer arena.deinit(); + + const host = try NativeTargetInfo.detect(.{}); + var builder = try Build.create( arena.allocator(), "test", "test", "test", "test", + host, ); defer builder.destroy(); diff --git a/lib/std/Build/LibExeObjStep.zig b/lib/std/Build/LibExeObjStep.zig index af9d34440d..67f42c1783 100644 --- a/lib/std/Build/LibExeObjStep.zig +++ b/lib/std/Build/LibExeObjStep.zig @@ -364,7 +364,7 @@ pub fn create(builder: *std.Build, options: Options) *LibExeObjStep { .output_h_path_source = GeneratedFile{ .step = &self.step }, .output_pdb_path_source = GeneratedFile{ .step = &self.step }, - .target_info = undefined, // populated in computeOutFileNames + .target_info = NativeTargetInfo.detect(self.target) catch unreachable, }; self.computeOutFileNames(); if (root_src) |rs| rs.addStepDependencies(&self.step); @@ -372,9 +372,6 @@ pub fn create(builder: *std.Build, options: Options) *LibExeObjStep { } fn computeOutFileNames(self: *LibExeObjStep) void { - self.target_info = NativeTargetInfo.detect(self.target) catch - unreachable; - const target = self.target_info.target; self.out_filename = std.zig.binNameAlloc(self.builder.allocator, .{ @@ -1946,12 +1943,15 @@ test "addPackage" { var arena = std.heap.ArenaAllocator.init(std.testing.allocator); defer arena.deinit(); + const host = try NativeTargetInfo.detect(.{}); + var builder = try std.Build.create( arena.allocator(), "test", "test", "test", "test", + host, ); defer builder.destroy(); diff --git a/lib/std/Build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig index 3d26807411..8e1a7ef2fc 100644 --- a/lib/std/Build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -279,12 +279,16 @@ test "OptionsStep" { var arena = std.heap.ArenaAllocator.init(std.testing.allocator); defer arena.deinit(); + + const host = try std.zig.system.NativeTargetInfo.detect(.{}); + var builder = try std.Build.create( arena.allocator(), "test", "test", "test", "test", + host, ); defer builder.destroy(); From 9a29f4e0387f0480273ca4347ee43e4917cad8e2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 12:48:46 -0700 Subject: [PATCH 19/65] langref updates for new std.Build API --- doc/langref.html.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/langref.html.in b/doc/langref.html.in index 1163ad0200..00a263bae2 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -10560,8 +10560,9 @@ pub fn build(b: *std.Build) void { // for restricting supported target set are available. const target = b.standardTargetOptions(.{}); - // Standard release options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. + // Standard optimization options allow the person running `zig build` to select + // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not + // set a preferred release mode, allowing the user to decide how to optimize. const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ @@ -10964,8 +10965,11 @@ int main(int argc, char **argv) { const std = @import("std"); pub fn build(b: *std.Build) void { - const lib = b.addSharedLibrary("mathtest", "mathtest.zig", b.version(1, 0, 0)); - + const lib = b.addSharedLibrary(.{ + .name = "mathtest", + .root_source_file = .{ .path = "mathtest.zig" }, + .version = .{ .major = 1, .minor = 0, .patch = 0 }, + }); const exe = b.addExecutable(.{ .name = "test", }); @@ -11028,7 +11032,10 @@ int main(int argc, char **argv) { const std = @import("std"); pub fn build(b: *std.Build) void { - const obj = b.addObject("base64", "base64.zig"); + const obj = b.addObject(.{ + .name = "base64", + .root_source_file = .{ .path = "base64.zig" }, + }); const exe = b.addExecutable(.{ .name = "test", From 34b314509919d85a6b6ff9de3bbdad2fec6b2b78 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 13:05:00 -0700 Subject: [PATCH 20/65] update test case for new std.builtin.OptimizeMode API --- test/cases/compile_errors/invalid_member_of_builtin_enum.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cases/compile_errors/invalid_member_of_builtin_enum.zig b/test/cases/compile_errors/invalid_member_of_builtin_enum.zig index 3edb17ffbf..b0a176d792 100644 --- a/test/cases/compile_errors/invalid_member_of_builtin_enum.zig +++ b/test/cases/compile_errors/invalid_member_of_builtin_enum.zig @@ -1,6 +1,6 @@ const builtin = @import("std").builtin; export fn entry() void { - const foo = builtin.Mode.x86; + const foo = builtin.OptimizeMode.x86; _ = foo; } @@ -8,5 +8,5 @@ export fn entry() void { // backend=stage2 // target=native // -// :3:30: error: enum 'builtin.Mode' has no member named 'x86' +// :3:38: error: enum 'builtin.OptimizeMode' has no member named 'x86' // :?:18: note: enum declared here From 77544683ddd5f4d577ecc9c92a2b52a276aed2a6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 13:38:03 -0700 Subject: [PATCH 21/65] fix init-exe, init-lib templates --- lib/init-exe/build.zig | 2 +- lib/init-lib/build.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/init-exe/build.zig b/lib/init-exe/build.zig index b88515b403..2ef5b21fe9 100644 --- a/lib/init-exe/build.zig +++ b/lib/init-exe/build.zig @@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void { // Standard optimization options allow the person running `zig build` to select // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not // set a preferred release mode, allowing the user to decide how to optimize. - const optimize = b.standardOptimizeOption(); + const optimize = b.standardOptimizeOption(.{}); const exe = b.addExecutable(.{ .name = "$", diff --git a/lib/init-lib/build.zig b/lib/init-lib/build.zig index 5ebb55373f..2887c170e6 100644 --- a/lib/init-lib/build.zig +++ b/lib/init-lib/build.zig @@ -13,7 +13,7 @@ pub fn build(b: *std.Build) void { // Standard optimization options allow the person running `zig build` to select // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not // set a preferred release mode, allowing the user to decide how to optimize. - const optimize = b.standardOptimizeOption(); + const optimize = b.standardOptimizeOption(.{}); const lib = b.addStaticLibrary(.{ .name = "$", From 16cdd1297ebfac534615eaeb8439a4e1de71837c Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 13:44:06 -0700 Subject: [PATCH 22/65] rename std.Build.LibExeObjStep to std.Build.CompileStep This matches the nomenclature internally: a Compilation is the main type that represents a single invokation of the compiler. --- build.zig | 12 +- lib/std/Build.zig | 49 +++--- lib/std/Build/CheckObjectStep.zig | 2 +- .../{LibExeObjStep.zig => CompileStep.zig} | 154 +++++++++--------- lib/std/Build/EmulatableRunStep.zig | 6 +- lib/std/Build/InstallArtifactStep.zig | 8 +- lib/std/Build/InstallRawStep.zig | 6 +- lib/std/Build/OptionsStep.zig | 6 +- lib/std/Build/RunStep.zig | 10 +- lib/std/Build/Step.zig | 4 +- lib/std/Build/TranslateCStep.zig | 6 +- lib/std/std.zig | 2 + test/link/macho/bugs/13457/build.zig | 1 - test/link/macho/dead_strip/build.zig | 7 +- test/link/macho/dead_strip_dylibs/build.zig | 3 +- test/link/macho/headerpad/build.zig | 3 +- test/link/macho/needed_framework/build.zig | 1 - test/link/macho/needed_library/build.zig | 1 - test/link/macho/search_strategy/build.zig | 7 +- test/link/macho/strict_validation/build.zig | 1 - test/link/macho/unwind_info/build.zig | 7 +- test/link/macho/uuid/build.zig | 7 +- test/link/macho/weak_framework/build.zig | 1 - test/link/macho/weak_library/build.zig | 1 - test/tests.zig | 10 +- 25 files changed, 162 insertions(+), 153 deletions(-) rename lib/std/Build/{LibExeObjStep.zig => CompileStep.zig} (93%) diff --git a/build.zig b/build.zig index 713eac6517..ecf51fe316 100644 --- a/build.zig +++ b/build.zig @@ -516,7 +516,7 @@ fn addCompilerStep( b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget, -) *std.Build.LibExeObjStep { +) *std.Build.CompileStep { const exe = b.addExecutable(.{ .name = "zig", .root_source_file = .{ .path = "src/main.zig" }, @@ -544,7 +544,7 @@ const exe_cflags = [_][]const u8{ fn addCmakeCfgOptionsToExe( b: *std.Build, cfg: CMakeConfig, - exe: *std.Build.LibExeObjStep, + exe: *std.Build.CompileStep, use_zig_libcxx: bool, ) !void { if (exe.target.isDarwin()) { @@ -623,7 +623,7 @@ fn addCmakeCfgOptionsToExe( } } -fn addStaticLlvmOptionsToExe(exe: *std.Build.LibExeObjStep) !void { +fn addStaticLlvmOptionsToExe(exe: *std.Build.CompileStep) !void { // Adds the Zig C++ sources which both stage1 and stage2 need. // // We need this because otherwise zig_clang_cc1_main.cpp ends up pulling @@ -662,7 +662,7 @@ fn addStaticLlvmOptionsToExe(exe: *std.Build.LibExeObjStep) !void { fn addCxxKnownPath( b: *std.Build, ctx: CMakeConfig, - exe: *std.Build.LibExeObjStep, + exe: *std.Build.CompileStep, objname: []const u8, errtxt: ?[]const u8, need_cpp_includes: bool, @@ -695,7 +695,7 @@ fn addCxxKnownPath( } } -fn addCMakeLibraryList(exe: *std.Build.LibExeObjStep, list: []const u8) void { +fn addCMakeLibraryList(exe: *std.Build.CompileStep, list: []const u8) void { var it = mem.tokenize(u8, list, ";"); while (it.next()) |lib| { if (mem.startsWith(u8, lib, "-l")) { @@ -709,7 +709,7 @@ fn addCMakeLibraryList(exe: *std.Build.LibExeObjStep, list: []const u8) void { } const CMakeConfig = struct { - llvm_linkage: std.Build.LibExeObjStep.Linkage, + llvm_linkage: std.Build.CompileStep.Linkage, cmake_binary_dir: []const u8, cmake_prefix_path: []const u8, cmake_static_library_prefix: []const u8, diff --git a/lib/std/Build.zig b/lib/std/Build.zig index c0152ef6f1..4647baa398 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -19,6 +19,9 @@ const NativeTargetInfo = std.zig.system.NativeTargetInfo; const Sha256 = std.crypto.hash.sha2.Sha256; const Build = @This(); +///// deprecated: use `CompileStep` instead. +//pub const LibExeObjStep = CompileStep; + pub const Step = @import("Build/Step.zig"); pub const CheckFileStep = @import("Build/CheckFileStep.zig"); pub const CheckObjectStep = @import("Build/CheckObjectStep.zig"); @@ -29,7 +32,7 @@ pub const InstallArtifactStep = @import("Build/InstallArtifactStep.zig"); pub const InstallDirStep = @import("Build/InstallDirStep.zig"); pub const InstallFileStep = @import("Build/InstallFileStep.zig"); pub const InstallRawStep = @import("Build/InstallRawStep.zig"); -pub const LibExeObjStep = @import("Build/LibExeObjStep.zig"); +pub const CompileStep = @import("Build/CompileStep.zig"); pub const LogStep = @import("Build/LogStep.zig"); pub const OptionsStep = @import("Build/OptionsStep.zig"); pub const RemoveDirStep = @import("Build/RemoveDirStep.zig"); @@ -423,11 +426,11 @@ pub const ExecutableOptions = struct { version: ?std.builtin.Version = null, target: CrossTarget = .{}, optimize: std.builtin.Mode = .Debug, - linkage: ?LibExeObjStep.Linkage = null, + linkage: ?CompileStep.Linkage = null, }; -pub fn addExecutable(b: *Build, options: ExecutableOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ +pub fn addExecutable(b: *Build, options: ExecutableOptions) *CompileStep { + return CompileStep.create(b, .{ .name = options.name, .root_source_file = options.root_source_file, .version = options.version, @@ -445,8 +448,8 @@ pub const ObjectOptions = struct { optimize: std.builtin.Mode, }; -pub fn addObject(b: *Build, options: ObjectOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ +pub fn addObject(b: *Build, options: ObjectOptions) *CompileStep { + return CompileStep.create(b, .{ .name = options.name, .root_source_file = options.root_source_file, .target = options.target, @@ -463,8 +466,8 @@ pub const SharedLibraryOptions = struct { optimize: std.builtin.Mode, }; -pub fn addSharedLibrary(b: *Build, options: SharedLibraryOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ +pub fn addSharedLibrary(b: *Build, options: SharedLibraryOptions) *CompileStep { + return CompileStep.create(b, .{ .name = options.name, .root_source_file = options.root_source_file, .kind = .lib, @@ -483,8 +486,8 @@ pub const StaticLibraryOptions = struct { version: ?std.builtin.Version = null, }; -pub fn addStaticLibrary(b: *Build, options: StaticLibraryOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ +pub fn addStaticLibrary(b: *Build, options: StaticLibraryOptions) *CompileStep { + return CompileStep.create(b, .{ .name = options.name, .root_source_file = options.root_source_file, .kind = .lib, @@ -497,15 +500,15 @@ pub fn addStaticLibrary(b: *Build, options: StaticLibraryOptions) *LibExeObjStep pub const TestOptions = struct { name: []const u8 = "test", - kind: LibExeObjStep.Kind = .@"test", + kind: CompileStep.Kind = .@"test", root_source_file: FileSource, target: CrossTarget = .{}, optimize: std.builtin.Mode = .Debug, version: ?std.builtin.Version = null, }; -pub fn addTest(b: *Build, options: TestOptions) *LibExeObjStep { - return LibExeObjStep.create(b, .{ +pub fn addTest(b: *Build, options: TestOptions) *CompileStep { + return CompileStep.create(b, .{ .name = options.name, .kind = options.kind, .root_source_file = options.root_source_file, @@ -521,8 +524,8 @@ pub const AssemblyOptions = struct { optimize: std.builtin.Mode, }; -pub fn addAssembly(b: *Build, options: AssemblyOptions) *LibExeObjStep { - const obj_step = LibExeObjStep.create(b, .{ +pub fn addAssembly(b: *Build, options: AssemblyOptions) *CompileStep { + const obj_step = CompileStep.create(b, .{ .name = options.name, .root_source_file = null, .target = options.target, @@ -536,7 +539,7 @@ pub fn addAssembly(b: *Build, options: AssemblyOptions) *LibExeObjStep { /// executable. More command line arguments can be added with `addArg`, /// `addArgs`, and `addArtifactArg`. /// Be careful using this function, as it introduces a system dependency. -/// To run an executable built with zig build, see `LibExeObjStep.run`. +/// To run an executable built with zig build, see `CompileStep.run`. pub fn addSystemCommand(self: *Build, argv: []const []const u8) *RunStep { assert(argv.len >= 1); const run_step = RunStep.create(self, self.fmt("run {s}", .{argv[0]})); @@ -1167,11 +1170,11 @@ pub fn makePath(self: *Build, path: []const u8) !void { }; } -pub fn installArtifact(self: *Build, artifact: *LibExeObjStep) void { +pub fn installArtifact(self: *Build, artifact: *CompileStep) void { self.getInstallStep().dependOn(&self.addInstallArtifact(artifact).step); } -pub fn addInstallArtifact(self: *Build, artifact: *LibExeObjStep) *InstallArtifactStep { +pub fn addInstallArtifact(self: *Build, artifact: *CompileStep) *InstallArtifactStep { return InstallArtifactStep.create(self, artifact); } @@ -1195,7 +1198,7 @@ pub fn installLibFile(self: *Build, src_path: []const u8, dest_rel_path: []const } /// Output format (BIN vs Intel HEX) determined by filename -pub fn installRaw(self: *Build, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { +pub fn installRaw(self: *Build, artifact: *CompileStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { const raw = self.addInstallRaw(artifact, dest_filename, options); self.getInstallStep().dependOn(&raw.step); return raw; @@ -1220,7 +1223,7 @@ pub fn addInstallHeaderFile(b: *Build, src_path: []const u8, dest_rel_path: []co return b.addInstallFileWithDir(.{ .path = src_path }, .header, dest_rel_path); } -pub fn addInstallRaw(self: *Build, artifact: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { +pub fn addInstallRaw(self: *Build, artifact: *CompileStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { return InstallRawStep.create(self, artifact, dest_filename, options); } @@ -1456,8 +1459,8 @@ pub fn getInstallPath(self: *Build, dir: InstallDir, dest_rel_path: []const u8) pub const Dependency = struct { builder: *Build, - pub fn artifact(d: *Dependency, name: []const u8) *LibExeObjStep { - var found: ?*LibExeObjStep = null; + pub fn artifact(d: *Dependency, name: []const u8) *CompileStep { + var found: ?*CompileStep = null; for (d.builder.install_tls.step.dependencies.items) |dep_step| { const inst = dep_step.cast(InstallArtifactStep) orelse continue; if (mem.eql(u8, inst.artifact.name, name)) { @@ -1767,7 +1770,7 @@ test { _ = InstallDirStep; _ = InstallFileStep; _ = InstallRawStep; - _ = LibExeObjStep; + _ = CompileStep; _ = LogStep; _ = OptionsStep; _ = RemoveDirStep; diff --git a/lib/std/Build/CheckObjectStep.zig b/lib/std/Build/CheckObjectStep.zig index 7907be1787..bfa5338927 100644 --- a/lib/std/Build/CheckObjectStep.zig +++ b/lib/std/Build/CheckObjectStep.zig @@ -42,7 +42,7 @@ pub fn runAndCompare(self: *CheckObjectStep) *EmulatableRunStep { const dependencies_len = self.step.dependencies.items.len; assert(dependencies_len > 0); const exe_step = self.step.dependencies.items[dependencies_len - 1]; - const exe = exe_step.cast(std.Build.LibExeObjStep).?; + const exe = exe_step.cast(std.Build.CompileStep).?; const emulatable_step = EmulatableRunStep.create(self.builder, "EmulatableRun", exe); emulatable_step.step.dependOn(&self.step); return emulatable_step; diff --git a/lib/std/Build/LibExeObjStep.zig b/lib/std/Build/CompileStep.zig similarity index 93% rename from lib/std/Build/LibExeObjStep.zig rename to lib/std/Build/CompileStep.zig index 67f42c1783..5257c85a5c 100644 --- a/lib/std/Build/LibExeObjStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -27,9 +27,9 @@ const CheckObjectStep = std.Build.CheckObjectStep; const RunStep = std.Build.RunStep; const OptionsStep = std.Build.OptionsStep; const ConfigHeaderStep = std.Build.ConfigHeaderStep; -const LibExeObjStep = @This(); +const CompileStep = @This(); -pub const base_id = .lib_exe_obj; +pub const base_id: Step.Id = .compile; step: Step, builder: *std.Build, @@ -234,7 +234,7 @@ pub const CSourceFile = struct { pub const LinkObject = union(enum) { static_path: FileSource, - other_step: *LibExeObjStep, + other_step: *CompileStep, system_lib: SystemLib, assembly_file: FileSource, c_source_file: *CSourceFile, @@ -265,7 +265,7 @@ const FrameworkLinkInfo = struct { pub const IncludeDir = union(enum) { raw_path: []const u8, raw_path_system: []const u8, - other_step: *LibExeObjStep, + other_step: *CompileStep, config_header_step: *ConfigHeaderStep, }; @@ -305,15 +305,15 @@ pub const EmitOption = union(enum) { } }; -pub fn create(builder: *std.Build, options: Options) *LibExeObjStep { +pub fn create(builder: *std.Build, options: Options) *CompileStep { const name = builder.dupe(options.name); const root_src: ?FileSource = if (options.root_source_file) |rsrc| rsrc.dupe(builder) else null; if (mem.indexOf(u8, name, "/") != null or mem.indexOf(u8, name, "\\") != null) { panic("invalid name: '{s}'. It looks like a file path, but it is supposed to be the library or application name.", .{name}); } - const self = builder.allocator.create(LibExeObjStep) catch unreachable; - self.* = LibExeObjStep{ + const self = builder.allocator.create(CompileStep) catch unreachable; + self.* = CompileStep{ .strip = null, .unwind_tables = null, .builder = builder, @@ -371,7 +371,7 @@ pub fn create(builder: *std.Build, options: Options) *LibExeObjStep { return self; } -fn computeOutFileNames(self: *LibExeObjStep) void { +fn computeOutFileNames(self: *CompileStep) void { const target = self.target_info.target; self.out_filename = std.zig.binNameAlloc(self.builder.allocator, .{ @@ -424,26 +424,26 @@ fn computeOutFileNames(self: *LibExeObjStep) void { } } -pub fn setOutputDir(self: *LibExeObjStep, dir: []const u8) void { +pub fn setOutputDir(self: *CompileStep, dir: []const u8) void { self.output_dir = self.builder.dupePath(dir); } -pub fn install(self: *LibExeObjStep) void { +pub fn install(self: *CompileStep) void { self.builder.installArtifact(self); } -pub fn installRaw(self: *LibExeObjStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { +pub fn installRaw(self: *CompileStep, dest_filename: []const u8, options: InstallRawStep.CreateOptions) *InstallRawStep { return self.builder.installRaw(self, dest_filename, options); } -pub fn installHeader(a: *LibExeObjStep, src_path: []const u8, dest_rel_path: []const u8) void { +pub fn installHeader(a: *CompileStep, src_path: []const u8, dest_rel_path: []const u8) void { const install_file = a.builder.addInstallHeaderFile(src_path, dest_rel_path); a.builder.getInstallStep().dependOn(&install_file.step); a.installed_headers.append(&install_file.step) catch unreachable; } pub fn installHeadersDirectory( - a: *LibExeObjStep, + a: *CompileStep, src_dir_path: []const u8, dest_rel_path: []const u8, ) void { @@ -455,7 +455,7 @@ pub fn installHeadersDirectory( } pub fn installHeadersDirectoryOptions( - a: *LibExeObjStep, + a: *CompileStep, options: std.Build.InstallDirStep.Options, ) void { const install_dir = a.builder.addInstallDirectory(options); @@ -463,7 +463,7 @@ pub fn installHeadersDirectoryOptions( a.installed_headers.append(&install_dir.step) catch unreachable; } -pub fn installLibraryHeaders(a: *LibExeObjStep, l: *LibExeObjStep) void { +pub fn installLibraryHeaders(a: *CompileStep, l: *CompileStep) void { assert(l.kind == .lib); const install_step = a.builder.getInstallStep(); // Copy each element from installed_headers, modifying the builder @@ -488,7 +488,7 @@ pub fn installLibraryHeaders(a: *LibExeObjStep, l: *LibExeObjStep) void { /// Creates a `RunStep` with an executable built with `addExecutable`. /// Add command line arguments with `addArg`. -pub fn run(exe: *LibExeObjStep) *RunStep { +pub fn run(exe: *CompileStep) *RunStep { assert(exe.kind == .exe or exe.kind == .test_exe); // It doesn't have to be native. We catch that if you actually try to run it. @@ -512,7 +512,7 @@ pub fn run(exe: *LibExeObjStep) *RunStep { /// Allows running foreign binaries through emulation platforms such as Qemu or Rosetta. /// When a binary cannot be ran through emulation or the option is disabled, a warning /// will be printed and the binary will *NOT* be ran. -pub fn runEmulatable(exe: *LibExeObjStep) *EmulatableRunStep { +pub fn runEmulatable(exe: *CompileStep) *EmulatableRunStep { assert(exe.kind == .exe or exe.kind == .test_exe); const run_step = EmulatableRunStep.create(exe.builder, exe.builder.fmt("run {s}", .{exe.step.name}), exe); @@ -522,33 +522,33 @@ pub fn runEmulatable(exe: *LibExeObjStep) *EmulatableRunStep { return run_step; } -pub fn checkObject(self: *LibExeObjStep, obj_format: std.Target.ObjectFormat) *CheckObjectStep { +pub fn checkObject(self: *CompileStep, obj_format: std.Target.ObjectFormat) *CheckObjectStep { return CheckObjectStep.create(self.builder, self.getOutputSource(), obj_format); } -pub fn setLinkerScriptPath(self: *LibExeObjStep, source: FileSource) void { +pub fn setLinkerScriptPath(self: *CompileStep, source: FileSource) void { self.linker_script = source.dupe(self.builder); source.addStepDependencies(&self.step); } -pub fn linkFramework(self: *LibExeObjStep, framework_name: []const u8) void { +pub fn linkFramework(self: *CompileStep, framework_name: []const u8) void { self.frameworks.put(self.builder.dupe(framework_name), .{}) catch unreachable; } -pub fn linkFrameworkNeeded(self: *LibExeObjStep, framework_name: []const u8) void { +pub fn linkFrameworkNeeded(self: *CompileStep, framework_name: []const u8) void { self.frameworks.put(self.builder.dupe(framework_name), .{ .needed = true, }) catch unreachable; } -pub fn linkFrameworkWeak(self: *LibExeObjStep, framework_name: []const u8) void { +pub fn linkFrameworkWeak(self: *CompileStep, framework_name: []const u8) void { self.frameworks.put(self.builder.dupe(framework_name), .{ .weak = true, }) catch unreachable; } /// Returns whether the library, executable, or object depends on a particular system library. -pub fn dependsOnSystemLibrary(self: LibExeObjStep, name: []const u8) bool { +pub fn dependsOnSystemLibrary(self: CompileStep, name: []const u8) bool { if (isLibCLibrary(name)) { return self.is_linking_libc; } @@ -564,49 +564,49 @@ pub fn dependsOnSystemLibrary(self: LibExeObjStep, name: []const u8) bool { return false; } -pub fn linkLibrary(self: *LibExeObjStep, lib: *LibExeObjStep) void { +pub fn linkLibrary(self: *CompileStep, lib: *CompileStep) void { assert(lib.kind == .lib); self.linkLibraryOrObject(lib); } -pub fn isDynamicLibrary(self: *LibExeObjStep) bool { +pub fn isDynamicLibrary(self: *CompileStep) bool { return self.kind == .lib and self.linkage == Linkage.dynamic; } -pub fn isStaticLibrary(self: *LibExeObjStep) bool { +pub fn isStaticLibrary(self: *CompileStep) bool { return self.kind == .lib and self.linkage != Linkage.dynamic; } -pub fn producesPdbFile(self: *LibExeObjStep) bool { +pub fn producesPdbFile(self: *CompileStep) bool { if (!self.target.isWindows() and !self.target.isUefi()) return false; if (self.target.getObjectFormat() == .c) return false; if (self.strip == true) return false; return self.isDynamicLibrary() or self.kind == .exe or self.kind == .test_exe; } -pub fn linkLibC(self: *LibExeObjStep) void { +pub fn linkLibC(self: *CompileStep) void { self.is_linking_libc = true; } -pub fn linkLibCpp(self: *LibExeObjStep) void { +pub fn linkLibCpp(self: *CompileStep) void { self.is_linking_libcpp = true; } /// If the value is omitted, it is set to 1. /// `name` and `value` need not live longer than the function call. -pub fn defineCMacro(self: *LibExeObjStep, name: []const u8, value: ?[]const u8) void { +pub fn defineCMacro(self: *CompileStep, name: []const u8, value: ?[]const u8) void { const macro = std.Build.constructCMacro(self.builder.allocator, name, value); self.c_macros.append(macro) catch unreachable; } /// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1. -pub fn defineCMacroRaw(self: *LibExeObjStep, name_and_value: []const u8) void { +pub fn defineCMacroRaw(self: *CompileStep, name_and_value: []const u8) void { self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable; } /// This one has no integration with anything, it just puts -lname on the command line. /// Prefer to use `linkSystemLibrary` instead. -pub fn linkSystemLibraryName(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibraryName(self: *CompileStep, name: []const u8) void { self.link_objects.append(.{ .system_lib = .{ .name = self.builder.dupe(name), @@ -619,7 +619,7 @@ pub fn linkSystemLibraryName(self: *LibExeObjStep, name: []const u8) void { /// This one has no integration with anything, it just puts -needed-lname on the command line. /// Prefer to use `linkSystemLibraryNeeded` instead. -pub fn linkSystemLibraryNeededName(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibraryNeededName(self: *CompileStep, name: []const u8) void { self.link_objects.append(.{ .system_lib = .{ .name = self.builder.dupe(name), @@ -632,7 +632,7 @@ pub fn linkSystemLibraryNeededName(self: *LibExeObjStep, name: []const u8) void /// Darwin-only. This one has no integration with anything, it just puts -weak-lname on the /// command line. Prefer to use `linkSystemLibraryWeak` instead. -pub fn linkSystemLibraryWeakName(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibraryWeakName(self: *CompileStep, name: []const u8) void { self.link_objects.append(.{ .system_lib = .{ .name = self.builder.dupe(name), @@ -645,7 +645,7 @@ pub fn linkSystemLibraryWeakName(self: *LibExeObjStep, name: []const u8) void { /// This links against a system library, exclusively using pkg-config to find the library. /// Prefer to use `linkSystemLibrary` instead. -pub fn linkSystemLibraryPkgConfigOnly(self: *LibExeObjStep, lib_name: []const u8) void { +pub fn linkSystemLibraryPkgConfigOnly(self: *CompileStep, lib_name: []const u8) void { self.link_objects.append(.{ .system_lib = .{ .name = self.builder.dupe(lib_name), @@ -658,7 +658,7 @@ pub fn linkSystemLibraryPkgConfigOnly(self: *LibExeObjStep, lib_name: []const u8 /// This links against a system library, exclusively using pkg-config to find the library. /// Prefer to use `linkSystemLibraryNeeded` instead. -pub fn linkSystemLibraryNeededPkgConfigOnly(self: *LibExeObjStep, lib_name: []const u8) void { +pub fn linkSystemLibraryNeededPkgConfigOnly(self: *CompileStep, lib_name: []const u8) void { self.link_objects.append(.{ .system_lib = .{ .name = self.builder.dupe(lib_name), @@ -671,7 +671,7 @@ pub fn linkSystemLibraryNeededPkgConfigOnly(self: *LibExeObjStep, lib_name: []co /// Run pkg-config for the given library name and parse the output, returning the arguments /// that should be passed to zig to link the given library. -pub fn runPkgConfig(self: *LibExeObjStep, lib_name: []const u8) ![]const []const u8 { +pub fn runPkgConfig(self: *CompileStep, lib_name: []const u8) ![]const []const u8 { const pkg_name = match: { // First we have to map the library name to pkg config name. Unfortunately, // there are several examples where this is not straightforward: @@ -765,19 +765,19 @@ pub fn runPkgConfig(self: *LibExeObjStep, lib_name: []const u8) ![]const []const return zig_args.toOwnedSlice(); } -pub fn linkSystemLibrary(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibrary(self: *CompileStep, name: []const u8) void { self.linkSystemLibraryInner(name, .{}); } -pub fn linkSystemLibraryNeeded(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibraryNeeded(self: *CompileStep, name: []const u8) void { self.linkSystemLibraryInner(name, .{ .needed = true }); } -pub fn linkSystemLibraryWeak(self: *LibExeObjStep, name: []const u8) void { +pub fn linkSystemLibraryWeak(self: *CompileStep, name: []const u8) void { self.linkSystemLibraryInner(name, .{ .weak = true }); } -fn linkSystemLibraryInner(self: *LibExeObjStep, name: []const u8, opts: struct { +fn linkSystemLibraryInner(self: *CompileStep, name: []const u8, opts: struct { needed: bool = false, weak: bool = false, }) void { @@ -800,23 +800,23 @@ fn linkSystemLibraryInner(self: *LibExeObjStep, name: []const u8, opts: struct { }) catch unreachable; } -pub fn setNamePrefix(self: *LibExeObjStep, text: []const u8) void { +pub fn setNamePrefix(self: *CompileStep, text: []const u8) void { assert(self.kind == .@"test" or self.kind == .test_exe); self.name_prefix = self.builder.dupe(text); } -pub fn setFilter(self: *LibExeObjStep, text: ?[]const u8) void { +pub fn setFilter(self: *CompileStep, text: ?[]const u8) void { assert(self.kind == .@"test" or self.kind == .test_exe); self.filter = if (text) |t| self.builder.dupe(t) else null; } -pub fn setTestRunner(self: *LibExeObjStep, path: ?[]const u8) void { +pub fn setTestRunner(self: *CompileStep, path: ?[]const u8) void { assert(self.kind == .@"test" or self.kind == .test_exe); self.test_runner = if (path) |p| self.builder.dupePath(p) else null; } /// Handy when you have many C/C++ source files and want them all to have the same flags. -pub fn addCSourceFiles(self: *LibExeObjStep, files: []const []const u8, flags: []const []const u8) void { +pub fn addCSourceFiles(self: *CompileStep, files: []const []const u8, flags: []const []const u8) void { const c_source_files = self.builder.allocator.create(CSourceFiles) catch unreachable; const files_copy = self.builder.dupeStrings(files); @@ -829,89 +829,89 @@ pub fn addCSourceFiles(self: *LibExeObjStep, files: []const []const u8, flags: [ self.link_objects.append(.{ .c_source_files = c_source_files }) catch unreachable; } -pub fn addCSourceFile(self: *LibExeObjStep, file: []const u8, flags: []const []const u8) void { +pub fn addCSourceFile(self: *CompileStep, file: []const u8, flags: []const []const u8) void { self.addCSourceFileSource(.{ .args = flags, .source = .{ .path = file }, }); } -pub fn addCSourceFileSource(self: *LibExeObjStep, source: CSourceFile) void { +pub fn addCSourceFileSource(self: *CompileStep, source: CSourceFile) void { const c_source_file = self.builder.allocator.create(CSourceFile) catch unreachable; c_source_file.* = source.dupe(self.builder); self.link_objects.append(.{ .c_source_file = c_source_file }) catch unreachable; source.source.addStepDependencies(&self.step); } -pub fn setVerboseLink(self: *LibExeObjStep, value: bool) void { +pub fn setVerboseLink(self: *CompileStep, value: bool) void { self.verbose_link = value; } -pub fn setVerboseCC(self: *LibExeObjStep, value: bool) void { +pub fn setVerboseCC(self: *CompileStep, value: bool) void { self.verbose_cc = value; } -pub fn overrideZigLibDir(self: *LibExeObjStep, dir_path: []const u8) void { +pub fn overrideZigLibDir(self: *CompileStep, dir_path: []const u8) void { self.override_lib_dir = self.builder.dupePath(dir_path); } -pub fn setMainPkgPath(self: *LibExeObjStep, dir_path: []const u8) void { +pub fn setMainPkgPath(self: *CompileStep, dir_path: []const u8) void { self.main_pkg_path = self.builder.dupePath(dir_path); } -pub fn setLibCFile(self: *LibExeObjStep, libc_file: ?FileSource) void { +pub fn setLibCFile(self: *CompileStep, libc_file: ?FileSource) void { self.libc_file = if (libc_file) |f| f.dupe(self.builder) else null; } /// Returns the generated executable, library or object file. /// To run an executable built with zig build, use `run`, or create an install step and invoke it. -pub fn getOutputSource(self: *LibExeObjStep) FileSource { +pub fn getOutputSource(self: *CompileStep) FileSource { return FileSource{ .generated = &self.output_path_source }; } /// Returns the generated import library. This function can only be called for libraries. -pub fn getOutputLibSource(self: *LibExeObjStep) FileSource { +pub fn getOutputLibSource(self: *CompileStep) FileSource { assert(self.kind == .lib); return FileSource{ .generated = &self.output_lib_path_source }; } /// Returns the generated header file. /// This function can only be called for libraries or object files which have `emit_h` set. -pub fn getOutputHSource(self: *LibExeObjStep) FileSource { +pub fn getOutputHSource(self: *CompileStep) FileSource { assert(self.kind != .exe and self.kind != .test_exe and self.kind != .@"test"); assert(self.emit_h); return FileSource{ .generated = &self.output_h_path_source }; } /// Returns the generated PDB file. This function can only be called for Windows and UEFI. -pub fn getOutputPdbSource(self: *LibExeObjStep) FileSource { +pub fn getOutputPdbSource(self: *CompileStep) FileSource { // TODO: Is this right? Isn't PDB for *any* PE/COFF file? assert(self.target.isWindows() or self.target.isUefi()); return FileSource{ .generated = &self.output_pdb_path_source }; } -pub fn addAssemblyFile(self: *LibExeObjStep, path: []const u8) void { +pub fn addAssemblyFile(self: *CompileStep, path: []const u8) void { self.link_objects.append(.{ .assembly_file = .{ .path = self.builder.dupe(path) }, }) catch unreachable; } -pub fn addAssemblyFileSource(self: *LibExeObjStep, source: FileSource) void { +pub fn addAssemblyFileSource(self: *CompileStep, source: FileSource) void { const source_duped = source.dupe(self.builder); self.link_objects.append(.{ .assembly_file = source_duped }) catch unreachable; source_duped.addStepDependencies(&self.step); } -pub fn addObjectFile(self: *LibExeObjStep, source_file: []const u8) void { +pub fn addObjectFile(self: *CompileStep, source_file: []const u8) void { self.addObjectFileSource(.{ .path = source_file }); } -pub fn addObjectFileSource(self: *LibExeObjStep, source: FileSource) void { +pub fn addObjectFileSource(self: *CompileStep, source: FileSource) void { self.link_objects.append(.{ .static_path = source.dupe(self.builder) }) catch unreachable; source.addStepDependencies(&self.step); } -pub fn addObject(self: *LibExeObjStep, obj: *LibExeObjStep) void { +pub fn addObject(self: *CompileStep, obj: *CompileStep) void { assert(obj.kind == .obj); self.linkLibraryOrObject(obj); } @@ -921,41 +921,41 @@ pub const addIncludeDir = @compileError("deprecated; use addIncludePath"); pub const addLibPath = @compileError("deprecated, use addLibraryPath"); pub const addFrameworkDir = @compileError("deprecated, use addFrameworkPath"); -pub fn addSystemIncludePath(self: *LibExeObjStep, path: []const u8) void { +pub fn addSystemIncludePath(self: *CompileStep, path: []const u8) void { self.include_dirs.append(IncludeDir{ .raw_path_system = self.builder.dupe(path) }) catch unreachable; } -pub fn addIncludePath(self: *LibExeObjStep, path: []const u8) void { +pub fn addIncludePath(self: *CompileStep, path: []const u8) void { self.include_dirs.append(IncludeDir{ .raw_path = self.builder.dupe(path) }) catch unreachable; } -pub fn addConfigHeader(self: *LibExeObjStep, config_header: *ConfigHeaderStep) void { +pub fn addConfigHeader(self: *CompileStep, config_header: *ConfigHeaderStep) void { self.step.dependOn(&config_header.step); self.include_dirs.append(.{ .config_header_step = config_header }) catch @panic("OOM"); } -pub fn addLibraryPath(self: *LibExeObjStep, path: []const u8) void { +pub fn addLibraryPath(self: *CompileStep, path: []const u8) void { self.lib_paths.append(self.builder.dupe(path)) catch unreachable; } -pub fn addRPath(self: *LibExeObjStep, path: []const u8) void { +pub fn addRPath(self: *CompileStep, path: []const u8) void { self.rpaths.append(self.builder.dupe(path)) catch unreachable; } -pub fn addFrameworkPath(self: *LibExeObjStep, dir_path: []const u8) void { +pub fn addFrameworkPath(self: *CompileStep, dir_path: []const u8) void { self.framework_dirs.append(self.builder.dupe(dir_path)) catch unreachable; } -pub fn addPackage(self: *LibExeObjStep, package: Pkg) void { +pub fn addPackage(self: *CompileStep, package: Pkg) void { self.packages.append(self.builder.dupePkg(package)) catch unreachable; self.addRecursiveBuildDeps(package); } -pub fn addOptions(self: *LibExeObjStep, package_name: []const u8, options: *OptionsStep) void { +pub fn addOptions(self: *CompileStep, package_name: []const u8, options: *OptionsStep) void { self.addPackage(options.getPackage(package_name)); } -fn addRecursiveBuildDeps(self: *LibExeObjStep, package: Pkg) void { +fn addRecursiveBuildDeps(self: *CompileStep, package: Pkg) void { package.source.addStepDependencies(&self.step); if (package.dependencies) |deps| { for (deps) |dep| { @@ -964,7 +964,7 @@ fn addRecursiveBuildDeps(self: *LibExeObjStep, package: Pkg) void { } } -pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: []const u8) void { +pub fn addPackagePath(self: *CompileStep, name: []const u8, pkg_index_path: []const u8) void { self.addPackage(Pkg{ .name = self.builder.dupe(name), .source = .{ .path = self.builder.dupe(pkg_index_path) }, @@ -973,7 +973,7 @@ pub fn addPackagePath(self: *LibExeObjStep, name: []const u8, pkg_index_path: [] /// If Vcpkg was found on the system, it will be added to include and lib /// paths for the specified target. -pub fn addVcpkgPaths(self: *LibExeObjStep, linkage: LibExeObjStep.Linkage) !void { +pub fn addVcpkgPaths(self: *CompileStep, linkage: CompileStep.Linkage) !void { // Ideally in the Unattempted case we would call the function recursively // after findVcpkgRoot and have only one switch statement, but the compiler // cannot resolve the error set. @@ -1008,7 +1008,7 @@ pub fn addVcpkgPaths(self: *LibExeObjStep, linkage: LibExeObjStep.Linkage) !void } } -pub fn setExecCmd(self: *LibExeObjStep, args: []const ?[]const u8) void { +pub fn setExecCmd(self: *CompileStep, args: []const ?[]const u8) void { assert(self.kind == .@"test"); const duped_args = self.builder.allocator.alloc(?[]u8, args.len) catch unreachable; for (args) |arg, i| { @@ -1017,13 +1017,13 @@ pub fn setExecCmd(self: *LibExeObjStep, args: []const ?[]const u8) void { self.exec_cmd_args = duped_args; } -fn linkLibraryOrObject(self: *LibExeObjStep, other: *LibExeObjStep) void { +fn linkLibraryOrObject(self: *CompileStep, other: *CompileStep) void { self.step.dependOn(&other.step); self.link_objects.append(.{ .other_step = other }) catch unreachable; self.include_dirs.append(.{ .other_step = other }) catch unreachable; } -fn makePackageCmd(self: *LibExeObjStep, pkg: Pkg, zig_args: *ArrayList([]const u8)) error{OutOfMemory}!void { +fn makePackageCmd(self: *CompileStep, pkg: Pkg, zig_args: *ArrayList([]const u8)) error{OutOfMemory}!void { const builder = self.builder; try zig_args.append("--pkg-begin"); @@ -1040,7 +1040,7 @@ fn makePackageCmd(self: *LibExeObjStep, pkg: Pkg, zig_args: *ArrayList([]const u } fn make(step: *Step) !void { - const self = @fieldParentPtr(LibExeObjStep, "step", step); + const self = @fieldParentPtr(CompileStep, "step", step); const builder = self.builder; if (self.root_src == null and self.link_objects.items.len == 0) { @@ -2004,7 +2004,7 @@ const TransitiveDeps = struct { } } - fn addInner(td: *TransitiveDeps, other: *LibExeObjStep, dyn: bool) !void { + fn addInner(td: *TransitiveDeps, other: *CompileStep, dyn: bool) !void { // Inherit dependency on libc and libc++ td.is_linking_libcpp = td.is_linking_libcpp or other.is_linking_libcpp; td.is_linking_libc = td.is_linking_libc or other.is_linking_libc; diff --git a/lib/std/Build/EmulatableRunStep.zig b/lib/std/Build/EmulatableRunStep.zig index b7b12d791f..26804b2fc8 100644 --- a/lib/std/Build/EmulatableRunStep.zig +++ b/lib/std/Build/EmulatableRunStep.zig @@ -6,7 +6,7 @@ const std = @import("../std.zig"); const Step = std.Build.Step; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const RunStep = std.Build.RunStep; const fs = std.fs; @@ -23,7 +23,7 @@ step: Step, builder: *std.Build, /// The artifact (executable) to be run by this step -exe: *LibExeObjStep, +exe: *CompileStep, /// Set this to `null` to ignore the exit code for the purpose of determining a successful execution expected_exit_code: ?u8 = 0, @@ -45,7 +45,7 @@ hide_foreign_binaries_warning: bool, /// binary through emulation when any of the emulation options such as `enable_rosetta` are set to true. /// When set to false, and the binary is foreign, running the executable is skipped. /// Asserts given artifact is an executable. -pub fn create(builder: *std.Build, name: []const u8, artifact: *LibExeObjStep) *EmulatableRunStep { +pub fn create(builder: *std.Build, name: []const u8, artifact: *CompileStep) *EmulatableRunStep { std.debug.assert(artifact.kind == .exe or artifact.kind == .test_exe); const self = builder.allocator.create(EmulatableRunStep) catch unreachable; diff --git a/lib/std/Build/InstallArtifactStep.zig b/lib/std/Build/InstallArtifactStep.zig index 929b30e935..898b9e85e7 100644 --- a/lib/std/Build/InstallArtifactStep.zig +++ b/lib/std/Build/InstallArtifactStep.zig @@ -1,6 +1,6 @@ const std = @import("../std.zig"); const Step = std.Build.Step; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const InstallDir = std.Build.InstallDir; const InstallArtifactStep = @This(); @@ -8,12 +8,12 @@ pub const base_id = .install_artifact; step: Step, builder: *std.Build, -artifact: *LibExeObjStep, +artifact: *CompileStep, dest_dir: InstallDir, pdb_dir: ?InstallDir, h_dir: ?InstallDir, -pub fn create(builder: *std.Build, artifact: *LibExeObjStep) *InstallArtifactStep { +pub fn create(builder: *std.Build, artifact: *CompileStep) *InstallArtifactStep { if (artifact.install_step) |s| return s; const self = builder.allocator.create(InstallArtifactStep) catch unreachable; @@ -67,7 +67,7 @@ fn make(step: *Step) !void { const full_dest_path = builder.getInstallPath(self.dest_dir, self.artifact.out_filename); try builder.updateFile(self.artifact.getOutputSource().getPath(builder), full_dest_path); if (self.artifact.isDynamicLibrary() and self.artifact.version != null and self.artifact.target.wantSharedLibSymLinks()) { - try LibExeObjStep.doAtomicSymLinks(builder.allocator, full_dest_path, self.artifact.major_only_filename.?, self.artifact.name_only_filename.?); + try CompileStep.doAtomicSymLinks(builder.allocator, full_dest_path, self.artifact.major_only_filename.?, self.artifact.name_only_filename.?); } if (self.artifact.isDynamicLibrary() and self.artifact.target.isWindows() and self.artifact.emit_implib != .no_emit) { const full_implib_path = builder.getInstallPath(self.dest_dir, self.artifact.out_lib_filename); diff --git a/lib/std/Build/InstallRawStep.zig b/lib/std/Build/InstallRawStep.zig index 08d646ff88..e7ffe78878 100644 --- a/lib/std/Build/InstallRawStep.zig +++ b/lib/std/Build/InstallRawStep.zig @@ -9,7 +9,7 @@ const ArenaAllocator = std.heap.ArenaAllocator; const ArrayListUnmanaged = std.ArrayListUnmanaged; const File = std.fs.File; const InstallDir = std.Build.InstallDir; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const Step = std.Build.Step; const elf = std.elf; const fs = std.fs; @@ -25,7 +25,7 @@ pub const RawFormat = enum { step: Step, builder: *std.Build, -artifact: *LibExeObjStep, +artifact: *CompileStep, dest_dir: InstallDir, dest_filename: []const u8, options: CreateOptions, @@ -40,7 +40,7 @@ pub const CreateOptions = struct { pub fn create( builder: *std.Build, - artifact: *LibExeObjStep, + artifact: *CompileStep, dest_filename: []const u8, options: CreateOptions, ) *InstallRawStep { diff --git a/lib/std/Build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig index 8e1a7ef2fc..94c41ce9e6 100644 --- a/lib/std/Build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -3,7 +3,7 @@ const builtin = @import("builtin"); const fs = std.fs; const Step = std.Build.Step; const GeneratedFile = std.Build.GeneratedFile; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const FileSource = std.Build.FileSource; const OptionsStep = @This(); @@ -195,7 +195,7 @@ pub fn addOptionFileSource( /// The value is the path in the cache dir. /// Adds a dependency automatically. -pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *LibExeObjStep) void { +pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *CompileStep) void { self.artifact_args.append(.{ .name = self.builder.dupe(name), .artifact = artifact }) catch unreachable; self.step.dependOn(&artifact.step); } @@ -266,7 +266,7 @@ fn hashContentsToFileName(self: *OptionsStep) [64]u8 { const OptionArtifactArg = struct { name: []const u8, - artifact: *LibExeObjStep, + artifact: *CompileStep, }; const OptionFileSourceArg = struct { diff --git a/lib/std/Build/RunStep.zig b/lib/std/Build/RunStep.zig index 83e4f7f66c..9ab9ea6335 100644 --- a/lib/std/Build/RunStep.zig +++ b/lib/std/Build/RunStep.zig @@ -1,7 +1,7 @@ const std = @import("../std.zig"); const builtin = @import("builtin"); const Step = std.Build.Step; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const WriteFileStep = std.Build.WriteFileStep; const fs = std.fs; const mem = std.mem; @@ -48,7 +48,7 @@ pub const StdIoAction = union(enum) { }; pub const Arg = union(enum) { - artifact: *LibExeObjStep, + artifact: *CompileStep, file_source: std.Build.FileSource, bytes: []u8, }; @@ -66,7 +66,7 @@ pub fn create(builder: *std.Build, name: []const u8) *RunStep { return self; } -pub fn addArtifactArg(self: *RunStep, artifact: *LibExeObjStep) void { +pub fn addArtifactArg(self: *RunStep, artifact: *CompileStep) void { self.argv.append(Arg{ .artifact = artifact }) catch unreachable; self.step.dependOn(&artifact.step); } @@ -355,13 +355,13 @@ fn printCmd(cwd: ?[]const u8, argv: []const []const u8) void { std.debug.print("\n", .{}); } -fn addPathForDynLibs(self: *RunStep, artifact: *LibExeObjStep) void { +fn addPathForDynLibs(self: *RunStep, artifact: *CompileStep) void { addPathForDynLibsInternal(&self.step, self.builder, artifact); } /// This should only be used for internal usage, this is called automatically /// for the user. -pub fn addPathForDynLibsInternal(step: *Step, builder: *std.Build, artifact: *LibExeObjStep) void { +pub fn addPathForDynLibsInternal(step: *Step, builder: *std.Build, artifact: *CompileStep) void { for (artifact.link_objects.items) |link_object| { switch (link_object) { .other_step => |other| { diff --git a/lib/std/Build/Step.zig b/lib/std/Build/Step.zig index 86d6645c29..aff8a49161 100644 --- a/lib/std/Build/Step.zig +++ b/lib/std/Build/Step.zig @@ -7,7 +7,7 @@ done_flag: bool, pub const Id = enum { top_level, - lib_exe_obj, + compile, install_artifact, install_file, install_dir, @@ -28,7 +28,7 @@ pub const Id = enum { pub fn Type(comptime id: Id) type { return switch (id) { .top_level => Build.TopLevelStep, - .lib_exe_obj => Build.LibExeObjStep, + .compile => Build.CompileStep, .install_artifact => Build.InstallArtifactStep, .install_file => Build.InstallFileStep, .install_dir => Build.InstallDirStep, diff --git a/lib/std/Build/TranslateCStep.zig b/lib/std/Build/TranslateCStep.zig index 5404747846..c59362aeee 100644 --- a/lib/std/Build/TranslateCStep.zig +++ b/lib/std/Build/TranslateCStep.zig @@ -1,6 +1,6 @@ const std = @import("../std.zig"); const Step = std.Build.Step; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const CheckFileStep = std.Build.CheckFileStep; const fs = std.fs; const mem = std.mem; @@ -51,11 +51,11 @@ pub const AddExecutableOptions = struct { version: ?std.builtin.Version = null, target: ?CrossTarget = null, optimize: ?std.builtin.Mode = null, - linkage: ?LibExeObjStep.Linkage = null, + linkage: ?CompileStep.Linkage = null, }; /// Creates a step to build an executable from the translated source. -pub fn addExecutable(self: *TranslateCStep, options: AddExecutableOptions) *LibExeObjStep { +pub fn addExecutable(self: *TranslateCStep, options: AddExecutableOptions) *CompileStep { return self.builder.addExecutable(.{ .root_source_file = .{ .generated = &self.output_file }, .name = options.name orelse "translated_c", diff --git a/lib/std/std.zig b/lib/std/std.zig index e0318ceb43..7440b49662 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -97,8 +97,10 @@ pub const zig = @import("zig.zig"); pub const start = @import("start.zig"); ///// Deprecated. Use `std.Build` instead. +///// TODO: remove this after releasing 0.11.0 //pub const build = struct { // /// Deprecated. Use `std.Build` instead. +// /// TODO: remove this after releasing 0.11.0 // pub const Builder = Build; //}; diff --git a/test/link/macho/bugs/13457/build.zig b/test/link/macho/bugs/13457/build.zig index 6ca1f31b86..3560b4a168 100644 --- a/test/link/macho/bugs/13457/build.zig +++ b/test/link/macho/bugs/13457/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/link/macho/dead_strip/build.zig b/test/link/macho/dead_strip/build.zig index b6c3002492..d82c81edca 100644 --- a/test/link/macho/dead_strip/build.zig +++ b/test/link/macho/dead_strip/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); @@ -36,7 +35,11 @@ pub fn build(b: *std.Build) void { } } -fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario( + b: *std.Build, + optimize: std.builtin.OptimizeMode, + target: std.zig.CrossTarget, +) *std.Build.CompileStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/dead_strip_dylibs/build.zig b/test/link/macho/dead_strip_dylibs/build.zig index f61b30ca4a..8b62cec6e6 100644 --- a/test/link/macho/dead_strip_dylibs/build.zig +++ b/test/link/macho/dead_strip_dylibs/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); @@ -35,7 +34,7 @@ pub fn build(b: *std.Build) void { } } -fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { +fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode) *std.Build.CompileStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/headerpad/build.zig b/test/link/macho/headerpad/build.zig index 2b3c6abb8a..3ef17573f8 100644 --- a/test/link/macho/headerpad/build.zig +++ b/test/link/macho/headerpad/build.zig @@ -1,6 +1,5 @@ const std = @import("std"); const builtin = @import("builtin"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); @@ -93,7 +92,7 @@ pub fn build(b: *std.Build) void { } } -fn simpleExe(b: *std.Build, optimize: std.builtin.OptimizeMode) *LibExeObjectStep { +fn simpleExe(b: *std.Build, optimize: std.builtin.OptimizeMode) *std.Build.CompileStep { const exe = b.addExecutable(.{ .name = "main", .optimize = optimize, diff --git a/test/link/macho/needed_framework/build.zig b/test/link/macho/needed_framework/build.zig index 62b70b21f1..8b6e3dd87f 100644 --- a/test/link/macho/needed_framework/build.zig +++ b/test/link/macho/needed_framework/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/link/macho/needed_library/build.zig b/test/link/macho/needed_library/build.zig index cdad94357b..92a73d22b7 100644 --- a/test/link/macho/needed_library/build.zig +++ b/test/link/macho/needed_library/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/link/macho/search_strategy/build.zig b/test/link/macho/search_strategy/build.zig index eeda89446b..62757f885b 100644 --- a/test/link/macho/search_strategy/build.zig +++ b/test/link/macho/search_strategy/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); @@ -35,7 +34,11 @@ pub fn build(b: *std.Build) void { } } -fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario( + b: *std.Build, + optimize: std.builtin.OptimizeMode, + target: std.zig.CrossTarget, +) *std.Build.CompileStep { const static = b.addStaticLibrary(.{ .name = "a", .optimize = optimize, diff --git a/test/link/macho/strict_validation/build.zig b/test/link/macho/strict_validation/build.zig index 6eabc02b5f..408076657b 100644 --- a/test/link/macho/strict_validation/build.zig +++ b/test/link/macho/strict_validation/build.zig @@ -1,6 +1,5 @@ const std = @import("std"); const builtin = @import("builtin"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/link/macho/unwind_info/build.zig b/test/link/macho/unwind_info/build.zig index e43c002e2e..408f762f5d 100644 --- a/test/link/macho/unwind_info/build.zig +++ b/test/link/macho/unwind_info/build.zig @@ -1,6 +1,5 @@ const std = @import("std"); const builtin = @import("builtin"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); @@ -51,7 +50,11 @@ fn testUnwindInfo( test_step.dependOn(&run_cmd.step); } -fn createScenario(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn createScenario( + b: *std.Build, + optimize: std.builtin.OptimizeMode, + target: std.zig.CrossTarget, +) *std.Build.CompileStep { const exe = b.addExecutable(.{ .name = "test", .optimize = optimize, diff --git a/test/link/macho/uuid/build.zig b/test/link/macho/uuid/build.zig index 62c288f1a0..6a68263fbf 100644 --- a/test/link/macho/uuid/build.zig +++ b/test/link/macho/uuid/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test"); @@ -51,7 +50,11 @@ fn testUuid( } } -fn simpleDylib(b: *std.Build, optimize: std.builtin.OptimizeMode, target: std.zig.CrossTarget) *LibExeObjectStep { +fn simpleDylib( + b: *std.Build, + optimize: std.builtin.OptimizeMode, + target: std.zig.CrossTarget, +) *std.Build.CompileStep { const dylib = b.addSharedLibrary(.{ .name = "test", .version = .{ .major = 1, .minor = 0 }, diff --git a/test/link/macho/weak_framework/build.zig b/test/link/macho/weak_framework/build.zig index 5be66991dd..ca28458d77 100644 --- a/test/link/macho/weak_framework/build.zig +++ b/test/link/macho/weak_framework/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/link/macho/weak_library/build.zig b/test/link/macho/weak_library/build.zig index 505ab5ae96..de5aa45e30 100644 --- a/test/link/macho/weak_library/build.zig +++ b/test/link/macho/weak_library/build.zig @@ -1,5 +1,4 @@ const std = @import("std"); -const LibExeObjectStep = std.Build.LibExeObjStep; pub fn build(b: *std.Build) void { const optimize = b.standardOptimizeOption(.{}); diff --git a/test/tests.zig b/test/tests.zig index de25528dde..0f36c8eb94 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -8,7 +8,7 @@ const mem = std.mem; const fmt = std.fmt; const ArrayList = std.ArrayList; const OptimizeMode = std.builtin.OptimizeMode; -const LibExeObjStep = std.Build.LibExeObjStep; +const CompileStep = std.Build.CompileStep; const Allocator = mem.Allocator; const ExecError = std.Build.ExecError; const Step = std.Build.Step; @@ -842,7 +842,7 @@ pub const StackTracesContext = struct { step: Step, context: *StackTracesContext, - exe: *LibExeObjStep, + exe: *CompileStep, name: []const u8, optimize_mode: OptimizeMode, expect_output: []const u8, @@ -850,7 +850,7 @@ pub const StackTracesContext = struct { pub fn create( context: *StackTracesContext, - exe: *LibExeObjStep, + exe: *CompileStep, name: []const u8, optimize_mode: OptimizeMode, expect_output: []const u8, @@ -1180,14 +1180,14 @@ pub const GenHContext = struct { const GenHCmpOutputStep = struct { step: Step, context: *GenHContext, - obj: *LibExeObjStep, + obj: *CompileStep, name: []const u8, test_index: usize, case: *const TestCase, pub fn create( context: *GenHContext, - obj: *LibExeObjStep, + obj: *CompileStep, name: []const u8, case: *const TestCase, ) *GenHCmpOutputStep { From 13a96165405af33fa6ef43a3ce2c1d8aea846287 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 13:48:24 -0700 Subject: [PATCH 23/65] std.Build: add deprecated declarations These declarations are now aliases of their new APIs and marked as deprecated via doc comments: * std.build.Builder * std.build * std.Build.LibExeObjStep --- lib/std/Build.zig | 11 ++++++----- lib/std/std.zig | 9 ++------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/std/Build.zig b/lib/std/Build.zig index 4647baa398..008ae5f4d7 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -19,8 +19,12 @@ const NativeTargetInfo = std.zig.system.NativeTargetInfo; const Sha256 = std.crypto.hash.sha2.Sha256; const Build = @This(); -///// deprecated: use `CompileStep` instead. -//pub const LibExeObjStep = CompileStep; +/// deprecated: use `CompileStep`. +pub const LibExeObjStep = CompileStep; +/// deprecated: use `Build`. +pub const Builder = Build; +/// deprecated: use `InstallDirStep.Options` +pub const InstallDirectoryOptions = InstallDirStep.Options; pub const Step = @import("Build/Step.zig"); pub const CheckFileStep = @import("Build/CheckFileStep.zig"); @@ -1637,9 +1641,6 @@ pub fn constructCMacro(allocator: Allocator, name: []const u8, value: ?[]const u return macro; } -/// deprecated: use `InstallDirStep.Options` -pub const InstallDirectoryOptions = InstallDirStep.Options; - pub const VcpkgRoot = union(VcpkgRootStatus) { unattempted: void, not_found: void, diff --git a/lib/std/std.zig b/lib/std/std.zig index 7440b49662..40ba896569 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -96,13 +96,8 @@ pub const wasm = @import("wasm.zig"); pub const zig = @import("zig.zig"); pub const start = @import("start.zig"); -///// Deprecated. Use `std.Build` instead. -///// TODO: remove this after releasing 0.11.0 -//pub const build = struct { -// /// Deprecated. Use `std.Build` instead. -// /// TODO: remove this after releasing 0.11.0 -// pub const Builder = Build; -//}; +/// deprecated: use `Build`. +pub const build = Build; const root = @import("root"); const options_override = if (@hasDecl(root, "std_options")) root.std_options else struct {}; From 90e48d4b3469fb4f8dd2f3b52e05453029d45fdc Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 14:02:32 -0700 Subject: [PATCH 24/65] std.Build: avoid use of catch unreachable Usage of `catch unreachable` in build scripts is completely harmless because build scripts are always run in Debug mode, however, it sets a poor example for beginners to learn from. --- lib/std/Build.zig | 69 ++++++++------- lib/std/Build/CheckFileStep.zig | 2 +- lib/std/Build/CheckObjectStep.zig | 12 +-- lib/std/Build/CompileStep.zig | 121 ++++++++++++++------------ lib/std/Build/EmulatableRunStep.zig | 8 +- lib/std/Build/FmtStep.zig | 4 +- lib/std/Build/InstallArtifactStep.zig | 2 +- lib/std/Build/InstallRawStep.zig | 4 +- lib/std/Build/OptionsStep.zig | 62 +++++++------ lib/std/Build/RunStep.zig | 24 ++--- lib/std/Build/Step.zig | 4 +- lib/std/Build/TranslateCStep.zig | 12 +-- lib/std/Build/WriteFileStep.zig | 6 +- 13 files changed, 169 insertions(+), 161 deletions(-) diff --git a/lib/std/Build.zig b/lib/std/Build.zig index 008ae5f4d7..d695637fc3 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -564,12 +564,12 @@ pub fn addConfigHeader( /// Allocator.dupe without the need to handle out of memory. pub fn dupe(self: *Build, bytes: []const u8) []u8 { - return self.allocator.dupe(u8, bytes) catch unreachable; + return self.allocator.dupe(u8, bytes) catch @panic("OOM"); } /// Duplicates an array of strings without the need to handle out of memory. pub fn dupeStrings(self: *Build, strings: []const []const u8) [][]u8 { - const array = self.allocator.alloc([]u8, strings.len) catch unreachable; + const array = self.allocator.alloc([]u8, strings.len) catch @panic("OOM"); for (strings) |s, i| { array[i] = self.dupe(s); } @@ -596,7 +596,7 @@ pub fn dupePkg(self: *Build, package: Pkg) Pkg { }; if (package.dependencies) |dependencies| { - const new_dependencies = self.allocator.alloc(Pkg, dependencies.len) catch unreachable; + const new_dependencies = self.allocator.alloc(Pkg, dependencies.len) catch @panic("OOM"); the_copy.dependencies = new_dependencies; for (dependencies) |dep_package, i| { @@ -613,20 +613,20 @@ pub fn addWriteFile(self: *Build, file_path: []const u8, data: []const u8) *Writ } pub fn addWriteFiles(self: *Build) *WriteFileStep { - const write_file_step = self.allocator.create(WriteFileStep) catch unreachable; + const write_file_step = self.allocator.create(WriteFileStep) catch @panic("OOM"); write_file_step.* = WriteFileStep.init(self); return write_file_step; } pub fn addLog(self: *Build, comptime format: []const u8, args: anytype) *LogStep { const data = self.fmt(format, args); - const log_step = self.allocator.create(LogStep) catch unreachable; + const log_step = self.allocator.create(LogStep) catch @panic("OOM"); log_step.* = LogStep.init(self, data); return log_step; } pub fn addRemoveDirTree(self: *Build, dir_path: []const u8) *RemoveDirStep { - const remove_dir_step = self.allocator.create(RemoveDirStep) catch unreachable; + const remove_dir_step = self.allocator.create(RemoveDirStep) catch @panic("OOM"); remove_dir_step.* = RemoveDirStep.init(self, dir_path); return remove_dir_step; } @@ -719,13 +719,13 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_ const type_id = comptime typeToEnum(T); const enum_options = if (type_id == .@"enum") blk: { const fields = comptime std.meta.fields(T); - var options = ArrayList([]const u8).initCapacity(self.allocator, fields.len) catch unreachable; + var options = ArrayList([]const u8).initCapacity(self.allocator, fields.len) catch @panic("OOM"); inline for (fields) |field| { options.appendAssumeCapacity(field.name); } - break :blk options.toOwnedSlice() catch unreachable; + break :blk options.toOwnedSlice() catch @panic("OOM"); } else null; const available_option = AvailableOption{ .name = name, @@ -733,10 +733,10 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_ .description = description, .enum_options = enum_options, }; - if ((self.available_options_map.fetchPut(name, available_option) catch unreachable) != null) { + if ((self.available_options_map.fetchPut(name, available_option) catch @panic("OOM")) != null) { panic("Option '{s}' declared twice", .{name}); } - self.available_options_list.append(available_option) catch unreachable; + self.available_options_list.append(available_option) catch @panic("OOM"); const option_ptr = self.user_input_options.getPtr(name) orelse return null; option_ptr.used = true; @@ -840,7 +840,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_ return null; }, .scalar => |s| { - return self.allocator.dupe([]const u8, &[_][]const u8{s}) catch unreachable; + return self.allocator.dupe([]const u8, &[_][]const u8{s}) catch @panic("OOM"); }, .list => |lst| return lst.items, }, @@ -848,12 +848,12 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_ } pub fn step(self: *Build, name: []const u8, description: []const u8) *Step { - const step_info = self.allocator.create(TopLevelStep) catch unreachable; + const step_info = self.allocator.create(TopLevelStep) catch @panic("OOM"); step_info.* = TopLevelStep{ .step = Step.initNoOp(.top_level, name, self.allocator), .description = self.dupe(description), }; - self.top_level_steps.append(step_info) catch unreachable; + self.top_level_steps.append(step_info) catch @panic("OOM"); return &step_info.step; } @@ -949,7 +949,7 @@ pub fn standardTargetOptions(self: *Build, args: StandardTargetOptionsArgs) Cros }, }; - const selected_canonicalized_triple = selected_target.zigTriple(self.allocator) catch unreachable; + const selected_canonicalized_triple = selected_target.zigTriple(self.allocator) catch @panic("OOM"); if (args.whitelist) |list| whitelist_check: { // Make sure it's a match of one of the list. @@ -960,7 +960,7 @@ pub fn standardTargetOptions(self: *Build, args: StandardTargetOptionsArgs) Cros mismatch_cpu_features = true; mismatch_triple = true; - const t_triple = t.zigTriple(self.allocator) catch unreachable; + const t_triple = t.zigTriple(self.allocator) catch @panic("OOM"); if (mem.eql(u8, t_triple, selected_canonicalized_triple)) { mismatch_triple = false; whitelist_item = t; @@ -977,7 +977,7 @@ pub fn standardTargetOptions(self: *Build, args: StandardTargetOptionsArgs) Cros selected_canonicalized_triple, }); for (list) |t| { - const t_triple = t.zigTriple(self.allocator) catch unreachable; + const t_triple = t.zigTriple(self.allocator) catch @panic("OOM"); log.err(" {s}", .{t_triple}); } } else { @@ -1033,22 +1033,22 @@ pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const .scalar => |s| { // turn it into a list var list = ArrayList([]const u8).init(self.allocator); - list.append(s) catch unreachable; - list.append(value) catch unreachable; - self.user_input_options.put(name, .{ + try list.append(s); + try list.append(value); + try self.user_input_options.put(name, .{ .name = name, .value = .{ .list = list }, .used = false, - }) catch unreachable; + }); }, .list => |*list| { // append to the list - list.append(value) catch unreachable; - self.user_input_options.put(name, .{ + try list.append(value); + try self.user_input_options.put(name, .{ .name = name, .value = .{ .list = list.* }, .used = false, - }) catch unreachable; + }); }, .flag => { log.warn("Option '-D{s}={s}' conflicts with flag '-D{s}'.", .{ name, value, name }); @@ -1240,13 +1240,13 @@ pub fn addInstallFileWithDir( if (dest_rel_path.len == 0) { panic("dest_rel_path must be non-empty", .{}); } - const install_step = self.allocator.create(InstallFileStep) catch unreachable; + const install_step = self.allocator.create(InstallFileStep) catch @panic("OOM"); install_step.* = InstallFileStep.init(self, source.dupe(self), install_dir, dest_rel_path); return install_step; } pub fn addInstallDirectory(self: *Build, options: InstallDirectoryOptions) *InstallDirStep { - const install_step = self.allocator.create(InstallDirStep) catch unreachable; + const install_step = self.allocator.create(InstallDirStep) catch @panic("OOM"); install_step.* = InstallDirStep.init(self, options); return install_step; } @@ -1256,7 +1256,7 @@ pub fn pushInstalledFile(self: *Build, dir: InstallDir, dest_rel_path: []const u .dir = dir, .path = dest_rel_path, }; - self.installed_files.append(file.dupe(self)) catch unreachable; + self.installed_files.append(file.dupe(self)) catch @panic("OOM"); } pub fn updateFile(self: *Build, source_path: []const u8, dest_path: []const u8) !void { @@ -1289,16 +1289,15 @@ pub fn truncateFile(self: *Build, dest_path: []const u8) !void { } pub fn pathFromRoot(self: *Build, rel_path: []const u8) []u8 { - return fs.path.resolve(self.allocator, &[_][]const u8{ self.build_root, rel_path }) catch unreachable; + return fs.path.resolve(self.allocator, &[_][]const u8{ self.build_root, rel_path }) catch @panic("OOM"); } -/// Shorthand for `std.fs.path.join(Build.allocator, paths) catch unreachable` pub fn pathJoin(self: *Build, paths: []const []const u8) []u8 { - return fs.path.join(self.allocator, paths) catch unreachable; + return fs.path.join(self.allocator, paths) catch @panic("OOM"); } pub fn fmt(self: *Build, comptime format: []const u8, args: anytype) []u8 { - return fmt_lib.allocPrint(self.allocator, format, args) catch unreachable; + return fmt_lib.allocPrint(self.allocator, format, args) catch @panic("OOM"); } pub fn findProgram(self: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 { @@ -1442,7 +1441,7 @@ pub fn exec(self: *Build, argv: []const []const u8) ![]u8 { } pub fn addSearchPrefix(self: *Build, search_prefix: []const u8) void { - self.search_prefixes.append(self.dupePath(search_prefix)) catch unreachable; + self.search_prefixes.append(self.dupePath(search_prefix)) catch @panic("OOM"); } pub fn getInstallPath(self: *Build, dir: InstallDir, dest_rel_path: []const u8) []const u8 { @@ -1457,7 +1456,7 @@ pub fn getInstallPath(self: *Build, dir: InstallDir, dest_rel_path: []const u8) return fs.path.resolve( self.allocator, &[_][]const u8{ base_dir, dest_rel_path }, - ) catch unreachable; + ) catch @panic("OOM"); } pub const Dependency = struct { @@ -1509,14 +1508,14 @@ fn dependencyInner( comptime build_zig: type, args: anytype, ) *Dependency { - const sub_builder = b.createChild(name, build_root, args) catch unreachable; - sub_builder.runBuild(build_zig) catch unreachable; + const sub_builder = b.createChild(name, build_root, args) catch @panic("unhandled error"); + sub_builder.runBuild(build_zig) catch @panic("unhandled error"); if (sub_builder.validateUserInputDidItFail()) { std.debug.dumpCurrentStackTrace(@returnAddress()); } - const dep = b.allocator.create(Dependency) catch unreachable; + const dep = b.allocator.create(Dependency) catch @panic("OOM"); dep.* = .{ .builder = sub_builder }; return dep; } diff --git a/lib/std/Build/CheckFileStep.zig b/lib/std/Build/CheckFileStep.zig index 3b8cfe5263..b08a797e84 100644 --- a/lib/std/Build/CheckFileStep.zig +++ b/lib/std/Build/CheckFileStep.zig @@ -18,7 +18,7 @@ pub fn create( source: std.Build.FileSource, expected_matches: []const []const u8, ) *CheckFileStep { - const self = builder.allocator.create(CheckFileStep) catch unreachable; + const self = builder.allocator.create(CheckFileStep) catch @panic("OOM"); self.* = CheckFileStep{ .builder = builder, .step = Step.init(.check_file, "CheckFile", builder.allocator, make), diff --git a/lib/std/Build/CheckObjectStep.zig b/lib/std/Build/CheckObjectStep.zig index bfa5338927..5cb096581f 100644 --- a/lib/std/Build/CheckObjectStep.zig +++ b/lib/std/Build/CheckObjectStep.zig @@ -24,7 +24,7 @@ obj_format: std.Target.ObjectFormat, pub fn create(builder: *std.Build, source: std.Build.FileSource, obj_format: std.Target.ObjectFormat) *CheckObjectStep { const gpa = builder.allocator; - const self = gpa.create(CheckObjectStep) catch unreachable; + const self = gpa.create(CheckObjectStep) catch @panic("OOM"); self.* = .{ .builder = builder, .step = Step.init(.check_file, "CheckObject", gpa, make), @@ -228,14 +228,14 @@ const Check = struct { self.actions.append(.{ .tag = .match, .phrase = self.builder.dupe(phrase), - }) catch unreachable; + }) catch @panic("OOM"); } fn notPresent(self: *Check, phrase: []const u8) void { self.actions.append(.{ .tag = .not_present, .phrase = self.builder.dupe(phrase), - }) catch unreachable; + }) catch @panic("OOM"); } fn computeCmp(self: *Check, phrase: []const u8, expected: ComputeCompareExpected) void { @@ -243,7 +243,7 @@ const Check = struct { .tag = .compute_cmp, .phrase = self.builder.dupe(phrase), .expected = expected, - }) catch unreachable; + }) catch @panic("OOM"); } }; @@ -251,7 +251,7 @@ const Check = struct { pub fn checkStart(self: *CheckObjectStep, phrase: []const u8) void { var new_check = Check.create(self.builder); new_check.match(phrase); - self.checks.append(new_check) catch unreachable; + self.checks.append(new_check) catch @panic("OOM"); } /// Adds another searched phrase to the latest created Check with `CheckObjectStep.checkStart(...)`. @@ -293,7 +293,7 @@ pub fn checkComputeCompare( ) void { var new_check = Check.create(self.builder); new_check.computeCmp(program, expected); - self.checks.append(new_check) catch unreachable; + self.checks.append(new_check) catch @panic("OOM"); } fn make(step: *Step) !void { diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index 5257c85a5c..7396a5ce66 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -312,7 +312,7 @@ pub fn create(builder: *std.Build, options: Options) *CompileStep { panic("invalid name: '{s}'. It looks like a file path, but it is supposed to be the library or application name.", .{name}); } - const self = builder.allocator.create(CompileStep) catch unreachable; + const self = builder.allocator.create(CompileStep) catch @panic("OOM"); self.* = CompileStep{ .strip = null, .unwind_tables = null, @@ -364,7 +364,7 @@ pub fn create(builder: *std.Build, options: Options) *CompileStep { .output_h_path_source = GeneratedFile{ .step = &self.step }, .output_pdb_path_source = GeneratedFile{ .step = &self.step }, - .target_info = NativeTargetInfo.detect(self.target) catch unreachable, + .target_info = NativeTargetInfo.detect(self.target) catch @panic("unhandled error"), }; self.computeOutFileNames(); if (root_src) |rs| rs.addStepDependencies(&self.step); @@ -387,7 +387,7 @@ fn computeOutFileNames(self: *CompileStep) void { .static => .Static, }) else null, .version = self.version, - }) catch unreachable; + }) catch @panic("OOM"); if (self.kind == .lib) { if (self.linkage != null and self.linkage.? == .static) { @@ -439,7 +439,7 @@ pub fn installRaw(self: *CompileStep, dest_filename: []const u8, options: Instal pub fn installHeader(a: *CompileStep, src_path: []const u8, dest_rel_path: []const u8) void { const install_file = a.builder.addInstallHeaderFile(src_path, dest_rel_path); a.builder.getInstallStep().dependOn(&install_file.step); - a.installed_headers.append(&install_file.step) catch unreachable; + a.installed_headers.append(&install_file.step) catch @panic("OOM"); } pub fn installHeadersDirectory( @@ -460,7 +460,7 @@ pub fn installHeadersDirectoryOptions( ) void { const install_dir = a.builder.addInstallDirectory(options); a.builder.getInstallStep().dependOn(&install_dir.step); - a.installed_headers.append(&install_dir.step) catch unreachable; + a.installed_headers.append(&install_dir.step) catch @panic("OOM"); } pub fn installLibraryHeaders(a: *CompileStep, l: *CompileStep) void { @@ -472,7 +472,7 @@ pub fn installLibraryHeaders(a: *CompileStep, l: *CompileStep) void { const step_copy = switch (step.id) { inline .install_file, .install_dir => |id| blk: { const T = id.Type(); - const ptr = a.builder.allocator.create(T) catch unreachable; + const ptr = a.builder.allocator.create(T) catch @panic("OOM"); ptr.* = step.cast(T).?.*; ptr.override_source_builder = ptr.builder; ptr.builder = a.builder; @@ -480,10 +480,10 @@ pub fn installLibraryHeaders(a: *CompileStep, l: *CompileStep) void { }, else => unreachable, }; - a.installed_headers.append(step_copy) catch unreachable; + a.installed_headers.append(step_copy) catch @panic("OOM"); install_step.dependOn(step_copy); } - a.installed_headers.appendSlice(l.installed_headers.items) catch unreachable; + a.installed_headers.appendSlice(l.installed_headers.items) catch @panic("OOM"); } /// Creates a `RunStep` with an executable built with `addExecutable`. @@ -532,19 +532,19 @@ pub fn setLinkerScriptPath(self: *CompileStep, source: FileSource) void { } pub fn linkFramework(self: *CompileStep, framework_name: []const u8) void { - self.frameworks.put(self.builder.dupe(framework_name), .{}) catch unreachable; + self.frameworks.put(self.builder.dupe(framework_name), .{}) catch @panic("OOM"); } pub fn linkFrameworkNeeded(self: *CompileStep, framework_name: []const u8) void { self.frameworks.put(self.builder.dupe(framework_name), .{ .needed = true, - }) catch unreachable; + }) catch @panic("OOM"); } pub fn linkFrameworkWeak(self: *CompileStep, framework_name: []const u8) void { self.frameworks.put(self.builder.dupe(framework_name), .{ .weak = true, - }) catch unreachable; + }) catch @panic("OOM"); } /// Returns whether the library, executable, or object depends on a particular system library. @@ -596,12 +596,12 @@ pub fn linkLibCpp(self: *CompileStep) void { /// `name` and `value` need not live longer than the function call. pub fn defineCMacro(self: *CompileStep, name: []const u8, value: ?[]const u8) void { const macro = std.Build.constructCMacro(self.builder.allocator, name, value); - self.c_macros.append(macro) catch unreachable; + self.c_macros.append(macro) catch @panic("OOM"); } /// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1. pub fn defineCMacroRaw(self: *CompileStep, name_and_value: []const u8) void { - self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable; + self.c_macros.append(self.builder.dupe(name_and_value)) catch @panic("OOM"); } /// This one has no integration with anything, it just puts -lname on the command line. @@ -614,7 +614,7 @@ pub fn linkSystemLibraryName(self: *CompileStep, name: []const u8) void { .weak = false, .use_pkg_config = .no, }, - }) catch unreachable; + }) catch @panic("OOM"); } /// This one has no integration with anything, it just puts -needed-lname on the command line. @@ -627,7 +627,7 @@ pub fn linkSystemLibraryNeededName(self: *CompileStep, name: []const u8) void { .weak = false, .use_pkg_config = .no, }, - }) catch unreachable; + }) catch @panic("OOM"); } /// Darwin-only. This one has no integration with anything, it just puts -weak-lname on the @@ -640,7 +640,7 @@ pub fn linkSystemLibraryWeakName(self: *CompileStep, name: []const u8) void { .weak = true, .use_pkg_config = .no, }, - }) catch unreachable; + }) catch @panic("OOM"); } /// This links against a system library, exclusively using pkg-config to find the library. @@ -653,7 +653,7 @@ pub fn linkSystemLibraryPkgConfigOnly(self: *CompileStep, lib_name: []const u8) .weak = false, .use_pkg_config = .force, }, - }) catch unreachable; + }) catch @panic("OOM"); } /// This links against a system library, exclusively using pkg-config to find the library. @@ -666,7 +666,7 @@ pub fn linkSystemLibraryNeededPkgConfigOnly(self: *CompileStep, lib_name: []cons .weak = false, .use_pkg_config = .force, }, - }) catch unreachable; + }) catch @panic("OOM"); } /// Run pkg-config for the given library name and parse the output, returning the arguments @@ -797,7 +797,7 @@ fn linkSystemLibraryInner(self: *CompileStep, name: []const u8, opts: struct { .weak = opts.weak, .use_pkg_config = .yes, }, - }) catch unreachable; + }) catch @panic("OOM"); } pub fn setNamePrefix(self: *CompileStep, text: []const u8) void { @@ -817,7 +817,7 @@ pub fn setTestRunner(self: *CompileStep, path: ?[]const u8) void { /// Handy when you have many C/C++ source files and want them all to have the same flags. pub fn addCSourceFiles(self: *CompileStep, files: []const []const u8, flags: []const []const u8) void { - const c_source_files = self.builder.allocator.create(CSourceFiles) catch unreachable; + const c_source_files = self.builder.allocator.create(CSourceFiles) catch @panic("OOM"); const files_copy = self.builder.dupeStrings(files); const flags_copy = self.builder.dupeStrings(flags); @@ -826,7 +826,7 @@ pub fn addCSourceFiles(self: *CompileStep, files: []const []const u8, flags: []c .files = files_copy, .flags = flags_copy, }; - self.link_objects.append(.{ .c_source_files = c_source_files }) catch unreachable; + self.link_objects.append(.{ .c_source_files = c_source_files }) catch @panic("OOM"); } pub fn addCSourceFile(self: *CompileStep, file: []const u8, flags: []const []const u8) void { @@ -837,9 +837,9 @@ pub fn addCSourceFile(self: *CompileStep, file: []const u8, flags: []const []con } pub fn addCSourceFileSource(self: *CompileStep, source: CSourceFile) void { - const c_source_file = self.builder.allocator.create(CSourceFile) catch unreachable; + const c_source_file = self.builder.allocator.create(CSourceFile) catch @panic("OOM"); c_source_file.* = source.dupe(self.builder); - self.link_objects.append(.{ .c_source_file = c_source_file }) catch unreachable; + self.link_objects.append(.{ .c_source_file = c_source_file }) catch @panic("OOM"); source.source.addStepDependencies(&self.step); } @@ -893,12 +893,12 @@ pub fn getOutputPdbSource(self: *CompileStep) FileSource { pub fn addAssemblyFile(self: *CompileStep, path: []const u8) void { self.link_objects.append(.{ .assembly_file = .{ .path = self.builder.dupe(path) }, - }) catch unreachable; + }) catch @panic("OOM"); } pub fn addAssemblyFileSource(self: *CompileStep, source: FileSource) void { const source_duped = source.dupe(self.builder); - self.link_objects.append(.{ .assembly_file = source_duped }) catch unreachable; + self.link_objects.append(.{ .assembly_file = source_duped }) catch @panic("OOM"); source_duped.addStepDependencies(&self.step); } @@ -907,7 +907,7 @@ pub fn addObjectFile(self: *CompileStep, source_file: []const u8) void { } pub fn addObjectFileSource(self: *CompileStep, source: FileSource) void { - self.link_objects.append(.{ .static_path = source.dupe(self.builder) }) catch unreachable; + self.link_objects.append(.{ .static_path = source.dupe(self.builder) }) catch @panic("OOM"); source.addStepDependencies(&self.step); } @@ -922,11 +922,11 @@ pub const addLibPath = @compileError("deprecated, use addLibraryPath"); pub const addFrameworkDir = @compileError("deprecated, use addFrameworkPath"); pub fn addSystemIncludePath(self: *CompileStep, path: []const u8) void { - self.include_dirs.append(IncludeDir{ .raw_path_system = self.builder.dupe(path) }) catch unreachable; + self.include_dirs.append(IncludeDir{ .raw_path_system = self.builder.dupe(path) }) catch @panic("OOM"); } pub fn addIncludePath(self: *CompileStep, path: []const u8) void { - self.include_dirs.append(IncludeDir{ .raw_path = self.builder.dupe(path) }) catch unreachable; + self.include_dirs.append(IncludeDir{ .raw_path = self.builder.dupe(path) }) catch @panic("OOM"); } pub fn addConfigHeader(self: *CompileStep, config_header: *ConfigHeaderStep) void { @@ -935,19 +935,19 @@ pub fn addConfigHeader(self: *CompileStep, config_header: *ConfigHeaderStep) voi } pub fn addLibraryPath(self: *CompileStep, path: []const u8) void { - self.lib_paths.append(self.builder.dupe(path)) catch unreachable; + self.lib_paths.append(self.builder.dupe(path)) catch @panic("OOM"); } pub fn addRPath(self: *CompileStep, path: []const u8) void { - self.rpaths.append(self.builder.dupe(path)) catch unreachable; + self.rpaths.append(self.builder.dupe(path)) catch @panic("OOM"); } pub fn addFrameworkPath(self: *CompileStep, dir_path: []const u8) void { - self.framework_dirs.append(self.builder.dupe(dir_path)) catch unreachable; + self.framework_dirs.append(self.builder.dupe(dir_path)) catch @panic("OOM"); } pub fn addPackage(self: *CompileStep, package: Pkg) void { - self.packages.append(self.builder.dupePkg(package)) catch unreachable; + self.packages.append(self.builder.dupePkg(package)) catch @panic("OOM"); self.addRecursiveBuildDeps(package); } @@ -1010,7 +1010,7 @@ pub fn addVcpkgPaths(self: *CompileStep, linkage: CompileStep.Linkage) !void { pub fn setExecCmd(self: *CompileStep, args: []const ?[]const u8) void { assert(self.kind == .@"test"); - const duped_args = self.builder.allocator.alloc(?[]u8, args.len) catch unreachable; + const duped_args = self.builder.allocator.alloc(?[]u8, args.len) catch @panic("OOM"); for (args) |arg, i| { duped_args[i] = if (arg) |a| self.builder.dupe(a) else null; } @@ -1019,8 +1019,8 @@ pub fn setExecCmd(self: *CompileStep, args: []const ?[]const u8) void { fn linkLibraryOrObject(self: *CompileStep, other: *CompileStep) void { self.step.dependOn(&other.step); - self.link_objects.append(.{ .other_step = other }) catch unreachable; - self.include_dirs.append(.{ .other_step = other }) catch unreachable; + self.link_objects.append(.{ .other_step = other }) catch @panic("OOM"); + self.include_dirs.append(.{ .other_step = other }) catch @panic("OOM"); } fn makePackageCmd(self: *CompileStep, pkg: Pkg, zig_args: *ArrayList([]const u8)) error{OutOfMemory}!void { @@ -1051,7 +1051,7 @@ fn make(step: *Step) !void { var zig_args = ArrayList([]const u8).init(builder.allocator); defer zig_args.deinit(); - zig_args.append(builder.zig_exe) catch unreachable; + try zig_args.append(builder.zig_exe); const cmd = switch (self.kind) { .lib => "build-lib", @@ -1060,7 +1060,7 @@ fn make(step: *Step) !void { .@"test" => "test", .test_exe => "test", }; - zig_args.append(cmd) catch unreachable; + try zig_args.append(cmd); if (builder.color != .auto) { try zig_args.append("--color"); @@ -1265,12 +1265,12 @@ fn make(step: *Step) !void { try zig_args.append("--debug-compile-errors"); } - if (builder.verbose_cimport) zig_args.append("--verbose-cimport") catch unreachable; - if (builder.verbose_air) zig_args.append("--verbose-air") catch unreachable; - if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable; - if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable; - if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable; - if (builder.verbose_llvm_cpu_features) zig_args.append("--verbose-llvm-cpu-features") catch unreachable; + if (builder.verbose_cimport) try zig_args.append("--verbose-cimport"); + if (builder.verbose_air) try zig_args.append("--verbose-air"); + if (builder.verbose_llvm_ir) try zig_args.append("--verbose-llvm-ir"); + if (builder.verbose_link or self.verbose_link) try zig_args.append("--verbose-link"); + if (builder.verbose_cc or self.verbose_cc) try zig_args.append("--verbose-cc"); + if (builder.verbose_llvm_cpu_features) try zig_args.append("--verbose-llvm-cpu-features"); if (self.emit_analysis.getArg(builder, "emit-analysis")) |arg| try zig_args.append(arg); if (self.emit_asm.getArg(builder, "emit-asm")) |arg| try zig_args.append(arg); @@ -1336,7 +1336,7 @@ fn make(step: *Step) !void { switch (self.optimize) { .Debug => {}, // Skip since it's the default. - else => zig_args.append(builder.fmt("-O{s}", .{@tagName(self.optimize)})) catch unreachable, + else => try zig_args.append(builder.fmt("-O{s}", .{@tagName(self.optimize)})), } try zig_args.append("--cache-dir"); @@ -1345,8 +1345,8 @@ fn make(step: *Step) !void { try zig_args.append("--global-cache-dir"); try zig_args.append(builder.pathFromRoot(builder.global_cache_root)); - zig_args.append("--name") catch unreachable; - zig_args.append(self.name) catch unreachable; + try zig_args.append("--name"); + try zig_args.append(self.name); if (self.linkage) |some| switch (some) { .dynamic => try zig_args.append("-dynamic"), @@ -1354,8 +1354,8 @@ fn make(step: *Step) !void { }; if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic) { if (self.version) |version| { - zig_args.append("--version") catch unreachable; - zig_args.append(builder.fmt("{}", .{version})) catch unreachable; + try zig_args.append("--version"); + try zig_args.append(builder.fmt("{}", .{version})); } if (self.target.isDarwin()) { @@ -1651,13 +1651,13 @@ fn make(step: *Step) !void { const name = entry.key_ptr.*; const info = entry.value_ptr.*; if (info.needed) { - zig_args.append("-needed_framework") catch unreachable; + try zig_args.append("-needed_framework"); } else if (info.weak) { - zig_args.append("-weak_framework") catch unreachable; + try zig_args.append("-weak_framework"); } else { - zig_args.append("-framework") catch unreachable; + try zig_args.append("-framework"); } - zig_args.append(name) catch unreachable; + try zig_args.append(name); } } else { if (self.framework_dirs.items.len > 0) { @@ -1748,7 +1748,7 @@ fn make(step: *Step) !void { // Slow path for arguments that need to be escaped. We'll need to allocate and copy var escaped = try ArrayList(u8).initCapacity(args_arena.allocator(), arg.len + 1); const writer = escaped.writer(); - writer.writeAll(arg[0..arg_idx]) catch unreachable; + try writer.writeAll(arg[0..arg_idx]); for (arg[arg_idx..]) |to_escape| { if (to_escape == '\\' or to_escape == '"') try writer.writeByte('\\'); try writer.writeByte(to_escape); @@ -1874,23 +1874,28 @@ fn findVcpkgRoot(allocator: Allocator) !?[]const u8 { return vcpkg_path; } -pub fn doAtomicSymLinks(allocator: Allocator, output_path: []const u8, filename_major_only: []const u8, filename_name_only: []const u8) !void { +pub fn doAtomicSymLinks( + allocator: Allocator, + output_path: []const u8, + filename_major_only: []const u8, + filename_name_only: []const u8, +) !void { const out_dir = fs.path.dirname(output_path) orelse "."; const out_basename = fs.path.basename(output_path); // sym link for libfoo.so.1 to libfoo.so.1.2.3 - const major_only_path = fs.path.join( + const major_only_path = try fs.path.join( allocator, &[_][]const u8{ out_dir, filename_major_only }, - ) catch unreachable; + ); fs.atomicSymLink(allocator, out_basename, major_only_path) catch |err| { log.err("Unable to symlink {s} -> {s}", .{ major_only_path, out_basename }); return err; }; // sym link for libfoo.so to libfoo.so.1 - const name_only_path = fs.path.join( + const name_only_path = try fs.path.join( allocator, &[_][]const u8{ out_dir, filename_name_only }, - ) catch unreachable; + ); fs.atomicSymLink(allocator, filename_major_only, name_only_path) catch |err| { log.err("Unable to symlink {s} -> {s}", .{ name_only_path, filename_major_only }); return err; diff --git a/lib/std/Build/EmulatableRunStep.zig b/lib/std/Build/EmulatableRunStep.zig index 26804b2fc8..5517f7f9aa 100644 --- a/lib/std/Build/EmulatableRunStep.zig +++ b/lib/std/Build/EmulatableRunStep.zig @@ -47,7 +47,7 @@ hide_foreign_binaries_warning: bool, /// Asserts given artifact is an executable. pub fn create(builder: *std.Build, name: []const u8, artifact: *CompileStep) *EmulatableRunStep { std.debug.assert(artifact.kind == .exe or artifact.kind == .test_exe); - const self = builder.allocator.create(EmulatableRunStep) catch unreachable; + const self = builder.allocator.create(EmulatableRunStep) catch @panic("OOM"); const option_name = "hide-foreign-warnings"; const hide_warnings = if (builder.available_options_map.get(option_name) == null) warn: { @@ -154,9 +154,9 @@ fn warnAboutForeignBinaries(step: *EmulatableRunStep) void { const builder = step.builder; const artifact = step.exe; - const host_name = builder.host.target.zigTriple(builder.allocator) catch unreachable; - const foreign_name = artifact.target.zigTriple(builder.allocator) catch unreachable; - const target_info = std.zig.system.NativeTargetInfo.detect(artifact.target) catch unreachable; + const host_name = builder.host.target.zigTriple(builder.allocator) catch @panic("unhandled error"); + const foreign_name = artifact.target.zigTriple(builder.allocator) catch @panic("unhandled error"); + const target_info = std.zig.system.NativeTargetInfo.detect(artifact.target) catch @panic("unhandled error"); const need_cross_glibc = artifact.target.isGnuLibC() and artifact.is_linking_libc; switch (builder.host.getExternalExecutor(target_info, .{ .qemu_fixes_dl = need_cross_glibc and builder.glibc_runtimes_dir != null, diff --git a/lib/std/Build/FmtStep.zig b/lib/std/Build/FmtStep.zig index 44a93dee66..6404d22f13 100644 --- a/lib/std/Build/FmtStep.zig +++ b/lib/std/Build/FmtStep.zig @@ -9,12 +9,12 @@ builder: *std.Build, argv: [][]const u8, pub fn create(builder: *std.Build, paths: []const []const u8) *FmtStep { - const self = builder.allocator.create(FmtStep) catch unreachable; + const self = builder.allocator.create(FmtStep) catch @panic("OOM"); const name = "zig fmt"; self.* = FmtStep{ .step = Step.init(.fmt, name, builder.allocator, make), .builder = builder, - .argv = builder.allocator.alloc([]u8, paths.len + 2) catch unreachable, + .argv = builder.allocator.alloc([]u8, paths.len + 2) catch @panic("OOM"), }; self.argv[0] = builder.zig_exe; diff --git a/lib/std/Build/InstallArtifactStep.zig b/lib/std/Build/InstallArtifactStep.zig index 898b9e85e7..8ee739a41c 100644 --- a/lib/std/Build/InstallArtifactStep.zig +++ b/lib/std/Build/InstallArtifactStep.zig @@ -16,7 +16,7 @@ h_dir: ?InstallDir, pub fn create(builder: *std.Build, artifact: *CompileStep) *InstallArtifactStep { if (artifact.install_step) |s| return s; - const self = builder.allocator.create(InstallArtifactStep) catch unreachable; + const self = builder.allocator.create(InstallArtifactStep) catch @panic("OOM"); self.* = InstallArtifactStep{ .builder = builder, .step = Step.init(.install_artifact, builder.fmt("install {s}", .{artifact.step.name}), builder.allocator, make), diff --git a/lib/std/Build/InstallRawStep.zig b/lib/std/Build/InstallRawStep.zig index e7ffe78878..014c44f287 100644 --- a/lib/std/Build/InstallRawStep.zig +++ b/lib/std/Build/InstallRawStep.zig @@ -44,7 +44,7 @@ pub fn create( dest_filename: []const u8, options: CreateOptions, ) *InstallRawStep { - const self = builder.allocator.create(InstallRawStep) catch unreachable; + const self = builder.allocator.create(InstallRawStep) catch @panic("OOM"); self.* = InstallRawStep{ .step = Step.init(.install_raw, builder.fmt("install raw binary {s}", .{artifact.step.name}), builder.allocator, make), .builder = builder, @@ -82,7 +82,7 @@ fn make(step: *Step) !void { const full_dest_path = b.getInstallPath(self.dest_dir, self.dest_filename); self.output_file.path = full_dest_path; - fs.cwd().makePath(b.getInstallPath(self.dest_dir, "")) catch unreachable; + try fs.cwd().makePath(b.getInstallPath(self.dest_dir, "")); var argv_list = std.ArrayList([]const u8).init(b.allocator); try argv_list.appendSlice(&.{ b.zig_exe, "objcopy" }); diff --git a/lib/std/Build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig index 94c41ce9e6..a353737512 100644 --- a/lib/std/Build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -19,7 +19,7 @@ artifact_args: std.ArrayList(OptionArtifactArg), file_source_args: std.ArrayList(OptionFileSourceArg), pub fn create(builder: *std.Build) *OptionsStep { - const self = builder.allocator.create(OptionsStep) catch unreachable; + const self = builder.allocator.create(OptionsStep) catch @panic("OOM"); self.* = .{ .builder = builder, .step = Step.init(.options, "options", builder.allocator, make), @@ -34,44 +34,48 @@ pub fn create(builder: *std.Build) *OptionsStep { } pub fn addOption(self: *OptionsStep, comptime T: type, name: []const u8, value: T) void { + return addOptionFallible(self, T, name, value) catch @panic("unhandled error"); +} + +fn addOptionFallible(self: *OptionsStep, comptime T: type, name: []const u8, value: T) !void { const out = self.contents.writer(); switch (T) { []const []const u8 => { - out.print("pub const {}: []const []const u8 = &[_][]const u8{{\n", .{std.zig.fmtId(name)}) catch unreachable; + try out.print("pub const {}: []const []const u8 = &[_][]const u8{{\n", .{std.zig.fmtId(name)}); for (value) |slice| { - out.print(" \"{}\",\n", .{std.zig.fmtEscapes(slice)}) catch unreachable; + try out.print(" \"{}\",\n", .{std.zig.fmtEscapes(slice)}); } - out.writeAll("};\n") catch unreachable; + try out.writeAll("};\n"); return; }, [:0]const u8 => { - out.print("pub const {}: [:0]const u8 = \"{}\";\n", .{ std.zig.fmtId(name), std.zig.fmtEscapes(value) }) catch unreachable; + try out.print("pub const {}: [:0]const u8 = \"{}\";\n", .{ std.zig.fmtId(name), std.zig.fmtEscapes(value) }); return; }, []const u8 => { - out.print("pub const {}: []const u8 = \"{}\";\n", .{ std.zig.fmtId(name), std.zig.fmtEscapes(value) }) catch unreachable; + try out.print("pub const {}: []const u8 = \"{}\";\n", .{ std.zig.fmtId(name), std.zig.fmtEscapes(value) }); return; }, ?[:0]const u8 => { - out.print("pub const {}: ?[:0]const u8 = ", .{std.zig.fmtId(name)}) catch unreachable; + try out.print("pub const {}: ?[:0]const u8 = ", .{std.zig.fmtId(name)}); if (value) |payload| { - out.print("\"{}\";\n", .{std.zig.fmtEscapes(payload)}) catch unreachable; + try out.print("\"{}\";\n", .{std.zig.fmtEscapes(payload)}); } else { - out.writeAll("null;\n") catch unreachable; + try out.writeAll("null;\n"); } return; }, ?[]const u8 => { - out.print("pub const {}: ?[]const u8 = ", .{std.zig.fmtId(name)}) catch unreachable; + try out.print("pub const {}: ?[]const u8 = ", .{std.zig.fmtId(name)}); if (value) |payload| { - out.print("\"{}\";\n", .{std.zig.fmtEscapes(payload)}) catch unreachable; + try out.print("\"{}\";\n", .{std.zig.fmtEscapes(payload)}); } else { - out.writeAll("null;\n") catch unreachable; + try out.writeAll("null;\n"); } return; }, std.builtin.Version => { - out.print( + try out.print( \\pub const {}: @import("std").builtin.Version = .{{ \\ .major = {d}, \\ .minor = {d}, @@ -84,11 +88,11 @@ pub fn addOption(self: *OptionsStep, comptime T: type, name: []const u8, value: value.major, value.minor, value.patch, - }) catch unreachable; + }); return; }, std.SemanticVersion => { - out.print( + try out.print( \\pub const {}: @import("std").SemanticVersion = .{{ \\ .major = {d}, \\ .minor = {d}, @@ -100,38 +104,38 @@ pub fn addOption(self: *OptionsStep, comptime T: type, name: []const u8, value: value.major, value.minor, value.patch, - }) catch unreachable; + }); if (value.pre) |some| { - out.print(" .pre = \"{}\",\n", .{std.zig.fmtEscapes(some)}) catch unreachable; + try out.print(" .pre = \"{}\",\n", .{std.zig.fmtEscapes(some)}); } if (value.build) |some| { - out.print(" .build = \"{}\",\n", .{std.zig.fmtEscapes(some)}) catch unreachable; + try out.print(" .build = \"{}\",\n", .{std.zig.fmtEscapes(some)}); } - out.writeAll("};\n") catch unreachable; + try out.writeAll("};\n"); return; }, else => {}, } switch (@typeInfo(T)) { .Enum => |enum_info| { - out.print("pub const {} = enum {{\n", .{std.zig.fmtId(@typeName(T))}) catch unreachable; + try out.print("pub const {} = enum {{\n", .{std.zig.fmtId(@typeName(T))}); inline for (enum_info.fields) |field| { - out.print(" {},\n", .{std.zig.fmtId(field.name)}) catch unreachable; + try out.print(" {},\n", .{std.zig.fmtId(field.name)}); } - out.writeAll("};\n") catch unreachable; - out.print("pub const {}: {s} = {s}.{s};\n", .{ + try out.writeAll("};\n"); + try out.print("pub const {}: {s} = {s}.{s};\n", .{ std.zig.fmtId(name), std.zig.fmtId(@typeName(T)), std.zig.fmtId(@typeName(T)), std.zig.fmtId(@tagName(value)), - }) catch unreachable; + }); return; }, else => {}, } - out.print("pub const {}: {s} = ", .{ std.zig.fmtId(name), @typeName(T) }) catch unreachable; - printLiteral(out, value, 0) catch unreachable; - out.writeAll(";\n") catch unreachable; + try out.print("pub const {}: {s} = ", .{ std.zig.fmtId(name), @typeName(T) }); + try printLiteral(out, value, 0); + try out.writeAll(";\n"); } // TODO: non-recursive? @@ -189,14 +193,14 @@ pub fn addOptionFileSource( self.file_source_args.append(.{ .name = name, .source = source.dupe(self.builder), - }) catch unreachable; + }) catch @panic("OOM"); source.addStepDependencies(&self.step); } /// The value is the path in the cache dir. /// Adds a dependency automatically. pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *CompileStep) void { - self.artifact_args.append(.{ .name = self.builder.dupe(name), .artifact = artifact }) catch unreachable; + self.artifact_args.append(.{ .name = self.builder.dupe(name), .artifact = artifact }) catch @panic("OOM"); self.step.dependOn(&artifact.step); } diff --git a/lib/std/Build/RunStep.zig b/lib/std/Build/RunStep.zig index 9ab9ea6335..07f2363623 100644 --- a/lib/std/Build/RunStep.zig +++ b/lib/std/Build/RunStep.zig @@ -54,7 +54,7 @@ pub const Arg = union(enum) { }; pub fn create(builder: *std.Build, name: []const u8) *RunStep { - const self = builder.allocator.create(RunStep) catch unreachable; + const self = builder.allocator.create(RunStep) catch @panic("OOM"); self.* = RunStep{ .builder = builder, .step = Step.init(base_id, name, builder.allocator, make), @@ -67,19 +67,19 @@ pub fn create(builder: *std.Build, name: []const u8) *RunStep { } pub fn addArtifactArg(self: *RunStep, artifact: *CompileStep) void { - self.argv.append(Arg{ .artifact = artifact }) catch unreachable; + self.argv.append(Arg{ .artifact = artifact }) catch @panic("OOM"); self.step.dependOn(&artifact.step); } pub fn addFileSourceArg(self: *RunStep, file_source: std.Build.FileSource) void { self.argv.append(Arg{ .file_source = file_source.dupe(self.builder), - }) catch unreachable; + }) catch @panic("OOM"); file_source.addStepDependencies(&self.step); } pub fn addArg(self: *RunStep, arg: []const u8) void { - self.argv.append(Arg{ .bytes = self.builder.dupe(arg) }) catch unreachable; + self.argv.append(Arg{ .bytes = self.builder.dupe(arg) }) catch @panic("OOM"); } pub fn addArgs(self: *RunStep, args: []const []const u8) void { @@ -89,7 +89,7 @@ pub fn addArgs(self: *RunStep, args: []const []const u8) void { } pub fn clearEnvironment(self: *RunStep) void { - const new_env_map = self.builder.allocator.create(EnvMap) catch unreachable; + const new_env_map = self.builder.allocator.create(EnvMap) catch @panic("OOM"); new_env_map.* = EnvMap.init(self.builder.allocator); self.env_map = new_env_map; } @@ -107,9 +107,9 @@ pub fn addPathDirInternal(step: *Step, builder: *std.Build, search_path: []const if (prev_path) |pp| { const new_path = builder.fmt("{s}" ++ [1]u8{fs.path.delimiter} ++ "{s}", .{ pp, search_path }); - env_map.put(key, new_path) catch unreachable; + env_map.put(key, new_path) catch @panic("OOM"); } else { - env_map.put(key, builder.dupePath(search_path)) catch unreachable; + env_map.put(key, builder.dupePath(search_path)) catch @panic("OOM"); } } @@ -124,8 +124,8 @@ fn getEnvMapInternal(step: *Step, allocator: Allocator) *EnvMap { else => unreachable, }; return maybe_env_map orelse { - const env_map = allocator.create(EnvMap) catch unreachable; - env_map.* = process.getEnvMap(allocator) catch unreachable; + const env_map = allocator.create(EnvMap) catch @panic("OOM"); + env_map.* = process.getEnvMap(allocator) catch @panic("unhandled error"); switch (step.id) { .run => step.cast(RunStep).?.env_map = env_map, .emulatable_run => step.cast(RunStep).?.env_map = env_map, @@ -140,7 +140,7 @@ pub fn setEnvironmentVariable(self: *RunStep, key: []const u8, value: []const u8 env_map.put( self.builder.dupe(key), self.builder.dupe(value), - ) catch unreachable; + ) catch @panic("unhandled error"); } pub fn expectStdErrEqual(self: *RunStep, bytes: []const u8) void { @@ -234,7 +234,7 @@ pub fn runCommand( switch (stdout_action) { .expect_exact, .expect_matches => { - stdout = child.stdout.?.reader().readAllAlloc(builder.allocator, max_stdout_size) catch unreachable; + stdout = try child.stdout.?.reader().readAllAlloc(builder.allocator, max_stdout_size); }, .inherit, .ignore => {}, } @@ -244,7 +244,7 @@ pub fn runCommand( switch (stderr_action) { .expect_exact, .expect_matches => { - stderr = child.stderr.?.reader().readAllAlloc(builder.allocator, max_stdout_size) catch unreachable; + stderr = try child.stderr.?.reader().readAllAlloc(builder.allocator, max_stdout_size); }, .inherit, .ignore => {}, } diff --git a/lib/std/Build/Step.zig b/lib/std/Build/Step.zig index aff8a49161..ff0ceb2a51 100644 --- a/lib/std/Build/Step.zig +++ b/lib/std/Build/Step.zig @@ -57,7 +57,7 @@ pub fn init( ) Step { return Step{ .id = id, - .name = allocator.dupe(u8, name) catch unreachable, + .name = allocator.dupe(u8, name) catch @panic("OOM"), .makeFn = makeFn, .dependencies = std.ArrayList(*Step).init(allocator), .loop_flag = false, @@ -77,7 +77,7 @@ pub fn make(self: *Step) !void { } pub fn dependOn(self: *Step, other: *Step) void { - self.dependencies.append(other) catch unreachable; + self.dependencies.append(other) catch @panic("OOM"); } fn makeNoOp(self: *Step) anyerror!void { diff --git a/lib/std/Build/TranslateCStep.zig b/lib/std/Build/TranslateCStep.zig index c59362aeee..d9874142d8 100644 --- a/lib/std/Build/TranslateCStep.zig +++ b/lib/std/Build/TranslateCStep.zig @@ -28,7 +28,7 @@ pub const Options = struct { }; pub fn create(builder: *std.Build, options: Options) *TranslateCStep { - const self = builder.allocator.create(TranslateCStep) catch unreachable; + const self = builder.allocator.create(TranslateCStep) catch @panic("OOM"); const source = options.source_file.dupe(builder); self.* = TranslateCStep{ .step = Step.init(.translate_c, "translate-c", builder.allocator, make), @@ -67,7 +67,7 @@ pub fn addExecutable(self: *TranslateCStep, options: AddExecutableOptions) *Comp } pub fn addIncludeDir(self: *TranslateCStep, include_dir: []const u8) void { - self.include_dirs.append(self.builder.dupePath(include_dir)) catch unreachable; + self.include_dirs.append(self.builder.dupePath(include_dir)) catch @panic("OOM"); } pub fn addCheckFile(self: *TranslateCStep, expected_matches: []const []const u8) *CheckFileStep { @@ -78,12 +78,12 @@ pub fn addCheckFile(self: *TranslateCStep, expected_matches: []const []const u8) /// `name` and `value` need not live longer than the function call. pub fn defineCMacro(self: *TranslateCStep, name: []const u8, value: ?[]const u8) void { const macro = std.Build.constructCMacro(self.builder.allocator, name, value); - self.c_macros.append(macro) catch unreachable; + self.c_macros.append(macro) catch @panic("OOM"); } /// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1. pub fn defineCMacroRaw(self: *TranslateCStep, name_and_value: []const u8) void { - self.c_macros.append(self.builder.dupe(name_and_value)) catch unreachable; + self.c_macros.append(self.builder.dupe(name_and_value)) catch @panic("OOM"); } fn make(step: *Step) !void { @@ -129,8 +129,8 @@ fn make(step: *Step) !void { self.output_dir = fs.path.dirname(output_path).?; } - self.output_file.path = fs.path.join( + self.output_file.path = try fs.path.join( self.builder.allocator, &[_][]const u8{ self.output_dir.?, self.out_basename }, - ) catch unreachable; + ); } diff --git a/lib/std/Build/WriteFileStep.zig b/lib/std/Build/WriteFileStep.zig index 59ac568221..9e8fcdc203 100644 --- a/lib/std/Build/WriteFileStep.zig +++ b/lib/std/Build/WriteFileStep.zig @@ -28,7 +28,7 @@ pub fn init(builder: *std.Build) WriteFileStep { } pub fn add(self: *WriteFileStep, basename: []const u8, bytes: []const u8) void { - const node = self.builder.allocator.create(std.TailQueue(File).Node) catch unreachable; + const node = self.builder.allocator.create(std.TailQueue(File).Node) catch @panic("unhandled error"); node.* = .{ .data = .{ .source = std.Build.GeneratedFile{ .step = &self.step }, @@ -106,10 +106,10 @@ fn make(step: *Step) !void { }); return err; }; - node.data.source.path = fs.path.join( + node.data.source.path = try fs.path.join( self.builder.allocator, &[_][]const u8{ self.output_dir, node.data.basename }, - ) catch unreachable; + ); } } } From 2f5892671e49850070064f689a7d8f93d6a7a0dd Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 14:56:35 -0700 Subject: [PATCH 25/65] move compiler's CType logic to std.Target This API only depends on std.Target and is extremely useful in build scripts when populating configure files. --- lib/std/target.zig | 553 +++++++++++++++++++++++++++++++++++++ src/Sema.zig | 2 +- src/codegen/c.zig | 1 - src/codegen/llvm.zig | 5 +- src/type.zig | 630 ++++--------------------------------------- 5 files changed, 601 insertions(+), 590 deletions(-) diff --git a/lib/std/target.zig b/lib/std/target.zig index 8ae175aac8..4429f8be2d 100644 --- a/lib/std/target.zig +++ b/lib/std/target.zig @@ -1880,6 +1880,559 @@ pub const Target = struct { => 16, }; } + + pub const CType = enum { + short, + ushort, + int, + uint, + long, + ulong, + longlong, + ulonglong, + float, + double, + longdouble, + }; + + pub fn c_type_byte_size(t: Target, c_type: CType) u16 { + return switch (c_type) { + .short, + .ushort, + .int, + .uint, + .long, + .ulong, + .longlong, + .ulonglong, + => @divExact(c_type_bit_size(t, c_type), 8), + + .float => 4, + .double => 8, + + .longdouble => switch (c_type_bit_size(t, c_type)) { + 16 => 2, + 32 => 4, + 64 => 8, + 80 => @intCast(u16, mem.alignForward(10, c_type_alignment(t, .longdouble))), + 128 => 16, + else => unreachable, + }, + }; + } + + pub fn c_type_bit_size(target: Target, c_type: CType) u16 { + switch (target.os.tag) { + .freestanding, .other => switch (target.cpu.arch) { + .msp430 => switch (c_type) { + .short, .ushort, .int, .uint => return 16, + .float, .long, .ulong => return 32, + .longlong, .ulonglong, .double, .longdouble => return 64, + }, + .avr => switch (c_type) { + .short, .ushort, .int, .uint => return 16, + .long, .ulong, .float, .double, .longdouble => return 32, + .longlong, .ulonglong => return 64, + }, + .tce, .tcele => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .long, .ulong, .longlong, .ulonglong => return 32, + .float, .double, .longdouble => return 32, + }, + .mips64, .mips64el => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return if (target.abi != .gnuabin32) 64 else 32, + .longlong, .ulonglong, .double => return 64, + .longdouble => return 128, + }, + .x86_64 => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => switch (target.abi) { + .gnux32, .muslx32 => return 32, + else => return 64, + }, + .longlong, .ulonglong, .double => return 64, + .longdouble => return 80, + }, + else => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return target.cpu.arch.ptrBitWidth(), + .longlong, .ulonglong, .double => return 64, + .longdouble => switch (target.cpu.arch) { + .x86 => switch (target.abi) { + .android => return 64, + else => return 80, + }, + + .powerpc, + .powerpcle, + .powerpc64, + .powerpc64le, + => switch (target.abi) { + .musl, + .musleabi, + .musleabihf, + .muslx32, + => return 64, + else => return 128, + }, + + .riscv32, + .riscv64, + .aarch64, + .aarch64_be, + .aarch64_32, + .s390x, + .sparc, + .sparc64, + .sparcel, + .wasm32, + .wasm64, + => return 128, + + else => return 64, + }, + }, + }, + + .linux, + .freebsd, + .netbsd, + .dragonfly, + .openbsd, + .wasi, + .emscripten, + .plan9, + .solaris, + .haiku, + .ananas, + .fuchsia, + .minix, + => switch (target.cpu.arch) { + .msp430 => switch (c_type) { + .short, .ushort, .int, .uint => return 16, + .long, .ulong, .float => return 32, + .longlong, .ulonglong, .double, .longdouble => return 64, + }, + .avr => switch (c_type) { + .short, .ushort, .int, .uint => return 16, + .long, .ulong, .float, .double, .longdouble => return 32, + .longlong, .ulonglong => return 64, + }, + .tce, .tcele => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .long, .ulong, .longlong, .ulonglong => return 32, + .float, .double, .longdouble => return 32, + }, + .mips64, .mips64el => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return if (target.abi != .gnuabin32) 64 else 32, + .longlong, .ulonglong, .double => return 64, + .longdouble => if (target.os.tag == .freebsd) return 64 else return 128, + }, + .x86_64 => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => switch (target.abi) { + .gnux32, .muslx32 => return 32, + else => return 64, + }, + .longlong, .ulonglong, .double => return 64, + .longdouble => return 80, + }, + else => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return target.cpu.arch.ptrBitWidth(), + .longlong, .ulonglong, .double => return 64, + .longdouble => switch (target.cpu.arch) { + .x86 => switch (target.abi) { + .android => return 64, + else => return 80, + }, + + .powerpc, + .powerpcle, + => switch (target.abi) { + .musl, + .musleabi, + .musleabihf, + .muslx32, + => return 64, + else => switch (target.os.tag) { + .freebsd, .netbsd, .openbsd => return 64, + else => return 128, + }, + }, + + .powerpc64, + .powerpc64le, + => switch (target.abi) { + .musl, + .musleabi, + .musleabihf, + .muslx32, + => return 64, + else => switch (target.os.tag) { + .freebsd, .openbsd => return 64, + else => return 128, + }, + }, + + .riscv32, + .riscv64, + .aarch64, + .aarch64_be, + .aarch64_32, + .s390x, + .mips64, + .mips64el, + .sparc, + .sparc64, + .sparcel, + .wasm32, + .wasm64, + => return 128, + + else => return 64, + }, + }, + }, + + .windows, .uefi => switch (target.cpu.arch) { + .x86 => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return 32, + .longlong, .ulonglong, .double => return 64, + .longdouble => switch (target.abi) { + .gnu, .gnuilp32, .cygnus => return 80, + else => return 64, + }, + }, + .x86_64 => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => switch (target.abi) { + .cygnus => return 64, + else => return 32, + }, + .longlong, .ulonglong, .double => return 64, + .longdouble => switch (target.abi) { + .gnu, .gnuilp32, .cygnus => return 80, + else => return 64, + }, + }, + else => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => return 32, + .longlong, .ulonglong, .double => return 64, + .longdouble => return 64, + }, + }, + + .macos, .ios, .tvos, .watchos => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => switch (target.cpu.arch) { + .x86, .arm, .aarch64_32 => return 32, + .x86_64 => switch (target.abi) { + .gnux32, .muslx32 => return 32, + else => return 64, + }, + else => return 64, + }, + .longlong, .ulonglong, .double => return 64, + .longdouble => switch (target.cpu.arch) { + .x86 => switch (target.abi) { + .android => return 64, + else => return 80, + }, + .x86_64 => return 80, + else => return 64, + }, + }, + + .nvcl, .cuda => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong => switch (target.cpu.arch) { + .nvptx => return 32, + .nvptx64 => return 64, + else => return 64, + }, + .longlong, .ulonglong, .double => return 64, + .longdouble => return 64, + }, + + .amdhsa, .amdpal => switch (c_type) { + .short, .ushort => return 16, + .int, .uint, .float => return 32, + .long, .ulong, .longlong, .ulonglong, .double => return 64, + .longdouble => return 128, + }, + + .cloudabi, + .kfreebsd, + .lv2, + .zos, + .rtems, + .nacl, + .aix, + .ps4, + .ps5, + .elfiamcu, + .mesa3d, + .contiki, + .hermit, + .hurd, + .opencl, + .glsl450, + .vulkan, + .driverkit, + .shadermodel, + => @panic("TODO specify the C integer and float type sizes for this OS"), + } + } + + pub fn c_type_alignment(target: Target, c_type: CType) u16 { + // Overrides for unusual alignments + switch (target.cpu.arch) { + .avr => switch (c_type) { + .short, .ushort => return 2, + else => return 1, + }, + .x86 => switch (target.os.tag) { + .windows, .uefi => switch (c_type) { + .longlong, .ulonglong, .double => return 8, + .longdouble => switch (target.abi) { + .gnu, .gnuilp32, .cygnus => return 4, + else => return 8, + }, + else => {}, + }, + else => {}, + }, + else => {}, + } + + // Next-power-of-two-aligned, up to a maximum. + return @min( + std.math.ceilPowerOfTwoAssert(u16, (c_type_bit_size(target, c_type) + 7) / 8), + switch (target.cpu.arch) { + .arm, .armeb, .thumb, .thumbeb => switch (target.os.tag) { + .netbsd => switch (target.abi) { + .gnueabi, + .gnueabihf, + .eabi, + .eabihf, + .android, + .musleabi, + .musleabihf, + => 8, + + else => @as(u16, 4), + }, + .ios, .tvos, .watchos => 4, + else => 8, + }, + + .msp430, + .avr, + => 2, + + .arc, + .csky, + .x86, + .xcore, + .dxil, + .loongarch32, + .tce, + .tcele, + .le32, + .amdil, + .hsail, + .spir, + .spirv32, + .kalimba, + .shave, + .renderscript32, + .ve, + .spu_2, + => 4, + + .aarch64_32, + .amdgcn, + .amdil64, + .bpfel, + .bpfeb, + .hexagon, + .hsail64, + .loongarch64, + .m68k, + .mips, + .mipsel, + .sparc, + .sparcel, + .sparc64, + .lanai, + .le64, + .nvptx, + .nvptx64, + .r600, + .s390x, + .spir64, + .spirv64, + .renderscript64, + => 8, + + .aarch64, + .aarch64_be, + .mips64, + .mips64el, + .powerpc, + .powerpcle, + .powerpc64, + .powerpc64le, + .riscv32, + .riscv64, + .x86_64, + .wasm32, + .wasm64, + => 16, + }, + ); + } + + pub fn c_type_preferred_alignment(target: Target, c_type: CType) u16 { + // Overrides for unusual alignments + switch (target.cpu.arch) { + .arm, .armeb, .thumb, .thumbeb => switch (target.os.tag) { + .netbsd => switch (target.abi) { + .gnueabi, + .gnueabihf, + .eabi, + .eabihf, + .android, + .musleabi, + .musleabihf, + => {}, + + else => switch (c_type) { + .longdouble => return 4, + else => {}, + }, + }, + .ios, .tvos, .watchos => switch (c_type) { + .longdouble => return 4, + else => {}, + }, + else => {}, + }, + .arc => switch (c_type) { + .longdouble => return 4, + else => {}, + }, + .avr => switch (c_type) { + .int, .uint, .long, .ulong, .float, .longdouble => return 1, + .short, .ushort => return 2, + .double => return 4, + .longlong, .ulonglong => return 8, + }, + .x86 => switch (target.os.tag) { + .windows, .uefi => switch (c_type) { + .longdouble => switch (target.abi) { + .gnu, .gnuilp32, .cygnus => return 4, + else => return 8, + }, + else => {}, + }, + else => switch (c_type) { + .longdouble => return 4, + else => {}, + }, + }, + else => {}, + } + + // Next-power-of-two-aligned, up to a maximum. + return @min( + std.math.ceilPowerOfTwoAssert(u16, (c_type_bit_size(target, c_type) + 7) / 8), + switch (target.cpu.arch) { + .msp430 => @as(u16, 2), + + .csky, + .xcore, + .dxil, + .loongarch32, + .tce, + .tcele, + .le32, + .amdil, + .hsail, + .spir, + .spirv32, + .kalimba, + .shave, + .renderscript32, + .ve, + .spu_2, + => 4, + + .arc, + .arm, + .armeb, + .avr, + .thumb, + .thumbeb, + .aarch64_32, + .amdgcn, + .amdil64, + .bpfel, + .bpfeb, + .hexagon, + .hsail64, + .x86, + .loongarch64, + .m68k, + .mips, + .mipsel, + .sparc, + .sparcel, + .sparc64, + .lanai, + .le64, + .nvptx, + .nvptx64, + .r600, + .s390x, + .spir64, + .spirv64, + .renderscript64, + => 8, + + .aarch64, + .aarch64_be, + .mips64, + .mips64el, + .powerpc, + .powerpcle, + .powerpc64, + .powerpc64le, + .riscv32, + .riscv64, + .x86_64, + .wasm32, + .wasm64, + => 16, + }, + ); + } }; test { diff --git a/src/Sema.zig b/src/Sema.zig index 7448fd149c..87be3de7be 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -26076,7 +26076,7 @@ fn coerceVarArgParam( .Array => return sema.fail(block, inst_src, "arrays must be passed by reference to variadic function", .{}), .Float => float: { const target = sema.mod.getTarget(); - const double_bits = @import("type.zig").CType.sizeInBits(.double, target); + const double_bits = target.c_type_bit_size(.double); const inst_bits = uncasted_ty.floatBits(sema.mod.getTarget()); if (inst_bits >= double_bits) break :float inst; switch (double_bits) { diff --git a/src/codegen/c.zig b/src/codegen/c.zig index eb0ae1b1f6..2f721e1b4b 100644 --- a/src/codegen/c.zig +++ b/src/codegen/c.zig @@ -16,7 +16,6 @@ const trace = @import("../tracy.zig").trace; const LazySrcLoc = Module.LazySrcLoc; const Air = @import("../Air.zig"); const Liveness = @import("../Liveness.zig"); -const CType = @import("../type.zig").CType; const target_util = @import("../target.zig"); const libcFloatPrefix = target_util.libcFloatPrefix; diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig index c528abdd7c..e19c70f322 100644 --- a/src/codegen/llvm.zig +++ b/src/codegen/llvm.zig @@ -19,7 +19,6 @@ const Liveness = @import("../Liveness.zig"); const Value = @import("../value.zig").Value; const Type = @import("../type.zig").Type; const LazySrcLoc = Module.LazySrcLoc; -const CType = @import("../type.zig").CType; const x86_64_abi = @import("../arch/x86_64/abi.zig"); const wasm_c_abi = @import("../arch/wasm/abi.zig"); const aarch64_c_abi = @import("../arch/aarch64/abi.zig"); @@ -11043,8 +11042,8 @@ fn backendSupportsF128(target: std.Target) bool { fn intrinsicsAllowed(scalar_ty: Type, target: std.Target) bool { return switch (scalar_ty.tag()) { .f16 => backendSupportsF16(target), - .f80 => (CType.longdouble.sizeInBits(target) == 80) and backendSupportsF80(target), - .f128 => (CType.longdouble.sizeInBits(target) == 128) and backendSupportsF128(target), + .f80 => (target.c_type_bit_size(.longdouble) == 80) and backendSupportsF80(target), + .f128 => (target.c_type_bit_size(.longdouble) == 128) and backendSupportsF128(target), else => true, }; } diff --git a/src/type.zig b/src/type.zig index c675cd225d..a13e30cb4c 100644 --- a/src/type.zig +++ b/src/type.zig @@ -2937,24 +2937,24 @@ pub const Type = extern union { .anyframe_T, => return AbiAlignmentAdvanced{ .scalar = @divExact(target.cpu.arch.ptrBitWidth(), 8) }, - .c_short => return AbiAlignmentAdvanced{ .scalar = CType.short.alignment(target) }, - .c_ushort => return AbiAlignmentAdvanced{ .scalar = CType.ushort.alignment(target) }, - .c_int => return AbiAlignmentAdvanced{ .scalar = CType.int.alignment(target) }, - .c_uint => return AbiAlignmentAdvanced{ .scalar = CType.uint.alignment(target) }, - .c_long => return AbiAlignmentAdvanced{ .scalar = CType.long.alignment(target) }, - .c_ulong => return AbiAlignmentAdvanced{ .scalar = CType.ulong.alignment(target) }, - .c_longlong => return AbiAlignmentAdvanced{ .scalar = CType.longlong.alignment(target) }, - .c_ulonglong => return AbiAlignmentAdvanced{ .scalar = CType.ulonglong.alignment(target) }, - .c_longdouble => return AbiAlignmentAdvanced{ .scalar = CType.longdouble.alignment(target) }, + .c_short => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.short) }, + .c_ushort => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.ushort) }, + .c_int => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.int) }, + .c_uint => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.uint) }, + .c_long => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.long) }, + .c_ulong => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.ulong) }, + .c_longlong => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.longlong) }, + .c_ulonglong => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.ulonglong) }, + .c_longdouble => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.longdouble) }, .f16 => return AbiAlignmentAdvanced{ .scalar = 2 }, - .f32 => return AbiAlignmentAdvanced{ .scalar = CType.float.alignment(target) }, - .f64 => switch (CType.double.sizeInBits(target)) { - 64 => return AbiAlignmentAdvanced{ .scalar = CType.double.alignment(target) }, + .f32 => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.float) }, + .f64 => switch (target.c_type_bit_size(.double)) { + 64 => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.double) }, else => return AbiAlignmentAdvanced{ .scalar = 8 }, }, - .f80 => switch (CType.longdouble.sizeInBits(target)) { - 80 => return AbiAlignmentAdvanced{ .scalar = CType.longdouble.alignment(target) }, + .f80 => switch (target.c_type_bit_size(.longdouble)) { + 80 => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.longdouble) }, else => { var payload: Payload.Bits = .{ .base = .{ .tag = .int_unsigned }, @@ -2964,8 +2964,8 @@ pub const Type = extern union { return AbiAlignmentAdvanced{ .scalar = abiAlignment(u80_ty, target) }; }, }, - .f128 => switch (CType.longdouble.sizeInBits(target)) { - 128 => return AbiAlignmentAdvanced{ .scalar = CType.longdouble.alignment(target) }, + .f128 => switch (target.c_type_bit_size(.longdouble)) { + 128 => return AbiAlignmentAdvanced{ .scalar = target.c_type_alignment(.longdouble) }, else => return AbiAlignmentAdvanced{ .scalar = 16 }, }, @@ -3434,21 +3434,22 @@ pub const Type = extern union { else => return AbiSizeAdvanced{ .scalar = @divExact(target.cpu.arch.ptrBitWidth(), 8) }, }, - .c_short => return AbiSizeAdvanced{ .scalar = @divExact(CType.short.sizeInBits(target), 8) }, - .c_ushort => return AbiSizeAdvanced{ .scalar = @divExact(CType.ushort.sizeInBits(target), 8) }, - .c_int => return AbiSizeAdvanced{ .scalar = @divExact(CType.int.sizeInBits(target), 8) }, - .c_uint => return AbiSizeAdvanced{ .scalar = @divExact(CType.uint.sizeInBits(target), 8) }, - .c_long => return AbiSizeAdvanced{ .scalar = @divExact(CType.long.sizeInBits(target), 8) }, - .c_ulong => return AbiSizeAdvanced{ .scalar = @divExact(CType.ulong.sizeInBits(target), 8) }, - .c_longlong => return AbiSizeAdvanced{ .scalar = @divExact(CType.longlong.sizeInBits(target), 8) }, - .c_ulonglong => return AbiSizeAdvanced{ .scalar = @divExact(CType.ulonglong.sizeInBits(target), 8) }, + .c_short => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.short) }, + .c_ushort => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.ushort) }, + .c_int => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.int) }, + .c_uint => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.uint) }, + .c_long => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.long) }, + .c_ulong => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.ulong) }, + .c_longlong => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.longlong) }, + .c_ulonglong => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.ulonglong) }, + .c_longdouble => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.longdouble) }, .f16 => return AbiSizeAdvanced{ .scalar = 2 }, .f32 => return AbiSizeAdvanced{ .scalar = 4 }, .f64 => return AbiSizeAdvanced{ .scalar = 8 }, .f128 => return AbiSizeAdvanced{ .scalar = 16 }, - .f80 => switch (CType.longdouble.sizeInBits(target)) { - 80 => return AbiSizeAdvanced{ .scalar = std.mem.alignForward(10, CType.longdouble.alignment(target)) }, + .f80 => switch (target.c_type_bit_size(.longdouble)) { + 80 => return AbiSizeAdvanced{ .scalar = target.c_type_byte_size(.longdouble) }, else => { var payload: Payload.Bits = .{ .base = .{ .tag = .int_unsigned }, @@ -3458,14 +3459,6 @@ pub const Type = extern union { return AbiSizeAdvanced{ .scalar = abiSize(u80_ty, target) }; }, }, - .c_longdouble => switch (CType.longdouble.sizeInBits(target)) { - 16 => return AbiSizeAdvanced{ .scalar = abiSize(Type.f16, target) }, - 32 => return AbiSizeAdvanced{ .scalar = abiSize(Type.f32, target) }, - 64 => return AbiSizeAdvanced{ .scalar = abiSize(Type.f64, target) }, - 80 => return AbiSizeAdvanced{ .scalar = abiSize(Type.f80, target) }, - 128 => return AbiSizeAdvanced{ .scalar = abiSize(Type.f128, target) }, - else => unreachable, - }, // TODO revisit this when we have the concept of the error tag type .anyerror_void_error_union, @@ -3748,15 +3741,15 @@ pub const Type = extern union { .manyptr_const_u8_sentinel_0, => return target.cpu.arch.ptrBitWidth(), - .c_short => return CType.short.sizeInBits(target), - .c_ushort => return CType.ushort.sizeInBits(target), - .c_int => return CType.int.sizeInBits(target), - .c_uint => return CType.uint.sizeInBits(target), - .c_long => return CType.long.sizeInBits(target), - .c_ulong => return CType.ulong.sizeInBits(target), - .c_longlong => return CType.longlong.sizeInBits(target), - .c_ulonglong => return CType.ulonglong.sizeInBits(target), - .c_longdouble => return CType.longdouble.sizeInBits(target), + .c_short => return target.c_type_bit_size(.short), + .c_ushort => return target.c_type_bit_size(.ushort), + .c_int => return target.c_type_bit_size(.int), + .c_uint => return target.c_type_bit_size(.uint), + .c_long => return target.c_type_bit_size(.long), + .c_ulong => return target.c_type_bit_size(.ulong), + .c_longlong => return target.c_type_bit_size(.longlong), + .c_ulonglong => return target.c_type_bit_size(.ulonglong), + .c_longdouble => return target.c_type_bit_size(.longdouble), .error_set, .error_set_single, @@ -4631,14 +4624,14 @@ pub const Type = extern union { .i128 => return .{ .signedness = .signed, .bits = 128 }, .usize => return .{ .signedness = .unsigned, .bits = target.cpu.arch.ptrBitWidth() }, .isize => return .{ .signedness = .signed, .bits = target.cpu.arch.ptrBitWidth() }, - .c_short => return .{ .signedness = .signed, .bits = CType.short.sizeInBits(target) }, - .c_ushort => return .{ .signedness = .unsigned, .bits = CType.ushort.sizeInBits(target) }, - .c_int => return .{ .signedness = .signed, .bits = CType.int.sizeInBits(target) }, - .c_uint => return .{ .signedness = .unsigned, .bits = CType.uint.sizeInBits(target) }, - .c_long => return .{ .signedness = .signed, .bits = CType.long.sizeInBits(target) }, - .c_ulong => return .{ .signedness = .unsigned, .bits = CType.ulong.sizeInBits(target) }, - .c_longlong => return .{ .signedness = .signed, .bits = CType.longlong.sizeInBits(target) }, - .c_ulonglong => return .{ .signedness = .unsigned, .bits = CType.ulonglong.sizeInBits(target) }, + .c_short => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.short) }, + .c_ushort => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ushort) }, + .c_int => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.int) }, + .c_uint => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.uint) }, + .c_long => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.long) }, + .c_ulong => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ulong) }, + .c_longlong => return .{ .signedness = .signed, .bits = target.c_type_bit_size(.longlong) }, + .c_ulonglong => return .{ .signedness = .unsigned, .bits = target.c_type_bit_size(.ulonglong) }, .enum_full, .enum_nonexhaustive => ty = ty.cast(Payload.EnumFull).?.data.tag_ty, .enum_numbered => ty = ty.castTag(.enum_numbered).?.data.tag_ty, @@ -4724,7 +4717,7 @@ pub const Type = extern union { .f64 => 64, .f80 => 80, .f128, .comptime_float => 128, - .c_longdouble => CType.longdouble.sizeInBits(target), + .c_longdouble => target.c_type_bit_size(.longdouble), else => unreachable, }; @@ -6689,536 +6682,3 @@ pub const Type = extern union { /// to packed struct layout to find out all the places in the codebase you need to edit! pub const packed_struct_layout_version = 2; }; - -pub const CType = enum { - short, - ushort, - int, - uint, - long, - ulong, - longlong, - ulonglong, - longdouble, - - // We don't have a `c_float`/`c_double` type in Zig, but these - // are useful for querying target-correct alignment and checking - // whether C's double is f64 or f32 - float, - double, - - pub fn sizeInBits(self: CType, target: Target) u16 { - switch (target.os.tag) { - .freestanding, .other => switch (target.cpu.arch) { - .msp430 => switch (self) { - .short, .ushort, .int, .uint => return 16, - .float, .long, .ulong => return 32, - .longlong, .ulonglong, .double, .longdouble => return 64, - }, - .avr => switch (self) { - .short, .ushort, .int, .uint => return 16, - .long, .ulong, .float, .double, .longdouble => return 32, - .longlong, .ulonglong => return 64, - }, - .tce, .tcele => switch (self) { - .short, .ushort => return 16, - .int, .uint, .long, .ulong, .longlong, .ulonglong => return 32, - .float, .double, .longdouble => return 32, - }, - .mips64, .mips64el => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return if (target.abi != .gnuabin32) 64 else 32, - .longlong, .ulonglong, .double => return 64, - .longdouble => return 128, - }, - .x86_64 => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => switch (target.abi) { - .gnux32, .muslx32 => return 32, - else => return 64, - }, - .longlong, .ulonglong, .double => return 64, - .longdouble => return 80, - }, - else => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return target.cpu.arch.ptrBitWidth(), - .longlong, .ulonglong, .double => return 64, - .longdouble => switch (target.cpu.arch) { - .x86 => switch (target.abi) { - .android => return 64, - else => return 80, - }, - - .powerpc, - .powerpcle, - .powerpc64, - .powerpc64le, - => switch (target.abi) { - .musl, - .musleabi, - .musleabihf, - .muslx32, - => return 64, - else => return 128, - }, - - .riscv32, - .riscv64, - .aarch64, - .aarch64_be, - .aarch64_32, - .s390x, - .sparc, - .sparc64, - .sparcel, - .wasm32, - .wasm64, - => return 128, - - else => return 64, - }, - }, - }, - - .linux, - .freebsd, - .netbsd, - .dragonfly, - .openbsd, - .wasi, - .emscripten, - .plan9, - .solaris, - .haiku, - .ananas, - .fuchsia, - .minix, - => switch (target.cpu.arch) { - .msp430 => switch (self) { - .short, .ushort, .int, .uint => return 16, - .long, .ulong, .float => return 32, - .longlong, .ulonglong, .double, .longdouble => return 64, - }, - .avr => switch (self) { - .short, .ushort, .int, .uint => return 16, - .long, .ulong, .float, .double, .longdouble => return 32, - .longlong, .ulonglong => return 64, - }, - .tce, .tcele => switch (self) { - .short, .ushort => return 16, - .int, .uint, .long, .ulong, .longlong, .ulonglong => return 32, - .float, .double, .longdouble => return 32, - }, - .mips64, .mips64el => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return if (target.abi != .gnuabin32) 64 else 32, - .longlong, .ulonglong, .double => return 64, - .longdouble => if (target.os.tag == .freebsd) return 64 else return 128, - }, - .x86_64 => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => switch (target.abi) { - .gnux32, .muslx32 => return 32, - else => return 64, - }, - .longlong, .ulonglong, .double => return 64, - .longdouble => return 80, - }, - else => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return target.cpu.arch.ptrBitWidth(), - .longlong, .ulonglong, .double => return 64, - .longdouble => switch (target.cpu.arch) { - .x86 => switch (target.abi) { - .android => return 64, - else => return 80, - }, - - .powerpc, - .powerpcle, - => switch (target.abi) { - .musl, - .musleabi, - .musleabihf, - .muslx32, - => return 64, - else => switch (target.os.tag) { - .freebsd, .netbsd, .openbsd => return 64, - else => return 128, - }, - }, - - .powerpc64, - .powerpc64le, - => switch (target.abi) { - .musl, - .musleabi, - .musleabihf, - .muslx32, - => return 64, - else => switch (target.os.tag) { - .freebsd, .openbsd => return 64, - else => return 128, - }, - }, - - .riscv32, - .riscv64, - .aarch64, - .aarch64_be, - .aarch64_32, - .s390x, - .mips64, - .mips64el, - .sparc, - .sparc64, - .sparcel, - .wasm32, - .wasm64, - => return 128, - - else => return 64, - }, - }, - }, - - .windows, .uefi => switch (target.cpu.arch) { - .x86 => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return 32, - .longlong, .ulonglong, .double => return 64, - .longdouble => switch (target.abi) { - .gnu, .gnuilp32, .cygnus => return 80, - else => return 64, - }, - }, - .x86_64 => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => switch (target.abi) { - .cygnus => return 64, - else => return 32, - }, - .longlong, .ulonglong, .double => return 64, - .longdouble => switch (target.abi) { - .gnu, .gnuilp32, .cygnus => return 80, - else => return 64, - }, - }, - else => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => return 32, - .longlong, .ulonglong, .double => return 64, - .longdouble => return 64, - }, - }, - - .macos, .ios, .tvos, .watchos => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => switch (target.cpu.arch) { - .x86, .arm, .aarch64_32 => return 32, - .x86_64 => switch (target.abi) { - .gnux32, .muslx32 => return 32, - else => return 64, - }, - else => return 64, - }, - .longlong, .ulonglong, .double => return 64, - .longdouble => switch (target.cpu.arch) { - .x86 => switch (target.abi) { - .android => return 64, - else => return 80, - }, - .x86_64 => return 80, - else => return 64, - }, - }, - - .nvcl, .cuda => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong => switch (target.cpu.arch) { - .nvptx => return 32, - .nvptx64 => return 64, - else => return 64, - }, - .longlong, .ulonglong, .double => return 64, - .longdouble => return 64, - }, - - .amdhsa, .amdpal => switch (self) { - .short, .ushort => return 16, - .int, .uint, .float => return 32, - .long, .ulong, .longlong, .ulonglong, .double => return 64, - .longdouble => return 128, - }, - - .cloudabi, - .kfreebsd, - .lv2, - .zos, - .rtems, - .nacl, - .aix, - .ps4, - .ps5, - .elfiamcu, - .mesa3d, - .contiki, - .hermit, - .hurd, - .opencl, - .glsl450, - .vulkan, - .driverkit, - .shadermodel, - => @panic("TODO specify the C integer and float type sizes for this OS"), - } - } - - pub fn alignment(self: CType, target: Target) u16 { - - // Overrides for unusual alignments - switch (target.cpu.arch) { - .avr => switch (self) { - .short, .ushort => return 2, - else => return 1, - }, - .x86 => switch (target.os.tag) { - .windows, .uefi => switch (self) { - .longlong, .ulonglong, .double => return 8, - .longdouble => switch (target.abi) { - .gnu, .gnuilp32, .cygnus => return 4, - else => return 8, - }, - else => {}, - }, - else => {}, - }, - else => {}, - } - - // Next-power-of-two-aligned, up to a maximum. - return @min( - std.math.ceilPowerOfTwoAssert(u16, (self.sizeInBits(target) + 7) / 8), - switch (target.cpu.arch) { - .arm, .armeb, .thumb, .thumbeb => switch (target.os.tag) { - .netbsd => switch (target.abi) { - .gnueabi, - .gnueabihf, - .eabi, - .eabihf, - .android, - .musleabi, - .musleabihf, - => 8, - - else => @as(u16, 4), - }, - .ios, .tvos, .watchos => 4, - else => 8, - }, - - .msp430, - .avr, - => 2, - - .arc, - .csky, - .x86, - .xcore, - .dxil, - .loongarch32, - .tce, - .tcele, - .le32, - .amdil, - .hsail, - .spir, - .spirv32, - .kalimba, - .shave, - .renderscript32, - .ve, - .spu_2, - => 4, - - .aarch64_32, - .amdgcn, - .amdil64, - .bpfel, - .bpfeb, - .hexagon, - .hsail64, - .loongarch64, - .m68k, - .mips, - .mipsel, - .sparc, - .sparcel, - .sparc64, - .lanai, - .le64, - .nvptx, - .nvptx64, - .r600, - .s390x, - .spir64, - .spirv64, - .renderscript64, - => 8, - - .aarch64, - .aarch64_be, - .mips64, - .mips64el, - .powerpc, - .powerpcle, - .powerpc64, - .powerpc64le, - .riscv32, - .riscv64, - .x86_64, - .wasm32, - .wasm64, - => 16, - }, - ); - } - - pub fn preferredAlignment(self: CType, target: Target) u16 { - - // Overrides for unusual alignments - switch (target.cpu.arch) { - .arm, .armeb, .thumb, .thumbeb => switch (target.os.tag) { - .netbsd => switch (target.abi) { - .gnueabi, - .gnueabihf, - .eabi, - .eabihf, - .android, - .musleabi, - .musleabihf, - => {}, - - else => switch (self) { - .longdouble => return 4, - else => {}, - }, - }, - .ios, .tvos, .watchos => switch (self) { - .longdouble => return 4, - else => {}, - }, - else => {}, - }, - .arc => switch (self) { - .longdouble => return 4, - else => {}, - }, - .avr => switch (self) { - .int, .uint, .long, .ulong, .float, .longdouble => return 1, - .short, .ushort => return 2, - .double => return 4, - .longlong, .ulonglong => return 8, - }, - .x86 => switch (target.os.tag) { - .windows, .uefi => switch (self) { - .longdouble => switch (target.abi) { - .gnu, .gnuilp32, .cygnus => return 4, - else => return 8, - }, - else => {}, - }, - else => switch (self) { - .longdouble => return 4, - else => {}, - }, - }, - else => {}, - } - - // Next-power-of-two-aligned, up to a maximum. - return @min( - std.math.ceilPowerOfTwoAssert(u16, (self.sizeInBits(target) + 7) / 8), - switch (target.cpu.arch) { - .msp430 => @as(u16, 2), - - .csky, - .xcore, - .dxil, - .loongarch32, - .tce, - .tcele, - .le32, - .amdil, - .hsail, - .spir, - .spirv32, - .kalimba, - .shave, - .renderscript32, - .ve, - .spu_2, - => 4, - - .arc, - .arm, - .armeb, - .avr, - .thumb, - .thumbeb, - .aarch64_32, - .amdgcn, - .amdil64, - .bpfel, - .bpfeb, - .hexagon, - .hsail64, - .x86, - .loongarch64, - .m68k, - .mips, - .mipsel, - .sparc, - .sparcel, - .sparc64, - .lanai, - .le64, - .nvptx, - .nvptx64, - .r600, - .s390x, - .spir64, - .spirv64, - .renderscript64, - => 8, - - .aarch64, - .aarch64_be, - .mips64, - .mips64el, - .powerpc, - .powerpcle, - .powerpc64, - .powerpc64le, - .riscv32, - .riscv64, - .x86_64, - .wasm32, - .wasm64, - => 16, - }, - ); - } -}; From 3c1fc3f566b4a0c4493187c7f07b5c401a3e3a1b Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 14:57:20 -0700 Subject: [PATCH 26/65] std.Build.ConfigHeaderStep: support more types --- lib/std/Build/ConfigHeaderStep.zig | 76 +++++++++++++++++------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/lib/std/Build/ConfigHeaderStep.zig b/lib/std/Build/ConfigHeaderStep.zig index b961227c9c..58a78b939d 100644 --- a/lib/std/Build/ConfigHeaderStep.zig +++ b/lib/std/Build/ConfigHeaderStep.zig @@ -61,39 +61,51 @@ pub fn addValues(self: *ConfigHeaderStep, values: anytype) void { fn addValuesInner(self: *ConfigHeaderStep, values: anytype) !void { inline for (@typeInfo(@TypeOf(values)).Struct.fields) |field| { - switch (@typeInfo(field.type)) { - .Null => { - try self.values.put(field.name, .undef); - }, - .Void => { - try self.values.put(field.name, .defined); - }, - .Bool => { - try self.values.put(field.name, .{ .boolean = @field(values, field.name) }); - }, - .ComptimeInt => { - try self.values.put(field.name, .{ .int = @field(values, field.name) }); - }, - .EnumLiteral => { - try self.values.put(field.name, .{ .ident = @tagName(@field(values, field.name)) }); - }, - .Pointer => |ptr| { - switch (@typeInfo(ptr.child)) { - .Array => |array| { - if (ptr.size == .One and array.child == u8) { - try self.values.put(field.name, .{ .string = @field(values, field.name) }); - continue; - } - }, - else => {}, - } + try putValue(self, field.name, field.type, @field(values, field.name)); + } +} - @compileError("unsupported ConfigHeaderStep value type: " ++ - @typeName(field.type)); - }, - else => @compileError("unsupported ConfigHeaderStep value type: " ++ - @typeName(field.type)), - } +fn putValue(self: *ConfigHeaderStep, field_name: []const u8, comptime T: type, v: T) !void { + switch (@typeInfo(T)) { + .Null => { + try self.values.put(field_name, .undef); + }, + .Void => { + try self.values.put(field_name, .defined); + }, + .Bool => { + try self.values.put(field_name, .{ .boolean = v }); + }, + .Int => { + try self.values.put(field_name, .{ .int = v }); + }, + .ComptimeInt => { + try self.values.put(field_name, .{ .int = v }); + }, + .EnumLiteral => { + try self.values.put(field_name, .{ .ident = @tagName(v) }); + }, + .Optional => { + if (v) |x| { + return putValue(self, field_name, @TypeOf(x), x); + } else { + try self.values.put(field_name, .undef); + } + }, + .Pointer => |ptr| { + switch (@typeInfo(ptr.child)) { + .Array => |array| { + if (ptr.size == .One and array.child == u8) { + try self.values.put(field_name, .{ .string = v }); + return; + } + }, + else => {}, + } + + @compileError("unsupported ConfigHeaderStep value type: " ++ @typeName(T)); + }, + else => @compileError("unsupported ConfigHeaderStep value type: " ++ @typeName(T)), } } From 7d14baec900efbbbae0ae25da79f976716241ec0 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 15:00:26 -0700 Subject: [PATCH 27/65] tests: fix missing target for C ABI tests This regressed earlier in this branch. --- test/tests.zig | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tests.zig b/test/tests.zig index 0f36c8eb94..94030ce851 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -1360,6 +1360,7 @@ pub fn addCAbiTests(b: *std.Build, skip_non_native: bool, skip_release: bool) *S const test_step = b.addTest(.{ .root_source_file = .{ .path = "test/c_abi/main.zig" }, .optimize = optimize_mode, + .target = c_abi_target, }); if (c_abi_target.abi != null and c_abi_target.abi.?.isMusl()) { // TODO NativeTargetInfo insists on dynamically linking musl From 8d37c6f71c790faecdb6acdd2868823be2bd2496 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 31 Jan 2023 15:34:08 -0700 Subject: [PATCH 28/65] std.Build.CompileStep: fix API usage in unit test --- lib/std/Build/CompileStep.zig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index 7396a5ce66..12c73bdba6 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -1970,7 +1970,10 @@ test "addPackage" { .dependencies = &[_]Pkg{pkg_dep}, }; - var exe = builder.addExecutable("not_an_executable", "/not/an/executable.zig"); + var exe = builder.addExecutable(.{ + .name = "not_an_executable", + .root_source_file = .{ .path = "/not/an/executable.zig" }, + }); exe.addPackage(pkg_top); try std.testing.expectEqual(@as(usize, 1), exe.packages.items.len); From 2ccff5115454bab4898bae3de88f5619310bc5c1 Mon Sep 17 00:00:00 2001 From: praschke Date: Tue, 31 Jan 2023 21:55:16 +0000 Subject: [PATCH 29/65] mingw: repair msvcrt-os build flags __LIBMSVCRT__ is still used and is distinct from __LIBMSVCRT_OS__ --- src/mingw.zig | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mingw.zig b/src/mingw.zig index 1fee8e90a4..06880743c6 100644 --- a/src/mingw.zig +++ b/src/mingw.zig @@ -106,6 +106,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { .msvcrt_os_lib => { const extra_flags = try arena.dupe([]const u8, &[_][]const u8{ "-DHAVE_CONFIG_H", + "-D__LIBMSVCRT__", "-D__LIBMSVCRT_OS__", "-I", From 9fdc32c96e3961ae2f5287483c9638051df34180 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 09:13:49 +0100 Subject: [PATCH 30/65] link: clean up type resolution in Elf.Atom and MachO.Atom --- src/link/Coff/Atom.zig | 2 +- src/link/Elf/Atom.zig | 4 ++-- src/link/MachO/Atom.zig | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/link/Coff/Atom.zig b/src/link/Coff/Atom.zig index 1ee31cccaa..80c04a8fa1 100644 --- a/src/link/Coff/Atom.zig +++ b/src/link/Coff/Atom.zig @@ -119,7 +119,7 @@ pub fn addBaseRelocation(coff_file: *Coff, atom_index: Index, offset: u32) !void try gop.value_ptr.append(gpa, offset); } -pub fn freeRelocations(coff_file: *Coff, atom_index: Atom.Index) void { +pub fn freeRelocations(coff_file: *Coff, atom_index: Index) void { const gpa = coff_file.base.allocator; var removed_relocs = coff_file.relocs.fetchRemove(atom_index); if (removed_relocs) |*relocs| relocs.value.deinit(gpa); diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig index 79b699636f..24cf19432c 100644 --- a/src/link/Elf/Atom.zig +++ b/src/link/Elf/Atom.zig @@ -20,8 +20,8 @@ offset_table_index: u32, /// Points to the previous and next neighbors, based on the `text_offset`. /// This can be used to find, for example, the capacity of this `TextBlock`. -prev_index: ?Atom.Index, -next_index: ?Atom.Index, +prev_index: ?Index, +next_index: ?Index, dbg_info_atom: Dwarf.Atom, diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index da0115d069..401d71813c 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -40,8 +40,8 @@ alignment: u32, /// Points to the previous and next neighbours /// TODO use the same trick as with symbols: reserve index 0 as null atom -next_index: ?Atom.Index, -prev_index: ?Atom.Index, +next_index: ?Index, +prev_index: ?Index, dbg_info_atom: Dwarf.Atom, @@ -119,13 +119,13 @@ pub fn freeListEligible(self: Atom, macho_file: *MachO) bool { return surplus >= MachO.min_text_capacity; } -pub fn addRelocation(macho_file: *MachO, atom_index: Atom.Index, reloc: Relocation) !void { +pub fn addRelocation(macho_file: *MachO, atom_index: Index, reloc: Relocation) !void { return addRelocations(macho_file, atom_index, 1, .{reloc}); } pub fn addRelocations( macho_file: *MachO, - atom_index: Atom.Index, + atom_index: Index, comptime count: comptime_int, relocs: [count]Relocation, ) !void { @@ -145,7 +145,7 @@ pub fn addRelocations( } } -pub fn addRebase(macho_file: *MachO, atom_index: Atom.Index, offset: u32) !void { +pub fn addRebase(macho_file: *MachO, atom_index: Index, offset: u32) !void { const gpa = macho_file.base.allocator; const atom = macho_file.getAtom(atom_index); log.debug(" (adding rebase at offset 0x{x} in %{?d})", .{ offset, atom.getSymbolIndex() }); @@ -156,7 +156,7 @@ pub fn addRebase(macho_file: *MachO, atom_index: Atom.Index, offset: u32) !void try gop.value_ptr.append(gpa, offset); } -pub fn addBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Binding) !void { +pub fn addBinding(macho_file: *MachO, atom_index: Index, binding: Binding) !void { const gpa = macho_file.base.allocator; const atom = macho_file.getAtom(atom_index); log.debug(" (adding binding to symbol {s} at offset 0x{x} in %{?d})", .{ @@ -171,7 +171,7 @@ pub fn addBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Binding) try gop.value_ptr.append(gpa, binding); } -pub fn addLazyBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Binding) !void { +pub fn addLazyBinding(macho_file: *MachO, atom_index: Index, binding: Binding) !void { const gpa = macho_file.base.allocator; const atom = macho_file.getAtom(atom_index); log.debug(" (adding lazy binding to symbol {s} at offset 0x{x} in %{?d})", .{ @@ -186,7 +186,7 @@ pub fn addLazyBinding(macho_file: *MachO, atom_index: Atom.Index, binding: Bindi try gop.value_ptr.append(gpa, binding); } -pub fn resolveRelocations(macho_file: *MachO, atom_index: Atom.Index) !void { +pub fn resolveRelocations(macho_file: *MachO, atom_index: Index) !void { const atom = macho_file.getAtom(atom_index); const relocs = macho_file.relocs.get(atom_index) orelse return; const source_sym = atom.getSymbol(macho_file); @@ -203,7 +203,7 @@ pub fn resolveRelocations(macho_file: *MachO, atom_index: Atom.Index) !void { } } -pub fn freeRelocations(macho_file: *MachO, atom_index: Atom.Index) void { +pub fn freeRelocations(macho_file: *MachO, atom_index: Index) void { const gpa = macho_file.base.allocator; var removed_relocs = macho_file.relocs.fetchOrderedRemove(atom_index); if (removed_relocs) |*relocs| relocs.value.deinit(gpa); From b3277c893691c462ec2e82577a78e7baafb42bf6 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 11:12:53 +0100 Subject: [PATCH 31/65] link: make Plan9 atoms fully owned by the linker --- src/Module.zig | 4 +- src/Sema.zig | 2 +- src/arch/aarch64/CodeGen.zig | 11 +- src/arch/arm/CodeGen.zig | 5 +- src/arch/riscv64/CodeGen.zig | 5 +- src/arch/x86_64/CodeGen.zig | 11 +- src/link.zig | 4 +- src/link/Plan9.zig | 228 ++++++++++++++++++++++------------- 8 files changed, 170 insertions(+), 100 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index b39fd2bab2..a914dc90d8 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5277,7 +5277,7 @@ pub fn clearDecl( .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, + .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, .spirv => .{ .spirv = {} }, @@ -5697,7 +5697,7 @@ pub fn allocateNewDecl( .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = link.File.Plan9.DeclBlock.empty }, + .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, .spirv => .{ .spirv = {} }, diff --git a/src/Sema.zig b/src/Sema.zig index 82321ef545..e54bfc7bd9 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5568,7 +5568,7 @@ pub fn analyzeExport( .coff => .{ .coff = {} }, .elf => .{ .elf = {} }, .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = null }, + .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = .{} }, .spirv => .{ .spirv = {} }, diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index d0fba2fd0e..aab30b73dc 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -4307,7 +4307,6 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.air.value(callee)) |func_value| { if (func_value.castTag(.function)) |func_payload| { const func = func_payload.data; - const fn_owner_decl = mod.declPtr(func.owner_decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); @@ -4333,11 +4332,12 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier }, }); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(func.owner_decl); + const decl_block_index = try p9.seeDecl(func.owner_decl); + const decl_block = p9.getDeclBlock(decl_block_index); const ptr_bits = self.target.cpu.arch.ptrBitWidth(); const ptr_bytes: u64 = @divExact(ptr_bits, 8); const got_addr = p9.bases.data; - const got_index = fn_owner_decl.link.plan9.got_index.?; + const got_index = decl_block.got_index.?; const fn_got_addr = got_addr + got_index * ptr_bytes; try self.genSetReg(Type.initTag(.usize), .x30, .{ .memory = fn_got_addr }); } else unreachable; @@ -6166,8 +6166,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(decl_index); - const got_addr = p9.bases.data + decl.link.plan9.got_index.? * ptr_bytes; + const decl_block_index = try p9.seeDecl(decl_index); + const decl_block = p9.getDeclBlock(decl_block_index); + const got_addr = p9.bases.data + decl_block.got_index.? * ptr_bytes; return MCValue{ .memory = got_addr }; } else { return self.fail("TODO codegen non-ELF const Decl pointer", .{}); diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index c6ee960e51..6574501767 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -6091,8 +6091,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne } else if (self.bin_file.cast(link.File.Coff)) |_| { return self.fail("TODO codegen COFF const Decl pointer", .{}); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(decl_index); - const got_addr = p9.bases.data + decl.link.plan9.got_index.? * ptr_bytes; + const decl_block_index = try p9.seeDecl(decl_index); + const decl_block = p9.getDeclBlock(decl_block_index); + const got_addr = p9.bases.data + decl_block.got_index.? * ptr_bytes; return MCValue{ .memory = got_addr }; } else { return self.fail("TODO codegen non-ELF const Decl pointer", .{}); diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index a0af1b3cce..423816c0b1 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -2558,8 +2558,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne } else if (self.bin_file.cast(link.File.Coff)) |_| { return self.fail("TODO codegen COFF const Decl pointer", .{}); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(decl_index); - const got_addr = p9.bases.data + decl.link.plan9.got_index.? * ptr_bytes; + const decl_block_index = try p9.seeDecl(decl_index); + const decl_block = p9.getDeclBlock(decl_block_index); + const got_addr = p9.bases.data + decl_block.got_index.? * ptr_bytes; return MCValue{ .memory = got_addr }; } else { return self.fail("TODO codegen non-ELF const Decl pointer", .{}); diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index b41973ea97..fcae7eaabc 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -3996,7 +3996,6 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier if (self.air.value(callee)) |func_value| { if (func_value.castTag(.function)) |func_payload| { const func = func_payload.data; - const fn_owner_decl = mod.declPtr(func.owner_decl); if (self.bin_file.cast(link.File.Elf)) |elf_file| { const atom_index = try elf_file.getOrCreateAtomForDecl(func.owner_decl); @@ -4042,11 +4041,12 @@ fn airCall(self: *Self, inst: Air.Inst.Index, modifier: std.builtin.CallModifier .data = undefined, }); } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(func.owner_decl); + const decl_block_index = try p9.seeDecl(func.owner_decl); + const decl_block = p9.getDeclBlock(decl_block_index); const ptr_bits = self.target.cpu.arch.ptrBitWidth(); const ptr_bytes: u64 = @divExact(ptr_bits, 8); const got_addr = p9.bases.data; - const got_index = fn_owner_decl.link.plan9.got_index.?; + const got_index = decl_block.got_index.?; const fn_got_addr = got_addr + got_index * ptr_bytes; _ = try self.addInst(.{ .tag = .call, @@ -6739,8 +6739,9 @@ fn lowerDeclRef(self: *Self, tv: TypedValue, decl_index: Module.Decl.Index) Inne .sym_index = sym_index, } }; } else if (self.bin_file.cast(link.File.Plan9)) |p9| { - try p9.seeDecl(decl_index); - const got_addr = p9.bases.data + decl.link.plan9.got_index.? * ptr_bytes; + const decl_block_index = try p9.seeDecl(decl_index); + const decl_block = p9.getDeclBlock(decl_block_index); + const got_addr = p9.bases.data + decl_block.got_index.? * ptr_bytes; return MCValue{ .memory = got_addr }; } else { return self.fail("TODO codegen non-ELF const Decl pointer", .{}); diff --git a/src/link.zig b/src/link.zig index eb74615492..c0eacf88a0 100644 --- a/src/link.zig +++ b/src/link.zig @@ -265,7 +265,7 @@ pub const File = struct { elf: void, coff: void, macho: void, - plan9: Plan9.DeclBlock, + plan9: void, c: void, wasm: Wasm.DeclBlock, spirv: void, @@ -287,7 +287,7 @@ pub const File = struct { elf: void, coff: void, macho: void, - plan9: Plan9.Export, + plan9: void, c: void, wasm: Wasm.Export, spirv: void, diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index a8b8caafab..20f540022a 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -21,14 +21,7 @@ const Allocator = std.mem.Allocator; const log = std.log.scoped(.link); const assert = std.debug.assert; -const FnDeclOutput = struct { - /// this code is modified when relocated so it is mutable - code: []u8, - /// this might have to be modified in the linker, so thats why its mutable - lineinfo: []u8, - start_line: u32, - end_line: u32, -}; +pub const base_tag = .plan9; base: link.File, sixtyfour_bit: bool, @@ -101,6 +94,9 @@ got_index_free_list: std.ArrayListUnmanaged(usize) = .{}, syms_index_free_list: std.ArrayListUnmanaged(usize) = .{}, +decl_blocks: std.ArrayListUnmanaged(DeclBlock) = .{}, +decls: std.AutoHashMapUnmanaged(Module.Decl.Index, DeclMetadata) = .{}, + const Reloc = struct { target: Module.Decl.Index, offset: u64, @@ -115,6 +111,42 @@ const Bases = struct { const UnnamedConstTable = std.AutoHashMapUnmanaged(Module.Decl.Index, std.ArrayListUnmanaged(struct { info: DeclBlock, code: []const u8 })); +pub const PtrWidth = enum { p32, p64 }; + +pub const DeclBlock = struct { + type: aout.Sym.Type, + /// offset in the text or data sects + offset: ?u64, + /// offset into syms + sym_index: ?usize, + /// offset into got + got_index: ?usize, + + pub const Index = u32; +}; + +const DeclMetadata = struct { + index: DeclBlock.Index, + exports: std.ArrayListUnmanaged(usize) = .{}, + + fn getExport(m: DeclMetadata, p9: *const Plan9, name: []const u8) ?usize { + for (m.exports.items) |exp| { + const sym = p9.syms.items[exp]; + if (mem.eql(u8, name, sym.name)) return exp; + } + return null; + } +}; + +const FnDeclOutput = struct { + /// this code is modified when relocated so it is mutable + code: []u8, + /// this might have to be modified in the linker, so thats why its mutable + lineinfo: []u8, + start_line: u32, + end_line: u32, +}; + fn getAddr(self: Plan9, addr: u64, t: aout.Sym.Type) u64 { return addr + switch (t) { .T, .t, .l, .L => self.bases.text, @@ -127,22 +159,6 @@ fn getSymAddr(self: Plan9, s: aout.Sym) u64 { return self.getAddr(s.value, s.type); } -pub const DeclBlock = struct { - type: aout.Sym.Type, - /// offset in the text or data sects - offset: ?u64, - /// offset into syms - sym_index: ?usize, - /// offset into got - got_index: ?usize, - pub const empty = DeclBlock{ - .type = .t, - .offset = null, - .sym_index = null, - .got_index = null, - }; -}; - pub fn defaultBaseAddrs(arch: std.Target.Cpu.Arch) Bases { return switch (arch) { .x86_64 => .{ @@ -164,8 +180,6 @@ pub fn defaultBaseAddrs(arch: std.Target.Cpu.Arch) Bases { }; } -pub const PtrWidth = enum { p32, p64 }; - pub fn createEmpty(gpa: Allocator, options: link.Options) !*Plan9 { if (options.use_llvm) return error.LLVMBackendDoesNotSupportPlan9; @@ -271,7 +285,7 @@ pub fn updateFunc(self: *Plan9, module: *Module, func: *Module.Fn, air: Air, liv const decl = module.declPtr(decl_index); self.freeUnnamedConsts(decl_index); - try self.seeDecl(decl_index); + _ = try self.seeDecl(decl_index); log.debug("codegen decl {*} ({s})", .{ decl, decl.name }); var code_buffer = std.ArrayList(u8).init(self.base.allocator); @@ -313,11 +327,11 @@ pub fn updateFunc(self: *Plan9, module: *Module, func: *Module.Fn, air: Air, liv .end_line = end_line, }; try self.putFn(decl_index, out); - return self.updateFinish(decl); + return self.updateFinish(decl_index); } pub fn lowerUnnamedConst(self: *Plan9, tv: TypedValue, decl_index: Module.Decl.Index) !u32 { - try self.seeDecl(decl_index); + _ = try self.seeDecl(decl_index); var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); @@ -387,7 +401,7 @@ pub fn updateDecl(self: *Plan9, module: *Module, decl_index: Module.Decl.Index) } } - try self.seeDecl(decl_index); + _ = try self.seeDecl(decl_index); log.debug("codegen decl {*} ({s}) ({d})", .{ decl, decl.name, decl_index }); @@ -414,28 +428,31 @@ pub fn updateDecl(self: *Plan9, module: *Module, decl_index: Module.Decl.Index) if (self.data_decl_table.fetchPutAssumeCapacity(decl_index, duped_code)) |old_entry| { self.base.allocator.free(old_entry.value); } - return self.updateFinish(decl); + return self.updateFinish(decl_index); } /// called at the end of update{Decl,Func} -fn updateFinish(self: *Plan9, decl: *Module.Decl) !void { +fn updateFinish(self: *Plan9, decl_index: Module.Decl.Index) !void { + const decl = self.base.options.module.?.declPtr(decl_index); const is_fn = (decl.ty.zigTypeTag() == .Fn); log.debug("update the symbol table and got for decl {*} ({s})", .{ decl, decl.name }); const sym_t: aout.Sym.Type = if (is_fn) .t else .d; + + const decl_block = self.getDeclBlockPtr(self.decls.get(decl_index).?.index); // write the internal linker metadata - decl.link.plan9.type = sym_t; + decl_block.type = sym_t; // write the symbol // we already have the got index const sym: aout.Sym = .{ .value = undefined, // the value of stuff gets filled in in flushModule - .type = decl.link.plan9.type, + .type = decl_block.type, .name = mem.span(decl.name), }; - if (decl.link.plan9.sym_index) |s| { + if (decl_block.sym_index) |s| { self.syms.items[s] = sym; } else { const s = try self.allocateSymbolIndex(); - decl.link.plan9.sym_index = s; + decl_block.sym_index = s; self.syms.items[s] = sym; } } @@ -550,6 +567,7 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No while (it.next()) |entry| { const decl_index = entry.key_ptr.*; const decl = mod.declPtr(decl_index); + const decl_block = self.getDeclBlockPtr(self.decls.get(decl_index).?.index); const out = entry.value_ptr.*; log.debug("write text decl {*} ({s}), lines {d} to {d}", .{ decl, decl.name, out.start_line + 1, out.end_line }); { @@ -568,16 +586,16 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No iovecs_i += 1; const off = self.getAddr(text_i, .t); text_i += out.code.len; - decl.link.plan9.offset = off; + decl_block.offset = off; if (!self.sixtyfour_bit) { - mem.writeIntNative(u32, got_table[decl.link.plan9.got_index.? * 4 ..][0..4], @intCast(u32, off)); - mem.writeInt(u32, got_table[decl.link.plan9.got_index.? * 4 ..][0..4], @intCast(u32, off), self.base.options.target.cpu.arch.endian()); + mem.writeIntNative(u32, got_table[decl_block.got_index.? * 4 ..][0..4], @intCast(u32, off)); + mem.writeInt(u32, got_table[decl_block.got_index.? * 4 ..][0..4], @intCast(u32, off), self.base.options.target.cpu.arch.endian()); } else { - mem.writeInt(u64, got_table[decl.link.plan9.got_index.? * 8 ..][0..8], off, self.base.options.target.cpu.arch.endian()); + mem.writeInt(u64, got_table[decl_block.got_index.? * 8 ..][0..8], off, self.base.options.target.cpu.arch.endian()); } - self.syms.items[decl.link.plan9.sym_index.?].value = off; + self.syms.items[decl_block.sym_index.?].value = off; if (mod.decl_exports.get(decl_index)) |exports| { - try self.addDeclExports(mod, decl, exports.items); + try self.addDeclExports(mod, decl_index, exports.items); } } } @@ -598,6 +616,7 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No while (it.next()) |entry| { const decl_index = entry.key_ptr.*; const decl = mod.declPtr(decl_index); + const decl_block = self.getDeclBlockPtr(self.decls.get(decl_index).?.index); const code = entry.value_ptr.*; log.debug("write data decl {*} ({s})", .{ decl, decl.name }); @@ -606,15 +625,15 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No iovecs_i += 1; const off = self.getAddr(data_i, .d); data_i += code.len; - decl.link.plan9.offset = off; + decl_block.offset = off; if (!self.sixtyfour_bit) { - mem.writeInt(u32, got_table[decl.link.plan9.got_index.? * 4 ..][0..4], @intCast(u32, off), self.base.options.target.cpu.arch.endian()); + mem.writeInt(u32, got_table[decl_block.got_index.? * 4 ..][0..4], @intCast(u32, off), self.base.options.target.cpu.arch.endian()); } else { - mem.writeInt(u64, got_table[decl.link.plan9.got_index.? * 8 ..][0..8], off, self.base.options.target.cpu.arch.endian()); + mem.writeInt(u64, got_table[decl_block.got_index.? * 8 ..][0..8], off, self.base.options.target.cpu.arch.endian()); } - self.syms.items[decl.link.plan9.sym_index.?].value = off; + self.syms.items[decl_block.sym_index.?].value = off; if (mod.decl_exports.get(decl_index)) |exports| { - try self.addDeclExports(mod, decl, exports.items); + try self.addDeclExports(mod, decl_index, exports.items); } } // write the unnamed constants after the other data decls @@ -676,7 +695,8 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No for (kv.value_ptr.items) |reloc| { const target_decl_index = reloc.target; const target_decl = mod.declPtr(target_decl_index); - const target_decl_offset = target_decl.link.plan9.offset.?; + const target_decl_block = self.getDeclBlock(self.decls.get(target_decl_index).?.index); + const target_decl_offset = target_decl_block.offset.?; const offset = reloc.offset; const addend = reloc.addend; @@ -709,28 +729,36 @@ pub fn flushModule(self: *Plan9, comp: *Compilation, prog_node: *std.Progress.No fn addDeclExports( self: *Plan9, module: *Module, - decl: *Module.Decl, + decl_index: Module.Decl.Index, exports: []const *Module.Export, ) !void { + const metadata = self.decls.getPtr(decl_index).?; + const decl_block = self.getDeclBlock(metadata.index); + for (exports) |exp| { // plan9 does not support custom sections if (exp.options.section) |section_name| { if (!mem.eql(u8, section_name, ".text") or !mem.eql(u8, section_name, ".data")) { - try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create(self.base.allocator, decl.srcLoc(), "plan9 does not support extra sections", .{})); + try module.failed_exports.put(module.gpa, exp, try Module.ErrorMsg.create( + self.base.allocator, + module.declPtr(decl_index).srcLoc(), + "plan9 does not support extra sections", + .{}, + )); break; } } const sym = .{ - .value = decl.link.plan9.offset.?, - .type = decl.link.plan9.type.toGlobal(), + .value = decl_block.offset.?, + .type = decl_block.type.toGlobal(), .name = exp.options.name, }; - if (exp.link.plan9) |i| { + if (metadata.getExport(self, exp.options.name)) |i| { self.syms.items[i] = sym; } else { try self.syms.append(self.base.allocator, sym); - exp.link.plan9 = self.syms.items.len - 1; + try metadata.exports.append(self.base.allocator, self.syms.items.len - 1); } } } @@ -760,13 +788,18 @@ pub fn freeDecl(self: *Plan9, decl_index: Module.Decl.Index) void { self.base.allocator.free(removed_entry.value); } } - if (decl.link.plan9.got_index) |i| { - // TODO: if this catch {} is triggered, an assertion in flushModule will be triggered, because got_index_free_list will have the wrong length - self.got_index_free_list.append(self.base.allocator, i) catch {}; - } - if (decl.link.plan9.sym_index) |i| { - self.syms_index_free_list.append(self.base.allocator, i) catch {}; - self.syms.items[i] = aout.Sym.undefined_symbol; + if (self.decls.fetchRemove(decl_index)) |const_kv| { + var kv = const_kv; + const decl_block = self.getDeclBlock(kv.value.index); + if (decl_block.got_index) |i| { + // TODO: if this catch {} is triggered, an assertion in flushModule will be triggered, because got_index_free_list will have the wrong length + self.got_index_free_list.append(self.base.allocator, i) catch {}; + } + if (decl_block.sym_index) |i| { + self.syms_index_free_list.append(self.base.allocator, i) catch {}; + self.syms.items[i] = aout.Sym.undefined_symbol; + } + kv.value.exports.deinit(self.base.allocator); } self.freeUnnamedConsts(decl_index); { @@ -786,12 +819,30 @@ fn freeUnnamedConsts(self: *Plan9, decl_index: Module.Decl.Index) void { unnamed_consts.clearAndFree(self.base.allocator); } -pub fn seeDecl(self: *Plan9, decl_index: Module.Decl.Index) !void { - const mod = self.base.options.module.?; - const decl = mod.declPtr(decl_index); - if (decl.link.plan9.got_index == null) { - decl.link.plan9.got_index = self.allocateGotIndex(); +fn createDeclBlock(self: *Plan9) !DeclBlock.Index { + const gpa = self.base.allocator; + const index = @intCast(DeclBlock.Index, self.decl_blocks.items.len); + const decl_block = try self.decl_blocks.addOne(gpa); + decl_block.* = .{ + .type = .t, + .offset = null, + .sym_index = null, + .got_index = null, + }; + return index; +} + +pub fn seeDecl(self: *Plan9, decl_index: Module.Decl.Index) !DeclBlock.Index { + const gop = try self.decls.getOrPut(self.base.allocator, decl_index); + if (!gop.found_existing) { + const index = try self.createDeclBlock(); + self.getDeclBlockPtr(index).got_index = self.allocateGotIndex(); + gop.value_ptr.* = .{ + .index = index, + .exports = .{}, + }; } + return gop.value_ptr.index; } pub fn updateDeclExports( @@ -800,7 +851,7 @@ pub fn updateDeclExports( decl_index: Module.Decl.Index, exports: []const *Module.Export, ) !void { - try self.seeDecl(decl_index); + _ = try self.seeDecl(decl_index); // we do all the things in flush _ = module; _ = exports; @@ -842,10 +893,17 @@ pub fn deinit(self: *Plan9) void { self.syms_index_free_list.deinit(gpa); self.file_segments.deinit(gpa); self.path_arena.deinit(); + self.decl_blocks.deinit(gpa); + + { + var it = self.decls.iterator(); + while (it.next()) |entry| { + entry.value_ptr.exports.deinit(gpa); + } + self.decls.deinit(gpa); + } } -pub const Export = ?usize; -pub const base_tag = .plan9; pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Options) !*Plan9 { if (options.use_llvm) return error.LLVMBackendDoesNotSupportPlan9; @@ -911,20 +969,19 @@ pub fn writeSyms(self: *Plan9, buf: *std.ArrayList(u8)) !void { } } - const mod = self.base.options.module.?; - // write the data symbols { var it = self.data_decl_table.iterator(); while (it.next()) |entry| { const decl_index = entry.key_ptr.*; - const decl = mod.declPtr(decl_index); - const sym = self.syms.items[decl.link.plan9.sym_index.?]; + const decl_metadata = self.decls.get(decl_index).?; + const decl_block = self.getDeclBlock(decl_metadata.index); + const sym = self.syms.items[decl_block.sym_index.?]; try self.writeSym(writer, sym); if (self.base.options.module.?.decl_exports.get(decl_index)) |exports| { - for (exports.items) |e| { - try self.writeSym(writer, self.syms.items[e.link.plan9.?]); - } + for (exports.items) |e| if (decl_metadata.getExport(self, e.options.name)) |exp_i| { + try self.writeSym(writer, self.syms.items[exp_i]); + }; } } } @@ -943,16 +1000,17 @@ pub fn writeSyms(self: *Plan9, buf: *std.ArrayList(u8)) !void { var submap_it = symidx_and_submap.functions.iterator(); while (submap_it.next()) |entry| { const decl_index = entry.key_ptr.*; - const decl = mod.declPtr(decl_index); - const sym = self.syms.items[decl.link.plan9.sym_index.?]; + const decl_metadata = self.decls.get(decl_index).?; + const decl_block = self.getDeclBlock(decl_metadata.index); + const sym = self.syms.items[decl_block.sym_index.?]; try self.writeSym(writer, sym); if (self.base.options.module.?.decl_exports.get(decl_index)) |exports| { - for (exports.items) |e| { - const s = self.syms.items[e.link.plan9.?]; + for (exports.items) |e| if (decl_metadata.getExport(self, e.options.name)) |exp_i| { + const s = self.syms.items[exp_i]; if (mem.eql(u8, s.name, "_start")) self.entry_val = s.value; try self.writeSym(writer, s); - } + }; } } } @@ -1004,3 +1062,11 @@ pub fn getDeclVAddr( }); return undefined; } + +pub fn getDeclBlock(self: *const Plan9, index: DeclBlock.Index) DeclBlock { + return self.decl_blocks.items[index]; +} + +fn getDeclBlockPtr(self: *Plan9, index: DeclBlock.Index) *DeclBlock { + return &self.decl_blocks.items[index]; +} From d98fc53b8fbe479f828114b0276d5290146cc2a3 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 11:49:07 +0100 Subject: [PATCH 32/65] link: use strtab.StringTable in Dwarf --- src/link/Dwarf.zig | 20 ++++++-------------- src/link/Elf.zig | 10 +++++----- src/link/MachO/DebugSymbols.zig | 12 ++++++------ 3 files changed, 17 insertions(+), 25 deletions(-) diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 8278377095..61ddda3494 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -18,8 +18,9 @@ const LinkBlock = File.LinkBlock; const LinkFn = File.LinkFn; const LinkerLoad = @import("../codegen.zig").LinkerLoad; const Module = @import("../Module.zig"); -const Value = @import("../value.zig").Value; +const StringTable = @import("strtab.zig").StringTable; const Type = @import("../type.zig").Type; +const Value = @import("../value.zig").Value; allocator: Allocator, bin_file: *File, @@ -42,7 +43,7 @@ abbrev_table_offset: ?u64 = null, /// TODO replace with InternPool /// Table of debug symbol names. -strtab: std.ArrayListUnmanaged(u8) = .{}, +strtab: StringTable(.strtab) = .{}, /// Quick lookup array of all defined source files referenced by at least one Decl. /// They will end up in the DWARF debug_line header as two lists: @@ -1770,11 +1771,11 @@ pub fn writeDbgInfoHeader(self: *Dwarf, module: *Module, low_pc: u64, high_pc: u }, } // Write the form for the compile unit, which must match the abbrev table above. - const name_strp = try self.makeString(module.root_pkg.root_src_path); + const name_strp = try self.strtab.insert(self.allocator, module.root_pkg.root_src_path); var compile_unit_dir_buffer: [std.fs.MAX_PATH_BYTES]u8 = undefined; const compile_unit_dir = resolveCompilationDir(module, &compile_unit_dir_buffer); - const comp_dir_strp = try self.makeString(compile_unit_dir); - const producer_strp = try self.makeString(link.producer_string); + const comp_dir_strp = try self.strtab.insert(self.allocator, compile_unit_dir); + const producer_strp = try self.strtab.insert(self.allocator, link.producer_string); di_buf.appendAssumeCapacity(@enumToInt(AbbrevKind.compile_unit)); if (self.bin_file.tag == .macho) { @@ -2435,15 +2436,6 @@ fn getRelocDbgInfoSubprogramHighPC(self: Dwarf) u32 { return dbg_info_low_pc_reloc_index + self.ptrWidthBytes(); } -/// TODO Improve this to use a table. -fn makeString(self: *Dwarf, bytes: []const u8) !u32 { - try self.strtab.ensureUnusedCapacity(self.allocator, bytes.len + 1); - const result = self.strtab.items.len; - self.strtab.appendSliceAssumeCapacity(bytes); - self.strtab.appendAssumeCapacity(0); - return @intCast(u32, result); -} - fn padToIdeal(actual_size: anytype) @TypeOf(actual_size) { return actual_size +| (actual_size / ideal_factor); } diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 747120ac5d..01326fb82e 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -688,8 +688,8 @@ pub fn populateMissingMetadata(self: *Elf) !void { // if (self.dwarf) |*dw| { // if (self.debug_str_section_index == null) { // self.debug_str_section_index = @intCast(u16, self.sections.slice().len); - // assert(dw.strtab.items.len == 0); - // try dw.strtab.append(gpa, 0); + // assert(dw.strtab.buffer.items.len == 0); + // try dw.strtab.buffer.append(gpa, 0); // try self.sections.append(gpa, .{ // .shdr = .{ // .sh_name = try self.shstrtab.insert(gpa, ".debug_str"), @@ -1164,10 +1164,10 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node // if (self.dwarf) |dwarf| { // const shdr_index = self.debug_str_section_index.?; - // if (self.debug_strtab_dirty or dwarf.strtab.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { - // try self.growNonAllocSection(shdr_index, dwarf.strtab.items.len, 1, false); + // if (self.debug_strtab_dirty or dwarf.strtab.buffer.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { + // try self.growNonAllocSection(shdr_index, dwarf.strtab.buffer.items.len, 1, false); // const debug_strtab_sect = self.sections.items(.shdr)[shdr_index]; - // try self.base.file.?.pwriteAll(dwarf.strtab.items, debug_strtab_sect.sh_offset); + // try self.base.file.?.pwriteAll(dwarf.strtab.buffer.items, debug_strtab_sect.sh_offset); // self.debug_strtab_dirty = false; // } // } diff --git a/src/link/MachO/DebugSymbols.zig b/src/link/MachO/DebugSymbols.zig index 7c22f441cd..0a5c8b0372 100644 --- a/src/link/MachO/DebugSymbols.zig +++ b/src/link/MachO/DebugSymbols.zig @@ -82,11 +82,11 @@ pub fn populateMissingMetadata(self: *DebugSymbols) !void { } if (self.debug_str_section_index == null) { - assert(self.dwarf.strtab.items.len == 0); - try self.dwarf.strtab.append(self.allocator, 0); + assert(self.dwarf.strtab.buffer.items.len == 0); + try self.dwarf.strtab.buffer.append(self.allocator, 0); self.debug_str_section_index = try self.allocateSection( "__debug_str", - @intCast(u32, self.dwarf.strtab.items.len), + @intCast(u32, self.dwarf.strtab.buffer.items.len), 0, ); self.debug_string_table_dirty = true; @@ -291,10 +291,10 @@ pub fn flushModule(self: *DebugSymbols, macho_file: *MachO) !void { { const sect_index = self.debug_str_section_index.?; - if (self.debug_string_table_dirty or self.dwarf.strtab.items.len != self.getSection(sect_index).size) { - const needed_size = @intCast(u32, self.dwarf.strtab.items.len); + if (self.debug_string_table_dirty or self.dwarf.strtab.buffer.items.len != self.getSection(sect_index).size) { + const needed_size = @intCast(u32, self.dwarf.strtab.buffer.items.len); try self.growSection(sect_index, needed_size, false); - try self.file.pwriteAll(self.dwarf.strtab.items, self.getSection(sect_index).offset); + try self.file.pwriteAll(self.dwarf.strtab.buffer.items, self.getSection(sect_index).offset); self.debug_string_table_dirty = false; } } From 5de2aae63cd75322e58204a6be8df49754e4851a Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 15:03:55 +0100 Subject: [PATCH 33/65] link: decouple DI atoms from linker atoms, and manage them in Dwarf linker --- src/Compilation.zig | 2 +- src/Module.zig | 12 +- src/arch/aarch64/CodeGen.zig | 17 +- src/arch/arm/CodeGen.zig | 17 +- src/arch/riscv64/CodeGen.zig | 10 +- src/arch/sparc64/CodeGen.zig | 10 +- src/arch/wasm/CodeGen.zig | 4 +- src/arch/x86_64/CodeGen.zig | 4 +- src/link.zig | 23 +- src/link/C.zig | 4 +- src/link/Coff.zig | 5 +- src/link/Dwarf.zig | 522 ++++++++++++++++++++--------------- src/link/Elf.zig | 520 +++++++++++++++++----------------- src/link/Elf/Atom.zig | 3 - src/link/MachO.zig | 130 ++++----- src/link/MachO/Atom.zig | 3 - src/link/Plan9.zig | 4 +- src/link/Wasm.zig | 17 +- src/link/Wasm/Atom.zig | 5 - 19 files changed, 655 insertions(+), 657 deletions(-) diff --git a/src/Compilation.zig b/src/Compilation.zig index 09c6e1c686..7d42d3b610 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -3299,7 +3299,7 @@ fn processOneJob(comp: *Compilation, job: Job) !void { const gpa = comp.gpa; const module = comp.bin_file.options.module.?; const decl = module.declPtr(decl_index); - comp.bin_file.updateDeclLineNumber(module, decl) catch |err| { + comp.bin_file.updateDeclLineNumber(module, decl_index) catch |err| { try module.failed_decls.ensureUnusedCapacity(gpa, 1); module.failed_decls.putAssumeCapacityNoClobber(decl_index, try Module.ErrorMsg.create( gpa, diff --git a/src/Module.zig b/src/Module.zig index a914dc90d8..eb947a6977 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5186,12 +5186,12 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err .coff => { // TODO Implement for COFF }, - .elf => if (decl.fn_link.elf.len != 0) { + .elf => { // TODO Look into detecting when this would be unnecessary by storing enough state // in `Decl` to notice that the line number did not change. comp.work_queue.writeItemAssumeCapacity(.{ .update_line_number = decl_index }); }, - .macho => if (decl.fn_link.macho.len != 0) { + .macho => { // TODO Look into detecting when this would be unnecessary by storing enough state // in `Decl` to notice that the line number did not change. comp.work_queue.writeItemAssumeCapacity(.{ .update_line_number = decl_index }); @@ -5285,8 +5285,8 @@ pub fn clearDecl( }; decl.fn_link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = {} }, - .elf => .{ .elf = link.File.Dwarf.SrcFn.empty }, - .macho => .{ .macho = link.File.Dwarf.SrcFn.empty }, + .elf => .{ .elf = {} }, + .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, @@ -5705,8 +5705,8 @@ pub fn allocateNewDecl( }, .fn_link = switch (mod.comp.bin_file.tag) { .coff => .{ .coff = {} }, - .elf => .{ .elf = link.File.Dwarf.SrcFn.empty }, - .macho => .{ .macho = link.File.Dwarf.SrcFn.empty }, + .elf => .{ .elf = {} }, + .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, diff --git a/src/arch/aarch64/CodeGen.zig b/src/arch/aarch64/CodeGen.zig index aab30b73dc..473a62fd83 100644 --- a/src/arch/aarch64/CodeGen.zig +++ b/src/arch/aarch64/CodeGen.zig @@ -203,13 +203,7 @@ const DbgInfoReloc = struct { else => unreachable, // not a possible argument }; - try dw.genArgDbgInfo( - reloc.name, - reloc.ty, - function.bin_file.tag, - function.mod_fn.owner_decl, - loc, - ); + try dw.genArgDbgInfo(reloc.name, reloc.ty, function.mod_fn.owner_decl, loc); }, .plan9 => {}, .none => {}, @@ -255,14 +249,7 @@ const DbgInfoReloc = struct { break :blk .nop; }, }; - try dw.genVarDbgInfo( - reloc.name, - reloc.ty, - function.bin_file.tag, - function.mod_fn.owner_decl, - is_ptr, - loc, - ); + try dw.genVarDbgInfo(reloc.name, reloc.ty, function.mod_fn.owner_decl, is_ptr, loc); }, .plan9 => {}, .none => {}, diff --git a/src/arch/arm/CodeGen.zig b/src/arch/arm/CodeGen.zig index 6574501767..57a8aed699 100644 --- a/src/arch/arm/CodeGen.zig +++ b/src/arch/arm/CodeGen.zig @@ -282,13 +282,7 @@ const DbgInfoReloc = struct { else => unreachable, // not a possible argument }; - try dw.genArgDbgInfo( - reloc.name, - reloc.ty, - function.bin_file.tag, - function.mod_fn.owner_decl, - loc, - ); + try dw.genArgDbgInfo(reloc.name, reloc.ty, function.mod_fn.owner_decl, loc); }, .plan9 => {}, .none => {}, @@ -331,14 +325,7 @@ const DbgInfoReloc = struct { break :blk .nop; }, }; - try dw.genVarDbgInfo( - reloc.name, - reloc.ty, - function.bin_file.tag, - function.mod_fn.owner_decl, - is_ptr, - loc, - ); + try dw.genVarDbgInfo(reloc.name, reloc.ty, function.mod_fn.owner_decl, is_ptr, loc); }, .plan9 => {}, .none => {}, diff --git a/src/arch/riscv64/CodeGen.zig b/src/arch/riscv64/CodeGen.zig index 423816c0b1..8b8fca4859 100644 --- a/src/arch/riscv64/CodeGen.zig +++ b/src/arch/riscv64/CodeGen.zig @@ -1615,13 +1615,9 @@ fn genArgDbgInfo(self: Self, inst: Air.Inst.Index, mcv: MCValue) !void { switch (self.debug_output) { .dwarf => |dw| switch (mcv) { - .register => |reg| try dw.genArgDbgInfo( - name, - ty, - self.bin_file.tag, - self.mod_fn.owner_decl, - .{ .register = reg.dwarfLocOp() }, - ), + .register => |reg| try dw.genArgDbgInfo(name, ty, self.mod_fn.owner_decl, .{ + .register = reg.dwarfLocOp(), + }), .stack_offset => {}, else => {}, }, diff --git a/src/arch/sparc64/CodeGen.zig b/src/arch/sparc64/CodeGen.zig index e67244167e..418c67c580 100644 --- a/src/arch/sparc64/CodeGen.zig +++ b/src/arch/sparc64/CodeGen.zig @@ -3412,13 +3412,9 @@ fn genArgDbgInfo(self: Self, inst: Air.Inst.Index, mcv: MCValue) !void { switch (self.debug_output) { .dwarf => |dw| switch (mcv) { - .register => |reg| try dw.genArgDbgInfo( - name, - ty, - self.bin_file.tag, - self.mod_fn.owner_decl, - .{ .register = reg.dwarfLocOp() }, - ), + .register => |reg| try dw.genArgDbgInfo(name, ty, self.mod_fn.owner_decl, .{ + .register = reg.dwarfLocOp(), + }), else => {}, }, else => {}, diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 342d6b70cc..8212d281e5 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -2475,7 +2475,7 @@ fn airArg(func: *CodeGen, inst: Air.Inst.Index) InnerError!void { .dwarf => |dwarf| { const src_index = func.air.instructions.items(.data)[inst].arg.src_index; const name = func.mod_fn.getParamName(func.bin_file.base.options.module.?, src_index); - try dwarf.genArgDbgInfo(name, arg_ty, .wasm, func.mod_fn.owner_decl, .{ + try dwarf.genArgDbgInfo(name, arg_ty, func.mod_fn.owner_decl, .{ .wasm_local = arg.local.value, }); }, @@ -5539,7 +5539,7 @@ fn airDbgVar(func: *CodeGen, inst: Air.Inst.Index, is_ptr: bool) !void { break :blk .nop; }, }; - try func.debug_output.dwarf.genVarDbgInfo(name, ty, .wasm, func.mod_fn.owner_decl, is_ptr, loc); + try func.debug_output.dwarf.genVarDbgInfo(name, ty, func.mod_fn.owner_decl, is_ptr, loc); func.finishAir(inst, .none, &.{}); } diff --git a/src/arch/x86_64/CodeGen.zig b/src/arch/x86_64/CodeGen.zig index fcae7eaabc..c11ea4e63e 100644 --- a/src/arch/x86_64/CodeGen.zig +++ b/src/arch/x86_64/CodeGen.zig @@ -3836,7 +3836,7 @@ fn genArgDbgInfo(self: Self, ty: Type, name: [:0]const u8, mcv: MCValue) !void { }, else => unreachable, // not a valid function parameter }; - try dw.genArgDbgInfo(name, ty, self.bin_file.tag, self.mod_fn.owner_decl, loc); + try dw.genArgDbgInfo(name, ty, self.mod_fn.owner_decl, loc); }, .plan9 => {}, .none => {}, @@ -3876,7 +3876,7 @@ fn genVarDbgInfo( break :blk .nop; }, }; - try dw.genVarDbgInfo(name, ty, self.bin_file.tag, self.mod_fn.owner_decl, is_ptr, loc); + try dw.genVarDbgInfo(name, ty, self.mod_fn.owner_decl, is_ptr, loc); }, .plan9 => {}, .none => {}, diff --git a/src/link.zig b/src/link.zig index c0eacf88a0..3dd182b586 100644 --- a/src/link.zig +++ b/src/link.zig @@ -273,9 +273,9 @@ pub const File = struct { }; pub const LinkFn = union { - elf: Dwarf.SrcFn, - coff: Coff.SrcFn, - macho: Dwarf.SrcFn, + elf: void, + coff: void, + macho: void, plan9: void, c: void, wasm: Wasm.FnData, @@ -580,22 +580,23 @@ pub const File = struct { } } - pub fn updateDeclLineNumber(base: *File, module: *Module, decl: *Module.Decl) UpdateDeclError!void { + pub fn updateDeclLineNumber(base: *File, module: *Module, decl_index: Module.Decl.Index) UpdateDeclError!void { + const decl = module.declPtr(decl_index); log.debug("updateDeclLineNumber {*} ({s}), line={}", .{ decl, decl.name, decl.src_line + 1, }); assert(decl.has_tv); if (build_options.only_c) { assert(base.tag == .c); - return @fieldParentPtr(C, "base", base).updateDeclLineNumber(module, decl); + return @fieldParentPtr(C, "base", base).updateDeclLineNumber(module, decl_index); } switch (base.tag) { - .coff => return @fieldParentPtr(Coff, "base", base).updateDeclLineNumber(module, decl), - .elf => return @fieldParentPtr(Elf, "base", base).updateDeclLineNumber(module, decl), - .macho => return @fieldParentPtr(MachO, "base", base).updateDeclLineNumber(module, decl), - .c => return @fieldParentPtr(C, "base", base).updateDeclLineNumber(module, decl), - .wasm => return @fieldParentPtr(Wasm, "base", base).updateDeclLineNumber(module, decl), - .plan9 => return @fieldParentPtr(Plan9, "base", base).updateDeclLineNumber(module, decl), + .coff => return @fieldParentPtr(Coff, "base", base).updateDeclLineNumber(module, decl_index), + .elf => return @fieldParentPtr(Elf, "base", base).updateDeclLineNumber(module, decl_index), + .macho => return @fieldParentPtr(MachO, "base", base).updateDeclLineNumber(module, decl_index), + .c => return @fieldParentPtr(C, "base", base).updateDeclLineNumber(module, decl_index), + .wasm => return @fieldParentPtr(Wasm, "base", base).updateDeclLineNumber(module, decl_index), + .plan9 => return @fieldParentPtr(Plan9, "base", base).updateDeclLineNumber(module, decl_index), .spirv, .nvptx => {}, } } diff --git a/src/link/C.zig b/src/link/C.zig index 8b05b8b22d..02e5cadfbc 100644 --- a/src/link/C.zig +++ b/src/link/C.zig @@ -219,12 +219,12 @@ pub fn updateDecl(self: *C, module: *Module, decl_index: Module.Decl.Index) !voi code.shrinkAndFree(module.gpa, code.items.len); } -pub fn updateDeclLineNumber(self: *C, module: *Module, decl: *Module.Decl) !void { +pub fn updateDeclLineNumber(self: *C, module: *Module, decl_index: Module.Decl.Index) !void { // The C backend does not have the ability to fix line numbers without re-generating // the entire Decl. _ = self; _ = module; - _ = decl; + _ = decl_index; } pub fn flush(self: *C, comp: *Compilation, prog_node: *std.Progress.Node) !void { diff --git a/src/link/Coff.zig b/src/link/Coff.zig index c062276b73..f563a617c7 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -195,7 +195,6 @@ pub const PtrWidth = enum { }; } }; -pub const SrcFn = void; pub const SymbolWithLoc = struct { // Index into the respective symbol table. @@ -1545,10 +1544,10 @@ pub fn getGlobalSymbol(self: *Coff, name: []const u8) !u32 { return global_index; } -pub fn updateDeclLineNumber(self: *Coff, module: *Module, decl: *Module.Decl) !void { +pub fn updateDeclLineNumber(self: *Coff, module: *Module, decl_index: Module.Decl.Index) !void { _ = self; _ = module; - _ = decl; + _ = decl_index; log.debug("TODO implement updateDeclLineNumber", .{}); } diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index 61ddda3494..e90db2d0df 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -27,17 +27,21 @@ bin_file: *File, ptr_width: PtrWidth, target: std.Target, -/// A list of `File.LinkFn` whose Line Number Programs have surplus capacity. -/// This is the same concept as `text_block_free_list`; see those doc comments. -dbg_line_fn_free_list: std.AutoHashMapUnmanaged(*SrcFn, void) = .{}, -dbg_line_fn_first: ?*SrcFn = null, -dbg_line_fn_last: ?*SrcFn = null, +/// A list of `Atom`s whose Line Number Programs have surplus capacity. +/// This is the same concept as `Section.free_list` in Elf; see those doc comments. +src_fn_free_list: std.AutoHashMapUnmanaged(Atom.Index, void) = .{}, +src_fn_first_index: ?Atom.Index = null, +src_fn_last_index: ?Atom.Index = null, +src_fns: std.ArrayListUnmanaged(Atom) = .{}, +src_fn_decls: AtomTable = .{}, /// A list of `Atom`s whose corresponding .debug_info tags have surplus capacity. /// This is the same concept as `text_block_free_list`; see those doc comments. -atom_free_list: std.AutoHashMapUnmanaged(*Atom, void) = .{}, -atom_first: ?*Atom = null, -atom_last: ?*Atom = null, +di_atom_free_list: std.AutoHashMapUnmanaged(Atom.Index, void) = .{}, +di_atom_first_index: ?Atom.Index = null, +di_atom_last_index: ?Atom.Index = null, +di_atoms: std.ArrayListUnmanaged(Atom) = .{}, +di_atom_decls: AtomTable = .{}, abbrev_table_offset: ?u64 = null, @@ -51,22 +55,23 @@ strtab: StringTable(.strtab) = .{}, /// * []file_names di_files: std.AutoArrayHashMapUnmanaged(*const Module.File, void) = .{}, -/// List of atoms that are owned directly by the DWARF module. -/// TODO convert links in DebugInfoAtom into indices and make -/// sure every atom is owned by this module. -managed_atoms: std.ArrayListUnmanaged(*Atom) = .{}, - global_abbrev_relocs: std.ArrayListUnmanaged(AbbrevRelocation) = .{}, -pub const Atom = struct { - /// Previous/next linked list pointers. - /// This is the linked list node for this Decl's corresponding .debug_info tag. - prev: ?*Atom, - next: ?*Atom, - /// Offset into .debug_info pointing to the tag for this Decl. +const AtomTable = std.AutoHashMapUnmanaged(Module.Decl.Index, Atom.Index); + +const Atom = struct { + /// Offset into .debug_info pointing to the tag for this Decl, or + /// offset from the beginning of the Debug Line Program header that contains this function. off: u32, - /// Size of the .debug_info tag for this Decl, not including padding. + /// Size of the .debug_info tag for this Decl, not including padding, or + /// size of the line number program component belonging to this function, not + /// including padding. len: u32, + + prev_index: ?Index, + next_index: ?Index, + + pub const Index = u32; }; /// Represents state of the analysed Decl. @@ -76,6 +81,7 @@ pub const Atom = struct { pub const DeclState = struct { gpa: Allocator, mod: *Module, + di_atom_decls: *const AtomTable, dbg_line: std.ArrayList(u8), dbg_info: std.ArrayList(u8), abbrev_type_arena: std.heap.ArenaAllocator, @@ -89,10 +95,11 @@ pub const DeclState = struct { abbrev_relocs: std.ArrayListUnmanaged(AbbrevRelocation) = .{}, exprloc_relocs: std.ArrayListUnmanaged(ExprlocRelocation) = .{}, - fn init(gpa: Allocator, mod: *Module) DeclState { + fn init(gpa: Allocator, mod: *Module, di_atom_decls: *const AtomTable) DeclState { return .{ .gpa = gpa, .mod = mod, + .di_atom_decls = di_atom_decls, .dbg_line = std.ArrayList(u8).init(gpa), .dbg_info = std.ArrayList(u8).init(gpa), .abbrev_type_arena = std.heap.ArenaAllocator.init(gpa), @@ -120,11 +127,11 @@ pub const DeclState = struct { /// Adds local type relocation of the form: @offset => @this + addend /// @this signifies the offset within the .debug_abbrev section of the containing atom. - fn addTypeRelocLocal(self: *DeclState, atom: *const Atom, offset: u32, addend: u32) !void { + fn addTypeRelocLocal(self: *DeclState, atom_index: Atom.Index, offset: u32, addend: u32) !void { log.debug("{x}: @this + {x}", .{ offset, addend }); try self.abbrev_relocs.append(self.gpa, .{ .target = null, - .atom = atom, + .atom_index = atom_index, .offset = offset, .addend = addend, }); @@ -133,13 +140,13 @@ pub const DeclState = struct { /// Adds global type relocation of the form: @offset => @symbol + 0 /// @symbol signifies a type abbreviation posititioned somewhere in the .debug_abbrev section /// which we use as our target of the relocation. - fn addTypeRelocGlobal(self: *DeclState, atom: *const Atom, ty: Type, offset: u32) !void { + fn addTypeRelocGlobal(self: *DeclState, atom_index: Atom.Index, ty: Type, offset: u32) !void { const resolv = self.abbrev_resolver.getContext(ty, .{ .mod = self.mod, }) orelse blk: { const sym_index = @intCast(u32, self.abbrev_table.items.len); try self.abbrev_table.append(self.gpa, .{ - .atom = atom, + .atom_index = atom_index, .type = ty, .offset = undefined, }); @@ -154,7 +161,7 @@ pub const DeclState = struct { log.debug("{x}: %{d} + 0", .{ offset, resolv }); try self.abbrev_relocs.append(self.gpa, .{ .target = resolv, - .atom = atom, + .atom_index = atom_index, .offset = offset, .addend = 0, }); @@ -163,7 +170,7 @@ pub const DeclState = struct { fn addDbgInfoType( self: *DeclState, module: *Module, - atom: *Atom, + atom_index: Atom.Index, ty: Type, ) error{OutOfMemory}!void { const arena = self.abbrev_type_arena.allocator(); @@ -228,7 +235,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 var index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, Type.bool, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, Type.bool, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try dbg_info_buffer.ensureUnusedCapacity(6); dbg_info_buffer.appendAssumeCapacity(0); @@ -240,7 +247,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, payload_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, payload_ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata const offset = abi_size - payload_ty.abiSize(target); try leb128.writeULEB128(dbg_info_buffer.writer(), offset); @@ -271,7 +278,7 @@ pub const DeclState = struct { try dbg_info_buffer.resize(index + 4); var buf = try arena.create(Type.SlicePtrFieldTypeBuffer); const ptr_ty = ty.slicePtrFieldType(buf); - try self.addTypeRelocGlobal(atom, ptr_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, ptr_ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try dbg_info_buffer.ensureUnusedCapacity(6); dbg_info_buffer.appendAssumeCapacity(0); @@ -283,7 +290,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, Type.usize, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, Type.usize, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try dbg_info_buffer.ensureUnusedCapacity(2); dbg_info_buffer.appendAssumeCapacity(ptr_bytes); @@ -295,7 +302,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 const index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, ty.childType(), @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, ty.childType(), @intCast(u32, index)); } }, .Array => { @@ -306,13 +313,13 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 var index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, ty.childType(), @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, ty.childType(), @intCast(u32, index)); // DW.AT.subrange_type try dbg_info_buffer.append(@enumToInt(AbbrevKind.array_dim)); // DW.AT.type, DW.FORM.ref4 index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, Type.usize, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, Type.usize, @intCast(u32, index)); // DW.AT.count, DW.FORM.udata const len = ty.arrayLenIncludingSentinel(); try leb128.writeULEB128(dbg_info_buffer.writer(), len); @@ -340,7 +347,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 var index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, field, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, field, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata const field_off = ty.structFieldOffset(field_index, target); try leb128.writeULEB128(dbg_info_buffer.writer(), field_off); @@ -372,7 +379,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 var index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, field.ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, field.ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata const field_off = ty.structFieldOffset(field_index, target); try leb128.writeULEB128(dbg_info_buffer.writer(), field_off); @@ -455,7 +462,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 const inner_union_index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(inner_union_index + 4); - try self.addTypeRelocLocal(atom, @intCast(u32, inner_union_index), 5); + try self.addTypeRelocLocal(atom_index, @intCast(u32, inner_union_index), 5); // DW.AT.data_member_location, DW.FORM.sdata try leb128.writeULEB128(dbg_info_buffer.writer(), payload_offset); } @@ -482,7 +489,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 const index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, field.ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, field.ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try dbg_info_buffer.append(0); } @@ -499,7 +506,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 const index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, union_obj.tag_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, union_obj.tag_ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try leb128.writeULEB128(dbg_info_buffer.writer(), tag_offset); @@ -542,7 +549,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 var index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, payload_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, payload_ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try leb128.writeULEB128(dbg_info_buffer.writer(), payload_off); @@ -555,7 +562,7 @@ pub const DeclState = struct { // DW.AT.type, DW.FORM.ref4 index = dbg_info_buffer.items.len; try dbg_info_buffer.resize(index + 4); - try self.addTypeRelocGlobal(atom, error_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, error_ty, @intCast(u32, index)); // DW.AT.data_member_location, DW.FORM.sdata try leb128.writeULEB128(dbg_info_buffer.writer(), error_off); @@ -588,12 +595,11 @@ pub const DeclState = struct { self: *DeclState, name: [:0]const u8, ty: Type, - tag: File.Tag, owner_decl: Module.Decl.Index, loc: DbgInfoLoc, ) error{OutOfMemory}!void { const dbg_info = &self.dbg_info; - const atom = getDbgInfoAtom(tag, self.mod, owner_decl); + const atom_index = self.di_atom_decls.get(owner_decl).?; const name_with_null = name.ptr[0 .. name.len + 1]; switch (loc) { @@ -638,7 +644,7 @@ pub const DeclState = struct { try dbg_info.ensureUnusedCapacity(5 + name_with_null.len); const index = dbg_info.items.len; try dbg_info.resize(index + 4); // dw.at.type, dw.form.ref4 - try self.addTypeRelocGlobal(atom, ty, @intCast(u32, index)); // DW.AT.type, DW.FORM.ref4 + try self.addTypeRelocGlobal(atom_index, ty, @intCast(u32, index)); // DW.AT.type, DW.FORM.ref4 dbg_info.appendSliceAssumeCapacity(name_with_null); // DW.AT.name, DW.FORM.string } @@ -646,13 +652,12 @@ pub const DeclState = struct { self: *DeclState, name: [:0]const u8, ty: Type, - tag: File.Tag, owner_decl: Module.Decl.Index, is_ptr: bool, loc: DbgInfoLoc, ) error{OutOfMemory}!void { const dbg_info = &self.dbg_info; - const atom = getDbgInfoAtom(tag, self.mod, owner_decl); + const atom_index = self.di_atom_decls.get(owner_decl).?; const name_with_null = name.ptr[0 .. name.len + 1]; try dbg_info.append(@enumToInt(AbbrevKind.variable)); const target = self.mod.getTarget(); @@ -782,7 +787,7 @@ pub const DeclState = struct { try dbg_info.ensureUnusedCapacity(5 + name_with_null.len); const index = dbg_info.items.len; try dbg_info.resize(index + 4); // dw.at.type, dw.form.ref4 - try self.addTypeRelocGlobal(atom, child_ty, @intCast(u32, index)); + try self.addTypeRelocGlobal(atom_index, child_ty, @intCast(u32, index)); dbg_info.appendSliceAssumeCapacity(name_with_null); // DW.AT.name, DW.FORM.string } @@ -815,7 +820,7 @@ pub const DeclState = struct { }; pub const AbbrevEntry = struct { - atom: *const Atom, + atom_index: Atom.Index, type: Type, offset: u32, }; @@ -824,7 +829,7 @@ pub const AbbrevRelocation = struct { /// If target is null, we deal with a local relocation that is based on simple offset + addend /// only. target: ?u32, - atom: *const Atom, + atom_index: Atom.Index, offset: u32, addend: u32, }; @@ -841,26 +846,6 @@ pub const ExprlocRelocation = struct { offset: u32, }; -pub const SrcFn = struct { - /// Offset from the beginning of the Debug Line Program header that contains this function. - off: u32, - /// Size of the line number program component belonging to this function, not - /// including padding. - len: u32, - - /// Points to the previous and next neighbors, based on the offset from .debug_line. - /// This can be used to find, for example, the capacity of this `SrcFn`. - prev: ?*SrcFn, - next: ?*SrcFn, - - pub const empty: SrcFn = .{ - .off = 0, - .len = 0, - .prev = null, - .next = null, - }; -}; - pub const PtrWidth = enum { p32, p64 }; pub const AbbrevKind = enum(u8) { @@ -910,16 +895,18 @@ pub fn init(allocator: Allocator, bin_file: *File, target: std.Target) Dwarf { pub fn deinit(self: *Dwarf) void { const gpa = self.allocator; - self.dbg_line_fn_free_list.deinit(gpa); - self.atom_free_list.deinit(gpa); + + self.src_fn_free_list.deinit(gpa); + self.src_fns.deinit(gpa); + self.src_fn_decls.deinit(gpa); + + self.di_atom_free_list.deinit(gpa); + self.di_atoms.deinit(gpa); + self.di_atom_decls.deinit(gpa); + self.strtab.deinit(gpa); self.di_files.deinit(gpa); self.global_abbrev_relocs.deinit(gpa); - - for (self.managed_atoms.items) |atom| { - gpa.destroy(atom); - } - self.managed_atoms.deinit(gpa); } /// Initializes Decl's state and its matching output buffers. @@ -935,15 +922,19 @@ pub fn initDeclState(self: *Dwarf, mod: *Module, decl_index: Module.Decl.Index) log.debug("initDeclState {s}{*}", .{ decl_name, decl }); const gpa = self.allocator; - var decl_state = DeclState.init(gpa, mod); + var decl_state = DeclState.init(gpa, mod, &self.di_atom_decls); errdefer decl_state.deinit(); const dbg_line_buffer = &decl_state.dbg_line; const dbg_info_buffer = &decl_state.dbg_info; + const di_atom_index = try self.getOrCreateAtomForDecl(.di_atom, decl_index); + assert(decl.has_tv); switch (decl.ty.zigTypeTag()) { .Fn => { + _ = try self.getOrCreateAtomForDecl(.src_fn, decl_index); + // For functions we need to add a prologue to the debug line program. try dbg_line_buffer.ensureTotalCapacity(26); @@ -1003,8 +994,7 @@ pub fn initDeclState(self: *Dwarf, mod: *Module, decl_index: Module.Decl.Index) dbg_info_buffer.items.len += 4; // DW.AT.high_pc, DW.FORM.data4 // if (fn_ret_has_bits) { - const atom = getDbgInfoAtom(self.bin_file.tag, mod, decl_index); - try decl_state.addTypeRelocGlobal(atom, fn_ret_type, @intCast(u32, dbg_info_buffer.items.len)); + try decl_state.addTypeRelocGlobal(di_atom_index, fn_ret_type, @intCast(u32, dbg_info_buffer.items.len)); dbg_info_buffer.items.len += 4; // DW.AT.type, DW.FORM.ref4 } @@ -1076,26 +1066,23 @@ pub fn commitDeclState( // This logic is nearly identical to the logic below in `updateDeclDebugInfo` for // `TextBlock` and the .debug_info. If you are editing this logic, you // probably need to edit that logic too. - const src_fn = switch (self.bin_file.tag) { - .elf => &decl.fn_link.elf, - .macho => &decl.fn_link.macho, - .wasm => &decl.fn_link.wasm.src_fn, - else => unreachable, // TODO - }; + const src_fn_index = self.src_fn_decls.get(decl_index).?; + const src_fn = self.getAtomPtr(.src_fn, src_fn_index); src_fn.len = @intCast(u32, dbg_line_buffer.items.len); - if (self.dbg_line_fn_last) |last| blk: { - if (src_fn == last) break :blk; - if (src_fn.next) |next| { + if (self.src_fn_last_index) |last_index| blk: { + if (src_fn_index == last_index) break :blk; + if (src_fn.next_index) |next_index| { + const next = self.getAtomPtr(.src_fn, next_index); // Update existing function - non-last item. if (src_fn.off + src_fn.len + min_nop_size > next.off) { // It grew too big, so we move it to a new location. - if (src_fn.prev) |prev| { - self.dbg_line_fn_free_list.put(gpa, prev, {}) catch {}; - prev.next = src_fn.next; + if (src_fn.prev_index) |prev_index| { + self.src_fn_free_list.put(gpa, prev_index, {}) catch {}; + self.getAtomPtr(.src_fn, prev_index).next_index = src_fn.next_index; } - next.prev = src_fn.prev; - src_fn.next = null; + next.prev_index = src_fn.prev_index; + src_fn.next_index = null; // Populate where it used to be with NOPs. switch (self.bin_file.tag) { .elf => { @@ -1118,33 +1105,42 @@ pub fn commitDeclState( else => unreachable, } // TODO Look at the free list before appending at the end. - src_fn.prev = last; - last.next = src_fn; - self.dbg_line_fn_last = src_fn; + src_fn.prev_index = last_index; + const last = self.getAtomPtr(.src_fn, last_index); + last.next_index = src_fn_index; + self.src_fn_last_index = src_fn_index; src_fn.off = last.off + padToIdeal(last.len); } - } else if (src_fn.prev == null) { + } else if (src_fn.prev_index == null) { // Append new function. // TODO Look at the free list before appending at the end. - src_fn.prev = last; - last.next = src_fn; - self.dbg_line_fn_last = src_fn; + src_fn.prev_index = last_index; + const last = self.getAtomPtr(.src_fn, last_index); + last.next_index = src_fn_index; + self.src_fn_last_index = src_fn_index; src_fn.off = last.off + padToIdeal(last.len); } } else { // This is the first function of the Line Number Program. - self.dbg_line_fn_first = src_fn; - self.dbg_line_fn_last = src_fn; + self.src_fn_first_index = src_fn_index; + self.src_fn_last_index = src_fn_index; src_fn.off = padToIdeal(self.dbgLineNeededHeaderBytes(&[0][]u8{}, &[0][]u8{})); } - const last_src_fn = self.dbg_line_fn_last.?; + const last_src_fn_index = self.src_fn_last_index.?; + const last_src_fn = self.getAtom(.src_fn, last_src_fn_index); const needed_size = last_src_fn.off + last_src_fn.len; - const prev_padding_size: u32 = if (src_fn.prev) |prev| src_fn.off - (prev.off + prev.len) else 0; - const next_padding_size: u32 = if (src_fn.next) |next| next.off - (src_fn.off + src_fn.len) else 0; + const prev_padding_size: u32 = if (src_fn.prev_index) |prev_index| blk: { + const prev = self.getAtom(.src_fn, prev_index); + break :blk src_fn.off - (prev.off + prev.len); + } else 0; + const next_padding_size: u32 = if (src_fn.next_index) |next_index| blk: { + const next = self.getAtom(.src_fn, next_index); + break :blk next.off - (src_fn.off + src_fn.len); + } else 0; // We only have support for one compilation unit so far, so the offsets are directly // from the .debug_line section. @@ -1213,7 +1209,7 @@ pub fn commitDeclState( if (dbg_info_buffer.items.len == 0) return; - const atom = getDbgInfoAtom(self.bin_file.tag, module, decl_index); + const di_atom_index = self.di_atom_decls.get(decl_index).?; if (decl_state.abbrev_table.items.len > 0) { // Now we emit the .debug_info types of the Decl. These will count towards the size of // the buffer, so we have to do it before computing the offset, and we can't perform the actual @@ -1235,12 +1231,12 @@ pub fn commitDeclState( if (deferred) continue; symbol.offset = @intCast(u32, dbg_info_buffer.items.len); - try decl_state.addDbgInfoType(module, atom, ty); + try decl_state.addDbgInfoType(module, di_atom_index, ty); } } log.debug("updateDeclDebugInfoAllocation for '{s}'", .{decl.name}); - try self.updateDeclDebugInfoAllocation(atom, @intCast(u32, dbg_info_buffer.items.len)); + try self.updateDeclDebugInfoAllocation(di_atom_index, @intCast(u32, dbg_info_buffer.items.len)); while (decl_state.abbrev_relocs.popOrNull()) |reloc| { if (reloc.target) |target| { @@ -1261,11 +1257,12 @@ pub fn commitDeclState( try self.global_abbrev_relocs.append(gpa, .{ .target = null, .offset = reloc.offset, - .atom = reloc.atom, + .atom_index = reloc.atom_index, .addend = reloc.addend, }); } else { - const value = symbol.atom.off + symbol.offset + reloc.addend; + const atom = self.getAtom(.di_atom, symbol.atom_index); + const value = atom.off + symbol.offset + reloc.addend; log.debug("{x}: [() => {x}] (%{d}, '{}')", .{ reloc.offset, value, target, ty.fmtDebug() }); mem.writeInt( u32, @@ -1275,10 +1272,11 @@ pub fn commitDeclState( ); } } else { + const atom = self.getAtom(.di_atom, reloc.atom_index); mem.writeInt( u32, dbg_info_buffer.items[reloc.offset..][0..@sizeOf(u32)], - reloc.atom.off + reloc.offset + reloc.addend, + atom.off + reloc.offset + reloc.addend, target_endian, ); } @@ -1294,7 +1292,7 @@ pub fn commitDeclState( .got_load => .got_load, }, .target = reloc.target, - .offset = reloc.offset + atom.off, + .offset = reloc.offset + self.getAtom(.di_atom, di_atom_index).off, .addend = 0, .prev_vaddr = 0, }); @@ -1304,10 +1302,10 @@ pub fn commitDeclState( } log.debug("writeDeclDebugInfo for '{s}", .{decl.name}); - try self.writeDeclDebugInfo(atom, dbg_info_buffer.items); + try self.writeDeclDebugInfo(di_atom_index, dbg_info_buffer.items); } -fn updateDeclDebugInfoAllocation(self: *Dwarf, atom: *Atom, len: u32) !void { +fn updateDeclDebugInfoAllocation(self: *Dwarf, atom_index: Atom.Index, len: u32) !void { const tracy = trace(@src()); defer tracy.end(); @@ -1316,19 +1314,21 @@ fn updateDeclDebugInfoAllocation(self: *Dwarf, atom: *Atom, len: u32) !void { // probably need to edit that logic too. const gpa = self.allocator; + const atom = self.getAtomPtr(.di_atom, atom_index); atom.len = len; - if (self.atom_last) |last| blk: { - if (atom == last) break :blk; - if (atom.next) |next| { + if (self.di_atom_last_index) |last_index| blk: { + if (atom_index == last_index) break :blk; + if (atom.next_index) |next_index| { + const next = self.getAtomPtr(.di_atom, next_index); // Update existing Decl - non-last item. if (atom.off + atom.len + min_nop_size > next.off) { // It grew too big, so we move it to a new location. - if (atom.prev) |prev| { - self.atom_free_list.put(gpa, prev, {}) catch {}; - prev.next = atom.next; + if (atom.prev_index) |prev_index| { + self.di_atom_free_list.put(gpa, prev_index, {}) catch {}; + self.getAtomPtr(.di_atom, prev_index).next_index = atom.next_index; } - next.prev = atom.prev; - atom.next = null; + next.prev_index = atom.prev_index; + atom.next_index = null; // Populate where it used to be with NOPs. switch (self.bin_file.tag) { .elf => { @@ -1351,31 +1351,33 @@ fn updateDeclDebugInfoAllocation(self: *Dwarf, atom: *Atom, len: u32) !void { else => unreachable, } // TODO Look at the free list before appending at the end. - atom.prev = last; - last.next = atom; - self.atom_last = atom; + atom.prev_index = last_index; + const last = self.getAtomPtr(.di_atom, last_index); + last.next_index = atom_index; + self.di_atom_last_index = atom_index; atom.off = last.off + padToIdeal(last.len); } - } else if (atom.prev == null) { + } else if (atom.prev_index == null) { // Append new Decl. // TODO Look at the free list before appending at the end. - atom.prev = last; - last.next = atom; - self.atom_last = atom; + atom.prev_index = last_index; + const last = self.getAtomPtr(.di_atom, last_index); + last.next_index = atom_index; + self.di_atom_last_index = atom_index; atom.off = last.off + padToIdeal(last.len); } } else { // This is the first Decl of the .debug_info - self.atom_first = atom; - self.atom_last = atom; + self.di_atom_first_index = atom_index; + self.di_atom_last_index = atom_index; atom.off = @intCast(u32, padToIdeal(self.dbgInfoHeaderBytes())); } } -fn writeDeclDebugInfo(self: *Dwarf, atom: *Atom, dbg_info_buf: []const u8) !void { +fn writeDeclDebugInfo(self: *Dwarf, atom_index: Atom.Index, dbg_info_buf: []const u8) !void { const tracy = trace(@src()); defer tracy.end(); @@ -1384,14 +1386,22 @@ fn writeDeclDebugInfo(self: *Dwarf, atom: *Atom, dbg_info_buf: []const u8) !void // probably need to edit that logic too. const gpa = self.allocator; - const last_decl = self.atom_last.?; + const atom = self.getAtom(.di_atom, atom_index); + const last_decl_index = self.di_atom_last_index.?; + const last_decl = self.getAtom(.di_atom, last_decl_index); // +1 for a trailing zero to end the children of the decl tag. const needed_size = last_decl.off + last_decl.len + 1; - const prev_padding_size: u32 = if (atom.prev) |prev| atom.off - (prev.off + prev.len) else 0; - const next_padding_size: u32 = if (atom.next) |next| next.off - (atom.off + atom.len) else 0; + const prev_padding_size: u32 = if (atom.prev_index) |prev_index| blk: { + const prev = self.getAtom(.di_atom, prev_index); + break :blk atom.off - (prev.off + prev.len); + } else 0; + const next_padding_size: u32 = if (atom.next_index) |next_index| blk: { + const next = self.getAtom(.di_atom, next_index); + break :blk next.off - (atom.off + atom.len); + } else 0; // To end the children of the decl tag. - const trailing_zero = atom.next == null; + const trailing_zero = atom.next_index == null; // We only have support for one compilation unit so far, so the offsets are directly // from the .debug_info section. @@ -1459,10 +1469,15 @@ fn writeDeclDebugInfo(self: *Dwarf, atom: *Atom, dbg_info_buf: []const u8) !void } } -pub fn updateDeclLineNumber(self: *Dwarf, decl: *const Module.Decl) !void { +pub fn updateDeclLineNumber(self: *Dwarf, module: *Module, decl_index: Module.Decl.Index) !void { const tracy = trace(@src()); defer tracy.end(); + const atom_index = try self.getOrCreateAtomForDecl(.src_fn, decl_index); + const atom = self.getAtom(.src_fn, atom_index); + if (atom.len == 0) return; + + const decl = module.declPtr(decl_index); const func = decl.val.castTag(.function).?.data; log.debug("decl.src_line={d}, func.lbrace_line={d}, func.rbrace_line={d}", .{ decl.src_line, @@ -1477,78 +1492,80 @@ pub fn updateDeclLineNumber(self: *Dwarf, decl: *const Module.Decl) !void { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; const shdr = elf_file.sections.items(.shdr)[elf_file.debug_line_section_index.?]; - const file_pos = shdr.sh_offset + decl.fn_link.elf.off + self.getRelocDbgLineOff(); + const file_pos = shdr.sh_offset + atom.off + self.getRelocDbgLineOff(); try elf_file.base.file.?.pwriteAll(&data, file_pos); }, .macho => { const d_sym = self.bin_file.cast(File.MachO).?.getDebugSymbols().?; const sect = d_sym.getSection(d_sym.debug_line_section_index.?); - const file_pos = sect.offset + decl.fn_link.macho.off + self.getRelocDbgLineOff(); + const file_pos = sect.offset + atom.off + self.getRelocDbgLineOff(); try d_sym.file.pwriteAll(&data, file_pos); }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const offset = decl.fn_link.wasm.src_fn.off + self.getRelocDbgLineOff(); - const atom = wasm_file.debug_line_atom.?; - mem.copy(u8, atom.code.items[offset..], &data); + const offset = atom.off + self.getRelocDbgLineOff(); + const atom_ = wasm_file.debug_line_atom.?; + mem.copy(u8, atom_.code.items[offset..], &data); }, else => unreachable, } } -pub fn freeAtom(self: *Dwarf, atom: *Atom) void { - if (self.atom_first == atom) { - self.atom_first = atom.next; - } - if (self.atom_last == atom) { - // TODO shrink the .debug_info section size here - self.atom_last = atom.prev; - } - - if (atom.prev) |prev| { - prev.next = atom.next; - - // TODO the free list logic like we do for text blocks above - } else { - atom.prev = null; - } - - if (atom.next) |next| { - next.prev = atom.prev; - } else { - atom.next = null; - } -} - -pub fn freeDecl(self: *Dwarf, decl: *Module.Decl) void { - // TODO make this logic match freeTextBlock. Maybe abstract the logic out since the same thing - // is desired for both. +pub fn freeDecl(self: *Dwarf, decl_index: Module.Decl.Index) void { const gpa = self.allocator; - const fn_link = switch (self.bin_file.tag) { - .elf => &decl.fn_link.elf, - .macho => &decl.fn_link.macho, - .wasm => &decl.fn_link.wasm.src_fn, - else => unreachable, - }; - _ = self.dbg_line_fn_free_list.remove(fn_link); - if (fn_link.prev) |prev| { - self.dbg_line_fn_free_list.put(gpa, prev, {}) catch {}; - prev.next = fn_link.next; - if (fn_link.next) |next| { - next.prev = prev; - } else { - self.dbg_line_fn_last = prev; + // Free SrcFn atom + if (self.src_fn_decls.fetchRemove(decl_index)) |kv| { + const src_fn_index = kv.value; + const src_fn = self.getAtom(.src_fn, src_fn_index); + _ = self.src_fn_free_list.remove(src_fn_index); + + if (src_fn.prev_index) |prev_index| { + self.src_fn_free_list.put(gpa, prev_index, {}) catch {}; + const prev = self.getAtomPtr(.src_fn, prev_index); + prev.next_index = src_fn.next_index; + if (src_fn.next_index) |next_index| { + self.getAtomPtr(.src_fn, next_index).prev_index = prev_index; + } else { + self.src_fn_last_index = prev_index; + } + } else if (src_fn.next_index) |next_index| { + self.src_fn_first_index = next_index; + self.getAtomPtr(.src_fn, next_index).prev_index = null; + } + if (self.src_fn_first_index == src_fn_index) { + self.src_fn_first_index = src_fn.next_index; + } + if (self.src_fn_last_index == src_fn_index) { + self.src_fn_last_index = src_fn.prev_index; } - } else if (fn_link.next) |next| { - self.dbg_line_fn_first = next; - next.prev = null; } - if (self.dbg_line_fn_first == fn_link) { - self.dbg_line_fn_first = fn_link.next; - } - if (self.dbg_line_fn_last == fn_link) { - self.dbg_line_fn_last = fn_link.prev; + + // Free DI atom + if (self.di_atom_decls.fetchRemove(decl_index)) |kv| { + const di_atom_index = kv.value; + const di_atom = self.getAtomPtr(.di_atom, di_atom_index); + + if (self.di_atom_first_index == di_atom_index) { + self.di_atom_first_index = di_atom.next_index; + } + if (self.di_atom_last_index == di_atom_index) { + // TODO shrink the .debug_info section size here + self.di_atom_last_index = di_atom.prev_index; + } + + if (di_atom.prev_index) |prev_index| { + self.getAtomPtr(.di_atom, prev_index).next_index = di_atom.next_index; + // TODO the free list logic like we do for SrcFn above + } else { + di_atom.prev_index = null; + } + + if (di_atom.next_index) |next_index| { + self.getAtomPtr(.di_atom, next_index).prev_index = di_atom.prev_index; + } else { + di_atom.next_index = null; + } } } @@ -2276,10 +2293,14 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { const needed_with_padding = padToIdeal(needed_bytes); const delta = needed_with_padding - dbg_line_prg_off; - var src_fn = self.dbg_line_fn_first.?; - const last_fn = self.dbg_line_fn_last.?; + const first_fn_index = self.src_fn_first_index.?; + const first_fn = self.getAtom(.src_fn, first_fn_index); + const last_fn_index = self.src_fn_last_index.?; + const last_fn = self.getAtom(.src_fn, last_fn_index); - var buffer = try gpa.alloc(u8, last_fn.off + last_fn.len - src_fn.off); + var src_fn_index = first_fn_index; + + var buffer = try gpa.alloc(u8, last_fn.off + last_fn.len - first_fn.off); defer gpa.free(buffer); switch (self.bin_file.tag) { @@ -2288,7 +2309,7 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { const shdr_index = elf_file.debug_line_section_index.?; const needed_size = elf_file.sections.items(.shdr)[shdr_index].sh_size + delta; try elf_file.growNonAllocSection(shdr_index, needed_size, 1, true); - const file_pos = elf_file.sections.items(.shdr)[shdr_index].sh_offset + src_fn.off; + const file_pos = elf_file.sections.items(.shdr)[shdr_index].sh_offset + first_fn.off; const amt = try elf_file.base.file.?.preadAll(buffer, file_pos); if (amt != buffer.len) return error.InputOutput; @@ -2300,7 +2321,7 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { const sect_index = d_sym.debug_line_section_index.?; const needed_size = @intCast(u32, d_sym.getSection(sect_index).size + delta); try d_sym.growSection(sect_index, needed_size, true); - const file_pos = d_sym.getSection(sect_index).offset + src_fn.off; + const file_pos = d_sym.getSection(sect_index).offset + first_fn.off; const amt = try d_sym.file.preadAll(buffer, file_pos); if (amt != buffer.len) return error.InputOutput; @@ -2310,18 +2331,19 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; const debug_line = &wasm_file.debug_line_atom.?.code; - mem.copy(u8, buffer, debug_line.items[src_fn.off..]); + mem.copy(u8, buffer, debug_line.items[first_fn.off..]); try debug_line.resize(self.allocator, debug_line.items.len + delta); - mem.copy(u8, debug_line.items[src_fn.off + delta ..], buffer); + mem.copy(u8, debug_line.items[first_fn.off + delta ..], buffer); }, else => unreachable, } while (true) { + const src_fn = self.getAtomPtr(.src_fn, src_fn_index); src_fn.off += delta; - if (src_fn.next) |next| { - src_fn = next; + if (src_fn.next_index) |next_index| { + src_fn_index = next_index; } else break; } } @@ -2367,22 +2389,26 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { } fn getDebugInfoOff(self: Dwarf) ?u32 { - const first = self.atom_first orelse return null; + const first_index = self.di_atom_first_index orelse return null; + const first = self.getAtom(.di_atom, first_index); return first.off; } fn getDebugInfoEnd(self: Dwarf) ?u32 { - const last = self.atom_last orelse return null; + const last_index = self.di_atom_last_index orelse return null; + const last = self.getAtom(.di_atom, last_index); return last.off + last.len; } fn getDebugLineProgramOff(self: Dwarf) ?u32 { - const first = self.dbg_line_fn_first orelse return null; + const first_index = self.src_fn_first_index orelse return null; + const first = self.getAtom(.src_fn, first_index); return first.off; } fn getDebugLineProgramEnd(self: Dwarf) ?u32 { - const last = self.dbg_line_fn_last orelse return null; + const last_index = self.src_fn_last_index orelse return null; + const last = self.getAtom(.src_fn, last_index); return last.off + last.len; } @@ -2457,23 +2483,14 @@ pub fn flushModule(self: *Dwarf, module: *Module) !void { } error_set.names = names; - const atom = try gpa.create(Atom); - errdefer gpa.destroy(atom); - atom.* = .{ - .prev = null, - .next = null, - .off = 0, - .len = 0, - }; - var dbg_info_buffer = std.ArrayList(u8).init(arena); try addDbgInfoErrorSet(arena, module, error_ty, self.target, &dbg_info_buffer); - try self.managed_atoms.append(gpa, atom); + const di_atom_index = try self.createAtom(.di_atom); log.debug("updateDeclDebugInfoAllocation in flushModule", .{}); - try self.updateDeclDebugInfoAllocation(atom, @intCast(u32, dbg_info_buffer.items.len)); + try self.updateDeclDebugInfoAllocation(di_atom_index, @intCast(u32, dbg_info_buffer.items.len)); log.debug("writeDeclDebugInfo in flushModule", .{}); - try self.writeDeclDebugInfo(atom, dbg_info_buffer.items); + try self.writeDeclDebugInfo(di_atom_index, dbg_info_buffer.items); const file_pos = blk: { switch (self.bin_file.tag) { @@ -2494,22 +2511,23 @@ pub fn flushModule(self: *Dwarf, module: *Module) !void { }; var buf: [@sizeOf(u32)]u8 = undefined; - mem.writeInt(u32, &buf, atom.off, self.target.cpu.arch.endian()); + mem.writeInt(u32, &buf, self.getAtom(.di_atom, di_atom_index).off, self.target.cpu.arch.endian()); while (self.global_abbrev_relocs.popOrNull()) |reloc| { + const atom = self.getAtom(.di_atom, reloc.atom_index); switch (self.bin_file.tag) { .elf => { const elf_file = self.bin_file.cast(File.Elf).?; - try elf_file.base.file.?.pwriteAll(&buf, file_pos + reloc.atom.off + reloc.offset); + try elf_file.base.file.?.pwriteAll(&buf, file_pos + atom.off + reloc.offset); }, .macho => { const d_sym = self.bin_file.cast(File.MachO).?.getDebugSymbols().?; - try d_sym.file.pwriteAll(&buf, file_pos + reloc.atom.off + reloc.offset); + try d_sym.file.pwriteAll(&buf, file_pos + atom.off + reloc.offset); }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; const debug_info = wasm_file.debug_info_atom.?.code; - mem.copy(u8, debug_info.items[reloc.atom.off + reloc.offset ..], &buf); + mem.copy(u8, debug_info.items[atom.off + reloc.offset ..], &buf); }, else => unreachable, } @@ -2627,12 +2645,62 @@ fn addDbgInfoErrorSet( try dbg_info_buffer.append(0); } -fn getDbgInfoAtom(tag: File.Tag, mod: *Module, decl_index: Module.Decl.Index) *Atom { - const decl = mod.declPtr(decl_index); - return switch (tag) { - .elf => unreachable, - .macho => unreachable, - .wasm => &decl.link.wasm.dbg_info_atom, - else => unreachable, +const Kind = enum { src_fn, di_atom }; + +fn createAtom(self: *Dwarf, comptime kind: Kind) !Atom.Index { + const index = blk: { + switch (kind) { + .src_fn => { + const index = @intCast(Atom.Index, self.src_fns.items.len); + _ = try self.src_fns.addOne(self.allocator); + break :blk index; + }, + .di_atom => { + const index = @intCast(Atom.Index, self.di_atoms.items.len); + _ = try self.di_atoms.addOne(self.allocator); + break :blk index; + }, + } + }; + const atom = self.getAtomPtr(kind, index); + atom.* = .{ + .off = 0, + .len = 0, + .prev_index = null, + .next_index = null, + }; + return index; +} + +fn getOrCreateAtomForDecl(self: *Dwarf, comptime kind: Kind, decl_index: Module.Decl.Index) !Atom.Index { + switch (kind) { + .src_fn => { + const gop = try self.src_fn_decls.getOrPut(self.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = try self.createAtom(kind); + } + return gop.value_ptr.*; + }, + .di_atom => { + const gop = try self.di_atom_decls.getOrPut(self.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = try self.createAtom(kind); + } + return gop.value_ptr.*; + }, + } +} + +fn getAtom(self: *const Dwarf, comptime kind: Kind, index: Atom.Index) Atom { + return switch (kind) { + .src_fn => self.src_fns.items[index], + .di_atom => self.di_atoms.items[index], + }; +} + +fn getAtomPtr(self: *Dwarf, comptime kind: Kind, index: Atom.Index) *Atom { + return switch (kind) { + .src_fn => &self.src_fns.items[index], + .di_atom => &self.di_atoms.items[index], }; } diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 01326fb82e..3e0c6d2b57 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -344,9 +344,9 @@ pub fn deinit(self: *Elf) void { self.relocs.deinit(gpa); } - // if (self.dwarf) |*dw| { - // dw.deinit(); - // } + if (self.dwarf) |*dw| { + dw.deinit(); + } } pub fn getDeclVAddr(self: *Elf, decl_index: Module.Decl.Index, reloc_info: File.RelocInfo) !u64 { @@ -685,146 +685,146 @@ pub fn populateMissingMetadata(self: *Elf) !void { try self.writeSymbol(0); } - // if (self.dwarf) |*dw| { - // if (self.debug_str_section_index == null) { - // self.debug_str_section_index = @intCast(u16, self.sections.slice().len); - // assert(dw.strtab.buffer.items.len == 0); - // try dw.strtab.buffer.append(gpa, 0); - // try self.sections.append(gpa, .{ - // .shdr = .{ - // .sh_name = try self.shstrtab.insert(gpa, ".debug_str"), - // .sh_type = elf.SHT_PROGBITS, - // .sh_flags = elf.SHF_MERGE | elf.SHF_STRINGS, - // .sh_addr = 0, - // .sh_offset = 0, - // .sh_size = 0, - // .sh_link = 0, - // .sh_info = 0, - // .sh_addralign = 1, - // .sh_entsize = 1, - // }, - // .phdr_index = undefined, - // }); - // self.debug_strtab_dirty = true; - // self.shdr_table_dirty = true; - // } + if (self.dwarf) |*dw| { + if (self.debug_str_section_index == null) { + self.debug_str_section_index = @intCast(u16, self.sections.slice().len); + assert(dw.strtab.buffer.items.len == 0); + try dw.strtab.buffer.append(gpa, 0); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".debug_str"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = elf.SHF_MERGE | elf.SHF_STRINGS, + .sh_addr = 0, + .sh_offset = 0, + .sh_size = 0, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = 1, + .sh_entsize = 1, + }, + .phdr_index = undefined, + }); + self.debug_strtab_dirty = true; + self.shdr_table_dirty = true; + } - // if (self.debug_info_section_index == null) { - // self.debug_info_section_index = @intCast(u16, self.sections.slice().len); + if (self.debug_info_section_index == null) { + self.debug_info_section_index = @intCast(u16, self.sections.slice().len); - // const file_size_hint = 200; - // const p_align = 1; - // const off = self.findFreeSpace(file_size_hint, p_align); - // log.debug("found .debug_info free space 0x{x} to 0x{x}", .{ - // off, - // off + file_size_hint, - // }); - // try self.sections.append(gpa, .{ - // .shdr = .{ - // .sh_name = try self.shstrtab.insert(gpa, ".debug_info"), - // .sh_type = elf.SHT_PROGBITS, - // .sh_flags = 0, - // .sh_addr = 0, - // .sh_offset = off, - // .sh_size = file_size_hint, - // .sh_link = 0, - // .sh_info = 0, - // .sh_addralign = p_align, - // .sh_entsize = 0, - // }, - // .phdr_index = undefined, - // }); - // self.shdr_table_dirty = true; - // self.debug_info_header_dirty = true; - // } + const file_size_hint = 200; + const p_align = 1; + const off = self.findFreeSpace(file_size_hint, p_align); + log.debug("found .debug_info free space 0x{x} to 0x{x}", .{ + off, + off + file_size_hint, + }); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".debug_info"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = file_size_hint, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = p_align, + .sh_entsize = 0, + }, + .phdr_index = undefined, + }); + self.shdr_table_dirty = true; + self.debug_info_header_dirty = true; + } - // if (self.debug_abbrev_section_index == null) { - // self.debug_abbrev_section_index = @intCast(u16, self.sections.slice().len); + if (self.debug_abbrev_section_index == null) { + self.debug_abbrev_section_index = @intCast(u16, self.sections.slice().len); - // const file_size_hint = 128; - // const p_align = 1; - // const off = self.findFreeSpace(file_size_hint, p_align); - // log.debug("found .debug_abbrev free space 0x{x} to 0x{x}", .{ - // off, - // off + file_size_hint, - // }); - // try self.sections.append(gpa, .{ - // .shdr = .{ - // .sh_name = try self.shstrtab.insert(gpa, ".debug_abbrev"), - // .sh_type = elf.SHT_PROGBITS, - // .sh_flags = 0, - // .sh_addr = 0, - // .sh_offset = off, - // .sh_size = file_size_hint, - // .sh_link = 0, - // .sh_info = 0, - // .sh_addralign = p_align, - // .sh_entsize = 0, - // }, - // .phdr_index = undefined, - // }); - // self.shdr_table_dirty = true; - // self.debug_abbrev_section_dirty = true; - // } + const file_size_hint = 128; + const p_align = 1; + const off = self.findFreeSpace(file_size_hint, p_align); + log.debug("found .debug_abbrev free space 0x{x} to 0x{x}", .{ + off, + off + file_size_hint, + }); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".debug_abbrev"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = file_size_hint, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = p_align, + .sh_entsize = 0, + }, + .phdr_index = undefined, + }); + self.shdr_table_dirty = true; + self.debug_abbrev_section_dirty = true; + } - // if (self.debug_aranges_section_index == null) { - // self.debug_aranges_section_index = @intCast(u16, self.sections.slice().len); + if (self.debug_aranges_section_index == null) { + self.debug_aranges_section_index = @intCast(u16, self.sections.slice().len); - // const file_size_hint = 160; - // const p_align = 16; - // const off = self.findFreeSpace(file_size_hint, p_align); - // log.debug("found .debug_aranges free space 0x{x} to 0x{x}", .{ - // off, - // off + file_size_hint, - // }); - // try self.sections.append(gpa, .{ - // .shdr = .{ - // .sh_name = try self.shstrtab.insert(gpa, ".debug_aranges"), - // .sh_type = elf.SHT_PROGBITS, - // .sh_flags = 0, - // .sh_addr = 0, - // .sh_offset = off, - // .sh_size = file_size_hint, - // .sh_link = 0, - // .sh_info = 0, - // .sh_addralign = p_align, - // .sh_entsize = 0, - // }, - // .phdr_index = undefined, - // }); - // self.shdr_table_dirty = true; - // self.debug_aranges_section_dirty = true; - // } + const file_size_hint = 160; + const p_align = 16; + const off = self.findFreeSpace(file_size_hint, p_align); + log.debug("found .debug_aranges free space 0x{x} to 0x{x}", .{ + off, + off + file_size_hint, + }); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".debug_aranges"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = file_size_hint, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = p_align, + .sh_entsize = 0, + }, + .phdr_index = undefined, + }); + self.shdr_table_dirty = true; + self.debug_aranges_section_dirty = true; + } - // if (self.debug_line_section_index == null) { - // self.debug_line_section_index = @intCast(u16, self.sections.slice().len); + if (self.debug_line_section_index == null) { + self.debug_line_section_index = @intCast(u16, self.sections.slice().len); - // const file_size_hint = 250; - // const p_align = 1; - // const off = self.findFreeSpace(file_size_hint, p_align); - // log.debug("found .debug_line free space 0x{x} to 0x{x}", .{ - // off, - // off + file_size_hint, - // }); - // try self.sections.append(gpa, .{ - // .shdr = .{ - // .sh_name = try self.shstrtab.insert(gpa, ".debug_line"), - // .sh_type = elf.SHT_PROGBITS, - // .sh_flags = 0, - // .sh_addr = 0, - // .sh_offset = off, - // .sh_size = file_size_hint, - // .sh_link = 0, - // .sh_info = 0, - // .sh_addralign = p_align, - // .sh_entsize = 0, - // }, - // .phdr_index = undefined, - // }); - // self.shdr_table_dirty = true; - // self.debug_line_header_dirty = true; - // } - // } + const file_size_hint = 250; + const p_align = 1; + const off = self.findFreeSpace(file_size_hint, p_align); + log.debug("found .debug_line free space 0x{x} to 0x{x}", .{ + off, + off + file_size_hint, + }); + try self.sections.append(gpa, .{ + .shdr = .{ + .sh_name = try self.shstrtab.insert(gpa, ".debug_line"), + .sh_type = elf.SHT_PROGBITS, + .sh_flags = 0, + .sh_addr = 0, + .sh_offset = off, + .sh_size = file_size_hint, + .sh_link = 0, + .sh_info = 0, + .sh_addralign = p_align, + .sh_entsize = 0, + }, + .phdr_index = undefined, + }); + self.shdr_table_dirty = true; + self.debug_line_header_dirty = true; + } + } const shsize: u64 = switch (self.ptr_width) { .p32 => @sizeOf(elf.Elf32_Shdr), @@ -956,26 +956,25 @@ pub fn growNonAllocSection( } pub fn markDirty(self: *Elf, shdr_index: u16, phdr_index: ?u16) void { - _ = shdr_index; self.shdr_table_dirty = true; // TODO look into only writing one section if (phdr_index) |_| { self.phdr_table_dirty = true; // TODO look into making only the one program header dirty } - // if (self.dwarf) |_| { - // if (self.debug_info_section_index.? == shdr_index) { - // self.debug_info_header_dirty = true; - // } else if (self.debug_line_section_index.? == shdr_index) { - // self.debug_line_header_dirty = true; - // } else if (self.debug_abbrev_section_index.? == shdr_index) { - // self.debug_abbrev_section_dirty = true; - // } else if (self.debug_str_section_index.? == shdr_index) { - // self.debug_strtab_dirty = true; - // } else if (self.debug_aranges_section_index.? == shdr_index) { - // self.debug_aranges_section_dirty = true; - // } - // } + if (self.dwarf) |_| { + if (self.debug_info_section_index.? == shdr_index) { + self.debug_info_header_dirty = true; + } else if (self.debug_line_section_index.? == shdr_index) { + self.debug_line_header_dirty = true; + } else if (self.debug_abbrev_section_index.? == shdr_index) { + self.debug_abbrev_section_dirty = true; + } else if (self.debug_str_section_index.? == shdr_index) { + self.debug_strtab_dirty = true; + } else if (self.debug_aranges_section_index.? == shdr_index) { + self.debug_aranges_section_dirty = true; + } + } } pub fn flush(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) link.File.FlushError!void { @@ -1015,14 +1014,13 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node // TODO This linker code currently assumes there is only 1 compilation unit and it // corresponds to the Zig source code. const module = self.base.options.module orelse return error.LinkingWithoutZigSourceUnimplemented; - _ = module; const target_endian = self.base.options.target.cpu.arch.endian(); const foreign_endian = target_endian != builtin.cpu.arch.endian(); - // if (self.dwarf) |*dw| { - // try dw.flushModule(module); - // } + if (self.dwarf) |*dw| { + try dw.flushModule(module); + } { var it = self.relocs.iterator(); @@ -1068,43 +1066,43 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node self.logSymtab(); } - // if (self.dwarf) |*dw| { - // if (self.debug_abbrev_section_dirty) { - // try dw.writeDbgAbbrev(); - // if (!self.shdr_table_dirty) { - // // Then it won't get written with the others and we need to do it. - // try self.writeSectHeader(self.debug_abbrev_section_index.?); - // } - // self.debug_abbrev_section_dirty = false; - // } + if (self.dwarf) |*dw| { + if (self.debug_abbrev_section_dirty) { + try dw.writeDbgAbbrev(); + if (!self.shdr_table_dirty) { + // Then it won't get written with the others and we need to do it. + try self.writeSectHeader(self.debug_abbrev_section_index.?); + } + self.debug_abbrev_section_dirty = false; + } - // if (self.debug_info_header_dirty) { - // // Currently only one compilation unit is supported, so the address range is simply - // // identical to the main program header virtual address and memory size. - // const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; - // const low_pc = text_phdr.p_vaddr; - // const high_pc = text_phdr.p_vaddr + text_phdr.p_memsz; - // try dw.writeDbgInfoHeader(module, low_pc, high_pc); - // self.debug_info_header_dirty = false; - // } + if (self.debug_info_header_dirty) { + // Currently only one compilation unit is supported, so the address range is simply + // identical to the main program header virtual address and memory size. + const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; + const low_pc = text_phdr.p_vaddr; + const high_pc = text_phdr.p_vaddr + text_phdr.p_memsz; + try dw.writeDbgInfoHeader(module, low_pc, high_pc); + self.debug_info_header_dirty = false; + } - // if (self.debug_aranges_section_dirty) { - // // Currently only one compilation unit is supported, so the address range is simply - // // identical to the main program header virtual address and memory size. - // const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; - // try dw.writeDbgAranges(text_phdr.p_vaddr, text_phdr.p_memsz); - // if (!self.shdr_table_dirty) { - // // Then it won't get written with the others and we need to do it. - // try self.writeSectHeader(self.debug_aranges_section_index.?); - // } - // self.debug_aranges_section_dirty = false; - // } + if (self.debug_aranges_section_dirty) { + // Currently only one compilation unit is supported, so the address range is simply + // identical to the main program header virtual address and memory size. + const text_phdr = &self.program_headers.items[self.phdr_load_re_index.?]; + try dw.writeDbgAranges(text_phdr.p_vaddr, text_phdr.p_memsz); + if (!self.shdr_table_dirty) { + // Then it won't get written with the others and we need to do it. + try self.writeSectHeader(self.debug_aranges_section_index.?); + } + self.debug_aranges_section_dirty = false; + } - // if (self.debug_line_header_dirty) { - // try dw.writeDbgLineHeader(); - // self.debug_line_header_dirty = false; - // } - // } + if (self.debug_line_header_dirty) { + try dw.writeDbgLineHeader(); + self.debug_line_header_dirty = false; + } + } if (self.phdr_table_dirty) { const phsize: u64 = switch (self.ptr_width) { @@ -1162,15 +1160,15 @@ pub fn flushModule(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node } } - // if (self.dwarf) |dwarf| { - // const shdr_index = self.debug_str_section_index.?; - // if (self.debug_strtab_dirty or dwarf.strtab.buffer.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { - // try self.growNonAllocSection(shdr_index, dwarf.strtab.buffer.items.len, 1, false); - // const debug_strtab_sect = self.sections.items(.shdr)[shdr_index]; - // try self.base.file.?.pwriteAll(dwarf.strtab.buffer.items, debug_strtab_sect.sh_offset); - // self.debug_strtab_dirty = false; - // } - // } + if (self.dwarf) |dwarf| { + const shdr_index = self.debug_str_section_index.?; + if (self.debug_strtab_dirty or dwarf.strtab.buffer.items.len != self.sections.items(.shdr)[shdr_index].sh_size) { + try self.growNonAllocSection(shdr_index, dwarf.strtab.buffer.items.len, 1, false); + const debug_strtab_sect = self.sections.items(.shdr)[shdr_index]; + try self.base.file.?.pwriteAll(dwarf.strtab.buffer.items, debug_strtab_sect.sh_offset); + self.debug_strtab_dirty = false; + } + } if (self.shdr_table_dirty) { const shsize: u64 = switch (self.ptr_width) { @@ -2100,10 +2098,6 @@ fn freeAtom(self: *Elf, atom_index: Atom.Index) void { self.getAtomPtr(atom_index).local_sym_index = 0; self.offset_table_free_list.append(self.base.allocator, atom.offset_table_index) catch {}; - - // if (self.dwarf) |*dw| { - // dw.freeAtom(&atom.dbg_info_atom); - // } } fn shrinkAtom(self: *Elf, atom_index: Atom.Index, new_block_size: u64) void { @@ -2133,7 +2127,6 @@ pub fn createAtom(self: *Elf) !Atom.Index { .offset_table_index = offset_table_index, .prev_index = null, .next_index = null, - .dbg_info_atom = undefined, }; log.debug("creating ATOM(%{d}) at index {d}", .{ local_sym_index, atom_index }); return atom_index; @@ -2219,16 +2212,16 @@ fn allocateAtom(self: *Elf, atom_index: Atom.Index, new_block_size: u64, alignme try self.growAllocSection(sym.st_shndx, needed_size); maybe_last_atom_index.* = atom_index; - // if (self.dwarf) |_| { - // // The .debug_info section has `low_pc` and `high_pc` values which is the virtual address - // // range of the compilation unit. When we expand the text section, this range changes, - // // so the DW_TAG.compile_unit tag of the .debug_info section becomes dirty. - // self.debug_info_header_dirty = true; - // // This becomes dirty for the same reason. We could potentially make this more - // // fine-grained with the addition of support for more compilation units. It is planned to - // // model each package as a different compilation unit. - // self.debug_aranges_section_dirty = true; - // } + if (self.dwarf) |_| { + // The .debug_info section has `low_pc` and `high_pc` values which is the virtual address + // range of the compilation unit. When we expand the text section, this range changes, + // so the DW_TAG.compile_unit tag of the .debug_info section becomes dirty. + self.debug_info_header_dirty = true; + // This becomes dirty for the same reason. We could potentially make this more + // fine-grained with the addition of support for more compilation units. It is planned to + // model each package as a different compilation unit. + self.debug_aranges_section_dirty = true; + } } shdr.sh_addralign = math.max(shdr.sh_addralign, alignment); @@ -2333,9 +2326,9 @@ pub fn freeDecl(self: *Elf, decl_index: Module.Decl.Index) void { kv.value.exports.deinit(self.base.allocator); } - // if (self.dwarf) |*dw| { - // dw.freeDecl(decl); - // } + if (self.dwarf) |*dw| { + dw.freeDecl(decl_index); + } } pub fn getOrCreateAtomForDecl(self: *Elf, decl_index: Module.Decl.Index) !Atom.Index { @@ -2471,15 +2464,15 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - // var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; - // defer if (decl_state) |*ds| ds.deinit(); + var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; + defer if (decl_state) |*ds| ds.deinit(); - // const res = if (decl_state) |*ds| - // try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ - // .dwarf = ds, - // }) - // else - const res = try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); + const res = if (decl_state) |*ds| + try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ + .dwarf = ds, + }) + else + try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); const code = switch (res) { .ok => code_buffer.items, @@ -2490,16 +2483,15 @@ pub fn updateFunc(self: *Elf, module: *Module, func: *Module.Fn, air: Air, liven }, }; const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_FUNC); - _ = local_sym; - // if (decl_state) |*ds| { - // try self.dwarf.?.commitDeclState( - // module, - // decl_index, - // local_sym.st_value, - // local_sym.st_size, - // ds, - // ); - // } + if (decl_state) |*ds| { + try self.dwarf.?.commitDeclState( + module, + decl_index, + local_sym.st_value, + local_sym.st_size, + ds, + ); + } // Since we updated the vaddr and the size, each corresponding export // symbol also needs to be updated. @@ -2536,27 +2528,27 @@ pub fn updateDecl(self: *Elf, module: *Module, decl_index: Module.Decl.Index) !v var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - // var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; - // defer if (decl_state) |*ds| ds.deinit(); + var decl_state: ?Dwarf.DeclState = if (self.dwarf) |*dw| try dw.initDeclState(module, decl_index) else null; + defer if (decl_state) |*ds| ds.deinit(); // TODO implement .debug_info for global variables const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val; - // const res = if (decl_state) |*ds| - // try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - // .ty = decl.ty, - // .val = decl_val, - // }, &code_buffer, .{ - // .dwarf = ds, - // }, .{ - // .parent_atom_index = atom.getSymbolIndex().?, - // }) - // else - const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .none, .{ - .parent_atom_index = atom.getSymbolIndex().?, - }); + const res = if (decl_state) |*ds| + try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .{ + .dwarf = ds, + }, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }) + else + try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .none, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }); const code = switch (res) { .ok => code_buffer.items, @@ -2568,16 +2560,15 @@ pub fn updateDecl(self: *Elf, module: *Module, decl_index: Module.Decl.Index) !v }; const local_sym = try self.updateDeclCode(decl_index, code, elf.STT_OBJECT); - _ = local_sym; - // if (decl_state) |*ds| { - // try self.dwarf.?.commitDeclState( - // module, - // decl_index, - // local_sym.st_value, - // local_sym.st_size, - // ds, - // ); - // } + if (decl_state) |*ds| { + try self.dwarf.?.commitDeclState( + module, + decl_index, + local_sym.st_value, + local_sym.st_size, + ds, + ); + } // Since we updated the vaddr and the size, each corresponding export // symbol also needs to be updated. @@ -2737,19 +2728,20 @@ pub fn updateDeclExports( } /// Must be called only after a successful call to `updateDecl`. -pub fn updateDeclLineNumber(self: *Elf, mod: *Module, decl: *const Module.Decl) !void { +pub fn updateDeclLineNumber(self: *Elf, mod: *Module, decl_index: Module.Decl.Index) !void { const tracy = trace(@src()); defer tracy.end(); + const decl = mod.declPtr(decl_index); const decl_name = try decl.getFullyQualifiedName(mod); defer self.base.allocator.free(decl_name); log.debug("updateDeclLineNumber {s}{*}", .{ decl_name, decl }); if (self.llvm_object) |_| return; - // if (self.dwarf) |*dw| { - // try dw.updateDeclLineNumber(decl); - // } + if (self.dwarf) |*dw| { + try dw.updateDeclLineNumber(mod, decl_index); + } } pub fn deleteDeclExport(self: *Elf, decl_index: Module.Decl.Index, name: []const u8) void { diff --git a/src/link/Elf/Atom.zig b/src/link/Elf/Atom.zig index 24cf19432c..4ab304ef71 100644 --- a/src/link/Elf/Atom.zig +++ b/src/link/Elf/Atom.zig @@ -4,7 +4,6 @@ const std = @import("std"); const assert = std.debug.assert; const elf = std.elf; -const Dwarf = @import("../Dwarf.zig"); const Elf = @import("../Elf.zig"); /// Each decl always gets a local symbol with the fully qualified name. @@ -23,8 +22,6 @@ offset_table_index: u32, prev_index: ?Index, next_index: ?Index, -dbg_info_atom: Dwarf.Atom, - pub const Index = u32; pub const Reloc = struct { diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 42aaa3a275..22eb58775b 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -472,9 +472,9 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No const module = self.base.options.module orelse return error.LinkingWithoutZigSourceUnimplemented; - // if (self.d_sym) |*d_sym| { - // try d_sym.dwarf.flushModule(module); - // } + if (self.d_sym) |*d_sym| { + try d_sym.dwarf.flushModule(module); + } var libs = std.StringArrayHashMap(link.SystemLib).init(arena); try resolveLibSystem( @@ -664,10 +664,10 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No try self.writeCodeSignature(comp, csig); // code signing always comes last } - // if (self.d_sym) |*d_sym| { - // // Flush debug symbols bundle. - // try d_sym.flushModule(self); - // } + if (self.d_sym) |*d_sym| { + // Flush debug symbols bundle. + try d_sym.flushModule(self); + } // if (build_options.enable_link_snapshots) { // if (self.base.options.enable_link_snapshots) @@ -1089,7 +1089,6 @@ pub fn createAtom(self: *MachO) !Atom.Index { .alignment = 0, .prev_index = null, .next_index = null, - .dbg_info_atom = undefined, }; log.debug("creating ATOM(%{d}) at index {d}", .{ sym_index, atom_index }); return atom_index; @@ -1724,9 +1723,9 @@ pub fn deinit(self: *MachO) void { if (self.llvm_object) |llvm_object| llvm_object.destroy(gpa); } - // if (self.d_sym) |*d_sym| { - // d_sym.deinit(); - // } + if (self.d_sym) |*d_sym| { + d_sym.deinit(); + } self.got_entries.deinit(gpa); self.got_entries_free_list.deinit(gpa); @@ -1804,9 +1803,8 @@ pub fn deinit(self: *MachO) void { } fn freeAtom(self: *MachO, atom_index: Atom.Index) void { - log.debug("freeAtom {d}", .{atom_index}); - const gpa = self.base.allocator; + log.debug("freeAtom {d}", .{atom_index}); // Remove any relocs and base relocs associated with this Atom Atom.freeRelocations(self, atom_index); @@ -1876,9 +1874,9 @@ fn freeAtom(self: *MachO, atom_index: Atom.Index) void { }; _ = self.got_entries_table.remove(got_target); - // if (self.d_sym) |*d_sym| { - // d_sym.swapRemoveRelocs(sym_index); - // } + if (self.d_sym) |*d_sym| { + d_sym.swapRemoveRelocs(sym_index); + } log.debug(" adding GOT index {d} to free list (target local@{d})", .{ got_index, sym_index }); } @@ -1887,10 +1885,6 @@ fn freeAtom(self: *MachO, atom_index: Atom.Index) void { _ = self.atom_by_index_table.remove(sym_index); log.debug(" adding local symbol index {d} to free list", .{sym_index}); self.getAtomPtr(atom_index).sym_index = 0; - - // if (self.d_sym) |*d_sym| { - // d_sym.dwarf.freeAtom(&atom.dbg_info_atom); - // } } fn shrinkAtom(self: *MachO, atom_index: Atom.Index, new_block_size: u64) void { @@ -2020,23 +2014,22 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv Atom.freeRelocations(self, atom_index); const atom = self.getAtom(atom_index); - _ = atom; var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - // var decl_state = if (self.d_sym) |*d_sym| - // try d_sym.dwarf.initDeclState(module, decl_index) - // else - // null; - // defer if (decl_state) |*ds| ds.deinit(); + var decl_state = if (self.d_sym) |*d_sym| + try d_sym.dwarf.initDeclState(module, decl_index) + else + null; + defer if (decl_state) |*ds| ds.deinit(); - // const res = if (decl_state) |*ds| - // try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ - // .dwarf = ds, - // }) - // else - const res = try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); + const res = if (decl_state) |*ds| + try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .{ + .dwarf = ds, + }) + else + try codegen.generateFunction(&self.base, decl.srcLoc(), func, air, liveness, &code_buffer, .none); const code = switch (res) { .ok => code_buffer.items, @@ -2048,11 +2041,10 @@ pub fn updateFunc(self: *MachO, module: *Module, func: *Module.Fn, air: Air, liv }; const addr = try self.updateDeclCode(decl_index, code); - _ = addr; - // if (decl_state) |*ds| { - // try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); - // } + if (decl_state) |*ds| { + try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); + } // Since we updated the vaddr and the size, each corresponding export symbol also // needs to be updated. @@ -2154,29 +2146,29 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index) var code_buffer = std.ArrayList(u8).init(self.base.allocator); defer code_buffer.deinit(); - // var decl_state: ?Dwarf.DeclState = if (self.d_sym) |*d_sym| - // try d_sym.dwarf.initDeclState(module, decl_index) - // else - // null; - // defer if (decl_state) |*ds| ds.deinit(); + var decl_state: ?Dwarf.DeclState = if (self.d_sym) |*d_sym| + try d_sym.dwarf.initDeclState(module, decl_index) + else + null; + defer if (decl_state) |*ds| ds.deinit(); const decl_val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val; - // const res = if (decl_state) |*ds| - // try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - // .ty = decl.ty, - // .val = decl_val, - // }, &code_buffer, .{ - // .dwarf = ds, - // }, .{ - // .parent_atom_index = atom.getSymbolIndex().?, - // }) - // else - const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ - .ty = decl.ty, - .val = decl_val, - }, &code_buffer, .none, .{ - .parent_atom_index = atom.getSymbolIndex().?, - }); + const res = if (decl_state) |*ds| + try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .{ + .dwarf = ds, + }, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }) + else + try codegen.generateSymbol(&self.base, decl.srcLoc(), .{ + .ty = decl.ty, + .val = decl_val, + }, &code_buffer, .none, .{ + .parent_atom_index = atom.getSymbolIndex().?, + }); const code = switch (res) { .ok => code_buffer.items, @@ -2187,11 +2179,10 @@ pub fn updateDecl(self: *MachO, module: *Module, decl_index: Module.Decl.Index) }, }; const addr = try self.updateDeclCode(decl_index, code); - _ = addr; - // if (decl_state) |*ds| { - // try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); - // } + if (decl_state) |*ds| { + try self.d_sym.?.dwarf.commitDeclState(module, decl_index, addr, atom.size, ds); + } // Since we updated the vaddr and the size, each corresponding export symbol also // needs to be updated. @@ -2432,13 +2423,10 @@ fn updateDeclCode(self: *MachO, decl_index: Module.Decl.Index, code: []const u8) return atom.getSymbol(self).n_value; } -pub fn updateDeclLineNumber(self: *MachO, module: *Module, decl: *const Module.Decl) !void { - _ = decl; - _ = self; - _ = module; - // if (self.d_sym) |*d_sym| { - // try d_sym.dwarf.updateDeclLineNumber(decl); - // } +pub fn updateDeclLineNumber(self: *MachO, module: *Module, decl_index: Module.Decl.Index) !void { + if (self.d_sym) |*d_sym| { + try d_sym.dwarf.updateDeclLineNumber(module, decl_index); + } } pub fn updateDeclExports( @@ -2611,9 +2599,9 @@ pub fn freeDecl(self: *MachO, decl_index: Module.Decl.Index) void { kv.value.exports.deinit(self.base.allocator); } - // if (self.d_sym) |*d_sym| { - // d_sym.dwarf.freeDecl(decl); - // } + if (self.d_sym) |*d_sym| { + d_sym.dwarf.freeDecl(decl_index); + } } pub fn getDeclVAddr(self: *MachO, decl_index: Module.Decl.Index, reloc_info: File.RelocInfo) !u64 { diff --git a/src/link/MachO/Atom.zig b/src/link/MachO/Atom.zig index 401d71813c..5fb94b7c13 100644 --- a/src/link/MachO/Atom.zig +++ b/src/link/MachO/Atom.zig @@ -13,7 +13,6 @@ const trace = @import("../../tracy.zig").trace; const Allocator = mem.Allocator; const Arch = std.Target.Cpu.Arch; -const Dwarf = @import("../Dwarf.zig"); const MachO = @import("../MachO.zig"); const Relocation = @import("Relocation.zig"); const SymbolWithLoc = MachO.SymbolWithLoc; @@ -43,8 +42,6 @@ alignment: u32, next_index: ?Index, prev_index: ?Index, -dbg_info_atom: Dwarf.Atom, - pub const Index = u32; pub const Binding = struct { diff --git a/src/link/Plan9.zig b/src/link/Plan9.zig index 20f540022a..87e3ca5c22 100644 --- a/src/link/Plan9.zig +++ b/src/link/Plan9.zig @@ -1018,10 +1018,10 @@ pub fn writeSyms(self: *Plan9, buf: *std.ArrayList(u8)) !void { } /// Must be called only after a successful call to `updateDecl`. -pub fn updateDeclLineNumber(self: *Plan9, mod: *Module, decl: *const Module.Decl) !void { +pub fn updateDeclLineNumber(self: *Plan9, mod: *Module, decl_index: Module.Decl.Index) !void { _ = self; _ = mod; - _ = decl; + _ = decl_index; } pub fn getDeclVAddr( diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 31dfb87659..ee4518796e 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -183,13 +183,9 @@ pub const Segment = struct { pub const FnData = struct { /// Reference to the wasm type that represents this function. type_index: u32, - /// Contains debug information related to this function. - /// For Wasm, the offset is relative to the code-section. - src_fn: Dwarf.SrcFn, pub const empty: FnData = .{ .type_index = undefined, - .src_fn = Dwarf.SrcFn.empty, }; }; @@ -1122,17 +1118,18 @@ pub fn updateDecl(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !voi return wasm.finishUpdateDecl(decl, code); } -pub fn updateDeclLineNumber(wasm: *Wasm, mod: *Module, decl: *const Module.Decl) !void { +pub fn updateDeclLineNumber(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !void { if (wasm.llvm_object) |_| return; if (wasm.dwarf) |*dw| { const tracy = trace(@src()); defer tracy.end(); + const decl = mod.declPtr(decl_index); const decl_name = try decl.getFullyQualifiedName(mod); defer wasm.base.allocator.free(decl_name); log.debug("updateDeclLineNumber {s}{*}", .{ decl_name, decl }); - try dw.updateDeclLineNumber(decl); + try dw.updateDeclLineNumber(mod, decl_index); } } @@ -1460,10 +1457,9 @@ pub fn freeDecl(wasm: *Wasm, decl_index: Module.Decl.Index) void { _ = wasm.resolved_symbols.swapRemove(atom.symbolLoc()); _ = wasm.symbol_atom.remove(atom.symbolLoc()); - if (wasm.dwarf) |*dwarf| { - dwarf.freeDecl(decl); - dwarf.freeAtom(&atom.dbg_info_atom); - } + // if (wasm.dwarf) |*dwarf| { + // dwarf.freeDecl(decl_index); + // } atom.deinit(wasm.base.allocator); } @@ -1882,7 +1878,6 @@ fn initializeCallCtorsFunction(wasm: *Wasm) !void { .next = null, .prev = null, .code = function_body.moveToUnmanaged(), - .dbg_info_atom = undefined, }; try wasm.managed_atoms.append(wasm.base.allocator, atom); try wasm.appendAtomAtIndex(wasm.code_section_index.?, atom); diff --git a/src/link/Wasm/Atom.zig b/src/link/Wasm/Atom.zig index 20f847e475..554f98b5ca 100644 --- a/src/link/Wasm/Atom.zig +++ b/src/link/Wasm/Atom.zig @@ -4,7 +4,6 @@ const std = @import("std"); const types = @import("types.zig"); const Wasm = @import("../Wasm.zig"); const Symbol = @import("Symbol.zig"); -const Dwarf = @import("../Dwarf.zig"); const leb = std.leb; const log = std.log.scoped(.link); @@ -39,9 +38,6 @@ prev: ?*Atom, /// When the parent atom is being freed, it will also do so for all local atoms. locals: std.ArrayListUnmanaged(Atom) = .{}, -/// Represents the debug Atom that holds all debug information of this Atom. -dbg_info_atom: Dwarf.Atom, - /// Represents a default empty wasm `Atom` pub const empty: Atom = .{ .alignment = 0, @@ -51,7 +47,6 @@ pub const empty: Atom = .{ .prev = null, .size = 0, .sym_index = 0, - .dbg_info_atom = undefined, }; /// Frees all resources owned by this `Atom`. From e0f3975fc8a7afd8a613802321fd46e64d8970d5 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 16:01:43 +0100 Subject: [PATCH 34/65] link: make SpirV atoms fully owned by the linker --- src/Module.zig | 19 +++---------------- src/codegen/spirv.zig | 30 +++++++++++++++++++----------- src/link.zig | 2 +- src/link/SpirV.zig | 18 +++++++----------- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index eb947a6977..bfeeea51e8 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5183,20 +5183,7 @@ fn scanDecl(iter: *ScanDeclIter, decl_sub_index: usize, flags: u4) Allocator.Err decl.zir_decl_index = @intCast(u32, decl_sub_index); if (decl.getFunction()) |_| { switch (comp.bin_file.tag) { - .coff => { - // TODO Implement for COFF - }, - .elf => { - // TODO Look into detecting when this would be unnecessary by storing enough state - // in `Decl` to notice that the line number did not change. - comp.work_queue.writeItemAssumeCapacity(.{ .update_line_number = decl_index }); - }, - .macho => { - // TODO Look into detecting when this would be unnecessary by storing enough state - // in `Decl` to notice that the line number did not change. - comp.work_queue.writeItemAssumeCapacity(.{ .update_line_number = decl_index }); - }, - .plan9 => { + .coff, .elf, .macho, .plan9 => { // TODO Look into detecting when this would be unnecessary by storing enough state // in `Decl` to notice that the line number did not change. comp.work_queue.writeItemAssumeCapacity(.{ .update_line_number = decl_index }); @@ -5290,7 +5277,7 @@ pub fn clearDecl( .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, - .spirv => .{ .spirv = .{} }, + .spirv => .{ .spirv = {} }, .nvptx => .{ .nvptx = {} }, }; } @@ -5710,7 +5697,7 @@ pub fn allocateNewDecl( .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, - .spirv => .{ .spirv = .{} }, + .spirv => .{ .spirv = {} }, .nvptx => .{ .nvptx = {} }, }, .generation = 0, diff --git a/src/codegen/spirv.zig b/src/codegen/spirv.zig index e1af8c847f..c5a3d57d07 100644 --- a/src/codegen/spirv.zig +++ b/src/codegen/spirv.zig @@ -49,7 +49,7 @@ pub const DeclGen = struct { spv: *SpvModule, /// The decl we are currently generating code for. - decl: *Decl, + decl_index: Decl.Index, /// The intermediate code of the declaration we are currently generating. Note: If /// the declaration is not a function, this value will be undefined! @@ -59,6 +59,8 @@ pub const DeclGen = struct { /// Note: If the declaration is not a function, this value will be undefined! liveness: Liveness, + ids: *const std.AutoHashMap(Decl.Index, IdResult), + /// An array of function argument result-ids. Each index corresponds with the /// function argument of the same index. args: std.ArrayListUnmanaged(IdRef) = .{}, @@ -133,14 +135,20 @@ pub const DeclGen = struct { /// Initialize the common resources of a DeclGen. Some fields are left uninitialized, /// only set when `gen` is called. - pub fn init(allocator: Allocator, module: *Module, spv: *SpvModule) DeclGen { + pub fn init( + allocator: Allocator, + module: *Module, + spv: *SpvModule, + ids: *const std.AutoHashMap(Decl.Index, IdResult), + ) DeclGen { return .{ .gpa = allocator, .module = module, .spv = spv, - .decl = undefined, + .decl_index = undefined, .air = undefined, .liveness = undefined, + .ids = ids, .next_arg_index = undefined, .current_block_label_id = undefined, .error_msg = undefined, @@ -150,9 +158,9 @@ pub const DeclGen = struct { /// Generate the code for `decl`. If a reportable error occurred during code generation, /// a message is returned by this function. Callee owns the memory. If this function /// returns such a reportable error, it is valid to be called again for a different decl. - pub fn gen(self: *DeclGen, decl: *Decl, air: Air, liveness: Liveness) !?*Module.ErrorMsg { + pub fn gen(self: *DeclGen, decl_index: Decl.Index, air: Air, liveness: Liveness) !?*Module.ErrorMsg { // Reset internal resources, we don't want to re-allocate these. - self.decl = decl; + self.decl_index = decl_index; self.air = air; self.liveness = liveness; self.args.items.len = 0; @@ -194,7 +202,7 @@ pub const DeclGen = struct { pub fn fail(self: *DeclGen, comptime format: []const u8, args: anytype) Error { @setCold(true); const src = LazySrcLoc.nodeOffset(0); - const src_loc = src.toSrcLoc(self.decl); + const src_loc = src.toSrcLoc(self.module.declPtr(self.decl_index)); assert(self.error_msg == null); self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, format, args); return error.CodegenFail; @@ -332,7 +340,7 @@ pub const DeclGen = struct { }; const decl = self.module.declPtr(fn_decl_index); self.module.markDeclAlive(decl); - return decl.fn_link.spirv.id.toRef(); + return self.ids.get(fn_decl_index).?.toRef(); } const target = self.getTarget(); @@ -553,8 +561,8 @@ pub const DeclGen = struct { } fn genDecl(self: *DeclGen) !void { - const decl = self.decl; - const result_id = decl.fn_link.spirv.id; + const result_id = self.ids.get(self.decl_index).?; + const decl = self.module.declPtr(self.decl_index); if (decl.val.castTag(.function)) |_| { assert(decl.ty.zigTypeTag() == .Fn); @@ -945,7 +953,7 @@ pub const DeclGen = struct { fn airDbgStmt(self: *DeclGen, inst: Air.Inst.Index) !void { const dbg_stmt = self.air.instructions.items(.data)[inst].dbg_stmt; - const src_fname_id = try self.spv.resolveSourceFileName(self.decl); + const src_fname_id = try self.spv.resolveSourceFileName(self.module.declPtr(self.decl_index)); try self.func.body.emit(self.spv.gpa, .OpLine, .{ .file = src_fname_id, .line = dbg_stmt.line, @@ -1106,7 +1114,7 @@ pub const DeclGen = struct { assert(as.errors.items.len != 0); assert(self.error_msg == null); const loc = LazySrcLoc.nodeOffset(0); - const src_loc = loc.toSrcLoc(self.decl); + const src_loc = loc.toSrcLoc(self.module.declPtr(self.decl_index)); self.error_msg = try Module.ErrorMsg.create(self.module.gpa, src_loc, "failed to assemble SPIR-V inline assembly", .{}); const notes = try self.module.gpa.alloc(Module.ErrorMsg, as.errors.items.len); diff --git a/src/link.zig b/src/link.zig index 3dd182b586..450a008cea 100644 --- a/src/link.zig +++ b/src/link.zig @@ -279,7 +279,7 @@ pub const File = struct { plan9: void, c: void, wasm: Wasm.FnData, - spirv: SpirV.FnData, + spirv: void, nvptx: void, }; diff --git a/src/link/SpirV.zig b/src/link/SpirV.zig index 7dbd3a42ce..14a29e4498 100644 --- a/src/link/SpirV.zig +++ b/src/link/SpirV.zig @@ -42,13 +42,6 @@ const SpvModule = @import("../codegen/spirv/Module.zig"); const spec = @import("../codegen/spirv/spec.zig"); const IdResult = spec.IdResult; -// TODO: Should this struct be used at all rather than just a hashmap of aux data for every decl? -pub const FnData = struct { - // We're going to fill these in flushModule, and we're going to fill them unconditionally, - // so just set it to undefined. - id: IdResult = undefined, -}; - base: link.File, /// This linker backend does not try to incrementally link output SPIR-V code. @@ -209,16 +202,19 @@ pub fn flushModule(self: *SpirV, comp: *Compilation, prog_node: *std.Progress.No // so that we can access them before processing them. // TODO: We're allocating an ID unconditionally now, are there // declarations which don't generate a result? - // TODO: fn_link is used here, but thats probably not the right field. It will work anyway though. + var ids = std.AutoHashMap(Module.Decl.Index, IdResult).init(self.base.allocator); + defer ids.deinit(); + try ids.ensureTotalCapacity(@intCast(u32, self.decl_table.count())); + for (self.decl_table.keys()) |decl_index| { const decl = module.declPtr(decl_index); if (decl.has_tv) { - decl.fn_link.spirv.id = spv.allocId(); + ids.putAssumeCapacityNoClobber(decl_index, spv.allocId()); } } // Now, actually generate the code for all declarations. - var decl_gen = codegen.DeclGen.init(self.base.allocator, module, &spv); + var decl_gen = codegen.DeclGen.init(self.base.allocator, module, &spv, &ids); defer decl_gen.deinit(); var it = self.decl_table.iterator(); @@ -231,7 +227,7 @@ pub fn flushModule(self: *SpirV, comp: *Compilation, prog_node: *std.Progress.No const liveness = entry.value_ptr.liveness; // Note, if `decl` is not a function, air/liveness may be undefined. - if (try decl_gen.gen(decl, air, liveness)) |msg| { + if (try decl_gen.gen(decl_index, air, liveness)) |msg| { try module.failed_decls.put(module.gpa, decl_index, msg); return; // TODO: Attempt to generate more decls? } From 1aa0f8aa2f382fb56639ea6833a62c4b8b031247 Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 17:39:07 +0100 Subject: [PATCH 35/65] link: fix pointer invalidation issues in Elf, MachO and Coff --- src/link/Coff.zig | 12 ++++++++---- src/link/Elf.zig | 9 ++++----- src/link/MachO.zig | 4 ++-- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/link/Coff.zig b/src/link/Coff.zig index f563a617c7..2922e783e1 100644 --- a/src/link/Coff.zig +++ b/src/link/Coff.zig @@ -1035,7 +1035,6 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In const unnamed_consts = gop.value_ptr; const atom_index = try self.createAtom(); - const atom = self.getAtomPtr(atom_index); const sym_name = blk: { const decl_name = try decl.getFullyQualifiedName(mod); @@ -1045,11 +1044,15 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In break :blk try std.fmt.allocPrint(gpa, "__unnamed_{s}_{d}", .{ decl_name, index }); }; defer gpa.free(sym_name); - try self.setSymbolName(atom.getSymbolPtr(self), sym_name); - atom.getSymbolPtr(self).section_number = @intToEnum(coff.SectionNumber, self.rdata_section_index.? + 1); + { + const atom = self.getAtom(atom_index); + const sym = atom.getSymbolPtr(self); + try self.setSymbolName(sym, sym_name); + sym.section_number = @intToEnum(coff.SectionNumber, self.rdata_section_index.? + 1); + } const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), tv, &code_buffer, .none, .{ - .parent_atom_index = atom.getSymbolIndex().?, + .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?, }); const code = switch (res) { .ok => code_buffer.items, @@ -1062,6 +1065,7 @@ pub fn lowerUnnamedConst(self: *Coff, tv: TypedValue, decl_index: Module.Decl.In }; const required_alignment = tv.ty.abiAlignment(self.base.options.target); + const atom = self.getAtomPtr(atom_index); atom.alignment = required_alignment; atom.size = @intCast(u32, code.len); atom.getSymbolPtr(self).value = try self.allocateAtom(atom_index, atom.size, atom.alignment); diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 3e0c6d2b57..45952da6c0 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -2600,12 +2600,11 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module const name = self.shstrtab.get(name_str_index).?; const atom_index = try self.createAtom(); - const atom = self.getAtomPtr(atom_index); const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .{ .none = {}, }, .{ - .parent_atom_index = atom.getSymbolIndex().?, + .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?, }); const code = switch (res) { .ok => code_buffer.items, @@ -2620,7 +2619,7 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module const required_alignment = typed_value.ty.abiAlignment(self.base.options.target); const shdr_index = self.rodata_section_index.?; const phdr_index = self.sections.items(.phdr_index)[shdr_index]; - const local_sym = atom.getSymbolPtr(self); + const local_sym = self.getAtom(atom_index).getSymbolPtr(self); local_sym.st_name = name_str_index; local_sym.st_info = (elf.STB_LOCAL << 4) | elf.STT_OBJECT; local_sym.st_other = 0; @@ -2631,14 +2630,14 @@ pub fn lowerUnnamedConst(self: *Elf, typed_value: TypedValue, decl_index: Module log.debug("allocated text block for {s} at 0x{x}", .{ name, local_sym.st_value }); - try self.writeSymbol(atom.getSymbolIndex().?); + try self.writeSymbol(self.getAtom(atom_index).getSymbolIndex().?); try unnamed_consts.append(gpa, atom_index); const section_offset = local_sym.st_value - self.program_headers.items[phdr_index].p_vaddr; const file_offset = self.sections.items(.shdr)[shdr_index].sh_offset + section_offset; try self.base.file.?.pwriteAll(code, file_offset); - return atom.getSymbolIndex().?; + return self.getAtom(atom_index).getSymbolIndex().?; } pub fn updateDeclExports( diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 22eb58775b..24ef275c5b 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -2079,10 +2079,9 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu log.debug("allocating symbol indexes for {?s}", .{name}); const atom_index = try self.createAtom(); - const atom = self.getAtomPtr(atom_index); const res = try codegen.generateSymbol(&self.base, decl.srcLoc(), typed_value, &code_buffer, .none, .{ - .parent_atom_index = atom.getSymbolIndex().?, + .parent_atom_index = self.getAtom(atom_index).getSymbolIndex().?, }); const code = switch (res) { .ok => code_buffer.items, @@ -2095,6 +2094,7 @@ pub fn lowerUnnamedConst(self: *MachO, typed_value: TypedValue, decl_index: Modu }; const required_alignment = typed_value.ty.abiAlignment(self.base.options.target); + const atom = self.getAtomPtr(atom_index); atom.size = code.len; atom.alignment = required_alignment; // TODO: work out logic for disambiguating functions from function pointers From 46f54b23ae604c3f99f51ca719d9085530f6b59c Mon Sep 17 00:00:00 2001 From: Luuk de Gram Date: Wed, 1 Feb 2023 18:55:35 +0100 Subject: [PATCH 36/65] link: make Wasm atoms fully owned by the linker --- src/Module.zig | 6 +- src/Sema.zig | 2 +- src/arch/wasm/CodeGen.zig | 30 +- src/arch/wasm/Emit.zig | 29 +- src/link.zig | 4 +- src/link/Dwarf.zig | 25 +- src/link/Wasm.zig | 520 ++++++++++++++------------- src/link/Wasm/Atom.zig | 44 ++- src/link/Wasm/Object.zig | 15 +- test/link/wasm/export-data/build.zig | 4 +- 10 files changed, 353 insertions(+), 326 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index bfeeea51e8..f84d720d1f 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -5266,7 +5266,7 @@ pub fn clearDecl( .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, - .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, + .wasm => .{ .wasm = {} }, .spirv => .{ .spirv = {} }, .nvptx => .{ .nvptx = {} }, }; @@ -5374,7 +5374,7 @@ fn deleteDeclExports(mod: *Module, decl_index: Decl.Index) Allocator.Error!void try macho.deleteDeclExport(decl_index, exp.options.name); } if (mod.comp.bin_file.cast(link.File.Wasm)) |wasm| { - wasm.deleteExport(exp.link.wasm); + wasm.deleteDeclExport(decl_index); } if (mod.comp.bin_file.cast(link.File.Coff)) |coff| { coff.deleteDeclExport(decl_index, exp.options.name); @@ -5686,7 +5686,7 @@ pub fn allocateNewDecl( .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, - .wasm => .{ .wasm = link.File.Wasm.DeclBlock.empty }, + .wasm => .{ .wasm = {} }, .spirv => .{ .spirv = {} }, .nvptx => .{ .nvptx = {} }, }, diff --git a/src/Sema.zig b/src/Sema.zig index e54bfc7bd9..4871961753 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5570,7 +5570,7 @@ pub fn analyzeExport( .macho => .{ .macho = {} }, .plan9 => .{ .plan9 = {} }, .c => .{ .c = {} }, - .wasm => .{ .wasm = .{} }, + .wasm => .{ .wasm = {} }, .spirv => .{ .spirv = {} }, .nvptx => .{ .nvptx = {} }, }, diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 8212d281e5..8559a728e5 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -1269,10 +1269,10 @@ fn genFunc(func: *CodeGen) InnerError!void { var emit: Emit = .{ .mir = mir, - .bin_file = &func.bin_file.base, + .bin_file = func.bin_file, .code = func.code, .locals = func.locals.items, - .decl = func.decl, + .decl_index = func.decl_index, .dbg_output = func.debug_output, .prev_di_line = 0, .prev_di_column = 0, @@ -2115,21 +2115,20 @@ fn airCall(func: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModif const fn_info = fn_ty.fnInfo(); const first_param_sret = firstParamSRet(fn_info.cc, fn_info.return_type, func.target); - const callee: ?*Decl = blk: { + const callee: ?Decl.Index = blk: { const func_val = func.air.value(pl_op.operand) orelse break :blk null; const module = func.bin_file.base.options.module.?; if (func_val.castTag(.function)) |function| { - const decl = module.declPtr(function.data.owner_decl); - try decl.link.wasm.ensureInitialized(func.bin_file); - break :blk decl; + _ = try func.bin_file.getOrCreateAtomForDecl(function.data.owner_decl); + break :blk function.data.owner_decl; } else if (func_val.castTag(.extern_fn)) |extern_fn| { const ext_decl = module.declPtr(extern_fn.data.owner_decl); const ext_info = ext_decl.ty.fnInfo(); var func_type = try genFunctype(func.gpa, ext_info.cc, ext_info.param_types, ext_info.return_type, func.target); defer func_type.deinit(func.gpa); - const atom = &ext_decl.link.wasm; - try atom.ensureInitialized(func.bin_file); + const atom_index = try func.bin_file.getOrCreateAtomForDecl(extern_fn.data.owner_decl); + const atom = func.bin_file.getAtomPtr(atom_index); ext_decl.fn_link.wasm.type_index = try func.bin_file.putOrGetFuncType(func_type); try func.bin_file.addOrUpdateImport( mem.sliceTo(ext_decl.name, 0), @@ -2137,11 +2136,10 @@ fn airCall(func: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModif ext_decl.getExternFn().?.lib_name, ext_decl.fn_link.wasm.type_index, ); - break :blk ext_decl; + break :blk extern_fn.data.owner_decl; } else if (func_val.castTag(.decl_ref)) |decl_ref| { - const decl = module.declPtr(decl_ref.data); - try decl.link.wasm.ensureInitialized(func.bin_file); - break :blk decl; + _ = try func.bin_file.getOrCreateAtomForDecl(decl_ref.data); + break :blk decl_ref.data; } return func.fail("Expected a function, but instead found type '{}'", .{func_val.tag()}); }; @@ -2162,7 +2160,8 @@ fn airCall(func: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModif } if (callee) |direct| { - try func.addLabel(.call, direct.link.wasm.sym_index); + const atom_index = func.bin_file.decls.get(direct).?; + try func.addLabel(.call, func.bin_file.getAtom(atom_index).sym_index); } else { // in this case we call a function pointer // so load its value onto the stack @@ -2758,9 +2757,10 @@ fn lowerDeclRefValue(func: *CodeGen, tv: TypedValue, decl_index: Module.Decl.Ind } module.markDeclAlive(decl); - try decl.link.wasm.ensureInitialized(func.bin_file); + const atom_index = try func.bin_file.getOrCreateAtomForDecl(decl_index); + const atom = func.bin_file.getAtom(atom_index); - const target_sym_index = decl.link.wasm.sym_index; + const target_sym_index = atom.sym_index; if (decl.ty.zigTypeTag() == .Fn) { try func.bin_file.addTableFunction(target_sym_index); return WValue{ .function_index = target_sym_index }; diff --git a/src/arch/wasm/Emit.zig b/src/arch/wasm/Emit.zig index 71d21d2797..a340ac5da8 100644 --- a/src/arch/wasm/Emit.zig +++ b/src/arch/wasm/Emit.zig @@ -11,8 +11,8 @@ const leb128 = std.leb; /// Contains our list of instructions mir: Mir, -/// Reference to the file handler -bin_file: *link.File, +/// Reference to the Wasm module linker +bin_file: *link.File.Wasm, /// Possible error message. When set, the value is allocated and /// must be freed manually. error_msg: ?*Module.ErrorMsg = null, @@ -21,7 +21,7 @@ code: *std.ArrayList(u8), /// List of allocated locals. locals: []const u8, /// The declaration that code is being generated for. -decl: *Module.Decl, +decl_index: Module.Decl.Index, // Debug information /// Holds the debug information for this emission @@ -252,8 +252,8 @@ fn offset(self: Emit) u32 { fn fail(emit: *Emit, comptime format: []const u8, args: anytype) InnerError { @setCold(true); std.debug.assert(emit.error_msg == null); - // TODO: Determine the source location. - emit.error_msg = try Module.ErrorMsg.create(emit.bin_file.allocator, emit.decl.srcLoc(), format, args); + const mod = emit.bin_file.base.options.module.?; + emit.error_msg = try Module.ErrorMsg.create(emit.bin_file.base.allocator, mod.declPtr(emit.decl_index).srcLoc(), format, args); return error.EmitFail; } @@ -304,8 +304,9 @@ fn emitGlobal(emit: *Emit, tag: Mir.Inst.Tag, inst: Mir.Inst.Index) !void { const global_offset = emit.offset(); try emit.code.appendSlice(&buf); - // globals can have index 0 as it represents the stack pointer - try emit.decl.link.wasm.relocs.append(emit.bin_file.allocator, .{ + const atom_index = emit.bin_file.decls.get(emit.decl_index).?; + const atom = emit.bin_file.getAtomPtr(atom_index); + try atom.relocs.append(emit.bin_file.base.allocator, .{ .index = label, .offset = global_offset, .relocation_type = .R_WASM_GLOBAL_INDEX_LEB, @@ -361,7 +362,9 @@ fn emitCall(emit: *Emit, inst: Mir.Inst.Index) !void { try emit.code.appendSlice(&buf); if (label != 0) { - try emit.decl.link.wasm.relocs.append(emit.bin_file.allocator, .{ + const atom_index = emit.bin_file.decls.get(emit.decl_index).?; + const atom = emit.bin_file.getAtomPtr(atom_index); + try atom.relocs.append(emit.bin_file.base.allocator, .{ .offset = call_offset, .index = label, .relocation_type = .R_WASM_FUNCTION_INDEX_LEB, @@ -387,7 +390,9 @@ fn emitFunctionIndex(emit: *Emit, inst: Mir.Inst.Index) !void { try emit.code.appendSlice(&buf); if (symbol_index != 0) { - try emit.decl.link.wasm.relocs.append(emit.bin_file.allocator, .{ + const atom_index = emit.bin_file.decls.get(emit.decl_index).?; + const atom = emit.bin_file.getAtomPtr(atom_index); + try atom.relocs.append(emit.bin_file.base.allocator, .{ .offset = index_offset, .index = symbol_index, .relocation_type = .R_WASM_TABLE_INDEX_SLEB, @@ -399,7 +404,7 @@ fn emitMemAddress(emit: *Emit, inst: Mir.Inst.Index) !void { const extra_index = emit.mir.instructions.items(.data)[inst].payload; const mem = emit.mir.extraData(Mir.Memory, extra_index).data; const mem_offset = emit.offset() + 1; - const is_wasm32 = emit.bin_file.options.target.cpu.arch == .wasm32; + const is_wasm32 = emit.bin_file.base.options.target.cpu.arch == .wasm32; if (is_wasm32) { try emit.code.append(std.wasm.opcode(.i32_const)); var buf: [5]u8 = undefined; @@ -413,7 +418,9 @@ fn emitMemAddress(emit: *Emit, inst: Mir.Inst.Index) !void { } if (mem.pointer != 0) { - try emit.decl.link.wasm.relocs.append(emit.bin_file.allocator, .{ + const atom_index = emit.bin_file.decls.get(emit.decl_index).?; + const atom = emit.bin_file.getAtomPtr(atom_index); + try atom.relocs.append(emit.bin_file.base.allocator, .{ .offset = mem_offset, .index = mem.pointer, .relocation_type = if (is_wasm32) .R_WASM_MEMORY_ADDR_LEB else .R_WASM_MEMORY_ADDR_LEB64, diff --git a/src/link.zig b/src/link.zig index 450a008cea..0a3226f004 100644 --- a/src/link.zig +++ b/src/link.zig @@ -267,7 +267,7 @@ pub const File = struct { macho: void, plan9: void, c: void, - wasm: Wasm.DeclBlock, + wasm: void, spirv: void, nvptx: void, }; @@ -289,7 +289,7 @@ pub const File = struct { macho: void, plan9: void, c: void, - wasm: Wasm.Export, + wasm: void, spirv: void, nvptx: void, }; diff --git a/src/link/Dwarf.zig b/src/link/Dwarf.zig index e90db2d0df..a3d0aa8a53 100644 --- a/src/link/Dwarf.zig +++ b/src/link/Dwarf.zig @@ -1099,7 +1099,7 @@ pub fn commitDeclState( }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_line = wasm_file.debug_line_atom.?.code; + const debug_line = wasm_file.getAtomPtr(wasm_file.debug_line_atom.?).code; writeDbgLineNopsBuffered(debug_line.items, src_fn.off, 0, &.{}, src_fn.len); }, else => unreachable, @@ -1177,7 +1177,7 @@ pub fn commitDeclState( .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const atom = wasm_file.debug_line_atom.?; + const atom = wasm_file.getAtomPtr(wasm_file.debug_line_atom.?); const debug_line = &atom.code; const segment_size = debug_line.items.len; if (needed_size != segment_size) { @@ -1345,7 +1345,8 @@ fn updateDeclDebugInfoAllocation(self: *Dwarf, atom_index: Atom.Index, len: u32) }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_info = &wasm_file.debug_info_atom.?.code; + const debug_info_index = wasm_file.debug_info_atom.?; + const debug_info = &wasm_file.getAtomPtr(debug_info_index).code; try writeDbgInfoNopsToArrayList(gpa, debug_info, atom.off, 0, &.{0}, atom.len, false); }, else => unreachable, @@ -1441,7 +1442,7 @@ fn writeDeclDebugInfo(self: *Dwarf, atom_index: Atom.Index, dbg_info_buf: []cons .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; const info_atom = wasm_file.debug_info_atom.?; - const debug_info = &info_atom.code; + const debug_info = &wasm_file.getAtomPtr(info_atom).code; const segment_size = debug_info.items.len; if (needed_size != segment_size) { log.debug(" needed size does not equal allocated size: {d}", .{needed_size}); @@ -1504,8 +1505,8 @@ pub fn updateDeclLineNumber(self: *Dwarf, module: *Module, decl_index: Module.De .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; const offset = atom.off + self.getRelocDbgLineOff(); - const atom_ = wasm_file.debug_line_atom.?; - mem.copy(u8, atom_.code.items[offset..], &data); + const line_atom_index = wasm_file.debug_line_atom.?; + mem.copy(u8, wasm_file.getAtomPtr(line_atom_index).code.items[offset..], &data); }, else => unreachable, } @@ -1722,7 +1723,7 @@ pub fn writeDbgAbbrev(self: *Dwarf) !void { }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_abbrev = &wasm_file.debug_abbrev_atom.?.code; + const debug_abbrev = &wasm_file.getAtomPtr(wasm_file.debug_abbrev_atom.?).code; try debug_abbrev.resize(wasm_file.base.allocator, needed_size); mem.copy(u8, debug_abbrev.items, &abbrev_buf); }, @@ -1835,7 +1836,7 @@ pub fn writeDbgInfoHeader(self: *Dwarf, module: *Module, low_pc: u64, high_pc: u }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_info = &wasm_file.debug_info_atom.?.code; + const debug_info = &wasm_file.getAtomPtr(wasm_file.debug_info_atom.?).code; try writeDbgInfoNopsToArrayList(self.allocator, debug_info, 0, 0, di_buf.items, jmp_amt, false); }, else => unreachable, @@ -2156,7 +2157,7 @@ pub fn writeDbgAranges(self: *Dwarf, addr: u64, size: u64) !void { }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_ranges = &wasm_file.debug_ranges_atom.?.code; + const debug_ranges = &wasm_file.getAtomPtr(wasm_file.debug_ranges_atom.?).code; try debug_ranges.resize(wasm_file.base.allocator, needed_size); mem.copy(u8, debug_ranges.items, di_buf.items); }, @@ -2330,7 +2331,7 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_line = &wasm_file.debug_line_atom.?.code; + const debug_line = &wasm_file.getAtomPtr(wasm_file.debug_line_atom.?).code; mem.copy(u8, buffer, debug_line.items[first_fn.off..]); try debug_line.resize(self.allocator, debug_line.items.len + delta); mem.copy(u8, debug_line.items[first_fn.off + delta ..], buffer); @@ -2381,7 +2382,7 @@ pub fn writeDbgLineHeader(self: *Dwarf) !void { }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_line = wasm_file.debug_line_atom.?.code; + const debug_line = &wasm_file.getAtomPtr(wasm_file.debug_line_atom.?).code; writeDbgLineNopsBuffered(debug_line.items, 0, 0, di_buf.items, jmp_amt); }, else => unreachable, @@ -2526,7 +2527,7 @@ pub fn flushModule(self: *Dwarf, module: *Module) !void { }, .wasm => { const wasm_file = self.bin_file.cast(File.Wasm).?; - const debug_info = wasm_file.debug_info_atom.?.code; + const debug_info = wasm_file.getAtomPtr(wasm_file.debug_info_atom.?).code; mem.copy(u8, debug_info.items[atom.off + reloc.offset ..], &buf); }, else => unreachable, diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index ee4518796e..b06703ed61 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -9,7 +9,7 @@ const fs = std.fs; const leb = std.leb; const log = std.log.scoped(.link); -const Atom = @import("Wasm/Atom.zig"); +pub const Atom = @import("Wasm/Atom.zig"); const Dwarf = @import("Dwarf.zig"); const Module = @import("../Module.zig"); const Compilation = @import("../Compilation.zig"); @@ -31,10 +31,7 @@ const Object = @import("Wasm/Object.zig"); const Archive = @import("Wasm/Archive.zig"); const types = @import("Wasm/types.zig"); -pub const base_tag = link.File.Tag.wasm; - -/// deprecated: Use `@import("Wasm/Atom.zig");` -pub const DeclBlock = Atom; +pub const base_tag: link.File.Tag = .wasm; base: link.File, /// Output name of the file @@ -47,18 +44,16 @@ llvm_object: ?*LlvmObject = null, /// TODO: Allow setting this through a flag? host_name: []const u8 = "env", /// List of all `Decl` that are currently alive. -/// This is ment for bookkeeping so we can safely cleanup all codegen memory -/// when calling `deinit` -decls: std.AutoHashMapUnmanaged(Module.Decl.Index, void) = .{}, +/// Each index maps to the corresponding `Atom.Index`. +decls: std.AutoHashMapUnmanaged(Module.Decl.Index, Atom.Index) = .{}, /// List of all symbols generated by Zig code. symbols: std.ArrayListUnmanaged(Symbol) = .{}, /// List of symbol indexes which are free to be used. symbols_free_list: std.ArrayListUnmanaged(u32) = .{}, /// Maps atoms to their segment index -atoms: std.AutoHashMapUnmanaged(u32, *Atom) = .{}, -/// Atoms managed and created by the linker. This contains atoms -/// from object files, and not Atoms generated by a Decl. -managed_atoms: std.ArrayListUnmanaged(*Atom) = .{}, +atoms: std.AutoHashMapUnmanaged(u32, Atom.Index) = .{}, +/// List of all atoms. +managed_atoms: std.ArrayListUnmanaged(Atom) = .{}, /// Represents the index into `segments` where the 'code' section /// lives. code_section_index: ?u32 = null, @@ -148,7 +143,7 @@ undefs: std.StringArrayHashMapUnmanaged(SymbolLoc) = .{}, /// Maps a symbol's location to an atom. This can be used to find meta /// data of a symbol, such as its size, or its offset to perform a relocation. /// Undefined (and synthetic) symbols do not have an Atom and therefore cannot be mapped. -symbol_atom: std.AutoHashMapUnmanaged(SymbolLoc, *Atom) = .{}, +symbol_atom: std.AutoHashMapUnmanaged(SymbolLoc, Atom.Index) = .{}, /// Maps a symbol's location to its export name, which may differ from the decl's name /// which does the exporting. /// Note: The value represents the offset into the string table, rather than the actual string. @@ -165,14 +160,14 @@ error_table_symbol: ?u32 = null, // unit contains Zig code. The lifetime of these atoms are extended // until the end of the compiler's lifetime. Meaning they're not freed // during `flush()` in incremental-mode. -debug_info_atom: ?*Atom = null, -debug_line_atom: ?*Atom = null, -debug_loc_atom: ?*Atom = null, -debug_ranges_atom: ?*Atom = null, -debug_abbrev_atom: ?*Atom = null, -debug_str_atom: ?*Atom = null, -debug_pubnames_atom: ?*Atom = null, -debug_pubtypes_atom: ?*Atom = null, +debug_info_atom: ?Atom.Index = null, +debug_line_atom: ?Atom.Index = null, +debug_loc_atom: ?Atom.Index = null, +debug_ranges_atom: ?Atom.Index = null, +debug_abbrev_atom: ?Atom.Index = null, +debug_str_atom: ?Atom.Index = null, +debug_pubnames_atom: ?Atom.Index = null, +debug_pubtypes_atom: ?Atom.Index = null, pub const Segment = struct { alignment: u32, @@ -430,10 +425,10 @@ pub fn openPath(allocator: Allocator, sub_path: []const u8, options: link.Option // at the end during `initializeCallCtorsFunction`. } - if (!options.strip and options.module != null) { - wasm_bin.dwarf = Dwarf.init(allocator, &wasm_bin.base, options.target); - try wasm_bin.initDebugSections(); - } + // if (!options.strip and options.module != null) { + // wasm_bin.dwarf = Dwarf.init(allocator, &wasm_bin.base, options.target); + // try wasm_bin.initDebugSections(); + // } return wasm_bin; } @@ -474,6 +469,7 @@ fn createSyntheticSymbol(wasm: *Wasm, name: []const u8, tag: Symbol.Tag) !Symbol try wasm.globals.put(wasm.base.allocator, name_offset, loc); return loc; } + /// Initializes symbols and atoms for the debug sections /// Initialization is only done when compiling Zig code. /// When Zig is invoked as a linker instead, the atoms @@ -516,6 +512,36 @@ fn parseObjectFile(wasm: *Wasm, path: []const u8) !bool { return true; } +/// For a given `Module.Decl.Index` returns its corresponding `Atom.Index`. +/// When the index was not found, a new `Atom` will be created, and its index will be returned. +/// The newly created Atom is empty with default fields as specified by `Atom.empty`. +pub fn getOrCreateAtomForDecl(wasm: *Wasm, decl_index: Module.Decl.Index) !Atom.Index { + const gop = try wasm.decls.getOrPut(wasm.base.allocator, decl_index); + if (!gop.found_existing) { + gop.value_ptr.* = try wasm.createAtom(); + } + return gop.value_ptr.*; +} + +/// Creates a new empty `Atom` and returns its `Atom.Index` +fn createAtom(wasm: *Wasm) !Atom.Index { + const index = @intCast(Atom.Index, wasm.managed_atoms.items.len); + const atom = try wasm.managed_atoms.addOne(wasm.base.allocator); + atom.* = Atom.empty; + atom.sym_index = try wasm.allocateSymbol(); + try wasm.symbol_atom.putNoClobber(wasm.base.allocator, .{ .file = null, .index = atom.sym_index }, index); + + return index; +} + +pub inline fn getAtom(wasm: *const Wasm, index: Atom.Index) Atom { + return wasm.managed_atoms.items[index]; +} + +pub inline fn getAtomPtr(wasm: *Wasm, index: Atom.Index) *Atom { + return &wasm.managed_atoms.items[index]; +} + /// Parses an archive file and will then parse each object file /// that was found in the archive file. /// Returns false when the file is not an archive file. @@ -857,15 +883,16 @@ fn resolveLazySymbols(wasm: *Wasm) !void { try wasm.discarded.putNoClobber(wasm.base.allocator, kv.value, loc); _ = wasm.resolved_symbols.swapRemove(loc); // we don't want to emit this symbol, only use it for relocations. - const atom = try wasm.base.allocator.create(Atom); - errdefer wasm.base.allocator.destroy(atom); - try wasm.managed_atoms.append(wasm.base.allocator, atom); + // TODO: Can we use `createAtom` here while also re-using the symbol + // from `createSyntheticSymbol`. + const atom_index = @intCast(Atom.Index, wasm.managed_atoms.items.len); + const atom = try wasm.managed_atoms.addOne(wasm.base.allocator); atom.* = Atom.empty; atom.sym_index = loc.index; atom.alignment = 1; - try wasm.parseAtom(atom, .{ .data = .synthetic }); - try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom); + try wasm.parseAtom(atom_index, .{ .data = .synthetic }); + try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom_index); } if (wasm.undefs.fetchSwapRemove("__heap_end")) |kv| { @@ -873,15 +900,14 @@ fn resolveLazySymbols(wasm: *Wasm) !void { try wasm.discarded.putNoClobber(wasm.base.allocator, kv.value, loc); _ = wasm.resolved_symbols.swapRemove(loc); - const atom = try wasm.base.allocator.create(Atom); - errdefer wasm.base.allocator.destroy(atom); - try wasm.managed_atoms.append(wasm.base.allocator, atom); + const atom_index = @intCast(Atom.Index, wasm.managed_atoms.items.len); + const atom = try wasm.managed_atoms.addOne(wasm.base.allocator); atom.* = Atom.empty; atom.sym_index = loc.index; atom.alignment = 1; - try wasm.parseAtom(atom, .{ .data = .synthetic }); - try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom); + try wasm.parseAtom(atom_index, .{ .data = .synthetic }); + try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom_index); } } @@ -920,16 +946,6 @@ pub fn deinit(wasm: *Wasm) void { if (wasm.llvm_object) |llvm_object| llvm_object.destroy(gpa); } - if (wasm.base.options.module) |mod| { - var decl_it = wasm.decls.keyIterator(); - while (decl_it.next()) |decl_index_ptr| { - const decl = mod.declPtr(decl_index_ptr.*); - decl.link.wasm.deinit(gpa); - } - } else { - assert(wasm.decls.count() == 0); - } - for (wasm.func_types.items) |*func_type| { func_type.deinit(gpa); } @@ -954,9 +970,8 @@ pub fn deinit(wasm: *Wasm) void { wasm.symbol_atom.deinit(gpa); wasm.export_names.deinit(gpa); wasm.atoms.deinit(gpa); - for (wasm.managed_atoms.items) |managed_atom| { - managed_atom.deinit(gpa); - gpa.destroy(managed_atom); + for (wasm.managed_atoms.items) |*managed_atom| { + managed_atom.deinit(wasm); } wasm.managed_atoms.deinit(gpa); wasm.segments.deinit(gpa); @@ -1014,18 +1029,24 @@ pub fn updateFunc(wasm: *Wasm, mod: *Module, func: *Module.Fn, air: Air, livenes const decl_index = func.owner_decl; const decl = mod.declPtr(decl_index); - const atom = &decl.link.wasm; - try atom.ensureInitialized(wasm); - const gop = try wasm.decls.getOrPut(wasm.base.allocator, decl_index); - if (gop.found_existing) { - atom.clear(); - } else gop.value_ptr.* = {}; + const atom_index = try wasm.getOrCreateAtomForDecl(decl_index); + const atom = wasm.getAtomPtr(atom_index); + atom.clear(); - var decl_state: ?Dwarf.DeclState = if (wasm.dwarf) |*dwarf| try dwarf.initDeclState(mod, decl_index) else null; - defer if (decl_state) |*ds| ds.deinit(); + // var decl_state: ?Dwarf.DeclState = if (wasm.dwarf) |*dwarf| try dwarf.initDeclState(mod, decl_index) else null; + // defer if (decl_state) |*ds| ds.deinit(); var code_writer = std.ArrayList(u8).init(wasm.base.allocator); defer code_writer.deinit(); + // const result = try codegen.generateFunction( + // &wasm.base, + // decl.srcLoc(), + // func, + // air, + // liveness, + // &code_writer, + // if (decl_state) |*ds| .{ .dwarf = ds } else .none, + // ); const result = try codegen.generateFunction( &wasm.base, decl.srcLoc(), @@ -1033,7 +1054,7 @@ pub fn updateFunc(wasm: *Wasm, mod: *Module, func: *Module.Fn, air: Air, livenes air, liveness, &code_writer, - if (decl_state) |*ds| .{ .dwarf = ds } else .none, + .none, ); const code = switch (result) { @@ -1045,19 +1066,19 @@ pub fn updateFunc(wasm: *Wasm, mod: *Module, func: *Module.Fn, air: Air, livenes }, }; - if (wasm.dwarf) |*dwarf| { - try dwarf.commitDeclState( - mod, - decl_index, - // Actual value will be written after relocation. - // For Wasm, this is the offset relative to the code section - // which isn't known until flush(). - 0, - code.len, - &decl_state.?, - ); - } - return wasm.finishUpdateDecl(decl, code); + // if (wasm.dwarf) |*dwarf| { + // try dwarf.commitDeclState( + // mod, + // decl_index, + // // Actual value will be written after relocation. + // // For Wasm, this is the offset relative to the code section + // // which isn't known until flush(). + // 0, + // code.len, + // &decl_state.?, + // ); + // } + return wasm.finishUpdateDecl(decl_index, code); } // Generate code for the Decl, storing it in memory to be later written to @@ -1080,17 +1101,14 @@ pub fn updateDecl(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !voi return; } - const atom = &decl.link.wasm; - try atom.ensureInitialized(wasm); - const gop = try wasm.decls.getOrPut(wasm.base.allocator, decl_index); - if (gop.found_existing) { - atom.clear(); - } else gop.value_ptr.* = {}; + const atom_index = try wasm.getOrCreateAtomForDecl(decl_index); + const atom = wasm.getAtomPtr(atom_index); + atom.clear(); if (decl.isExtern()) { const variable = decl.getVariable().?; const name = mem.sliceTo(decl.name, 0); - return wasm.addOrUpdateImport(name, decl.link.wasm.sym_index, variable.lib_name, null); + return wasm.addOrUpdateImport(name, atom.sym_index, variable.lib_name, null); } const val = if (decl.val.castTag(.variable)) |payload| payload.data.init else decl.val; @@ -1103,7 +1121,7 @@ pub fn updateDecl(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !voi .{ .ty = decl.ty, .val = val }, &code_writer, .none, - .{ .parent_atom_index = decl.link.wasm.sym_index }, + .{ .parent_atom_index = atom.sym_index }, ); const code = switch (res) { @@ -1115,7 +1133,7 @@ pub fn updateDecl(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !voi }, }; - return wasm.finishUpdateDecl(decl, code); + return wasm.finishUpdateDecl(decl_index, code); } pub fn updateDeclLineNumber(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.Index) !void { @@ -1133,9 +1151,11 @@ pub fn updateDeclLineNumber(wasm: *Wasm, mod: *Module, decl_index: Module.Decl.I } } -fn finishUpdateDecl(wasm: *Wasm, decl: *Module.Decl, code: []const u8) !void { +fn finishUpdateDecl(wasm: *Wasm, decl_index: Module.Decl.Index, code: []const u8) !void { const mod = wasm.base.options.module.?; - const atom: *Atom = &decl.link.wasm; + const decl = mod.declPtr(decl_index); + const atom_index = wasm.decls.get(decl_index).?; + const atom = wasm.getAtomPtr(atom_index); const symbol = &wasm.symbols.items[atom.sym_index]; const full_name = try decl.getFullyQualifiedName(mod); defer wasm.base.allocator.free(full_name); @@ -1201,48 +1221,51 @@ pub fn lowerUnnamedConst(wasm: *Wasm, tv: TypedValue, decl_index: Module.Decl.In const decl = mod.declPtr(decl_index); // Create and initialize a new local symbol and atom - const local_index = decl.link.wasm.locals.items.len; + const atom_index = try wasm.createAtom(); + const parent_atom_index = try wasm.getOrCreateAtomForDecl(decl_index); + const parent_atom = wasm.getAtomPtr(parent_atom_index); + const local_index = parent_atom.locals.items.len; + try parent_atom.locals.append(wasm.base.allocator, atom_index); const fqdn = try decl.getFullyQualifiedName(mod); defer wasm.base.allocator.free(fqdn); const name = try std.fmt.allocPrintZ(wasm.base.allocator, "__unnamed_{s}_{d}", .{ fqdn, local_index }); defer wasm.base.allocator.free(name); - - const atom = try decl.link.wasm.locals.addOne(wasm.base.allocator); - atom.* = Atom.empty; - try atom.ensureInitialized(wasm); - atom.alignment = tv.ty.abiAlignment(wasm.base.options.target); - wasm.symbols.items[atom.sym_index] = .{ - .name = try wasm.string_table.put(wasm.base.allocator, name), - .flags = @enumToInt(Symbol.Flag.WASM_SYM_BINDING_LOCAL), - .tag = .data, - .index = undefined, - }; - - try wasm.resolved_symbols.putNoClobber(wasm.base.allocator, atom.symbolLoc(), {}); - var value_bytes = std.ArrayList(u8).init(wasm.base.allocator); defer value_bytes.deinit(); - const result = try codegen.generateSymbol( - &wasm.base, - decl.srcLoc(), - tv, - &value_bytes, - .none, - .{ - .parent_atom_index = atom.sym_index, - .addend = null, - }, - ); - const code = switch (result) { - .ok => value_bytes.items, - .fail => |em| { - decl.analysis = .codegen_failure; - try mod.failed_decls.put(mod.gpa, decl_index, em); - return error.AnalysisFail; - }, + const code = code: { + const atom = wasm.getAtomPtr(atom_index); + atom.alignment = tv.ty.abiAlignment(wasm.base.options.target); + wasm.symbols.items[atom.sym_index] = .{ + .name = try wasm.string_table.put(wasm.base.allocator, name), + .flags = @enumToInt(Symbol.Flag.WASM_SYM_BINDING_LOCAL), + .tag = .data, + .index = undefined, + }; + try wasm.resolved_symbols.putNoClobber(wasm.base.allocator, atom.symbolLoc(), {}); + + const result = try codegen.generateSymbol( + &wasm.base, + decl.srcLoc(), + tv, + &value_bytes, + .none, + .{ + .parent_atom_index = atom.sym_index, + .addend = null, + }, + ); + break :code switch (result) { + .ok => value_bytes.items, + .fail => |em| { + decl.analysis = .codegen_failure; + try mod.failed_decls.put(mod.gpa, decl_index, em); + return error.AnalysisFail; + }, + }; }; + const atom = wasm.getAtomPtr(atom_index); atom.size = @intCast(u32, code.len); try atom.code.appendSlice(wasm.base.allocator, code); return atom.sym_index; @@ -1290,10 +1313,13 @@ pub fn getDeclVAddr( ) !u64 { const mod = wasm.base.options.module.?; const decl = mod.declPtr(decl_index); - try decl.link.wasm.ensureInitialized(wasm); - const target_symbol_index = decl.link.wasm.sym_index; + + const target_atom_index = try wasm.getOrCreateAtomForDecl(decl_index); + const target_symbol_index = wasm.getAtom(target_atom_index).sym_index; + assert(reloc_info.parent_atom_index != 0); - const atom = wasm.symbol_atom.get(.{ .file = null, .index = reloc_info.parent_atom_index }).?; + const atom_index = wasm.symbol_atom.get(.{ .file = null, .index = reloc_info.parent_atom_index }).?; + const atom = wasm.getAtomPtr(atom_index); const is_wasm32 = wasm.base.options.target.cpu.arch == .wasm32; if (decl.ty.zigTypeTag() == .Fn) { assert(reloc_info.addend == 0); // addend not allowed for function relocations @@ -1321,9 +1347,10 @@ pub fn getDeclVAddr( return target_symbol_index; } -pub fn deleteExport(wasm: *Wasm, exp: Export) void { +pub fn deleteDeclExport(wasm: *Wasm, decl_index: Module.Decl.Index) void { if (wasm.llvm_object) |_| return; - const sym_index = exp.sym_index orelse return; + const atom_index = wasm.decls.get(decl_index) orelse return; + const sym_index = wasm.getAtom(atom_index).sym_index; const loc: SymbolLoc = .{ .file = null, .index = sym_index }; const symbol = loc.getSymbol(wasm); const symbol_name = wasm.string_table.get(symbol.name); @@ -1349,7 +1376,8 @@ pub fn updateDeclExports( } const decl = mod.declPtr(decl_index); - if (decl.link.wasm.getSymbolIndex() == null) return; // unititialized + const atom_index = try wasm.getOrCreateAtomForDecl(decl_index); + const atom = wasm.getAtom(atom_index); for (exports) |exp| { if (exp.options.section) |section| { @@ -1364,7 +1392,7 @@ pub fn updateDeclExports( const export_name = try wasm.string_table.put(wasm.base.allocator, exp.options.name); if (wasm.globals.getPtr(export_name)) |existing_loc| { - if (existing_loc.index == decl.link.wasm.sym_index) continue; + if (existing_loc.index == atom.sym_index) continue; const existing_sym: Symbol = existing_loc.getSymbol(wasm).*; const exp_is_weak = exp.options.linkage == .Internal or exp.options.linkage == .Weak; @@ -1385,15 +1413,16 @@ pub fn updateDeclExports( } else if (exp_is_weak) { continue; // to-be-exported symbol is weak, so we keep the existing symbol } else { - existing_loc.index = decl.link.wasm.sym_index; + // TODO: Revisit this, why was this needed? + existing_loc.index = atom.sym_index; existing_loc.file = null; - exp.link.wasm.sym_index = existing_loc.index; + // exp.link.wasm.sym_index = existing_loc.index; } } - const exported_decl = mod.declPtr(exp.exported_decl); - const sym_index = exported_decl.link.wasm.sym_index; - const sym_loc = exported_decl.link.wasm.symbolLoc(); + const exported_atom_index = try wasm.getOrCreateAtomForDecl(exp.exported_decl); + const exported_atom = wasm.getAtom(exported_atom_index); + const sym_loc = exported_atom.symbolLoc(); const symbol = sym_loc.getSymbol(wasm); switch (exp.options.linkage) { .Internal => { @@ -1429,7 +1458,6 @@ pub fn updateDeclExports( // if the symbol was previously undefined, remove it as an import _ = wasm.imports.remove(sym_loc); _ = wasm.undefs.swapRemove(exp.options.name); - exp.link.wasm.sym_index = sym_index; } } @@ -1439,11 +1467,13 @@ pub fn freeDecl(wasm: *Wasm, decl_index: Module.Decl.Index) void { } const mod = wasm.base.options.module.?; const decl = mod.declPtr(decl_index); - const atom = &decl.link.wasm; + const atom_index = wasm.decls.get(decl_index).?; + const atom = wasm.getAtomPtr(atom_index); wasm.symbols_free_list.append(wasm.base.allocator, atom.sym_index) catch {}; _ = wasm.decls.remove(decl_index); wasm.symbols.items[atom.sym_index].tag = .dead; - for (atom.locals.items) |local_atom| { + for (atom.locals.items) |local_atom_index| { + const local_atom = wasm.getAtom(local_atom_index); const local_symbol = &wasm.symbols.items[local_atom.sym_index]; local_symbol.tag = .dead; // also for any local symbol wasm.symbols_free_list.append(wasm.base.allocator, local_atom.sym_index) catch {}; @@ -1461,7 +1491,16 @@ pub fn freeDecl(wasm: *Wasm, decl_index: Module.Decl.Index) void { // dwarf.freeDecl(decl_index); // } - atom.deinit(wasm.base.allocator); + if (atom.next) |next_atom_index| { + const next_atom = wasm.getAtomPtr(next_atom_index); + next_atom.prev = atom.prev; + atom.next = null; + } + if (atom.prev) |prev_index| { + const prev_atom = wasm.getAtomPtr(prev_index); + prev_atom.next = atom.next; + atom.prev = null; + } } /// Appends a new entry to the indirect function table @@ -1583,7 +1622,8 @@ const Kind = union(enum) { }; /// Parses an Atom and inserts its metadata into the corresponding sections. -fn parseAtom(wasm: *Wasm, atom: *Atom, kind: Kind) !void { +fn parseAtom(wasm: *Wasm, atom_index: Atom.Index, kind: Kind) !void { + const atom = wasm.getAtomPtr(atom_index); const symbol = (SymbolLoc{ .file = null, .index = atom.sym_index }).getSymbol(wasm); const final_index: u32 = switch (kind) { .function => |fn_data| result: { @@ -1658,18 +1698,20 @@ fn parseAtom(wasm: *Wasm, atom: *Atom, kind: Kind) !void { const segment: *Segment = &wasm.segments.items[final_index]; segment.alignment = std.math.max(segment.alignment, atom.alignment); - try wasm.appendAtomAtIndex(final_index, atom); + try wasm.appendAtomAtIndex(final_index, atom_index); } /// From a given index, append the given `Atom` at the back of the linked list. /// Simply inserts it into the map of atoms when it doesn't exist yet. -pub fn appendAtomAtIndex(wasm: *Wasm, index: u32, atom: *Atom) !void { - if (wasm.atoms.getPtr(index)) |last| { - last.*.next = atom; - atom.prev = last.*; - last.* = atom; +pub fn appendAtomAtIndex(wasm: *Wasm, index: u32, atom_index: Atom.Index) !void { + const atom = wasm.getAtomPtr(atom_index); + if (wasm.atoms.getPtr(index)) |last_index_ptr| { + const last = wasm.getAtomPtr(last_index_ptr.*); + last.*.next = atom_index; + atom.prev = last_index_ptr.*; + last_index_ptr.* = atom_index; } else { - try wasm.atoms.putNoClobber(wasm.base.allocator, index, atom); + try wasm.atoms.putNoClobber(wasm.base.allocator, index, atom_index); } } @@ -1679,16 +1721,17 @@ fn allocateDebugAtoms(wasm: *Wasm) !void { if (wasm.dwarf == null) return; const allocAtom = struct { - fn f(bin: *Wasm, maybe_index: *?u32, atom: *Atom) !void { + fn f(bin: *Wasm, maybe_index: *?u32, atom_index: Atom.Index) !void { const index = maybe_index.* orelse idx: { const index = @intCast(u32, bin.segments.items.len); try bin.appendDummySegment(); maybe_index.* = index; break :idx index; }; + const atom = bin.getAtomPtr(atom_index); atom.size = @intCast(u32, atom.code.items.len); bin.symbols.items[atom.sym_index].index = index; - try bin.appendAtomAtIndex(index, atom); + try bin.appendAtomAtIndex(index, atom_index); } }.f; @@ -1710,15 +1753,16 @@ fn allocateAtoms(wasm: *Wasm) !void { var it = wasm.atoms.iterator(); while (it.next()) |entry| { const segment = &wasm.segments.items[entry.key_ptr.*]; - var atom: *Atom = entry.value_ptr.*.getFirst(); + var atom_index = entry.value_ptr.*; var offset: u32 = 0; while (true) { + const atom = wasm.getAtomPtr(atom_index); const symbol_loc = atom.symbolLoc(); if (wasm.code_section_index) |index| { if (index == entry.key_ptr.*) { if (!wasm.resolved_symbols.contains(symbol_loc)) { // only allocate resolved function body's. - atom = atom.next orelse break; + atom_index = atom.prev orelse break; continue; } } @@ -1732,8 +1776,7 @@ fn allocateAtoms(wasm: *Wasm) !void { atom.size, }); offset += atom.size; - try wasm.symbol_atom.put(wasm.base.allocator, symbol_loc, atom); // Update atom pointers - atom = atom.next orelse break; + atom_index = atom.prev orelse break; } segment.size = std.mem.alignForwardGeneric(u32, offset, segment.alignment); } @@ -1867,8 +1910,8 @@ fn initializeCallCtorsFunction(wasm: *Wasm) !void { symbol.index = func_index; // create the atom that will be output into the final binary - const atom = try wasm.base.allocator.create(Atom); - errdefer wasm.base.allocator.destroy(atom); + const atom_index = @intCast(Atom.Index, wasm.managed_atoms.items.len); + const atom = try wasm.managed_atoms.addOne(wasm.base.allocator); atom.* = .{ .size = @intCast(u32, function_body.items.len), .offset = 0, @@ -1879,13 +1922,13 @@ fn initializeCallCtorsFunction(wasm: *Wasm) !void { .prev = null, .code = function_body.moveToUnmanaged(), }; - try wasm.managed_atoms.append(wasm.base.allocator, atom); - try wasm.appendAtomAtIndex(wasm.code_section_index.?, atom); - try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom); + try wasm.appendAtomAtIndex(wasm.code_section_index.?, atom_index); + try wasm.symbol_atom.putNoClobber(wasm.base.allocator, loc, atom_index); // `allocateAtoms` has already been called, set the atom's offset manually. // This is fine to do manually as we insert the atom at the very end. - atom.offset = atom.prev.?.offset + atom.prev.?.size; + const prev_atom = wasm.getAtom(atom.prev.?); + atom.offset = prev_atom.offset + prev_atom.size; } fn setupImports(wasm: *Wasm) !void { @@ -2088,7 +2131,8 @@ fn setupExports(wasm: *Wasm) !void { break :blk try wasm.string_table.put(wasm.base.allocator, sym_name); }; const exp: types.Export = if (symbol.tag == .data) exp: { - const atom = wasm.symbol_atom.get(sym_loc).?; + const atom_index = wasm.symbol_atom.get(sym_loc).?; + const atom = wasm.getAtom(atom_index); const va = atom.getVA(wasm, symbol); const global_index = @intCast(u32, wasm.imported_globals_count + wasm.wasm_globals.items.len); try wasm.wasm_globals.append(wasm.base.allocator, .{ @@ -2193,7 +2237,8 @@ fn setupMemory(wasm: *Wasm) !void { const segment_index = wasm.data_segments.get(".synthetic").?; const segment = &wasm.segments.items[segment_index]; segment.offset = 0; // for simplicity we store the entire VA into atom's offset. - const atom = wasm.symbol_atom.get(loc).?; + const atom_index = wasm.symbol_atom.get(loc).?; + const atom = wasm.getAtomPtr(atom_index); atom.offset = @intCast(u32, mem.alignForwardGeneric(u64, memory_ptr, heap_alignment)); } @@ -2226,7 +2271,8 @@ fn setupMemory(wasm: *Wasm) !void { const segment_index = wasm.data_segments.get(".synthetic").?; const segment = &wasm.segments.items[segment_index]; segment.offset = 0; - const atom = wasm.symbol_atom.get(loc).?; + const atom_index = wasm.symbol_atom.get(loc).?; + const atom = wasm.getAtomPtr(atom_index); atom.offset = @intCast(u32, memory_ptr); } @@ -2352,15 +2398,14 @@ pub fn getErrorTableSymbol(wasm: *Wasm) !u32 { // and then return said symbol's index. The final table will be populated // during `flush` when we know all possible error names. - // As sym_index '0' is reserved, we use it for our stack pointer symbol - const symbol_index = wasm.symbols_free_list.popOrNull() orelse blk: { - const index = @intCast(u32, wasm.symbols.items.len); - _ = try wasm.symbols.addOne(wasm.base.allocator); - break :blk index; - }; + const atom_index = try wasm.createAtom(); + const atom = wasm.getAtomPtr(atom_index); + const slice_ty = Type.initTag(.const_slice_u8_sentinel_0); + atom.alignment = slice_ty.abiAlignment(wasm.base.options.target); + const sym_index = atom.sym_index; const sym_name = try wasm.string_table.put(wasm.base.allocator, "__zig_err_name_table"); - const symbol = &wasm.symbols.items[symbol_index]; + const symbol = &wasm.symbols.items[sym_index]; symbol.* = .{ .name = sym_name, .tag = .data, @@ -2369,20 +2414,11 @@ pub fn getErrorTableSymbol(wasm: *Wasm) !u32 { }; symbol.setFlag(.WASM_SYM_VISIBILITY_HIDDEN); - const slice_ty = Type.initTag(.const_slice_u8_sentinel_0); + try wasm.resolved_symbols.put(wasm.base.allocator, atom.symbolLoc(), {}); - const atom = try wasm.base.allocator.create(Atom); - atom.* = Atom.empty; - atom.sym_index = symbol_index; - atom.alignment = slice_ty.abiAlignment(wasm.base.options.target); - try wasm.managed_atoms.append(wasm.base.allocator, atom); - const loc = atom.symbolLoc(); - try wasm.resolved_symbols.put(wasm.base.allocator, loc, {}); - try wasm.symbol_atom.put(wasm.base.allocator, loc, atom); - - log.debug("Error name table was created with symbol index: ({d})", .{symbol_index}); - wasm.error_table_symbol = symbol_index; - return symbol_index; + log.debug("Error name table was created with symbol index: ({d})", .{sym_index}); + wasm.error_table_symbol = sym_index; + return sym_index; } /// Populates the error name table, when `error_table_symbol` is not null. @@ -2391,22 +2427,17 @@ pub fn getErrorTableSymbol(wasm: *Wasm) !u32 { /// The table is what is being pointed to within the runtime bodies that are generated. fn populateErrorNameTable(wasm: *Wasm) !void { const symbol_index = wasm.error_table_symbol orelse return; - const atom: *Atom = wasm.symbol_atom.get(.{ .file = null, .index = symbol_index }).?; + const atom_index = wasm.symbol_atom.get(.{ .file = null, .index = symbol_index }).?; + const atom = wasm.getAtomPtr(atom_index); + // Rather than creating a symbol for each individual error name, // we create a symbol for the entire region of error names. We then calculate // the pointers into the list using addends which are appended to the relocation. - const names_atom = try wasm.base.allocator.create(Atom); - names_atom.* = Atom.empty; - try wasm.managed_atoms.append(wasm.base.allocator, names_atom); - const names_symbol_index = wasm.symbols_free_list.popOrNull() orelse blk: { - const index = @intCast(u32, wasm.symbols.items.len); - _ = try wasm.symbols.addOne(wasm.base.allocator); - break :blk index; - }; - names_atom.sym_index = names_symbol_index; + const names_atom_index = try wasm.createAtom(); + const names_atom = wasm.getAtomPtr(names_atom_index); names_atom.alignment = 1; const sym_name = try wasm.string_table.put(wasm.base.allocator, "__zig_err_names"); - const names_symbol = &wasm.symbols.items[names_symbol_index]; + const names_symbol = &wasm.symbols.items[names_atom.sym_index]; names_symbol.* = .{ .name = sym_name, .tag = .data, @@ -2430,7 +2461,7 @@ fn populateErrorNameTable(wasm: *Wasm) !void { try atom.code.writer(wasm.base.allocator).writeIntLittle(u32, len - 1); // create relocation to the error name try atom.relocs.append(wasm.base.allocator, .{ - .index = names_symbol_index, + .index = names_atom.sym_index, .relocation_type = .R_WASM_MEMORY_ADDR_I32, .offset = offset, .addend = @intCast(i32, addend), @@ -2449,61 +2480,53 @@ fn populateErrorNameTable(wasm: *Wasm) !void { const name_loc = names_atom.symbolLoc(); try wasm.resolved_symbols.put(wasm.base.allocator, name_loc, {}); - try wasm.symbol_atom.put(wasm.base.allocator, name_loc, names_atom); + try wasm.symbol_atom.put(wasm.base.allocator, name_loc, names_atom_index); // link the atoms with the rest of the binary so they can be allocated // and relocations will be performed. - try wasm.parseAtom(atom, .{ .data = .read_only }); - try wasm.parseAtom(names_atom, .{ .data = .read_only }); + try wasm.parseAtom(atom_index, .{ .data = .read_only }); + try wasm.parseAtom(names_atom_index, .{ .data = .read_only }); } /// From a given index variable, creates a new debug section. /// This initializes the index, appends a new segment, /// and finally, creates a managed `Atom`. -pub fn createDebugSectionForIndex(wasm: *Wasm, index: *?u32, name: []const u8) !*Atom { +pub fn createDebugSectionForIndex(wasm: *Wasm, index: *?u32, name: []const u8) !Atom.Index { const new_index = @intCast(u32, wasm.segments.items.len); index.* = new_index; try wasm.appendDummySegment(); - const sym_index = wasm.symbols_free_list.popOrNull() orelse idx: { - const tmp_index = @intCast(u32, wasm.symbols.items.len); - _ = try wasm.symbols.addOne(wasm.base.allocator); - break :idx tmp_index; - }; - wasm.symbols.items[sym_index] = .{ + const atom_index = try wasm.createAtom(); + const atom = wasm.getAtomPtr(atom_index); + wasm.symbols.items[atom.sym_index] = .{ .tag = .section, .name = try wasm.string_table.put(wasm.base.allocator, name), .index = 0, .flags = @enumToInt(Symbol.Flag.WASM_SYM_BINDING_LOCAL), }; - const atom = try wasm.base.allocator.create(Atom); - atom.* = Atom.empty; atom.alignment = 1; // debug sections are always 1-byte-aligned - atom.sym_index = sym_index; - try wasm.managed_atoms.append(wasm.base.allocator, atom); - try wasm.symbol_atom.put(wasm.base.allocator, atom.symbolLoc(), atom); - return atom; + return atom_index; } fn resetState(wasm: *Wasm) void { for (wasm.segment_info.values()) |segment_info| { wasm.base.allocator.free(segment_info.name); } - if (wasm.base.options.module) |mod| { - var decl_it = wasm.decls.keyIterator(); - while (decl_it.next()) |decl_index_ptr| { - const decl = mod.declPtr(decl_index_ptr.*); - const atom = &decl.link.wasm; - atom.next = null; - atom.prev = null; - for (atom.locals.items) |*local_atom| { - local_atom.next = null; - local_atom.prev = null; - } + var atom_it = wasm.decls.valueIterator(); + while (atom_it.next()) |atom_index| { + const atom = wasm.getAtomPtr(atom_index.*); + atom.next = null; + atom.prev = null; + + for (atom.locals.items) |local_atom_index| { + const local_atom = wasm.getAtomPtr(local_atom_index); + local_atom.next = null; + local_atom.prev = null; } } + wasm.functions.clearRetainingCapacity(); wasm.exports.clearRetainingCapacity(); wasm.segments.clearRetainingCapacity(); @@ -2800,28 +2823,29 @@ pub fn flushModule(wasm: *Wasm, comp: *Compilation, prog_node: *std.Progress.Nod try wasm.setupStart(); try wasm.setupImports(); if (wasm.base.options.module) |mod| { - var decl_it = wasm.decls.keyIterator(); - while (decl_it.next()) |decl_index_ptr| { - const decl = mod.declPtr(decl_index_ptr.*); + var decl_it = wasm.decls.iterator(); + while (decl_it.next()) |entry| { + const decl = mod.declPtr(entry.key_ptr.*); if (decl.isExtern()) continue; - const atom = &decl.*.link.wasm; + const atom_index = entry.value_ptr.*; if (decl.ty.zigTypeTag() == .Fn) { - try wasm.parseAtom(atom, .{ .function = decl.fn_link.wasm }); + try wasm.parseAtom(atom_index, .{ .function = decl.fn_link.wasm }); } else if (decl.getVariable()) |variable| { if (!variable.is_mutable) { - try wasm.parseAtom(atom, .{ .data = .read_only }); + try wasm.parseAtom(atom_index, .{ .data = .read_only }); } else if (variable.init.isUndefDeep()) { - try wasm.parseAtom(atom, .{ .data = .uninitialized }); + try wasm.parseAtom(atom_index, .{ .data = .uninitialized }); } else { - try wasm.parseAtom(atom, .{ .data = .initialized }); + try wasm.parseAtom(atom_index, .{ .data = .initialized }); } } else { - try wasm.parseAtom(atom, .{ .data = .read_only }); + try wasm.parseAtom(atom_index, .{ .data = .read_only }); } // also parse atoms for a decl's locals - for (atom.locals.items) |*local_atom| { - try wasm.parseAtom(local_atom, .{ .data = .read_only }); + const atom = wasm.getAtomPtr(atom_index); + for (atom.locals.items) |local_atom_index| { + try wasm.parseAtom(local_atom_index, .{ .data = .read_only }); } } @@ -3066,20 +3090,22 @@ fn writeToFile( var code_section_size: u32 = 0; if (wasm.code_section_index) |code_index| { const header_offset = try reserveVecSectionHeader(&binary_bytes); - var atom: *Atom = wasm.atoms.get(code_index).?.getFirst(); + var atom_index = wasm.atoms.get(code_index).?; // The code section must be sorted in line with the function order. var sorted_atoms = try std.ArrayList(*Atom).initCapacity(wasm.base.allocator, wasm.functions.count()); defer sorted_atoms.deinit(); while (true) { + var atom = wasm.getAtomPtr(atom_index); if (wasm.resolved_symbols.contains(atom.symbolLoc())) { if (!is_obj) { atom.resolveRelocs(wasm); } sorted_atoms.appendAssumeCapacity(atom); } - atom = atom.next orelse break; + // atom = if (atom.prev) |prev| wasm.getAtomPtr(prev) else break; + atom_index = atom.prev orelse break; } const atom_sort_fn = struct { @@ -3119,11 +3145,11 @@ fn writeToFile( // do not output 'bss' section unless we import memory and therefore // want to guarantee the data is zero initialized if (!import_memory and std.mem.eql(u8, entry.key_ptr.*, ".bss")) continue; - const atom_index = entry.value_ptr.*; - const segment = wasm.segments.items[atom_index]; + const segment_index = entry.value_ptr.*; + const segment = wasm.segments.items[segment_index]; if (segment.size == 0) continue; // do not emit empty segments segment_count += 1; - var atom: *Atom = wasm.atoms.getPtr(atom_index).?.*.getFirst(); + var atom_index = wasm.atoms.get(segment_index).?; // flag and index to memory section (currently, there can only be 1 memory section in wasm) try leb.writeULEB128(binary_writer, @as(u32, 0)); @@ -3134,6 +3160,7 @@ fn writeToFile( // fill in the offset table and the data segments var current_offset: u32 = 0; while (true) { + const atom = wasm.getAtomPtr(atom_index); if (!is_obj) { atom.resolveRelocs(wasm); } @@ -3149,8 +3176,8 @@ fn writeToFile( try binary_writer.writeAll(atom.code.items); current_offset += atom.size; - if (atom.next) |next| { - atom = next; + if (atom.prev) |prev| { + atom_index = prev; } else { // also pad with zeroes when last atom to ensure // segments are aligned. @@ -3192,15 +3219,15 @@ fn writeToFile( } if (!wasm.base.options.strip) { - if (wasm.dwarf) |*dwarf| { - const mod = wasm.base.options.module.?; - try dwarf.writeDbgAbbrev(); - // for debug info and ranges, the address is always 0, - // as locations are always offsets relative to 'code' section. - try dwarf.writeDbgInfoHeader(mod, 0, code_section_size); - try dwarf.writeDbgAranges(0, code_section_size); - try dwarf.writeDbgLineHeader(); - } + // if (wasm.dwarf) |*dwarf| { + // const mod = wasm.base.options.module.?; + // try dwarf.writeDbgAbbrev(); + // // for debug info and ranges, the address is always 0, + // // as locations are always offsets relative to 'code' section. + // try dwarf.writeDbgInfoHeader(mod, 0, code_section_size); + // try dwarf.writeDbgAranges(0, code_section_size); + // try dwarf.writeDbgLineHeader(); + // } var debug_bytes = std.ArrayList(u8).init(wasm.base.allocator); defer debug_bytes.deinit(); @@ -3223,11 +3250,11 @@ fn writeToFile( for (debug_sections) |item| { if (item.index) |index| { - var atom = wasm.atoms.get(index).?.getFirst(); + var atom = wasm.getAtomPtr(wasm.atoms.get(index).?); while (true) { atom.resolveRelocs(wasm); try debug_bytes.appendSlice(atom.code.items); - atom = atom.next orelse break; + atom = if (atom.prev) |prev| wasm.getAtomPtr(prev) else break; } try emitDebugSection(&binary_bytes, debug_bytes.items, item.name); debug_bytes.clearRetainingCapacity(); @@ -3959,7 +3986,8 @@ fn emitSymbolTable(wasm: *Wasm, binary_bytes: *std.ArrayList(u8), symbol_table: if (symbol.isDefined()) { try leb.writeULEB128(writer, symbol.index); - const atom = wasm.symbol_atom.get(sym_loc).?; + const atom_index = wasm.symbol_atom.get(sym_loc).?; + const atom = wasm.getAtom(atom_index); try leb.writeULEB128(writer, @as(u32, atom.offset)); try leb.writeULEB128(writer, @as(u32, atom.size)); } @@ -4037,7 +4065,7 @@ fn emitCodeRelocations( const reloc_start = binary_bytes.items.len; var count: u32 = 0; - var atom: *Atom = wasm.atoms.get(code_index).?.getFirst(); + var atom: *Atom = wasm.getAtomPtr(wasm.atoms.get(code_index).?); // for each atom, we calculate the uleb size and append that var size_offset: u32 = 5; // account for code section size leb128 while (true) { @@ -4055,7 +4083,7 @@ fn emitCodeRelocations( } log.debug("Emit relocation: {}", .{relocation}); } - atom = atom.next orelse break; + atom = if (atom.prev) |prev| wasm.getAtomPtr(prev) else break; } if (count == 0) return; var buf: [5]u8 = undefined; @@ -4086,7 +4114,7 @@ fn emitDataRelocations( // for each atom, we calculate the uleb size and append that var size_offset: u32 = 5; // account for code section size leb128 for (wasm.data_segments.values()) |segment_index| { - var atom: *Atom = wasm.atoms.get(segment_index).?.getFirst(); + var atom: *Atom = wasm.getAtomPtr(wasm.atoms.get(segment_index).?); while (true) { size_offset += getULEB128Size(atom.size); for (atom.relocs.items) |relocation| { @@ -4105,7 +4133,7 @@ fn emitDataRelocations( } log.debug("Emit relocation: {}", .{relocation}); } - atom = atom.next orelse break; + atom = if (atom.prev) |prev| wasm.getAtomPtr(prev) else break; } } if (count == 0) return; diff --git a/src/link/Wasm/Atom.zig b/src/link/Wasm/Atom.zig index 554f98b5ca..e719f8dfcc 100644 --- a/src/link/Wasm/Atom.zig +++ b/src/link/Wasm/Atom.zig @@ -29,14 +29,17 @@ file: ?u16, /// Next atom in relation to this atom. /// When null, this atom is the last atom -next: ?*Atom, +next: ?Atom.Index, /// Previous atom in relation to this atom. /// is null when this atom is the first in its order -prev: ?*Atom, +prev: ?Atom.Index, /// Contains atoms local to a decl, all managed by this `Atom`. /// When the parent atom is being freed, it will also do so for all local atoms. -locals: std.ArrayListUnmanaged(Atom) = .{}, +locals: std.ArrayListUnmanaged(Atom.Index) = .{}, + +/// Alias to an unsigned 32-bit integer +pub const Index = u32; /// Represents a default empty wasm `Atom` pub const empty: Atom = .{ @@ -50,14 +53,12 @@ pub const empty: Atom = .{ }; /// Frees all resources owned by this `Atom`. -pub fn deinit(atom: *Atom, gpa: Allocator) void { +pub fn deinit(atom: *Atom, wasm: *Wasm) void { + const gpa = wasm.base.allocator; atom.relocs.deinit(gpa); atom.code.deinit(gpa); - - for (atom.locals.items) |*local| { - local.deinit(gpa); - } atom.locals.deinit(gpa); + atom.* = undefined; } /// Sets the length of relocations and code to '0', @@ -78,24 +79,11 @@ pub fn format(atom: Atom, comptime fmt: []const u8, options: std.fmt.FormatOptio }); } -/// Returns the first `Atom` from a given atom -pub fn getFirst(atom: *Atom) *Atom { - var tmp = atom; - while (tmp.prev) |prev| tmp = prev; - return tmp; -} - /// Returns the location of the symbol that represents this `Atom` pub fn symbolLoc(atom: Atom) Wasm.SymbolLoc { return .{ .file = atom.file, .index = atom.sym_index }; } -pub fn ensureInitialized(atom: *Atom, wasm_bin: *Wasm) !void { - if (atom.getSymbolIndex() != null) return; // already initialized - atom.sym_index = try wasm_bin.allocateSymbol(); - try wasm_bin.symbol_atom.putNoClobber(wasm_bin.base.allocator, atom.symbolLoc(), atom); -} - pub fn getSymbolIndex(atom: Atom) ?u32 { if (atom.sym_index == 0) return null; return atom.sym_index; @@ -198,20 +186,28 @@ fn relocationValue(atom: Atom, relocation: types.Relocation, wasm_bin: *const Wa if (symbol.isUndefined()) { return 0; } - const target_atom = wasm_bin.symbol_atom.get(target_loc).?; + const target_atom_index = wasm_bin.symbol_atom.get(target_loc) orelse { + // this can only occur during incremental-compilation when a relocation + // still points to a freed decl. It is fine to emit the value 0 here + // as no actual code will point towards it. + return 0; + }; + const target_atom = wasm_bin.getAtom(target_atom_index); const va = @intCast(i32, target_atom.getVA(wasm_bin, symbol)); return @intCast(u32, va + relocation.addend); }, .R_WASM_EVENT_INDEX_LEB => return symbol.index, .R_WASM_SECTION_OFFSET_I32 => { - const target_atom = wasm_bin.symbol_atom.get(target_loc).?; + const target_atom_index = wasm_bin.symbol_atom.get(target_loc).?; + const target_atom = wasm_bin.getAtom(target_atom_index); const rel_value = @intCast(i32, target_atom.offset) + relocation.addend; return @intCast(u32, rel_value); }, .R_WASM_FUNCTION_OFFSET_I32 => { - const target_atom = wasm_bin.symbol_atom.get(target_loc) orelse { + const target_atom_index = wasm_bin.symbol_atom.get(target_loc) orelse { return @bitCast(u32, @as(i32, -1)); }; + const target_atom = wasm_bin.getAtom(target_atom_index); const offset: u32 = 11 + Wasm.getULEB128Size(target_atom.size); // Header (11 bytes fixed-size) + body size (leb-encoded) const rel_value = @intCast(i32, target_atom.offset + offset) + relocation.addend; return @intCast(u32, rel_value); diff --git a/src/link/Wasm/Object.zig b/src/link/Wasm/Object.zig index 8f49d68712..7d4f6a4e36 100644 --- a/src/link/Wasm/Object.zig +++ b/src/link/Wasm/Object.zig @@ -901,14 +901,9 @@ pub fn parseIntoAtoms(object: *Object, gpa: Allocator, object_index: u16, wasm_b continue; // found unknown section, so skip parsing into atom as we do not know how to handle it. }; - const atom = try gpa.create(Atom); + const atom_index = @intCast(Atom.Index, wasm_bin.managed_atoms.items.len); + const atom = try wasm_bin.managed_atoms.addOne(gpa); atom.* = Atom.empty; - errdefer { - atom.deinit(gpa); - gpa.destroy(atom); - } - - try wasm_bin.managed_atoms.append(gpa, atom); atom.file = object_index; atom.size = relocatable_data.size; atom.alignment = relocatable_data.getAlignment(object); @@ -938,12 +933,12 @@ pub fn parseIntoAtoms(object: *Object, gpa: Allocator, object_index: u16, wasm_b .index = relocatable_data.getIndex(), })) |symbols| { atom.sym_index = symbols.pop(); - try wasm_bin.symbol_atom.putNoClobber(gpa, atom.symbolLoc(), atom); + try wasm_bin.symbol_atom.putNoClobber(gpa, atom.symbolLoc(), atom_index); // symbols referencing the same atom will be added as alias // or as 'parent' when they are global. while (symbols.popOrNull()) |idx| { - try wasm_bin.symbol_atom.putNoClobber(gpa, .{ .file = atom.file, .index = idx }, atom); + try wasm_bin.symbol_atom.putNoClobber(gpa, .{ .file = atom.file, .index = idx }, atom_index); const alias_symbol = object.symtable[idx]; if (alias_symbol.isGlobal()) { atom.sym_index = idx; @@ -956,7 +951,7 @@ pub fn parseIntoAtoms(object: *Object, gpa: Allocator, object_index: u16, wasm_b segment.alignment = std.math.max(segment.alignment, atom.alignment); } - try wasm_bin.appendAtomAtIndex(final_index, atom); + try wasm_bin.appendAtomAtIndex(final_index, atom_index); log.debug("Parsed into atom: '{s}' at segment index {d}", .{ object.string_table.get(object.symtable[atom.sym_index].name), final_index }); } } diff --git a/test/link/wasm/export-data/build.zig b/test/link/wasm/export-data/build.zig index 283566dab3..db2ca804e8 100644 --- a/test/link/wasm/export-data/build.zig +++ b/test/link/wasm/export-data/build.zig @@ -23,8 +23,8 @@ pub fn build(b: *Builder) void { check_lib.checkNext("type i32"); check_lib.checkNext("mutable false"); check_lib.checkNext("i32.const {bar_address}"); - check_lib.checkComputeCompare("foo_address", .{ .op = .eq, .value = .{ .literal = 0 } }); - check_lib.checkComputeCompare("bar_address", .{ .op = .eq, .value = .{ .literal = 4 } }); + check_lib.checkComputeCompare("foo_address", .{ .op = .eq, .value = .{ .literal = 4 } }); + check_lib.checkComputeCompare("bar_address", .{ .op = .eq, .value = .{ .literal = 0 } }); check_lib.checkStart("Section export"); check_lib.checkNext("entries 3"); From beb20d29db3fe945746581eba5d2f2cae1403cdb Mon Sep 17 00:00:00 2001 From: Jakub Konka Date: Wed, 1 Feb 2023 19:32:54 +0100 Subject: [PATCH 37/65] link: remove union types which are now internal to backends --- src/Module.zig | 56 +++++---------------------------------- src/Sema.zig | 10 ------- src/arch/wasm/CodeGen.zig | 6 ++--- src/link.zig | 33 ----------------------- src/link/Wasm.zig | 2 +- 5 files changed, 10 insertions(+), 97 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index f84d720d1f..b395c0a950 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -328,8 +328,6 @@ pub const ErrorInt = u32; pub const Export = struct { options: std.builtin.ExportOptions, src: LazySrcLoc, - /// Represents the position of the export, if any, in the output file. - link: link.File.Export, /// The Decl that performs the export. Note that this is *not* the Decl being exported. owner_decl: Decl.Index, /// The Decl containing the export statement. Inline function calls @@ -533,16 +531,8 @@ pub const Decl = struct { /// What kind of a declaration is this. kind: Kind, - /// Represents the position of the code in the output file. - /// This is populated regardless of semantic analysis and code generation. - link: link.File.LinkBlock, - - /// Represents the function in the linked output file, if the `Decl` is a function. - /// This is stored here and not in `Fn` because `Decl` survives across updates but - /// `Fn` does not. - /// TODO Look into making `Fn` a longer lived structure and moving this field there - /// to save on memory usage. - fn_link: link.File.LinkFn, + /// TODO remove this once Wasm backend catches up + fn_link: ?link.File.Wasm.FnData = null, /// The shallow set of other decls whose typed_value could possibly change if this Decl's /// typed_value is modified. @@ -5258,27 +5248,9 @@ pub fn clearDecl( if (decl.ty.isFnOrHasRuntimeBits()) { mod.comp.bin_file.freeDecl(decl_index); - // TODO instead of a union, put this memory trailing Decl objects, - // and allow it to be variably sized. - decl.link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = {} }, - .elf => .{ .elf = {} }, - .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = {} }, - .c => .{ .c = {} }, - .wasm => .{ .wasm = {} }, - .spirv => .{ .spirv = {} }, - .nvptx => .{ .nvptx = {} }, - }; decl.fn_link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = {} }, - .elf => .{ .elf = {} }, - .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = {} }, - .c => .{ .c = {} }, - .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, - .spirv => .{ .spirv = {} }, - .nvptx => .{ .nvptx = {} }, + .wasm => link.File.Wasm.FnData.empty, + else => null, }; } if (decl.getInnerNamespace()) |namespace| { @@ -5680,25 +5652,9 @@ pub fn allocateNewDecl( .deletion_flag = false, .zir_decl_index = 0, .src_scope = src_scope, - .link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = {} }, - .elf => .{ .elf = {} }, - .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = {} }, - .c => .{ .c = {} }, - .wasm => .{ .wasm = {} }, - .spirv => .{ .spirv = {} }, - .nvptx => .{ .nvptx = {} }, - }, .fn_link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = {} }, - .elf => .{ .elf = {} }, - .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = {} }, - .c => .{ .c = {} }, - .wasm => .{ .wasm = link.File.Wasm.FnData.empty }, - .spirv => .{ .spirv = {} }, - .nvptx => .{ .nvptx = {} }, + .wasm => link.File.Wasm.FnData.empty, + else => null, }, .generation = 0, .is_pub = false, diff --git a/src/Sema.zig b/src/Sema.zig index 4871961753..54c3c6dc38 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -5564,16 +5564,6 @@ pub fn analyzeExport( .visibility = borrowed_options.visibility, }, .src = src, - .link = switch (mod.comp.bin_file.tag) { - .coff => .{ .coff = {} }, - .elf => .{ .elf = {} }, - .macho => .{ .macho = {} }, - .plan9 => .{ .plan9 = {} }, - .c => .{ .c = {} }, - .wasm => .{ .wasm = {} }, - .spirv => .{ .spirv = {} }, - .nvptx => .{ .nvptx = {} }, - }, .owner_decl = sema.owner_decl_index, .src_decl = block.src_decl, .exported_decl = exported_decl_index, diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index 8559a728e5..cf9c741513 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -1194,7 +1194,7 @@ fn genFunc(func: *CodeGen) InnerError!void { const fn_info = func.decl.ty.fnInfo(); var func_type = try genFunctype(func.gpa, fn_info.cc, fn_info.param_types, fn_info.return_type, func.target); defer func_type.deinit(func.gpa); - func.decl.fn_link.wasm.type_index = try func.bin_file.putOrGetFuncType(func_type); + func.decl.fn_link.?.type_index = try func.bin_file.putOrGetFuncType(func_type); var cc_result = try func.resolveCallingConventionValues(func.decl.ty); defer cc_result.deinit(func.gpa); @@ -2129,12 +2129,12 @@ fn airCall(func: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModif defer func_type.deinit(func.gpa); const atom_index = try func.bin_file.getOrCreateAtomForDecl(extern_fn.data.owner_decl); const atom = func.bin_file.getAtomPtr(atom_index); - ext_decl.fn_link.wasm.type_index = try func.bin_file.putOrGetFuncType(func_type); + ext_decl.fn_link.?.type_index = try func.bin_file.putOrGetFuncType(func_type); try func.bin_file.addOrUpdateImport( mem.sliceTo(ext_decl.name, 0), atom.getSymbolIndex().?, ext_decl.getExternFn().?.lib_name, - ext_decl.fn_link.wasm.type_index, + ext_decl.fn_link.?.type_index, ); break :blk extern_fn.data.owner_decl; } else if (func_val.castTag(.decl_ref)) |decl_ref| { diff --git a/src/link.zig b/src/link.zig index 0a3226f004..2b3ce51667 100644 --- a/src/link.zig +++ b/src/link.zig @@ -261,39 +261,6 @@ pub const File = struct { /// of this linking operation. lock: ?Cache.Lock = null, - pub const LinkBlock = union { - elf: void, - coff: void, - macho: void, - plan9: void, - c: void, - wasm: void, - spirv: void, - nvptx: void, - }; - - pub const LinkFn = union { - elf: void, - coff: void, - macho: void, - plan9: void, - c: void, - wasm: Wasm.FnData, - spirv: void, - nvptx: void, - }; - - pub const Export = union { - elf: void, - coff: void, - macho: void, - plan9: void, - c: void, - wasm: void, - spirv: void, - nvptx: void, - }; - /// Attempts incremental linking, if the file already exists. If /// incremental linking fails, falls back to truncating the file and /// rewriting it. A malicious file is detected as incremental link failure diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index b06703ed61..17391b017a 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -2829,7 +2829,7 @@ pub fn flushModule(wasm: *Wasm, comp: *Compilation, prog_node: *std.Progress.Nod if (decl.isExtern()) continue; const atom_index = entry.value_ptr.*; if (decl.ty.zigTypeTag() == .Fn) { - try wasm.parseAtom(atom_index, .{ .function = decl.fn_link.wasm }); + try wasm.parseAtom(atom_index, .{ .function = decl.fn_link.? }); } else if (decl.getVariable()) |variable| { if (!variable.is_mutable) { try wasm.parseAtom(atom_index, .{ .data = .read_only }); From 490addde278001694d554a9a9fe2eb8235831143 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Wed, 1 Feb 2023 20:50:43 +0200 Subject: [PATCH 38/65] Sema: fix error location on comptime arg to typed generic param Closes #14505 --- src/Sema.zig | 13 +++++++++++- ...omptime_arg_to_generic_fn_callee_error.zig | 21 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/cases/compile_errors/comptime_arg_to_generic_fn_callee_error.zig diff --git a/src/Sema.zig b/src/Sema.zig index d306c68e08..4615c5b162 100644 --- a/src/Sema.zig +++ b/src/Sema.zig @@ -9015,7 +9015,18 @@ fn zirParam( if (is_comptime and sema.preallocated_new_func != null) { // We have a comptime value for this parameter so it should be elided from the // function type of the function instruction in this block. - const coerced_arg = try sema.coerce(block, param_ty, arg, src); + const coerced_arg = sema.coerce(block, param_ty, arg, .unneeded) catch |err| switch (err) { + error.NeededSourceLocation => { + // We are instantiating a generic function and a comptime arg + // cannot be coerced to the param type, but since we don't + // have the callee source location return `GenericPoison` + // so that the instantiation is failed and the coercion + // is handled by comptime call logic instead. + assert(sema.is_generic_instantiation); + return error.GenericPoison; + }, + else => return err, + }; sema.inst_map.putAssumeCapacity(inst, coerced_arg); return; } diff --git a/test/cases/compile_errors/comptime_arg_to_generic_fn_callee_error.zig b/test/cases/compile_errors/comptime_arg_to_generic_fn_callee_error.zig new file mode 100644 index 0000000000..efc3f556a9 --- /dev/null +++ b/test/cases/compile_errors/comptime_arg_to_generic_fn_callee_error.zig @@ -0,0 +1,21 @@ +const std = @import("std"); +const MyStruct = struct { + a: i32, + b: i32, + + pub fn getA(self: *List) i32 { + return self.items(.c); + } +}; +const List = std.MultiArrayList(MyStruct); +pub export fn entry() void { + var list = List{}; + _ = MyStruct.getA(&list); +} + +// error +// backend=stage2 +// target=native +// +// :7:28: error: no field named 'c' in enum 'meta.FieldEnum(tmp.MyStruct)' +// :?:?: note: enum declared here From 3c8d9681946630a1d953cb2c37cad248c7445093 Mon Sep 17 00:00:00 2001 From: ominitay <37453713+ominitay@users.noreply.github.com> Date: Sun, 31 Jul 2022 22:58:04 +0100 Subject: [PATCH 39/65] fmt: Make default_max_depth configurable --- lib/std/fmt.zig | 11 ++++++----- lib/std/std.zig | 5 +++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/std/fmt.zig b/lib/std/fmt.zig index 94b25c79a1..f2ee24a9e3 100644 --- a/lib/std/fmt.zig +++ b/lib/std/fmt.zig @@ -1,11 +1,12 @@ const std = @import("std.zig"); +const builtin = @import("builtin"); + const io = std.io; const math = std.math; const assert = std.debug.assert; const mem = std.mem; const unicode = std.unicode; const meta = std.meta; -const builtin = @import("builtin"); const errol = @import("fmt/errol.zig"); const lossyCast = std.math.lossyCast; const expectFmt = std.testing.expectFmt; @@ -190,7 +191,7 @@ pub fn format( .precision = precision, }, writer, - default_max_depth, + std.options.fmt_max_depth, ); } @@ -2140,15 +2141,15 @@ test "buffer" { { var buf1: [32]u8 = undefined; var fbs = std.io.fixedBufferStream(&buf1); - try formatType(1234, "", FormatOptions{}, fbs.writer(), default_max_depth); + try formatType(1234, "", FormatOptions{}, fbs.writer(), std.options.fmt_max_depth); try std.testing.expect(mem.eql(u8, fbs.getWritten(), "1234")); fbs.reset(); - try formatType('a', "c", FormatOptions{}, fbs.writer(), default_max_depth); + try formatType('a', "c", FormatOptions{}, fbs.writer(), std.options.fmt_max_depth); try std.testing.expect(mem.eql(u8, fbs.getWritten(), "a")); fbs.reset(); - try formatType(0b1100, "b", FormatOptions{}, fbs.writer(), default_max_depth); + try formatType(0b1100, "b", FormatOptions{}, fbs.writer(), std.options.fmt_max_depth); try std.testing.expect(mem.eql(u8, fbs.getWritten(), "1100")); } } diff --git a/lib/std/std.zig b/lib/std/std.zig index 40ba896569..e02be2ebaf 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -153,6 +153,11 @@ pub const options = struct { else log.defaultLog; + pub const fmt_max_depth = if (@hasDecl(options_override, "fmt_max_depth")) + options_override.fmt_max_depth + else + fmt.default_max_depth; + pub const cryptoRandomSeed: fn (buffer: []u8) void = if (@hasDecl(options_override, "cryptoRandomSeed")) options_override.cryptoRandomSeed else From 86ec26b1f00ce9ee2a9d559a1ca0415d05a9b908 Mon Sep 17 00:00:00 2001 From: Evan Typanski Date: Sat, 28 Jan 2023 11:53:38 -0500 Subject: [PATCH 40/65] translate-c: Fix types on assign expression bool --- src/translate_c.zig | 5 ++++- test/translate_c.zig | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/translate_c.zig b/src/translate_c.zig index 47a21f5b5c..a6715d161c 100644 --- a/src/translate_c.zig +++ b/src/translate_c.zig @@ -4519,7 +4519,10 @@ fn transCreateNodeAssign( defer block_scope.deinit(); const tmp = try block_scope.makeMangledName(c, "tmp"); - const rhs_node = try transExpr(c, &block_scope.base, rhs, .used); + var rhs_node = try transExpr(c, &block_scope.base, rhs, .used); + if (!exprIsBooleanType(lhs) and isBoolRes(rhs_node)) { + rhs_node = try Tag.bool_to_int.create(c.arena, rhs_node); + } const tmp_decl = try Tag.var_simple.create(c.arena, .{ .name = tmp, .init = rhs_node }); try block_scope.statements.append(tmp_decl); diff --git a/test/translate_c.zig b/test/translate_c.zig index 4ecb6835f5..d2db895a5a 100644 --- a/test/translate_c.zig +++ b/test/translate_c.zig @@ -3900,4 +3900,20 @@ pub fn addCases(cases: *tests.TranslateCContext) void { \\pub const ZERO = @as(c_int, 0); \\pub const WORLD = @as(c_int, 0o0000123); }); + + cases.add("Assign expression from bool to int", + \\void foo(void) { + \\ int a; + \\ if (a = 1 > 0) {} + \\} + , &[_][]const u8{ + \\pub export fn foo() void { + \\ var a: c_int = undefined; + \\ if ((blk: { + \\ const tmp = @boolToInt(@as(c_int, 1) > @as(c_int, 0)); + \\ a = tmp; + \\ break :blk tmp; + \\ }) != 0) {} + \\} + }); } From 1fba88450db12f184d76f0651f7ca933322c1fc0 Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Fri, 27 Jan 2023 18:29:28 +0000 Subject: [PATCH 41/65] langref: add paragraph and examples about indexing non-ASCII strings PR #10610 addressed most of the points from #1854. This additional paragraph and examples covers the OMISSIONS section clarifying issues about indexing into non-ASCII strings (whether valid UTF-8 or not). I think this finally closes #1854. --- doc/langref.html.in | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/doc/langref.html.in b/doc/langref.html.in index 00a263bae2..2e16c0c9e6 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -871,6 +871,13 @@ pub fn main() void { However, it is possible to embed non-UTF-8 bytes into a string literal using \xNN notation.

+ Indexing into a string containing non-ASCII bytes will return individual bytes, whether valid + UTF-8 or not. + The {#link|Zig Standard Library#} provides routines for checking the validity of UTF-8 encoded + strings, accessing their code points and other encoding/decoding related tasks in + {#syntax#}std.unicode{#endsyntax#}. +

+

Unicode code point literals have type {#syntax#}comptime_int{#endsyntax#}, the same as {#link|Integer Literals#}. All {#link|Escape Sequences#} are valid in both string literals and Unicode code point literals. @@ -894,9 +901,12 @@ pub fn main() void { print("{}\n", .{'e' == '\x65'}); // true print("{d}\n", .{'\u{1f4a9}'}); // 128169 print("{d}\n", .{'💯'}); // 128175 - print("{}\n", .{mem.eql(u8, "hello", "h\x65llo")}); // true - print("0x{x}\n", .{"\xff"[0]}); // non-UTF-8 strings are possible with \xNN notation. print("{u}\n", .{'⚡'}); + print("{}\n", .{mem.eql(u8, "hello", "h\x65llo")}); // true + print("{}\n", .{mem.eql(u8, "💯", "\xf0\x9f\x92\xaf")}); // also true + const invalid_utf8 = "\xff\xfe"; // non-UTF-8 strings are possible with \xNN notation. + print("0x{x}\n", .{invalid_utf8[1]}); // indexing them returns individual bytes... + print("0x{x}\n", .{"💯"[1]}); // ...as does indexing part-way through non-ASCII characters } {#code_end#} {#see_also|Arrays|Source Encoding#} From 629c3108aa71f94bd26dba8d4f20c9f3a3945bd4 Mon Sep 17 00:00:00 2001 From: Veikka Tuominen Date: Wed, 1 Feb 2023 21:41:02 +0200 Subject: [PATCH 42/65] AstGen: fix orelse type coercion in call arguments Closes #14506 --- src/AstGen.zig | 8 +++++++- test/behavior/basic.zig | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/AstGen.zig b/src/AstGen.zig index a5667ce9e8..10673a2b37 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -8721,6 +8721,7 @@ fn callExpr( defer arg_block.unstack(); // `call_inst` is reused to provide the param type. + arg_block.rl_ty_inst = call_inst; const arg_ref = try expr(&arg_block, &arg_block.base, .{ .rl = .{ .coerced_ty = call_inst }, .ctx = .fn_arg }, param_node); _ = try arg_block.addBreak(.break_inline, call_index, arg_ref); @@ -10869,7 +10870,12 @@ const GenZir = struct { // we emit ZIR for the block break instructions to have the result values, // and then rvalue() on that to pass the value to the result location. switch (parent_ri.rl) { - .ty, .coerced_ty => |ty_inst| { + .coerced_ty => |ty_inst| { + // Type coercion needs to happend before breaks. + gz.rl_ty_inst = ty_inst; + gz.break_result_info = .{ .rl = .{ .ty = ty_inst } }; + }, + .ty => |ty_inst| { gz.rl_ty_inst = ty_inst; gz.break_result_info = parent_ri; }, diff --git a/test/behavior/basic.zig b/test/behavior/basic.zig index 8a97b3cbcd..b82bfab99e 100644 --- a/test/behavior/basic.zig +++ b/test/behavior/basic.zig @@ -1125,3 +1125,21 @@ test "returning an opaque type from a function" { }; try expect(S.foo(123).b == 123); } + +test "orelse coercion as function argument" { + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + + const Loc = struct { start: i32 = -1 }; + const Container = struct { + a: ?Loc = null, + fn init(a: Loc) @This() { + return .{ + .a = a, + }; + } + }; + var optional: ?Loc = .{}; + var foo = Container.init(optional orelse .{}); + try expect(foo.a.?.start == -1); +} From ea6e0e33a7630fb78550a5567a98420c3377350c Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 1 Feb 2023 18:42:29 -0700 Subject: [PATCH 43/65] zig build: add executable bit and file path to package hash Unfortunately, due to the Windows equivalent of executable permissions being a bit tricky, there is follow-up work to be done. What is done in this commit is the hash modifications. At the fetch layer, executable bits inside packages are ignored. In the hash computation layer, executable bit is implemented for POSIX but not yet for Windows. This means that the hash will not break again in the future for packages that do not have any executable files, but it will break for packages that do. This is a hash-breaking change. Closes #14308 --- lib/std/fs/file.zig | 3 ++- lib/std/tar.zig | 23 +++++++++++++++++++++++ src/Package.zig | 24 +++++++++++++++++++++++- 3 files changed, 48 insertions(+), 2 deletions(-) diff --git a/lib/std/fs/file.zig b/lib/std/fs/file.zig index a6ecc37d92..1ba4bc18fd 100644 --- a/lib/std/fs/file.zig +++ b/lib/std/fs/file.zig @@ -179,7 +179,7 @@ pub const File = struct { lock_nonblocking: bool = false, /// For POSIX systems this is the file system mode the file will - /// be created with. + /// be created with. On other systems this is always 0. mode: Mode = default_mode, /// Setting this to `.blocking` prevents `O.NONBLOCK` from being passed even @@ -307,6 +307,7 @@ pub const File = struct { /// is unique to each filesystem. inode: INode, size: u64, + /// This is available on POSIX systems and is always 0 otherwise. mode: Mode, kind: Kind, diff --git a/lib/std/tar.zig b/lib/std/tar.zig index 4f6a77c6ba..91772d7319 100644 --- a/lib/std/tar.zig +++ b/lib/std/tar.zig @@ -1,6 +1,18 @@ pub const Options = struct { /// Number of directory levels to skip when extracting files. strip_components: u32 = 0, + /// How to handle the "mode" property of files from within the tar file. + mode_mode: ModeMode = .executable_bit_only, + + const ModeMode = enum { + /// The mode from the tar file is completely ignored. Files are created + /// with the default mode when creating files. + ignore, + /// The mode from the tar file is inspected for the owner executable bit + /// only. This bit is copied to the group and other executable bits. + /// Other bits of the mode are left as the default when creating files. + executable_bit_only, + }; }; pub const Header = struct { @@ -72,6 +84,17 @@ pub const Header = struct { }; pub fn pipeToFileSystem(dir: std.fs.Dir, reader: anytype, options: Options) !void { + switch (options.mode_mode) { + .ignore => {}, + .executable_bit_only => { + // This code does not look at the mode bits yet. To implement this feature, + // the implementation must be adjusted to look at the mode, and check the + // user executable bit, then call fchmod on newly created files when + // the executable bit is supposed to be set. + // It also needs to properly deal with ACLs on Windows. + @panic("TODO: unimplemented: tar ModeMode.executable_bit_only"); + }, + } var file_name_buffer: [255]u8 = undefined; var buffer: [512 * 8]u8 = undefined; var start: usize = 0; diff --git a/src/Package.zig b/src/Package.zig index ebe84b8444..0f036b9ef5 100644 --- a/src/Package.zig +++ b/src/Package.zig @@ -1,5 +1,6 @@ const Package = @This(); +const builtin = @import("builtin"); const std = @import("std"); const fs = std.fs; const mem = std.mem; @@ -440,6 +441,12 @@ fn unpackTarball( try std.tar.pipeToFileSystem(out_dir, decompress.reader(), .{ .strip_components = 1, + // TODO: we would like to set this to executable_bit_only, but two + // things need to happen before that: + // 1. the tar implementation needs to support it + // 2. the hashing algorithm here needs to support detecting the is_executable + // bit on Windows from the ACLs (see the isExecutable function). + .mode_mode = .ignore, }); } @@ -468,7 +475,7 @@ const HashedFile = struct { hash: [Hash.digest_length]u8, failure: Error!void, - const Error = fs.File.OpenError || fs.File.ReadError; + const Error = fs.File.OpenError || fs.File.ReadError || fs.File.StatError; fn lessThan(context: void, lhs: *const HashedFile, rhs: *const HashedFile) bool { _ = context; @@ -544,6 +551,8 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void var buf: [8000]u8 = undefined; var file = try dir.openFile(hashed_file.path, .{}); var hasher = Hash.init(.{}); + hasher.update(hashed_file.path); + hasher.update(&.{ 0, @boolToInt(try isExecutable(file)) }); while (true) { const bytes_read = try file.read(&buf); if (bytes_read == 0) break; @@ -552,6 +561,19 @@ fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void hasher.final(&hashed_file.hash); } +fn isExecutable(file: fs.File) !bool { + if (builtin.os.tag == .windows) { + // TODO check the ACL on Windows. + // Until this is implemented, this could be a false negative on + // Windows, which is why we do not yet set executable_bit_only above + // when unpacking the tarball. + return false; + } else { + const stat = try file.stat(); + return (stat.mode & std.os.S.IXUSR) != 0; + } +} + const hex_charset = "0123456789abcdef"; fn hex64(x: u64) [16]u8 { From 24ff8a1a5fc00c405e5506251f11d23653d6c8b5 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 1 Feb 2023 20:02:35 -0700 Subject: [PATCH 44/65] zig build: use multihash for the hash field https://multiformats.io/multihash/ Still, only SHA2-256 is supported. This is only intended to future-proof the hash field of the manifest. closes #14284 --- src/Package.zig | 76 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 9 deletions(-) diff --git a/src/Package.zig b/src/Package.zig index 0f036b9ef5..35b1ff5056 100644 --- a/src/Package.zig +++ b/src/Package.zig @@ -299,16 +299,37 @@ fn fetchAndUnpack( // Check if the expected_hash is already present in the global package // cache, and thereby avoid both fetching and unpacking. if (expected_hash) |h| cached: { - if (h.len != 2 * Hash.digest_length) { + const hex_multihash_len = 2 * multihash_len; + if (h.len >= 2) { + const their_multihash_func = std.fmt.parseInt(u8, h[0..2], 16) catch |err| { + return reportError( + ini, + comp_directory, + h.ptr, + "invalid multihash value: unable to parse hash function: {s}", + .{@errorName(err)}, + ); + }; + if (@intToEnum(MultihashFunction, their_multihash_func) != multihash_function) { + return reportError( + ini, + comp_directory, + h.ptr, + "unsupported hash function: only sha2-256 is supported", + .{}, + ); + } + } + if (h.len != hex_multihash_len) { return reportError( ini, comp_directory, h.ptr, "wrong hash size. expected: {d}, found: {d}", - .{ Hash.digest_length, h.len }, + .{ hex_multihash_len, h.len }, ); } - const hex_digest = h[0 .. 2 * Hash.digest_length]; + const hex_digest = h[0..hex_multihash_len]; const pkg_dir_sub_path = "p" ++ s ++ hex_digest; var pkg_dir = global_cache_directory.handle.openDir(pkg_dir_sub_path, .{}) catch |err| switch (err) { error.FileNotFound => break :cached, @@ -397,8 +418,8 @@ fn fetchAndUnpack( const pkg_dir_sub_path = "p" ++ s ++ hexDigest(actual_hash); try renameTmpIntoCache(global_cache_directory.handle, tmp_dir_sub_path, pkg_dir_sub_path); + const actual_hex = hexDigest(actual_hash); if (expected_hash) |h| { - const actual_hex = hexDigest(actual_hash); if (!mem.eql(u8, h, &actual_hex)) { return reportError( ini, @@ -414,7 +435,7 @@ fn fetchAndUnpack( comp_directory, url.ptr, "url field is missing corresponding hash field: hash={s}", - .{std.fmt.fmtSliceHexLower(&actual_hash)}, + .{&actual_hex}, ); } @@ -592,11 +613,30 @@ test hex64 { try std.testing.expectEqualStrings("[00efcdab78563412]", s); } -fn hexDigest(digest: [Hash.digest_length]u8) [Hash.digest_length * 2]u8 { - var result: [Hash.digest_length * 2]u8 = undefined; +const multihash_function: MultihashFunction = switch (Hash) { + std.crypto.hash.sha2.Sha256 => .@"sha2-256", + else => @compileError("unreachable"), +}; +comptime { + // We avoid unnecessary uleb128 code in hexDigest by asserting here the + // values are small enough to be contained in the one-byte encoding. + assert(@enumToInt(multihash_function) < 127); + assert(Hash.digest_length < 127); +} +const multihash_len = 1 + 1 + Hash.digest_length; + +fn hexDigest(digest: [Hash.digest_length]u8) [multihash_len * 2]u8 { + var result: [multihash_len * 2]u8 = undefined; + + result[0] = hex_charset[@enumToInt(multihash_function) >> 4]; + result[1] = hex_charset[@enumToInt(multihash_function) & 15]; + + result[2] = hex_charset[Hash.digest_length >> 4]; + result[3] = hex_charset[Hash.digest_length & 15]; + for (digest) |byte, i| { - result[i * 2 + 0] = hex_charset[byte >> 4]; - result[i * 2 + 1] = hex_charset[byte & 15]; + result[4 + i * 2] = hex_charset[byte >> 4]; + result[5 + i * 2] = hex_charset[byte & 15]; } return result; } @@ -629,3 +669,21 @@ fn renameTmpIntoCache( break; } } + +const MultihashFunction = enum(u16) { + identity = 0x00, + sha1 = 0x11, + @"sha2-256" = 0x12, + @"sha2-512" = 0x13, + @"sha3-512" = 0x14, + @"sha3-384" = 0x15, + @"sha3-256" = 0x16, + @"sha3-224" = 0x17, + @"sha2-384" = 0x20, + @"sha2-256-trunc254-padded" = 0x1012, + @"sha2-224" = 0x1013, + @"sha2-512-224" = 0x1014, + @"sha2-512-256" = 0x1015, + @"blake2b-256" = 0xb220, + _, +}; From 72a7e3dc5e3d2128f4d95b7ba9554ea2e6e35139 Mon Sep 17 00:00:00 2001 From: praschke Date: Wed, 1 Feb 2023 20:52:06 +0000 Subject: [PATCH 45/65] mingw: stop using K&R-style function definitions this patch is from upstream, to fix -Wdeprecated-non-prototypes issues. K&R-style has apparently been deprecated since even C89, and C2x will be repurposing the syntax space. this warning triggers when the change would affect the meaning of the code. --- lib/libc/mingw/misc/strtoimax.c | 5 +---- lib/libc/mingw/misc/strtoumax.c | 5 +---- lib/libc/mingw/misc/wcstoimax.c | 5 +---- lib/libc/mingw/misc/wcstoumax.c | 5 +---- 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/libc/mingw/misc/strtoimax.c b/lib/libc/mingw/misc/strtoimax.c index eef5da97cc..9e75f8a275 100644 --- a/lib/libc/mingw/misc/strtoimax.c +++ b/lib/libc/mingw/misc/strtoimax.c @@ -31,10 +31,7 @@ #define valid(n, b) ((n) >= 0 && (n) < (b)) intmax_t -strtoimax(nptr, endptr, base) - register const char * __restrict__ nptr; - char ** __restrict__ endptr; - register int base; +strtoimax(const char * __restrict__ nptr, char ** __restrict__ endptr, int base) { register uintmax_t accum; /* accumulates converted value */ register int n; /* numeral from digit character */ diff --git a/lib/libc/mingw/misc/strtoumax.c b/lib/libc/mingw/misc/strtoumax.c index e86cd76132..2c24db14d8 100644 --- a/lib/libc/mingw/misc/strtoumax.c +++ b/lib/libc/mingw/misc/strtoumax.c @@ -31,10 +31,7 @@ #define valid(n, b) ((n) >= 0 && (n) < (b)) uintmax_t -strtoumax(nptr, endptr, base) - register const char * __restrict__ nptr; - char ** __restrict__ endptr; - register int base; +strtoumax(const char * __restrict__ nptr, char ** __restrict__ endptr, int base) { register uintmax_t accum; /* accumulates converted value */ register uintmax_t next; /* for computing next value of accum */ diff --git a/lib/libc/mingw/misc/wcstoimax.c b/lib/libc/mingw/misc/wcstoimax.c index 9821cf07cc..99e97b9214 100644 --- a/lib/libc/mingw/misc/wcstoimax.c +++ b/lib/libc/mingw/misc/wcstoimax.c @@ -33,10 +33,7 @@ #define valid(n, b) ((n) >= 0 && (n) < (b)) intmax_t -wcstoimax(nptr, endptr, base) - register const wchar_t * __restrict__ nptr; - wchar_t ** __restrict__ endptr; - register int base; +wcstoimax(const wchar_t * __restrict__ nptr, wchar_t ** __restrict__ endptr, int base) { register uintmax_t accum; /* accumulates converted value */ register int n; /* numeral from digit character */ diff --git a/lib/libc/mingw/misc/wcstoumax.c b/lib/libc/mingw/misc/wcstoumax.c index 0f1ed540c2..97f2c30833 100644 --- a/lib/libc/mingw/misc/wcstoumax.c +++ b/lib/libc/mingw/misc/wcstoumax.c @@ -33,10 +33,7 @@ #define valid(n, b) ((n) >= 0 && (n) < (b)) uintmax_t -wcstoumax(nptr, endptr, base) - register const wchar_t * __restrict__ nptr; - wchar_t ** __restrict__ endptr; - register int base; +wcstoumax(const wchar_t * __restrict__ nptr, wchar_t ** __restrict__ endptr, int base) { register uintmax_t accum; /* accumulates converted value */ register uintmax_t next; /* for computing next value of accum */ From e712d5f03e6e3ddde6a4a6f7d2d82e786efd543a Mon Sep 17 00:00:00 2001 From: Kirk Scheibelhut Date: Wed, 1 Feb 2023 10:15:58 -0800 Subject: [PATCH 46/65] remove reference to removed addTestExe --- lib/std/Build/InstallArtifactStep.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/Build/InstallArtifactStep.zig b/lib/std/Build/InstallArtifactStep.zig index 8ee739a41c..c419c85fdf 100644 --- a/lib/std/Build/InstallArtifactStep.zig +++ b/lib/std/Build/InstallArtifactStep.zig @@ -23,7 +23,7 @@ pub fn create(builder: *std.Build, artifact: *CompileStep) *InstallArtifactStep .artifact = artifact, .dest_dir = artifact.override_dest_dir orelse switch (artifact.kind) { .obj => @panic("Cannot install a .obj build artifact."), - .@"test" => @panic("Cannot install a test build artifact, use addTestExe instead."), + .@"test" => @panic("Cannot install a .test build artifact, use .test_exe instead."), .exe, .test_exe => InstallDir{ .bin = {} }, .lib => InstallDir{ .lib = {} }, }, From c3abb63fe99eb7091e5841f8e65f197b77d868a8 Mon Sep 17 00:00:00 2001 From: Krzysztof Wolicki Der Teufel Date: Thu, 2 Feb 2023 14:46:42 +0100 Subject: [PATCH 47/65] autodoc: Added `@qualCast` builtin function handling --- lib/docs/main.js | 4 ++++ src/Autodoc.zig | 1 + 2 files changed, 5 insertions(+) diff --git a/lib/docs/main.js b/lib/docs/main.js index d488d018a6..62af5866b6 100644 --- a/lib/docs/main.js +++ b/lib/docs/main.js @@ -1354,6 +1354,10 @@ const NAV_MODES = { payloadHtml += "ptrCast"; break; } + case "qual_cast": { + payloadHtml += "qualCast"; + break; + } case "truncate": { payloadHtml += "truncate"; break; diff --git a/src/Autodoc.zig b/src/Autodoc.zig index 8afc9c859b..0798ec198f 100644 --- a/src/Autodoc.zig +++ b/src/Autodoc.zig @@ -1400,6 +1400,7 @@ fn walkInstruction( .float_cast, .int_cast, .ptr_cast, + .qual_cast, .truncate, .align_cast, .has_decl, From 03cdb4fb5853109e46bdc08d8a849a23780093ae Mon Sep 17 00:00:00 2001 From: Jan Philipp Hafer Date: Thu, 26 Jan 2023 22:44:39 +0100 Subject: [PATCH 48/65] compiler_rt: make README visually nice and improve explanations This commit makes the text more dense with sources, noes the outstanding audit and adds an explanation of the table before converting everything to markdown tables. For the status a checkmark or cross in utf8 encoding are used and the input and output sizes of all operations are given inclusive comments for understanding of the routines. This should document all compiler_rt integer and float routines, but does not include a documentation of existing ieee floating and math routines. --- lib/compiler_rt/README.md | 977 ++++++++++++++++++++------------------ 1 file changed, 520 insertions(+), 457 deletions(-) diff --git a/lib/compiler_rt/README.md b/lib/compiler_rt/README.md index b2c6a10695..8e838dfced 100644 --- a/lib/compiler_rt/README.md +++ b/lib/compiler_rt/README.md @@ -27,482 +27,545 @@ then statically linked and therefore is a transparent dependency for the programmer. For details see `../compiler_rt.zig`. -The routines in this folder are listed below. -Routines are annotated as `type source routine // description`, with `routine` -being the name used in aforementioned `compiler_rt.zig`. -`dev` means deviating from compiler_rt, `port` ported, `source` is the -information source for the implementation, `none` means unimplemented. -Some examples for the naming convention are: -- dev source name_routine, name_routine2 various implementations for performance, simplicity etc -- port llvm compiler-rt library routines from [LLVM](http://compiler-rt.llvm.org/) - * LLVM emits library calls to compiler-rt, if the hardware lacks functionality -- port musl libc routines from [musl](https://musl.libc.org/) -If the library or information source is uncommon, use the entry `other` for `source`. -Please do not break the search by inserting entries in another format than `impl space source`. - Bugs should be solved by trying to duplicate the bug upstream, if possible. * If the bug exists upstream, get it fixed upstream and port the fix downstream to Zig. * If the bug only exists in Zig, use the corresponding C code and debug both implementations side by side to figure out what is wrong. -## Integer library routines +Routines with status are given below. Sources were besides +"The Art of Computer Programming" by Donald E. Knuth, "HackersDelight" by Henry S. Warren, +"Bit Twiddling Hacks" collected by Sean Eron Anderson, "Berkeley SoftFloat" by John R. Hauser, +LLVM "compiler-rt" as it was MIT-licensed, "musl libc" and thoughts + work of contributors. -#### Integer Bit operations +The compiler-rt routines have not yet been audited. +See https://github.com/ziglang/zig/issues/1504. -- dev HackersDelight __clzsi2 // count leading zeros -- dev HackersDelight __clzdi2 // count leading zeros -- dev HackersDelight __clzti2 // count leading zeros -- dev HackersDelight __ctzsi2 // count trailing zeros -- dev HackersDelight __ctzdi2 // count trailing zeros -- dev HackersDelight __ctzti2 // count trailing zeros -- dev __ctzsi2 __ffssi2 // find least significant 1 bit -- dev __ctzsi2 __ffsdi2 // find least significant 1 bit -- dev __ctzsi2 __ffsti2 // find least significant 1 bit -- dev BitTwiddlingHacks __paritysi2 // bit parity -- dev BitTwiddlingHacks __paritydi2 // bit parity -- dev BitTwiddlingHacks __parityti2 // bit parity -- dev TAOCP __popcountsi2 // bit population -- dev TAOCP __popcountdi2 // bit population -- dev TAOCP __popcountti2 // bit population -- dev other __bswapsi2 // a byteswapped -- dev other __bswapdi2 // a byteswapped -- dev other __bswapti2 // a byteswapped +From left to right the columns mean 1. if the routine is implemented (✗ or ✓), +2. the name, 3. input (`a`), 4. input (`b`), 5. return value, +6. an explanation of the functionality, .. to repeat the comment from the +column a row above and/or additional return values. +Some routines have more extensive comments supplemented with a reference text. -#### Integer Comparison +Integer and Float Operations -- port llvm __cmpsi2 // a,b: i32, (a 0, (a==b) -> 1, (a>b) -> 2 -- port llvm __cmpdi2 // a,b: i64 -- port llvm __cmpti2 // a,b: i128 -- port llvm __ucmpsi2 // a,b: u32, (a 0, (a==b) -> 1, (a>b) -> 2 -- port llvm __ucmpdi2 // a,b: u64 -- port llvm __ucmpti2 // a,b: u128 +| Done | Name | a | b | Out | Comment | +| ------ | ------------- | ---- | ---- | ---- | ------------------------------ | +| | | | | | **Integer Bit Operations** | +| ✓ | __clzsi2 | u32 | ∅ | i32 | count leading zeroes | +| ✓ | __clzdi2 | u64 | ∅ | i32 | count leading zeroes | +| ✓ | __clzti2 | u128 | ∅ | i32 | count trailing zeros | +| ✓ | __ctzsi2 | u32 | ∅ | i32 | count trailing zeros | +| ✓ | __ctzdi2 | u64 | ∅ | i32 | count trailing zeros | +| ✓ | __ctzti2 | u128 | ∅ | i32 | count leading zeroes | +| ✓ | __ffssi2 | u32 | ∅ | i32 | count leading zeroes | +| ✓ | __ffsdi2 | u64 | ∅ | i32 | count leading zeroes | +| ✓ | __ffsti2 | u128 | ∅ | i32 | count leading zeroes | +| ✓ | __paritysi2 | u32 | ∅ | i32 | find least significant 1 bit | +| ✓ | __paritydi2 | u64 | ∅ | i32 | find least significant 1 bit | +| ✓ | __parityti2 | u128 | ∅ | i32 | find least significant 1 bit | +| ✓ | __popcountsi2 | u32 | ∅ | i32 | bit population | +| ✓ | __popcountdi2 | u64 | ∅ | i32 | bit population | +| ✓ | __popcountti2 | u128 | ∅ | i32 | bit population | +| ✓ | __bswapsi2 | u32 | ∅ | i32 | bit parity | +| ✓ | __bswapdi2 | u64 | ∅ | i32 | bit parity | +| ✓ | __bswapti2 | u128 | ∅ | i32 | bit parity | +| | | | | | **Integer Comparison** | +| ✓ | __cmpsi2 | i32 | i32 | i32 | `(a 0, (a==b) -> 1, (a>b) -> 2` | +| ✓ | __cmpdi2 | i64 | i64 | i32 | .. | +| ✓ | __cmpti2 | i128 | i128 | i32 | .. | +| ✓ | __ucmpsi2 | i32 | i32 | i32 | `(a 0, (a==b) -> 1, (a>b) -> 2` | +| ✓ | __ucmpdi2 | i64 | i64 | i32 | .. | +| ✓ | __ucmpti2 | i128 | i128 | i32 | .. | +| | | | | | **Integer Arithmetic** | +| ✗ | __ashlsi3 | i32 | i32 | i32 | `a << b` [^unused_rl78] | +| ✓ | __ashldi3 | i64 | i32 | i64 | .. | +| ✓ | __ashlti3 | i128 | i32 | i128 | .. | +| ✓ | __aeabi_llsl | i32 | i32 | i32 | .. ARM | +| ✗ | __ashrsi3 | i32 | i32 | i32 | `a >> b` arithmetic (sign fill) [^unused_rl78] | +| ✓ | __ashrdi3 | i64 | i32 | i64 | .. | +| ✓ | __ashrti3 | i128 | i32 | i128 | .. | +| ✓ | __aeabi_lasr | i64 | i32 | i64 | .. ARM | +| ✗ | __lshrsi3 | i32 | i32 | i32 | `a >> b` logical (zero fill) [^unused_rl78] | +| ✓ | __lshrdi3 | i64 | i32 | i64 | .. | +| ✓ | __lshrti3 | i128 | i32 | i128 | .. | +| ✓ | __aeabi_llsr | i64 | i32 | i64 | .. ARM | +| ✓ | __negsi2 | i32 | i32 | i32 | `-a` [^libgcc_compat] | +| ✓ | __negdi2 | i64 | i64 | i64 | .. | +| ✓ | __negti2 | i128 | i128 | i128 | .. | +| ✓ | __mulsi3 | i32 | i32 | i32 | `a * b` | +| ✓ | __muldi3 | i64 | i64 | i64 | .. | +| ✓ | __multi3 | i128 | i128 | i128 | .. | +| ✓ | __divsi3 | i32 | i32 | i32 | `a / b` | +| ✓ | __divdi3 | i64 | i64 | i64 | .. | +| ✓ | __divti3 | i128 | i128 | i128 | .. | +| ✓ | __aeabi_idiv | i32 | i32 | i32 | .. ARM | +| ✓ | __udivsi3 | u32 | u32 | u32 | `a / b` | +| ✓ | __udivdi3 | u64 | u64 | u64 | .. | +| ✓ | __udivti3 | u128 | u128 | u128 | .. | +| ✓ | __aeabi_uidiv | i32 | i32 | i32 | .. ARM | +| ✓ | __modsi3 | i32 | i32 | i32 | `a % b` | +| ✓ | __moddi3 | i64 | i64 | i64 | .. | +| ✓ | __modti3 | i128 | i128 | i128 | .. | +| ✓ | __umodsi3 | u32 | u32 | u32 | `a % b` | +| ✓ | __umoddi3 | u64 | u64 | u64 | .. | +| ✓ | __umodti3 | u128 | u128 | u128 | .. | +| ✓ | __udivmodsi4 | u32 | u32 | u32 | `a / b, rem.* = a % b` | +| ✓ | __udivmoddi4 | u64 | u64 | u64 | .. | +| ✓ | __udivmodti4 | u128 | u128 | u128 | .. | +| ✓ | __divmodsi4 | i32 | i32 | i32 | `a / b, rem.* = a % b` | +| ✓ | __divmoddi4 | i64 | i64 | i64 | .. | +| ✗ | __divmodti4 | i128 | i128 | i128 | .. [^libgcc_compat] | +| | | | | | **Integer Arithmetic with Trapping Overflow**| +| ✓ | __absvsi2 | i32 | i32 | i32 | abs(a) | +| ✓ | __absvdi2 | i64 | i64 | i64 | .. | +| ✓ | __absvti2 | i128 | i128 | i128 | .. | +| ✓ | __negvsi2 | i32 | i32 | i32 | `-a` [^libgcc_compat] | +| ✓ | __negvdi2 | i64 | i64 | i64 | .. | +| ✓ | __negvti2 | i128 | i128 | i128 | .. | +| ✗ | __addvsi3 | i32 | i32 | i32 | `a + b` | +| ✗ | __addvdi3 | i64 | i64 | i64 | .. | +| ✗ | __addvti3 | i128 | i128 | i128 | .. | +| ✗ | __subvsi3 | i32 | i32 | i32 | `a - b` | +| ✗ | __subvdi3 | i64 | i64 | i64 | .. | +| ✗ | __subvti3 | i128 | i128 | i128 | .. | +| ✗ | __mulvsi3 | i32 | i32 | i32 | `a * b` | +| ✗ | __mulvdi3 | i64 | i64 | i64 | .. | +| ✗ | __mulvti3 | i128 | i128 | i128 | .. | +| | | | | | **Integer Arithmetic which Return on Overflow** [^noptr_faster] | +| ✓ | __addosi4 | i32 | i32 | i32 | `a + b`, overflow->ov.*=1 else 0 [^perf_addition] | +| ✓ | __addodi4 | i64 | i64 | i64 | .. | +| ✓ | __addoti4 | i128 | i128 | i128 | .. | +| ✓ | __subosi4 | i32 | i32 | i32 | `a - b`, overflow->ov.*=1 else 0 [^perf_addition] | +| ✓ | __subodi4 | i64 | i64 | i64 | .. | +| ✓ | __suboti4 | i128 | i128 | i128 | .. | +| ✓ | __mulosi4 | i32 | i32 | i32 | `a * b`, overflow->ov.*=1 else 0 | +| ✓ | __mulodi4 | i64 | i64 | i64 | .. | +| ✓ | __muloti4 | i128 | i128 | i128 | .. | +| | | | | | **Float Conversion** | +| ✓ | __extendsfdf2 | f32 | ∅ | f64 | .. | +| ✓ | __extendsftf2 | f32 | ∅ | f128 | .. | +| ✓ | __extendsfxf2 | f32 | ∅ | f80 | .. | +| ✓ | __extenddftf2 | f64 | ∅ | f128 | .. | +| ✓ | __extenddfxf2 | f64 | ∅ | f80 | .. | +| ✓ | __truncsfhf2 | f32 | ∅ | f16 | rounding towards zero | +| ✓ | __truncdfhf2 | f64 | ∅ | f16 | .. | +| ✓ | __truncdfsf2 | f64 | ∅ | f32 | .. | +| ✓ | __trunctfhf2 | f128 | ∅ | f16 | .. | +| ✓ | __trunctfsf2 | f128 | ∅ | f32 | .. | +| ✓ | __trunctfdf2 | f128 | ∅ | f64 | .. | +| ✓ | __trunctfxf2 | f128 | ∅ | f80 | .. | +| ✓ | __truncxfhf2 | f80 | ∅ | f16 | .. | +| ✓ | __truncxfsf2 | f80 | ∅ | f32 | .. | +| ✓ | __truncxfdf2 | f80 | ∅ | f64 | .. | +| ✓ | __aeabi_f2h | f32 | ∅ | f16 | .. ARM | +| ✓ | __gnu_f2h_ieee | f32 | ∅ | f16 | ..GNU naming convention | +| ✓ | __aeabi_d2h | f64 | ∅ | f16 | .. ARM | +| ✓ | __aeabi_d2f | f64 | ∅ | f32 | .. ARM | +| ✓ | __trunckfsf2 | f128 | ∅ | f32 | .. PPC | +| ✓ | _Qp_qtos |*f128 | ∅ | f32 | .. SPARC | +| ✓ | __trunckfdf2 | f128 | ∅ | f64 | .. PPC | +| ✓ | _Qp_qtod |*f128 | ∅ | f64 | .. SPARC | +| ✓ | __fixhfsi | f16 | ∅ | i32 | rounding towards zero | +| ✓ | __fixsfsi | f32 | ∅ | i32 | .. | +| ✓ | __fixdfsi | f64 | ∅ | i32 | .. | +| ✓ | __fixtfsi | f128 | ∅ | i32 | .. | +| ✓ | __fixxfsi | f80 | ∅ | i32 | .. | +| ✓ | __fixhfdi | f16 | ∅ | i64 | .. | +| ✓ | __fixsfdi | f32 | ∅ | i64 | .. | +| ✓ | __fixdfdi | f64 | ∅ | i64 | .. | +| ✓ | __fixtfdi | f128 | ∅ | i64 | .. | +| ✓ | __fixxfdi | f80 | ∅ | i64 | .. | +| ✓ | __fixhfti | f16 | ∅ | i128 | .. | +| ✓ | __fixsfti | f32 | ∅ | i128 | .. | +| ✓ | __fixdfti | f64 | ∅ | i128 | .. | +| ✓ | __fixtfti | f128 | ∅ | i128 | .. | +| ✓ | __fixxfti | f80 | ∅ | i128 | .. | +| ✓ | __fixunshfsi | f16 | ∅ | u32 | rounding towards zero. negative values become 0. | +| ✓ | __fixunssfsi | f32 | ∅ | u32 | .. | +| ✓ | __fixunsdfsi | f64 | ∅ | u32 | .. | +| ✓ | __fixunstfsi | f128 | ∅ | u32 | .. | +| ✓ | __fixunsxfsi | f80 | ∅ | u32 | .. | +| ✓ | __fixunshfdi | f16 | ∅ | u64 | .. | +| ✓ | __fixunssfdi | f32 | ∅ | u64 | .. | +| ✓ | __fixunsdfdi | f64 | ∅ | u64 | .. | +| ✓ | __fixunstfdi | f128 | ∅ | u64 | .. | +| ✓ | __fixunsxfdi | f80 | ∅ | u64 | .. | +| ✓ | __fixunshfti | f16 | ∅ | u128 | .. | +| ✓ | __fixunssfti | f32 | ∅ | u128 | .. | +| ✓ | __fixunsdfti | f64 | ∅ | u128 | .. | +| ✓ | __fixunstfti | f128 | ∅ | u128 | .. | +| ✓ | __fixunsxfti | f80 | ∅ | u128 | .. | +| ✓ | __floatsihf | i32 | ∅ | f16 | int_to_float conversions | +| ✓ | __floatsisf | i32 | ∅ | f32 | .. | +| ✓ | __floatsidf | i32 | ∅ | f64 | .. | +| ✓ | __floatsitf | i32 | ∅ | f128 | .. | +| ✓ | __floatsixf | i32 | ∅ | f80 | .. | +| ✓ | __floatdisf | i64 | ∅ | f32 | .. | +| ✓ | __floatdidf | i64 | ∅ | f64 | .. | +| ✓ | __floatditf | i64 | ∅ | f128 | .. | +| ✓ | __floatdixf | i64 | ∅ | f80 | .. | +| ✓ | __floattihf | i128 | ∅ | f16 | .. | +| ✓ | __floattisf | i128 | ∅ | f32 | .. | +| ✓ | __floattidf | i128 | ∅ | f64 | .. | +| ✓ | __floattitf | i128 | ∅ | f128 | .. | +| ✓ | __floattixf | i128 | ∅ | f80 | .. | +| ✓ | __floatunsihf | u32 | ∅ | f16 | uint_to_float conversions | +| ✓ | __floatunsisf | u32 | ∅ | f32 | .. | +| ✓ | __floatunsidf | u32 | ∅ | f64 | .. | +| ✓ | __floatunsitf | u32 | ∅ | f128 | .. | +| ✓ | __floatunsixf | u32 | ∅ | f80 | .. | +| ✓ | __floatundihf | u64 | ∅ | f16 | .. | +| ✓ | __floatundisf | u64 | ∅ | f32 | .. | +| ✓ | __floatundidf | u64 | ∅ | f64 | .. | +| ✓ | __floatunditf | u64 | ∅ | f128 | .. | +| ✓ | __floatundixf | u64 | ∅ | f80 | .. | +| ✓ | __floatuntihf | u128 | ∅ | f16 | .. | +| ✓ | __floatuntisf | u128 | ∅ | f32 | .. | +| ✓ | __floatuntidf | u128 | ∅ | f64 | .. | +| ✓ | __floatuntitf | u128 | ∅ | f128 | .. | +| ✓ | __floatuntixf | u128 | ∅ | f80 | .. | +| | | | | | **Float Comparison** | +| ✓ | __cmphf2 | f16 | f16 | i32 | `(a-1, (a==b)->0, (a>b)->1, Nan->1` | +| ✓ | __cmpsf2 | f32 | f32 | i32 | exported from __lesf2, __ledf2, __letf2 (below) | +| ✓ | __cmpdf2 | f64 | f64 | i32 | But: if NaN is a possibility, use another routine. | +| ✓ | __cmptf2 | f128 | f128 | i32 | .. | +| ✓ | __cmpxf2 | f80 | f80 | i32 | .. | +| ✓ | _Qp_cmp |*f128 |*f128 | i32 | .. SPARC | +| ✓ | __unordhf2 | f16 | f16 | i32 | `(a==+-NaN or b==+-NaN) -> !=0, else -> 0` | +| ✓ | __unordsf2 | f32 | f32 | i32 | .. | +| ✓ | __unorddf2 | f64 | f64 | i32 | Note: only reliable for (input!=NaN) | +| ✓ | __unordtf2 | f128 | f128 | i32 | .. | +| ✓ | __unordxf2 | f80 | f80 | i32 | .. | +| ✓ | __aeabi_fcmpun | f32 | f32 | i32 | .. ARM | +| ✓ | __aeabi_dcmpun | f32 | f32 | i32 | .. ARM | +| ✓ | __unordkf2 | f128 | f128 | i32 | .. PPC | +| ✓ | __eqhf2 | f16 | f16 | i32 | `(a!=NaN) and (b!=Nan) and (a==b) -> output=0` | +| ✓ | __eqsf2 | f32 | f32 | i32 | .. | +| ✓ | __eqdf2 | f64 | f64 | i32 | .. | +| ✓ | __eqtf2 | f128 | f128 | i32 | .. | +| ✓ | __eqxf2 | f80 | f80 | i32 | .. | +| ✓ | __aeabi_fcmpeq | f32 | f32 | i32 | .. ARM | +| ✓ | __aeabi_dcmpeq | f32 | f32 | i32 | .. ARM | +| ✓ | __eqkf2 | f128 | f128 | i32 | .. PPC | +| ✓ | _Qp_feq |*f128 |*f128 | bool | .. SPARC | +| ✓ | __nehf2 | f16 | f16 | i32 | `(a==NaN) or (b==Nan) or (a!=b) -> output!=0` | +| ✓ | __nesf2 | f32 | f32 | i32 | Note: __eqXf2 and __neXf2 have same return value | +| ✓ | __nedf2 | f64 | f64 | i32 | .. | +| ✓ | __netf2 | f128 | f128 | i32 | .. | +| ✓ | __nexf2 | f80 | f80 | i32 | .. | +| ✓ | __nekf2 | f128 | f128 | i32 | .. PPC | +| ✓ | _Qp_fne |*f128 |*f128 | bool | .. SPARC | +| ✓ | __gehf2 | f16 | f16 | i32 | `(a!=Nan) and (b!=Nan) and (a>=b) -> output>=0` | +| ✓ | __gesf2 | f32 | f32 | i32 | .. | +| ✓ | __gedf2 | f64 | f64 | i32 | .. | +| ✓ | __getf2 | f128 | f128 | i32 | .. | +| ✓ | __gexf2 | f80 | f80 | i32 | .. | +| ✓ | __gekf2 | f128 | f128 | i32 | .. PPC | +| ✓ | _Qp_fge |*f128 |*f128 | bool | .. SPARC | +| ✓ | __lthf2 | f16 | f16 | i32 | `(a!=Nan) and (b!=Nan) and (a output<0` | +| ✓ | __ltsf2 | f32 | f32 | i32 | .. | +| ✓ | __ltdf2 | f64 | f64 | i32 | .. | +| ✓ | __lttf2 | f128 | f128 | i32 | .. | +| ✓ | __ltxf2 | f80 | f80 | i32 | .. | +| ✓ | __ltkf2 | f128 | f128 | i32 | .. PPC | +| ✓ | __aeabi_fcmplt | f32 | f32 | i32 | .. ARM | +| ✓ | __aeabi_dcmplt | f32 | f32 | i32 | .. ARM | +| ✓ | _Qp_flt |*f128 |*f128 | bool | .. SPARC | +| ✓ | __lehf2 | f16 | f16 | i32 | `(a!=Nan) and (b!=Nan) and (a<=b) -> output<=0` | +| ✓ | __lesf2 | f32 | f32 | i32 | .. | +| ✓ | __ledf2 | f64 | f64 | i32 | .. | +| ✓ | __letf2 | f128 | f128 | i32 | .. | +| ✓ | __lexf2 | f80 | f80 | i32 | .. | +| ✓ | __aeabi_fcmple | f32 | f32 | i32 | .. ARM | +| ✓ | __aeabi_dcmple | f32 | f32 | i32 | .. ARM | +| ✓ | __lekf2 | f128 | f128 | i32 | .. PPC | +| ✓ | _Qp_fle |*f128 |*f128 | bool | .. SPARC | +| ✓ | __gthf2 | f16 | f16 | i32 | `(a!=Nan) and (b!=Nan) and (a>b) -> output>0` | +| ✓ | __gtsf2 | f32 | f32 | i32 | .. | +| ✓ | __gtdf2 | f64 | f64 | i32 | .. | +| ✓ | __gttf2 | f128 | f128 | i32 | .. | +| ✓ | __gtxf2 | f80 | f80 | i32 | .. | +| ✓ | __gtkf2 | f128 | f128 | i32 | .. PPC | +| ✓ | _Qp_fgt |*f128 |*f128 | bool | .. SPARC | +| | | | | | **Float Arithmetic** | +| ✓ | __addhf3 | f32 | f32 | f32 | `a + b` | +| ✓ | __addsf3 | f32 | f32 | f32 | .. | +| ✓ | __adddf3 | f64 | f64 | f64 | .. | +| ✓ | __addtf3 | f128 | f128 | f128 | .. | +| ✓ | __addxf3 | f80 | f80 | f80 | .. | +| ✓ | __aeabi_fadd | f32 | f32 | f32 | .. ARM | +| ✓ | __aeabi_dadd | f64 | f64 | f64 | .. ARM | +| ✓ | __addkf3 | f128 | f128 | f128 | .. PPC | +| ✓ | _Qp_add |*f128 |*f128 | void | .. SPARC args *c,*a,*b c=a+b | +| ✓ | __subhf3 | f32 | f32 | f32 | `a - b` | +| ✓ | __subsf3 | f32 | f32 | f32 | .. | +| ✓ | __subdf3 | f64 | f64 | f64 | .. | +| ✓ | __subtf3 | f128 | f128 | f128 | .. | +| ✓ | __subxf3 | f80 | f80 | f80 | .. | +| ✓ | __aeabi_fsub | f32 | f32 | f32 | .. ARM | +| ✓ | __aeabi_dsub | f64 | f64 | f64 | .. ARM | +| ✓ | __subkf3 | f128 | f128 | f128 | .. PPC | +| ✓ | _Qp_sub |*f128 |*f128 | void | .. SPARC args *c,*a,*b c=a-b | +| ✓ | __mulhf3 | f32 | f32 | f32 | `a * b` | +| ✓ | __mulsf3 | f32 | f32 | f32 | .. | +| ✓ | __muldf3 | f64 | f64 | f64 | .. | +| ✓ | __multf3 | f128 | f128 | f128 | .. | +| ✓ | __mulxf3 | f80 | f80 | f80 | .. | +| ✓ | __aeabi_fmul | f32 | f32 | f32 | .. ARM | +| ✓ | __aeabi_dmul | f64 | f64 | f64 | .. ARM | +| ✓ | __mulkf3 | f128 | f128 | f128 | .. PPC | +| ✓ | _Qp_mul |*f128 |*f128 | void | .. SPARC args *c,*a,*b c=a*b | +| ✓ | __divsf3 | f32 | f32 | f32 | `a / b` | +| ✓ | __divdf3 | f64 | f64 | f64 | .. | +| ✓ | __divtf3 | f128 | f128 | f128 | .. | +| ✓ | __divxf3 | f80 | f80 | f80 | .. | +| ✓ | __aeabi_fdiv | f32 | f32 | f32 | .. ARM | +| ✓ | __aeabi_ddiv | f64 | f64 | f64 | .. ARM | +| ✓ | __divkf3 | f128 | f128 | f128 | .. PPC | +| ✓ | _Qp_div |*f128 |*f128 | void | .. SPARC args *c,*a,*b c=a*b | +| ✓ | __negsf2 | f32 | ∅ | f32[^unused_rl78] | -a (can be lowered directly to a xor) | +| ✓ | __negdf2 | f64 | ∅ | f64 | .. | +| ✓ | __negtf2 | f128 | ∅ | f128 | .. | +| ✓ | __negxf2 | f80 | ∅ | f80 | .. | +| | | | | | **Floating point raised to integer power** | +| ✗ | __powihf2 | f16 | f16 | f16 | `a ^ b` | +| ✗ | __powisf2 | f32 | f32 | f32 | .. | +| ✗ | __powidf2 | f64 | f64 | f64 | .. | +| ✗ | __powitf2 | f128 | f128 | f128 | .. | +| ✗ | __powixf2 | f80 | f80 | f80 | .. | +| ✓ | __mulhc3 | all4 | f16 | f16 | `(a+ib) * (c+id)` | +| ✓ | __mulsc3 | all4 | f32 | f32 | .. | +| ✓ | __muldc3 | all4 | f64 | f64 | .. | +| ✓ | __multc3 | all4 | f128 | f128 | .. | +| ✓ | __mulxc3 | all4 | f80 | f80 | .. | +| ✓ | __divhc3 | all4 | f16 | f16 | `(a+ib) / (c+id)` | +| ✓ | __divsc3 | all4 | f32 | f32 | .. | +| ✓ | __divdc3 | all4 | f64 | f64 | .. | +| ✓ | __divtc3 | all4 | f128 | f128 | .. | +| ✓ | __divxc3 | all4 | f80 | f80 | .. | -#### Integer Arithmetic +[^unused_rl78]: Unused in LLVM, but used for example by rl78. +[^libgcc_compat]: Unused in backends and for symbol-level compatibility with libgcc. +[^noptr_faster]: Operations without pointer and without C struct semantics lead to better optimizations. +[^perf_addition]: Has better performance than standard method due to 2s complement semantics. +Not provided by LLVM and libgcc. -- none none __ashlsi3 // a,b: i32, a << b unused in llvm, TODO (e.g. used by rl78) -- port llvm __ashldi3 // a,b: u64 -- port llvm __ashlti3 // a,b: u128 -- none none __ashrsi3 // a,b: i32, a >> b arithmetic (sign fill) TODO (e.g. used by rl78) -- port llvm __ashrdi3 // .. -- port llvm __ashrti3 // -- none none __lshrsi3 // a,b: i32, a >> b logical (zero fill) TODO (e.g. used by rl78) -- port llvm __lshrdi3 // -- port llvm __lshrti3 // -- port llvm __negdi2 // a: i32, -a, symbol-level compatibility with libgcc -- port llvm __negti2 // unnecessary: unused in backends -- port llvm __mulsi3 // a,b: i32, a * b -- port llvm __muldi3 // -- port llvm __multi3 // -- port llvm __divsi3 // a,b: i32, a / b -- port llvm __divdi3 // -- port llvm __divti3 // -- port llvm __udivsi3 // a,b: u32, a / b -- port llvm __udivdi3 // -- port llvm __udivti3 // -- port llvm __modsi3 // a,b: i32, a % b -- port llvm __moddi3 // -- port llvm __modti3 // -- port llvm __umodsi3 // a,b: u32, a % b -- port llvm __umoddi3 // -- port llvm __umodti3 // -- port llvm __udivmoddi4 // a,b: u32, a / b, rem.* = a % b unsigned -- port llvm __udivmodti4 // -- port llvm __udivmodsi4 // -- port llvm __divmodsi4 // a,b: i32, a / b, rem.* = a % b signed, ARM -- port llvm __divmoddi4 // - -#### Integer Arithmetic with trapping overflow - -- dev BitTwiddlingHacks __absvsi2 // abs(a) -- dev BitTwiddlingHacks __absvdi2 // abs(a) -- dev BitTwiddlingHacks __absvti2 // abs(a) -- port llvm __negvsi2 // -a symbol-level compatibility: libgcc -- port llvm __negvdi2 // -a unnecessary: unused in backends -- port llvm __negvti2 // -a -- TODO upstreaming __addvsi3..__mulvti3 after testing panics works -- dev HackersDelight __addvsi3 // a + b -- dev HackersDelight __addvdi3 // -- dev HackersDelight __addvti3 // -- dev HackersDelight __subvsi3 // a - b -- dev HackersDelight __subvdi3 // -- dev HackersDelight __subvti3 // -- dev HackersDelight __mulvsi3 // a * b -- dev HackersDelight __mulvdi3 // -- dev HackersDelight __mulvti3 // - -#### Integer Arithmetic which returns if overflow (would be faster without pointer) - -- dev HackersDelight __addosi4 // a + b, overflow->ov.*=1 else 0 -- dev HackersDelight __addodi4 // (completeness + performance, llvm does not use them) -- dev HackersDelight __addoti4 // -- dev HackersDelight __subosi4 // a - b, overflow->ov.*=1 else 0 -- dev HackersDelight __subodi4 // (completeness + performance, llvm does not use them) -- dev HackersDelight __suboti4 // -- dev HackersDelight __mulosi4 // a * b, overflow->ov.*=1 else 0 -- dev HackersDelight __mulodi4 // (required by llvm) -- dev HackersDelight __muloti4 // - -## Float library routines - -TODO: review source of implementation - -#### Float Conversion - -- dev other __extendsfdf2 // a: f32 -> f64, TODO: missing tests -- dev other __extendsftf2 // a: f32 -> f128 -- dev llvm __extendsfxf2 // a: f32 -> f80, TODO: missing tests -- dev other __extenddftf2 // a: f64 -> f128 -- dev llvm __extenddfxf2 // a: f64 -> f80 -- dev other __truncdfsf2 // a: f64 -> f32, rounding towards zero -- dev other __trunctfdf2 // a: f128-> f64 -- dev other __trunctfsf2 // a: f128-> f32 -- dev llvm __truncxfsf2 // a: f80 -> f32, TODO: missing tests -- dev llvm __truncxfdf2 // a: f80 -> f64, TODO: missing tests - -- dev unclear __fixsfsi // a: f32 -> i32, rounding towards zero -- dev unclear __fixdfsi // a: f64 -> i32 -- dev unclear __fixtfsi // a: f128-> i32 -- dev unclear __fixxfsi // a: f80 -> i32, TODO: missing tests -- dev unclear __fixsfdi // a: f32 -> i64, rounding towards zero -- dev unclear __fixdfdi // .. -- dev unclear __fixtfdi // -- dev unclear __fixxfdi // TODO: missing tests -- dev unclear __fixsfti // a: f32 -> i128, rounding towards zero -- dev unclear __fixdfti // .. -- dev unclear __fixtfdi // -- dev unclear __fixxfti // TODO: missing tests - -- dev unclear __fixunssfsi // a: f32 -> u32, rounding towards zero. negative values become 0. -- dev unclear __fixunsdfsi // .. -- dev unclear __fixunstfsi // -- dev unclear __fixunsxfsi // TODO: missing tests -- dev unclear __fixunssfdi // a: f32 -> u64, rounding towards zero. negative values become 0. -- dev unclear __fixunsdfdi // -- dev unclear __fixunstfdi // -- dev unclear __fixunsxfdi // TODO: missing tests -- dev unclear __fixunssfti // a: f32 -> u128, rounding towards zero. negative values become 0. -- dev unclear __fixunsdfti // -- dev unclear __fixunstfdi // -- dev unclear __fixunsxfti // TODO: some more tests needed for base coverage - -- dev unclear __floatsisf // a: i32 -> f32 -- dev unclear __floatsidf // a: i32 -> f64, TODO: missing tests -- dev unclear __floatsitf // .. -- dev unclear __floatsixf // TODO: missing tests -- dev unclear __floatdisf // a: i64 -> f32 -- dev unclear __floatdidf // -- dev unclear __floatditf // -- dev unclear __floatdixf // TODO: missing tests -- dev unclear __floattisf // a: i128-> f32 -- dev unclear __floattidf // -- dev unclear __floattitf // -- dev unclear __floattixf // TODO: missing tests - -- dev unclear __floatunsisf // a: u32 -> f32 -- dev unclear __floatunsidf // TODO: missing tests -- dev unclear __floatunsitf // -- dev unclear __floatunsixf // TODO: missing tests -- dev unclear __floatundisf // a: u64 -> f32 -- dev unclear __floatundidf // -- dev unclear __floatunditf // -- dev unclear __floatundixf // TODO: missing tests -- dev unclear __floatuntisf // a: u128-> f32 -- dev unclear __floatuntidf // -- dev unclear __floatuntitf // -- dev unclear __floatuntixf // TODO: missing tests - -#### Float Comparison - -- dev other __cmpsf2 // a,b:f32, (a-1,(a==b)->0,(a>b)->1,Nan->1 -- dev other __cmpdf2 // exported from __lesf2, __ledf2, __letf2 (below) -- dev other __cmptf2 // But: if NaN is a possibility, use another routine. -- dev other __unordsf2 // a,b:f32, (a==+-NaN or b==+-NaN) -> !=0, else -> 0 -- dev other __unorddf2 // __only reliable for (input!=NaN)__ -- dev other __unordtf2 // TODO: missing tests -- dev other __eqsf2 // (a!=NaN) and (b!=Nan) and (a==b) -> output=0 -- dev other __eqdf2 // -- dev other __eqtf2 // -- dev other __nesf2 // (a==NaN) or (b==Nan) or (a!=b) -> output!=0 -- dev other __nedf2 // -- dev other __netf2 // __eqtf2 and __netf2 have same return value -> tested with __eqsf2 -- dev other __gesf2 // (a!=Nan) and (b!=Nan) and (a>=b) -> output>=0 -- dev other __gedf2 // -- dev other __getf2 // TODO: missing tests -- dev other __ltsf2 // (a!=Nan) and (b!=Nan) and (a output<0 -- dev other __ltdf2 // -- dev other __lttf2 // TODO: missing tests -- dev other __lesf2 // (a!=Nan) and (b!=Nan) and (a<=b) -> output<=0 -- dev other __ledf2 // -- dev other __letf2 // TODO: missing tests -- dev other __gtsf2 // (a!=Nan) and (b!=Nan) and (a>b) -> output>0 -- dev other __gtdf2 // -- dev other __gttf2 // TODO: missing tests - -#### Float Arithmetic - -- dev unclear __addsf3 // a + b f32, TODO: missing tests -- dev unclear __adddf3 // a + b f64, TODO: missing tests -- dev unclear __addtf3 // a + b f128 -- dev unclear __addxf3 // a + b f80 -- dev unclear __aeabi_fadd // a + b f64 ARM: AAPCS -- dev unclear __aeabi_dadd // a + b f64 ARM: AAPCS -- dev unclear __subsf3 // a - b, TODO: missing tests -- dev unclear __subdf3 // a - b, TODO: missing tests -- dev unclear __subtf3 // a - b -- dev unclear __subxf3 // a - b f80, TODO: missing tests -- dev unclear __aeabi_fsub // a - b f64 ARM: AAPCS -- dev unclear __aeabi_dsub // a - b f64 ARM: AAPCS -- dev unclear __mulsf3 // a * b, TODO: missing tests -- dev unclear __muldf3 // a * b, TODO: missing tests -- dev unclear __multf3 // a * b -- dev unclear __mulxf3 // a * b -- dev unclear __divsf3 // a / b, TODO: review tests -- dev unclear __divdf3 // a / b, TODO: review tests -- dev unclear __divtf3 // a / b -- dev unclear __divxf3 // a / b -- dev unclear __negsf2 // -a symbol-level compatibility: libgcc uses this for the rl78 -- dev unclear __negdf2 // -a unnecessary: can be lowered directly to a xor -- dev unclear __negtf2 // -a, TODO: missing tests -- dev unclear __negxf2 // -a, TODO: missing tests - -#### Floating point raised to integer power -- dev unclear __powisf2 // a ^ b, TODO -- dev unclear __powidf2 // -- dev unclear __powitf2 // -- dev unclear __powixf2 // -- dev unclear __mulsc3 // (a+ib) * (c+id) -- dev unclear __muldc3 // -- dev unclear __multc3 // -- dev unclear __mulxc3 // -- dev unclear __divsc3 // (a+ib) * / (c+id) -- dev unclear __divdc3 // -- dev unclear __divtc3 // -- dev unclear __divxc3 // - -## Decimal float library routines +Decimal float library routines BID means Binary Integer Decimal encoding, DPD means Densely Packed Decimal encoding. BID should be only chosen for binary data, DPD for decimal data (ASCII, Unicode etc). -If possible, use BCD instead of DPD to represent numbers not accurately representable -in binary like the number 0.2. +For example the number 0.2 is not accurately representable in binary data. -All routines are TODO. +| Done | Name | a | b | Out | Comment | +| ------ | ------------- | --------- | --------- | --------- | ---------------------------- | +| | | | | | **Decimal Float Conversion** | +| ✗ | __dpd_extendsddd2 | dec32 | ∅ | dec64 | conversion | +| ✗ | __bid_extendsddd2 | dec32 | ∅ | dec64 | .. | +| ✗ | __dpd_extendsdtd2 | dec32 | ∅ | dec128| .. | +| ✗ | __bid_extendsdtd2 | dec32 | ∅ | dec128| .. | +| ✗ | __dpd_extendddtd2 | dec64 | ∅ | dec128| .. | +| ✗ | __bid_extendddtd2 | dec64 | ∅ | dec128| .. | +| ✗ | __dpd_truncddsd2 | dec64 | ∅ | dec32 | .. | +| ✗ | __bid_truncddsd2 | dec64 | ∅ | dec32 | .. | +| ✗ | __dpd_trunctdsd2 | dec128 | ∅ | dec32 | .. | +| ✗ | __bid_trunctdsd2 | dec128 | ∅ | dec32 | .. | +| ✗ | __dpd_trunctddd2 | dec128 | ∅ | dec64 | .. | +| ✗ | __bid_trunctddd2 | dec128 | ∅ | dec64 | .. | +| ✗ | __dpd_extendsfdd | float | ∅ | dec64 | .. | +| ✗ | __bid_extendsfdd | float | ∅ | dec64 | .. | +| ✗ | __dpd_extendsftd | float | ∅ | dec128| .. | +| ✗ | __bid_extendsftd | float | ∅ | dec128| .. | +| ✗ | __dpd_extenddftd | double | ∅ | dec128| .. | +| ✗ | __bid_extenddftd | double | ∅ | dec128| .. | +| ✗ | __dpd_extendxftd |long double | ∅ | dec128| .. | +| ✗ | __bid_extendxftd |long double | ∅ | dec128| .. | +| ✗ | __dpd_truncdfsd | double | ∅ | dec32 | .. | +| ✗ | __bid_truncdfsd | double | ∅ | dec32 | .. | +| ✗ | __dpd_truncxfsd |long double | ∅ | dec32 | .. | +| ✗ | __bid_truncxfsd |long double | ∅ | dec32 | .. | +| ✗ | __dpd_trunctfsd |long double | ∅ | dec32 | .. | +| ✗ | __bid_trunctfsd |long double | ∅ | dec32 | .. | +| ✗ | __dpd_truncxfdd |long double | ∅ | dec64 | .. | +| ✗ | __bid_truncxfdd |long double | ∅ | dec64 | .. | +| ✗ | __dpd_trunctfdd |long double | ∅ | dec64 | .. | +| ✗ | __bid_trunctfdd |long double | ∅ | dec64 | .. | +| ✗ | __dpd_truncddsf | dec64 | ∅ | float | .. | +| ✗ | __bid_truncddsf | dec64 | ∅ | float | .. | +| ✗ | __dpd_trunctdsf | dec128 | ∅ | float | .. | +| ✗ | __bid_trunctdsf | dec128 | ∅ | float | .. | +| ✗ | __dpd_extendsddf | dec32 | ∅ | double| .. | +| ✗ | __bid_extendsddf | dec32 | ∅ | double| .. | +| ✗ | __dpd_trunctddf | dec128 | ∅ | double| .. | +| ✗ | __bid_trunctddf | dec128 | ∅ | double| .. | +| ✗ | __dpd_extendsdxf | dec32 | ∅ |long double| .. | +| ✗ | __bid_extendsdxf | dec32 | ∅ |long double| .. | +| ✗ | __dpd_extendddxf | dec64 | ∅ |long double| .. | +| ✗ | __bid_extendddxf | dec64 | ∅ |long double| .. | +| ✗ | __dpd_trunctdxf | dec128 | ∅ |long double| .. | +| ✗ | __bid_trunctdxf | dec128 | ∅ |long double| .. | +| ✗ | __dpd_extendsdtf | dec32 | ∅ |long double| .. | +| ✗ | __bid_extendsdtf | dec32 | ∅ |long double| .. | +| ✗ | __dpd_extendddtf | dec64 | ∅ |long double| .. | +| ✗ | __bid_extendddtf | dec64 | ∅ |long double| .. | +| ✗ | __dpd_extendsfsd | float | ∅ | dec32 | same size conversions | +| ✗ | __bid_extendsfsd | float | ∅ | dec32 | .. | +| ✗ | __dpd_extenddfdd | double | ∅ | dec64 | .. | +| ✗ | __bid_extenddfdd | double | ∅ | dec64 | .. | +| ✗ | __dpd_extendtftd |long double | ∅ | dec128| .. | +| ✗ | __bid_extendtftd |long double | ∅ | dec128| .. | +| ✗ | __dpd_truncsdsf | dec32 | ∅ | float | .. | +| ✗ | __bid_truncsdsf | dec32 | ∅ | float | .. | +| ✗ | __dpd_truncdddf | dec64 | ∅ | float | conversion | +| ✗ | __bid_truncdddf | dec64 | ∅ | float | .. | +| ✗ | __dpd_trunctdtf | dec128 | ∅ |long double| .. | +| ✗ | __bid_trunctdtf | dec128 | ∅ |long double| .. | +| ✗ | __dpd_fixsdsi | dec32 | ∅ | int | .. | +| ✗ | __bid_fixsdsi | dec32 | ∅ | int | .. | +| ✗ | __dpd_fixddsi | dec64 | ∅ | int | .. | +| ✗ | __bid_fixddsi | dec64 | ∅ | int | .. | +| ✗ | __dpd_fixtdsi | dec128 | ∅ | int | .. | +| ✗ | __bid_fixtdsi | dec128 | ∅ | int | .. | +| ✗ | __dpd_fixsddi | dec32 | ∅ | long | .. | +| ✗ | __bid_fixsddi | dec32 | ∅ | long | .. | +| ✗ | __dpd_fixdddi | dec64 | ∅ | long | .. | +| ✗ | __bid_fixdddi | dec64 | ∅ | long | .. | +| ✗ | __dpd_fixtddi | dec128 | ∅ | long | .. | +| ✗ | __bid_fixtddi | dec128 | ∅ | long | .. | +| ✗ | __dpd_fixunssdsi | dec32 | ∅ |unsigned int | .. All negative values become zero. | +| ✗ | __bid_fixunssdsi | dec32 | ∅ |unsigned int | .. | +| ✗ | __dpd_fixunsddsi | dec64 | ∅ |unsigned int | .. | +| ✗ | __bid_fixunsddsi | dec64 | ∅ |unsigned int | .. | +| ✗ | __dpd_fixunstdsi | dec128 | ∅ |unsigned int | .. | +| ✗ | __bid_fixunstdsi | dec128 | ∅ |unsigned int | .. | +| ✗ | __dpd_fixunssddi | dec32 | ∅ |unsigned long| .. | +| ✗ | __bid_fixunssddi | dec32 | ∅ |unsigned long| .. | +| ✗ | __dpd_fixunsdddi | dec64 | ∅ |unsigned long| .. | +| ✗ | __bid_fixunsdddi | dec64 | ∅ |unsigned long| .. | +| ✗ | __dpd_fixunstddi | dec128 | ∅ |unsigned long| .. | +| ✗ | __bid_fixunstddi | dec128 | ∅ |unsigned long| .. | +| ✗ | __dpd_floatsisd | int | ∅ | dec32 | .. | +| ✗ | __bid_floatsisd | int | ∅ | dec32 | .. | +| ✗ | __dpd_floatsidd | int | ∅ | dec64 | .. | +| ✗ | __bid_floatsidd | int | ∅ | dec64 | .. | +| ✗ | __dpd_floatsitd | int | ∅ | dec128 | .. | +| ✗ | __bid_floatsitd | int | ∅ | dec128 | .. | +| ✗ | __dpd_floatdisd | long | ∅ | dec32 | .. | +| ✗ | __bid_floatdisd | long | ∅ | dec32 | .. | +| ✗ | __dpd_floatdidd | long | ∅ | dec64 | .. | +| ✗ | __bid_floatdidd | long | ∅ | dec64 | .. | +| ✗ | __dpd_floatditd | long | ∅ | dec128 | .. | +| ✗ | __bid_floatditd | long | ∅ | dec128 | .. | +| ✗ | __dpd_floatunssisd | unsigned int| ∅ | dec32 | .. | +| ✗ | __bid_floatunssisd | unsigned int| ∅ | dec32 | .. | +| ✗ | __dpd_floatunssidd | unsigned int| ∅ | dec64 | .. | +| ✗ | __bid_floatunssidd | unsigned int| ∅ | dec64 | .. | +| ✗ | __dpd_floatunssitd | unsigned int| ∅ | dec128 | .. | +| ✗ | __bid_floatunssitd | unsigned int| ∅ | dec128 | .. | +| ✗ | __dpd_floatunsdisd |unsigned long| ∅ | dec32 | .. | +| ✗ | __bid_floatunsdisd |unsigned long| ∅ | dec32 | .. | +| ✗ | __dpd_floatunsdidd |unsigned long| ∅ | dec64 | .. | +| ✗ | __bid_floatunsdidd |unsigned long| ∅ | dec64 | .. | +| ✗ | __dpd_floatunsditd |unsigned long| ∅ | dec128 | .. | +| ✗ | __bid_floatunsditd |unsigned long| ∅ | dec128 | .. | +| | | | | | **Decimal Float Comparison** | +| ✗ | __dpd_unordsd2 | dec32 | dec32 | c_int | `a +-NaN or a +-NaN -> 1(nonzero), else -> 0` | +| ✗ | __bid_unordsd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_unorddd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_unorddd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_unordtd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_unordtd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_eqsd2 | dec32 | dec32 | c_int |`a!=+-NaN and b!=+-Nan and a==b -> 0, else -> 1(nonzero)`| +| ✗ | __bid_eqsd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_eqdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_eqdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_eqtd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_eqtd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_nesd2 | dec32 | dec32 | c_int | `a==+-NaN or b==+-NaN or a!=b -> 1(nonzero), else -> 0` | +| ✗ | __bid_nesd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_nedd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_nedd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_netd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_netd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_gesd2 | dec32 | dec32 | c_int | `a!=+-NaN and b!=+-NaN and a>=b -> >=0, else -> <0` | +| ✗ | __bid_gesd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_gedd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_gedd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_getd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_getd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_ltsd2 | dec32 | dec32 | c_int | `a!=+-NaN and b!=+-NaN and a <0, else -> >=0` | +| ✗ | __bid_ltsd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_ltdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_ltdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_lttd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_lttd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_lesd2 | dec32 | dec32 | c_int | `a!=+-NaN and b!=+-NaN and a<=b -> <=0, else -> >=0` | +| ✗ | __bid_lesd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_ledd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_ledd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_letd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_letd2 | dec128 | dec128 | c_int | .. | +| ✗ | __dpd_gtsd2 | dec32 | dec32 | c_int | `a!=+-NaN and b!=+-NaN and a>b -> >0, else -> <=0` | +| ✗ | __bid_gtsd2 | dec32 | dec32 | c_int | .. | +| ✗ | __dpd_gtdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __bid_gtdd2 | dec64 | dec64 | c_int | .. | +| ✗ | __dpd_gttd2 | dec128 | dec128 | c_int | .. | +| ✗ | __bid_gttd2 | dec128 | dec128 | c_int | .. | +| | | | | | **Decimal Float Arithmetic**[^options] | +| ✗ | __dpd_addsd3 | dec32 | dec32 | dec32 |`a + b`| +| ✗ | __bid_addsd3 | dec32 | dec32 | dec32 | .. | +| ✗ | __dpd_adddd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __bid_adddd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __dpd_addtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __bid_addtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __dpd_subsd3 | dec32 | dec32 | dec32 |`a - b`| +| ✗ | __bid_subsd3 | dec32 | dec32 | dec32 | .. | +| ✗ | __dpd_subdd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __bid_subdd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __dpd_subtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __bid_subtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __dpd_mulsd3 | dec32 | dec32 | dec32 |`a * b`| +| ✗ | __bid_mulsd3 | dec32 | dec32 | dec32 | .. | +| ✗ | __dpd_muldd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __bid_muldd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __dpd_multd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __bid_multd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __dpd_divsd3 | dec32 | dec32 | dec32 |`a / b`| +| ✗ | __bid_divsd3 | dec32 | dec32 | dec32 | .. | +| ✗ | __dpd_divdd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __bid_divdd3 | dec64 | dec64 | dec64 | .. | +| ✗ | __dpd_divtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __bid_divtd3 | dec128 | dec128 | dec128 | .. | +| ✗ | __dpd_negsd2 | dec32 | dec32 | dec32 | `-a` | +| ✗ | __bid_negsd2 | dec32 | dec32 | dec32 | .. | +| ✗ | __dpd_negdd2 | dec64 | dec64 | dec64 | .. | +| ✗ | __bid_negdd2 | dec64 | dec64 | dec64 | .. | +| ✗ | __dpd_negtd2 | dec128 | dec128 | dec128 | .. | +| ✗ | __bid_negtd2 | dec128 | dec128 | dec128 | .. | -#### Decimal float Conversion +[^options]: These numbers include options with routines for +-0 and +-Nan. -- __dpd_extendsddd2 // dec32->dec64 -- __bid_extendsddd2 // dec32->dec64 -- __dpd_extendsdtd2 // dec32->dec128 -- __bid_extendsdtd2 // dec32->dec128 -- __dpd_extendddtd2 // dec64->dec128 -- __bid_extendddtd2 // dec64->dec128 -- __dpd_truncddsd2 // dec64->dec32 -- __bid_truncddsd2 // dec64->dec32 -- __dpd_trunctdsd2 // dec128->dec32 -- __bid_trunctdsd2 // dec128->dec32 -- __dpd_trunctddd2 // dec128->dec64 -- __bid_trunctddd2 // dec128->dec64 +Fixed-point fractional library routines -- __dpd_extendsfdd // float->dec64 -- __bid_extendsfdd // float->dec64 -- __dpd_extendsftd // float->dec128 -- __bid_extendsftd // float->dec128 -- __dpd_extenddftd // double->dec128 -- __bid_extenddftd // double->dec128 -- __dpd_extendxftd // long double->dec128 -- __bid_extendxftd // long double->dec128 -- __dpd_truncdfsd // double->dec32 -- __bid_truncdfsd // double->dec32 -- __dpd_truncxfsd // long double->dec32 -- __bid_truncxfsd // long double->dec32 -- __dpd_trunctfsd // long double->dec32 -- __bid_trunctfsd // long double->dec32 -- __dpd_truncxfdd // long double->dec64 -- __bid_truncxfdd // long double->dec64 -- __dpd_trunctfdd // long double->dec64 -- __bid_trunctfdd // long double->dec64 +TODO brief explanation + implementation -- __dpd_truncddsf // dec64->float -- __bid_truncddsf // dec64->float -- __dpd_trunctdsf // dec128->float -- __bid_trunctdsf // dec128->float -- __dpd_extendsddf // dec32->double -- __bid_extendsddf // dec32->double -- __dpd_trunctddf // dec128->double -- __bid_trunctddf // dec128->double -- __dpd_extendsdxf // dec32->long double -- __bid_extendsdxf // dec32->long double -- __dpd_extendddxf // dec64->long double -- __bid_extendddxf // dec64->long double -- __dpd_trunctdxf // dec128->long double -- __bid_trunctdxf // dec128->long double -- __dpd_extendsdtf // dec32->long double -- __bid_extendsdtf // dec32->long double -- __dpd_extendddtf // dec64->long double -- __bid_extendddtf // dec64->long double +| Done | Name | a | b | Out | Comment | +| ------ | ------------- | --------- | --------- | --------- | -------------------------- | +| | | | | | **Fixed-Point Fractional** | -Same size conversion: -- __dpd_extendsfsd // float->dec32 -- __bid_extendsfsd // float->dec32 -- __dpd_extenddfdd // double->dec64 -- __bid_extenddfdd // double->dec64 -- __dpd_extendtftd //long double->dec128 -- __bid_extendtftd //long double->dec128 -- __dpd_truncsdsf // dec32->float -- __bid_truncsdsf // dec32->float -- __dpd_truncdddf // dec64->float -- __bid_truncdddf // dec64->float -- __dpd_trunctdtf // dec128->long double -- __bid_trunctdtf // dec128->long double +Further content: +- aarch64 outline atomics +- atomics +- msvc things like _alldiv, _aulldiv, _allrem +- clear cache +- tls emulation +- math routines (cos, sin, tan, ceil, floor, exp, exp2, fabs, log, log10, log2, sincos, sqrt) +- bcmp +- ieee float routines (fma, fmax, fmin, fmod, fabs, float rounding, ) +- arm routines (memory routines + memclr [setting to 0], divmod routines and stubs for unwind_cpp) +- memory routines (memcmp, memcpy, memset, memmove) +- objective-c __isPlatformVersionAtLeast check +- stack probe routines -- __dpd_fixsdsi // dec32->int -- __bid_fixsdsi // dec32->int -- __dpd_fixddsi // dec64->int -- __bid_fixddsi // dec64->int -- __dpd_fixtdsi // dec128->int -- __bid_fixtdsi // dec128->int +Future work -- __dpd_fixsddi // dec32->long -- __bid_fixsddi // dec32->long -- __dpd_fixdddi // dec64->long -- __bid_fixdddi // dec64->long -- __dpd_fixtddi // dec128->long -- __bid_fixtddi // dec128->long - -- __dpd_fixunssdsi // dec32->unsigned int, All negative values become zero. -- __bid_fixunssdsi // dec32->unsigned int -- __dpd_fixunsddsi // dec64->unsigned int -- __bid_fixunsddsi // dec64->unsigned int -- __dpd_fixunstdsi // dec128->unsigned int -- __bid_fixunstdsi // dec128->unsigned int - -- __dpd_fixunssddi // dec32->unsigned long, All negative values become zero. -- __bid_fixunssddi // dec32->unsigned long -- __dpd_fixunsdddi // dec64->unsigned long -- __bid_fixunsdddi // dec64->unsigned long -- __dpd_fixunstddi // dec128->unsigned long -- __bid_fixunstddi // dec128->unsigned long - -- __dpd_floatsisd // int->dec32 -- __bid_floatsisd // int->dec32 -- __dpd_floatsidd // int->dec64 -- __bid_floatsidd // int->dec64 -- __dpd_floatsitd // int->dec128 -- __bid_floatsitd // int->dec128 - -- __dpd_floatdisd // long->dec32 -- __bid_floatdisd // long->dec32 -- __dpd_floatdidd // long->dec64 -- __bid_floatdidd // long->dec64 -- __dpd_floatditd // long->dec128 -- __bid_floatditd // long->dec128 - -- __dpd_floatunssisd // unsigned int->dec32 -- __bid_floatunssisd // unsigned int->dec32 -- __dpd_floatunssidd // unsigned int->dec64 -- __bid_floatunssidd // unsigned int->dec64 -- __dpd_floatunssitd // unsigned int->dec128 -- __bid_floatunssitd // unsigned int->dec128 - -- __dpd_floatunsdisd // unsigned long->dec32 -- __bid_floatunsdisd // unsigned long->dec32 -- __dpd_floatunsdidd // unsigned long->dec64 -- __bid_floatunsdidd // unsigned long->dec64 -- __dpd_floatunsditd // unsigned long->dec128 -- __bid_floatunsditd // unsigned long->dec128 - -#### Decimal float Comparison - -All decimal float comparison routines return c_int. - -- __dpd_unordsd2 // a,b: dec32, a +-NaN or a +-NaN -> 1(nonzero), else -> 0 -- __bid_unordsd2 // a,b: dec32 -- __dpd_unorddd2 // a,b: dec64 -- __bid_unorddd2 // a,b: dec64 -- __dpd_unordtd2 // a,b: dec128 -- __bid_unordtd2 // a,b: dec128 - -- __dpd_eqsd2 // a,b: dec32, a!=+-NaN and b!=+-Nan and a==b -> 0, else -> 1(nonzero) -- __bid_eqsd2 // a,b: dec32 -- __dpd_eqdd2 // a,b: dec64 -- __bid_eqdd2 // a,b: dec64 -- __dpd_eqtd2 // a,b: dec128 -- __bid_eqtd2 // a,b: dec128 - -- __dpd_nesd2 // a,b: dec32, a==+-NaN or b==+-NaN or a!=b -> 1(nonzero), else -> 0 -- __bid_nesd2 // a,b: dec32 -- __dpd_nedd2 // a,b: dec64 -- __bid_nedd2 // a,b: dec64 -- __dpd_netd2 // a,b: dec128 -- __bid_netd2 // a,b: dec128 - -- __dpd_gesd2 // a,b: dec32, a!=+-NaN and b!=+-NaN and a>=b -> >=0, else -> <0 -- __bid_gesd2 // a,b: dec32 -- __dpd_gedd2 // a,b: dec64 -- __bid_gedd2 // a,b: dec64 -- __dpd_getd2 // a,b: dec128 -- __bid_getd2 // a,b: dec128 - -- __dpd_ltsd2 // a,b: dec32, a!=+-NaN and b!=+-NaN and a <0, else -> >=0 -- __bid_ltsd2 // a,b: dec32 -- __dpd_ltdd2 // a,b: dec64 -- __bid_ltdd2 // a,b: dec64 -- __dpd_lttd2 // a,b: dec128 -- __bid_lttd2 // a,b: dec128 - -- __dpd_lesd2 // a,b: dec32, a!=+-NaN and b!=+-NaN and a<=b -> <=0, else -> >=0 -- __bid_lesd2 // a,b: dec32 -- __dpd_ledd2 // a,b: dec64 -- __bid_ledd2 // a,b: dec64 -- __dpd_letd2 // a,b: dec128 -- __bid_letd2 // a,b: dec128 - -- __dpd_gtsd2 // a,b: dec32, a!=+-NaN and b!=+-NaN and a>b -> >0, else -> <=0 -- __bid_gtsd2 // a,b: dec32 -- __dpd_gtdd2 // a,b: dec64 -- __bid_gtdd2 // a,b: dec64 -- __dpd_gttd2 // a,b: dec128 -- __bid_gttd2 // a,b: dec128 - -#### Decimal float Arithmetic - -These numbers include options with routines for +-0 and +-Nan. - -- __dpd_addsd3 // a,b: dec32 -> dec32, a + b -- __bid_addsd3 // a,b: dec32 -> dec32 -- __dpd_adddd3 // a,b: dec64 -> dec64 -- __bid_adddd3 // a,b: dec64 -> dec64 -- __dpd_addtd3 // a,b: dec128-> dec128 -- __bid_addtd3 // a,b: dec128-> dec128 -- __dpd_subsd3 // a,b: dec32, a - b -- __bid_subsd3 // a,b: dec32 -> dec32 -- __dpd_subdd3 // a,b: dec64 .. -- __bid_subdd3 // a,b: dec64 -- __dpd_subtd3 // a,b: dec128 -- __bid_subtd3 // a,b: dec128 -- __dpd_mulsd3 // a,b: dec32, a * b -- __bid_mulsd3 // a,b: dec32 -> dec32 -- __dpd_muldd3 // a,b: dec64 .. -- __bid_muldd3 // a,b: dec64 -- __dpd_multd3 // a,b: dec128 -- __bid_multd3 // a,b: dec128 -- __dpd_divsd3 // a,b: dec32, a / b -- __bid_divsd3 // a,b: dec32 -> dec32 -- __dpd_divdd3 // a,b: dec64 .. -- __bid_divdd3 // a,b: dec64 -- __dpd_divtd3 // a,b: dec128 -- __bid_divtd3 // a,b: dec128 -- __dpd_negsd2 // a,b: dec32, -a -- __bid_negsd2 // a,b: dec32 -> dec32 -- __dpd_negdd2 // a,b: dec64 .. -- __bid_negdd2 // a,b: dec64 -- __dpd_negtd2 // a,b: dec128 -- __bid_negtd2 // a,b: dec128 - -## Fixed-point fractional library routines - -TODO - -Too unclear for work items: -- Miscellaneous routines => unclear, if supported (cache control and stack functions) -- Zig-specific language runtime features, for example "Arbitrary length integer library routines" +Arbitrary length integer library routines From 873bb29c984b976021fb9ca95ad3298e03a8b3ff Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 2 Feb 2023 17:32:06 -0700 Subject: [PATCH 49/65] introduce ZON: Zig Object Notation * std.zig.parse is moved to std.zig.Ast.parse * the new function has an additional parameter that requires passing Mode.zig or Mode.zon * moved parser.zig code to Parse.zig * added parseZon function next to parseRoot function --- CMakeLists.txt | 2 +- lib/std/Build/OptionsStep.zig | 2 +- lib/std/zig.zig | 1 - lib/std/zig/Ast.zig | 78 +- lib/std/zig/Parse.zig | 3816 ++++++++++++++++++++++++++++++++ lib/std/zig/parse.zig | 3852 --------------------------------- lib/std/zig/parser_test.zig | 4 +- lib/std/zig/perf_test.zig | 3 +- src/Module.zig | 6 +- src/main.zig | 10 +- 10 files changed, 3898 insertions(+), 3876 deletions(-) create mode 100644 lib/std/zig/Parse.zig delete mode 100644 lib/std/zig/parse.zig diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a9de7bdc1..f8029fdcde 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -513,7 +513,7 @@ set(ZIG_STAGE2_SOURCES "${CMAKE_SOURCE_DIR}/lib/std/zig/Ast.zig" "${CMAKE_SOURCE_DIR}/lib/std/zig/CrossTarget.zig" "${CMAKE_SOURCE_DIR}/lib/std/zig/c_builtins.zig" - "${CMAKE_SOURCE_DIR}/lib/std/zig/parse.zig" + "${CMAKE_SOURCE_DIR}/lib/std/zig/Parse.zig" "${CMAKE_SOURCE_DIR}/lib/std/zig/render.zig" "${CMAKE_SOURCE_DIR}/lib/std/zig/string_literal.zig" "${CMAKE_SOURCE_DIR}/lib/std/zig/system.zig" diff --git a/lib/std/Build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig index a353737512..c1d2c8454a 100644 --- a/lib/std/Build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -367,5 +367,5 @@ test "OptionsStep" { \\ , options.contents.items); - _ = try std.zig.parse(arena.allocator(), try options.contents.toOwnedSliceSentinel(0)); + _ = try std.zig.Ast.parse(arena.allocator(), try options.contents.toOwnedSliceSentinel(0), .zig); } diff --git a/lib/std/zig.zig b/lib/std/zig.zig index bce8f6ce3c..f85cf75e60 100644 --- a/lib/std/zig.zig +++ b/lib/std/zig.zig @@ -8,7 +8,6 @@ pub const Tokenizer = tokenizer.Tokenizer; pub const fmtId = fmt.fmtId; pub const fmtEscapes = fmt.fmtEscapes; pub const isValidId = fmt.isValidId; -pub const parse = @import("zig/parse.zig").parse; pub const string_literal = @import("zig/string_literal.zig"); pub const number_literal = @import("zig/number_literal.zig"); pub const primitives = @import("zig/primitives.zig"); diff --git a/lib/std/zig/Ast.zig b/lib/std/zig/Ast.zig index f312093aa3..a9a02606eb 100644 --- a/lib/std/zig/Ast.zig +++ b/lib/std/zig/Ast.zig @@ -11,13 +11,6 @@ extra_data: []Node.Index, errors: []const Error, -const std = @import("../std.zig"); -const assert = std.debug.assert; -const testing = std.testing; -const mem = std.mem; -const Token = std.zig.Token; -const Ast = @This(); - pub const TokenIndex = u32; pub const ByteOffset = u32; @@ -34,7 +27,7 @@ pub const Location = struct { line_end: usize, }; -pub fn deinit(tree: *Ast, gpa: mem.Allocator) void { +pub fn deinit(tree: *Ast, gpa: Allocator) void { tree.tokens.deinit(gpa); tree.nodes.deinit(gpa); gpa.free(tree.extra_data); @@ -48,11 +41,69 @@ pub const RenderError = error{ OutOfMemory, }; +pub const Mode = enum { zig, zon }; + +/// Result should be freed with tree.deinit() when there are +/// no more references to any of the tokens or nodes. +pub fn parse(gpa: Allocator, source: [:0]const u8, mode: Mode) Allocator.Error!Ast { + var tokens = Ast.TokenList{}; + defer tokens.deinit(gpa); + + // Empirically, the zig std lib has an 8:1 ratio of source bytes to token count. + const estimated_token_count = source.len / 8; + try tokens.ensureTotalCapacity(gpa, estimated_token_count); + + var tokenizer = std.zig.Tokenizer.init(source); + while (true) { + const token = tokenizer.next(); + try tokens.append(gpa, .{ + .tag = token.tag, + .start = @intCast(u32, token.loc.start), + }); + if (token.tag == .eof) break; + } + + var parser: Parse = .{ + .source = source, + .gpa = gpa, + .token_tags = tokens.items(.tag), + .token_starts = tokens.items(.start), + .errors = .{}, + .nodes = .{}, + .extra_data = .{}, + .scratch = .{}, + .tok_i = 0, + }; + defer parser.errors.deinit(gpa); + defer parser.nodes.deinit(gpa); + defer parser.extra_data.deinit(gpa); + defer parser.scratch.deinit(gpa); + + // Empirically, Zig source code has a 2:1 ratio of tokens to AST nodes. + // Make sure at least 1 so we can use appendAssumeCapacity on the root node below. + const estimated_node_count = (tokens.len + 2) / 2; + try parser.nodes.ensureTotalCapacity(gpa, estimated_node_count); + + switch (mode) { + .zig => try parser.parseRoot(), + .zon => try parser.parseZon(), + } + + // TODO experiment with compacting the MultiArrayList slices here + return Ast{ + .source = source, + .tokens = tokens.toOwnedSlice(), + .nodes = parser.nodes.toOwnedSlice(), + .extra_data = try parser.extra_data.toOwnedSlice(gpa), + .errors = try parser.errors.toOwnedSlice(gpa), + }; +} + /// `gpa` is used for allocating the resulting formatted source code, as well as /// for allocating extra stack memory if needed, because this function utilizes recursion. /// Note: that's not actually true yet, see https://github.com/ziglang/zig/issues/1006. /// Caller owns the returned slice of bytes, allocated with `gpa`. -pub fn render(tree: Ast, gpa: mem.Allocator) RenderError![]u8 { +pub fn render(tree: Ast, gpa: Allocator) RenderError![]u8 { var buffer = std.ArrayList(u8).init(gpa); defer buffer.deinit(); @@ -3347,3 +3398,12 @@ pub const Node = struct { rparen: TokenIndex, }; }; + +const std = @import("../std.zig"); +const assert = std.debug.assert; +const testing = std.testing; +const mem = std.mem; +const Token = std.zig.Token; +const Ast = @This(); +const Allocator = std.mem.Allocator; +const Parse = @import("Parse.zig"); diff --git a/lib/std/zig/Parse.zig b/lib/std/zig/Parse.zig new file mode 100644 index 0000000000..f599a08f55 --- /dev/null +++ b/lib/std/zig/Parse.zig @@ -0,0 +1,3816 @@ +//! Represents in-progress parsing, will be converted to an Ast after completion. + +pub const Error = error{ParseError} || Allocator.Error; + +gpa: Allocator, +source: []const u8, +token_tags: []const Token.Tag, +token_starts: []const Ast.ByteOffset, +tok_i: TokenIndex, +errors: std.ArrayListUnmanaged(AstError), +nodes: Ast.NodeList, +extra_data: std.ArrayListUnmanaged(Node.Index), +scratch: std.ArrayListUnmanaged(Node.Index), + +const SmallSpan = union(enum) { + zero_or_one: Node.Index, + multi: Node.SubRange, +}; + +const Members = struct { + len: usize, + lhs: Node.Index, + rhs: Node.Index, + trailing: bool, + + fn toSpan(self: Members, p: *Parse) !Node.SubRange { + if (self.len <= 2) { + const nodes = [2]Node.Index{ self.lhs, self.rhs }; + return p.listToSpan(nodes[0..self.len]); + } else { + return Node.SubRange{ .start = self.lhs, .end = self.rhs }; + } + } +}; + +fn listToSpan(p: *Parse, list: []const Node.Index) !Node.SubRange { + try p.extra_data.appendSlice(p.gpa, list); + return Node.SubRange{ + .start = @intCast(Node.Index, p.extra_data.items.len - list.len), + .end = @intCast(Node.Index, p.extra_data.items.len), + }; +} + +fn addNode(p: *Parse, elem: Ast.NodeList.Elem) Allocator.Error!Node.Index { + const result = @intCast(Node.Index, p.nodes.len); + try p.nodes.append(p.gpa, elem); + return result; +} + +fn setNode(p: *Parse, i: usize, elem: Ast.NodeList.Elem) Node.Index { + p.nodes.set(i, elem); + return @intCast(Node.Index, i); +} + +fn reserveNode(p: *Parse, tag: Ast.Node.Tag) !usize { + try p.nodes.resize(p.gpa, p.nodes.len + 1); + p.nodes.items(.tag)[p.nodes.len - 1] = tag; + return p.nodes.len - 1; +} + +fn unreserveNode(p: *Parse, node_index: usize) void { + if (p.nodes.len == node_index) { + p.nodes.resize(p.gpa, p.nodes.len - 1) catch unreachable; + } else { + // There is zombie node left in the tree, let's make it as inoffensive as possible + // (sadly there's no no-op node) + p.nodes.items(.tag)[node_index] = .unreachable_literal; + p.nodes.items(.main_token)[node_index] = p.tok_i; + } +} + +fn addExtra(p: *Parse, extra: anytype) Allocator.Error!Node.Index { + const fields = std.meta.fields(@TypeOf(extra)); + try p.extra_data.ensureUnusedCapacity(p.gpa, fields.len); + const result = @intCast(u32, p.extra_data.items.len); + inline for (fields) |field| { + comptime assert(field.type == Node.Index); + p.extra_data.appendAssumeCapacity(@field(extra, field.name)); + } + return result; +} + +fn warnExpected(p: *Parse, expected_token: Token.Tag) error{OutOfMemory}!void { + @setCold(true); + try p.warnMsg(.{ + .tag = .expected_token, + .token = p.tok_i, + .extra = .{ .expected_tag = expected_token }, + }); +} + +fn warn(p: *Parse, error_tag: AstError.Tag) error{OutOfMemory}!void { + @setCold(true); + try p.warnMsg(.{ .tag = error_tag, .token = p.tok_i }); +} + +fn warnMsg(p: *Parse, msg: Ast.Error) error{OutOfMemory}!void { + @setCold(true); + switch (msg.tag) { + .expected_semi_after_decl, + .expected_semi_after_stmt, + .expected_comma_after_field, + .expected_comma_after_arg, + .expected_comma_after_param, + .expected_comma_after_initializer, + .expected_comma_after_switch_prong, + .expected_semi_or_else, + .expected_semi_or_lbrace, + .expected_token, + .expected_block, + .expected_block_or_assignment, + .expected_block_or_expr, + .expected_block_or_field, + .expected_expr, + .expected_expr_or_assignment, + .expected_fn, + .expected_inlinable, + .expected_labelable, + .expected_param_list, + .expected_prefix_expr, + .expected_primary_type_expr, + .expected_pub_item, + .expected_return_type, + .expected_suffix_op, + .expected_type_expr, + .expected_var_decl, + .expected_var_decl_or_fn, + .expected_loop_payload, + .expected_container, + => if (msg.token != 0 and !p.tokensOnSameLine(msg.token - 1, msg.token)) { + var copy = msg; + copy.token_is_prev = true; + copy.token -= 1; + return p.errors.append(p.gpa, copy); + }, + else => {}, + } + try p.errors.append(p.gpa, msg); +} + +fn fail(p: *Parse, tag: Ast.Error.Tag) error{ ParseError, OutOfMemory } { + @setCold(true); + return p.failMsg(.{ .tag = tag, .token = p.tok_i }); +} + +fn failExpected(p: *Parse, expected_token: Token.Tag) error{ ParseError, OutOfMemory } { + @setCold(true); + return p.failMsg(.{ + .tag = .expected_token, + .token = p.tok_i, + .extra = .{ .expected_tag = expected_token }, + }); +} + +fn failMsg(p: *Parse, msg: Ast.Error) error{ ParseError, OutOfMemory } { + @setCold(true); + try p.warnMsg(msg); + return error.ParseError; +} + +/// Root <- skip container_doc_comment? ContainerMembers eof +pub fn parseRoot(p: *Parse) !void { + // Root node must be index 0. + p.nodes.appendAssumeCapacity(.{ + .tag = .root, + .main_token = 0, + .data = undefined, + }); + const root_members = try p.parseContainerMembers(); + const root_decls = try root_members.toSpan(p); + if (p.token_tags[p.tok_i] != .eof) { + try p.warnExpected(.eof); + } + p.nodes.items(.data)[0] = .{ + .lhs = root_decls.start, + .rhs = root_decls.end, + }; +} + +/// Parse in ZON mode. Subset of the language. +/// TODO: set a flag in Parse struct, and honor that flag +/// by emitting compilation errors when non-zon nodes are encountered. +pub fn parseZon(p: *Parse) !void { + const node_index = p.parseExpr() catch |err| switch (err) { + error.ParseError => { + assert(p.errors.items.len > 0); + return; + }, + else => |e| return e, + }; + assert(node_index == 0); + if (p.token_tags[p.tok_i] != .eof) { + try p.warnExpected(.eof); + } +} + +/// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations) +/// +/// ContainerDeclarations +/// <- TestDecl ContainerDeclarations +/// / ComptimeDecl ContainerDeclarations +/// / doc_comment? KEYWORD_pub? Decl ContainerDeclarations +/// / +/// +/// ComptimeDecl <- KEYWORD_comptime Block +fn parseContainerMembers(p: *Parse) !Members { + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + + var field_state: union(enum) { + /// No fields have been seen. + none, + /// Currently parsing fields. + seen, + /// Saw fields and then a declaration after them. + /// Payload is first token of previous declaration. + end: Node.Index, + /// There was a declaration between fields, don't report more errors. + err, + } = .none; + + var last_field: TokenIndex = undefined; + + // Skip container doc comments. + while (p.eatToken(.container_doc_comment)) |_| {} + + var trailing = false; + while (true) { + const doc_comment = try p.eatDocComments(); + + switch (p.token_tags[p.tok_i]) { + .keyword_test => { + if (doc_comment) |some| { + try p.warnMsg(.{ .tag = .test_doc_comment, .token = some }); + } + const test_decl_node = try p.expectTestDeclRecoverable(); + if (test_decl_node != 0) { + if (field_state == .seen) { + field_state = .{ .end = test_decl_node }; + } + try p.scratch.append(p.gpa, test_decl_node); + } + trailing = false; + }, + .keyword_comptime => switch (p.token_tags[p.tok_i + 1]) { + .l_brace => { + if (doc_comment) |some| { + try p.warnMsg(.{ .tag = .comptime_doc_comment, .token = some }); + } + const comptime_token = p.nextToken(); + const block = p.parseBlock() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => blk: { + p.findNextContainerMember(); + break :blk null_node; + }, + }; + if (block != 0) { + const comptime_node = try p.addNode(.{ + .tag = .@"comptime", + .main_token = comptime_token, + .data = .{ + .lhs = block, + .rhs = undefined, + }, + }); + if (field_state == .seen) { + field_state = .{ .end = comptime_node }; + } + try p.scratch.append(p.gpa, comptime_node); + } + trailing = false; + }, + else => { + const identifier = p.tok_i; + defer last_field = identifier; + const container_field = p.expectContainerField() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextContainerMember(); + continue; + }, + }; + switch (field_state) { + .none => field_state = .seen, + .err, .seen => {}, + .end => |node| { + try p.warnMsg(.{ + .tag = .decl_between_fields, + .token = p.nodes.items(.main_token)[node], + }); + try p.warnMsg(.{ + .tag = .previous_field, + .is_note = true, + .token = last_field, + }); + try p.warnMsg(.{ + .tag = .next_field, + .is_note = true, + .token = identifier, + }); + // Continue parsing; error will be reported later. + field_state = .err; + }, + } + try p.scratch.append(p.gpa, container_field); + switch (p.token_tags[p.tok_i]) { + .comma => { + p.tok_i += 1; + trailing = true; + continue; + }, + .r_brace, .eof => { + trailing = false; + break; + }, + else => {}, + } + // There is not allowed to be a decl after a field with no comma. + // Report error but recover parser. + try p.warn(.expected_comma_after_field); + p.findNextContainerMember(); + }, + }, + .keyword_pub => { + p.tok_i += 1; + const top_level_decl = try p.expectTopLevelDeclRecoverable(); + if (top_level_decl != 0) { + if (field_state == .seen) { + field_state = .{ .end = top_level_decl }; + } + try p.scratch.append(p.gpa, top_level_decl); + } + trailing = p.token_tags[p.tok_i - 1] == .semicolon; + }, + .keyword_usingnamespace => { + const node = try p.expectUsingNamespaceRecoverable(); + if (node != 0) { + if (field_state == .seen) { + field_state = .{ .end = node }; + } + try p.scratch.append(p.gpa, node); + } + trailing = p.token_tags[p.tok_i - 1] == .semicolon; + }, + .keyword_const, + .keyword_var, + .keyword_threadlocal, + .keyword_export, + .keyword_extern, + .keyword_inline, + .keyword_noinline, + .keyword_fn, + => { + const top_level_decl = try p.expectTopLevelDeclRecoverable(); + if (top_level_decl != 0) { + if (field_state == .seen) { + field_state = .{ .end = top_level_decl }; + } + try p.scratch.append(p.gpa, top_level_decl); + } + trailing = p.token_tags[p.tok_i - 1] == .semicolon; + }, + .eof, .r_brace => { + if (doc_comment) |tok| { + try p.warnMsg(.{ + .tag = .unattached_doc_comment, + .token = tok, + }); + } + break; + }, + else => { + const c_container = p.parseCStyleContainer() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => false, + }; + if (c_container) continue; + + const identifier = p.tok_i; + defer last_field = identifier; + const container_field = p.expectContainerField() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextContainerMember(); + continue; + }, + }; + switch (field_state) { + .none => field_state = .seen, + .err, .seen => {}, + .end => |node| { + try p.warnMsg(.{ + .tag = .decl_between_fields, + .token = p.nodes.items(.main_token)[node], + }); + try p.warnMsg(.{ + .tag = .previous_field, + .is_note = true, + .token = last_field, + }); + try p.warnMsg(.{ + .tag = .next_field, + .is_note = true, + .token = identifier, + }); + // Continue parsing; error will be reported later. + field_state = .err; + }, + } + try p.scratch.append(p.gpa, container_field); + switch (p.token_tags[p.tok_i]) { + .comma => { + p.tok_i += 1; + trailing = true; + continue; + }, + .r_brace, .eof => { + trailing = false; + break; + }, + else => {}, + } + // There is not allowed to be a decl after a field with no comma. + // Report error but recover parser. + try p.warn(.expected_comma_after_field); + if (p.token_tags[p.tok_i] == .semicolon and p.token_tags[identifier] == .identifier) { + try p.warnMsg(.{ + .tag = .var_const_decl, + .is_note = true, + .token = identifier, + }); + } + p.findNextContainerMember(); + continue; + }, + } + } + + const items = p.scratch.items[scratch_top..]; + switch (items.len) { + 0 => return Members{ + .len = 0, + .lhs = 0, + .rhs = 0, + .trailing = trailing, + }, + 1 => return Members{ + .len = 1, + .lhs = items[0], + .rhs = 0, + .trailing = trailing, + }, + 2 => return Members{ + .len = 2, + .lhs = items[0], + .rhs = items[1], + .trailing = trailing, + }, + else => { + const span = try p.listToSpan(items); + return Members{ + .len = items.len, + .lhs = span.start, + .rhs = span.end, + .trailing = trailing, + }; + }, + } +} + +/// Attempts to find next container member by searching for certain tokens +fn findNextContainerMember(p: *Parse) void { + var level: u32 = 0; + while (true) { + const tok = p.nextToken(); + switch (p.token_tags[tok]) { + // Any of these can start a new top level declaration. + .keyword_test, + .keyword_comptime, + .keyword_pub, + .keyword_export, + .keyword_extern, + .keyword_inline, + .keyword_noinline, + .keyword_usingnamespace, + .keyword_threadlocal, + .keyword_const, + .keyword_var, + .keyword_fn, + => { + if (level == 0) { + p.tok_i -= 1; + return; + } + }, + .identifier => { + if (p.token_tags[tok + 1] == .comma and level == 0) { + p.tok_i -= 1; + return; + } + }, + .comma, .semicolon => { + // this decl was likely meant to end here + if (level == 0) { + return; + } + }, + .l_paren, .l_bracket, .l_brace => level += 1, + .r_paren, .r_bracket => { + if (level != 0) level -= 1; + }, + .r_brace => { + if (level == 0) { + // end of container, exit + p.tok_i -= 1; + return; + } + level -= 1; + }, + .eof => { + p.tok_i -= 1; + return; + }, + else => {}, + } + } +} + +/// Attempts to find the next statement by searching for a semicolon +fn findNextStmt(p: *Parse) void { + var level: u32 = 0; + while (true) { + const tok = p.nextToken(); + switch (p.token_tags[tok]) { + .l_brace => level += 1, + .r_brace => { + if (level == 0) { + p.tok_i -= 1; + return; + } + level -= 1; + }, + .semicolon => { + if (level == 0) { + return; + } + }, + .eof => { + p.tok_i -= 1; + return; + }, + else => {}, + } + } +} + +/// TestDecl <- KEYWORD_test (STRINGLITERALSINGLE / IDENTIFIER)? Block +fn expectTestDecl(p: *Parse) !Node.Index { + const test_token = p.assertToken(.keyword_test); + const name_token = switch (p.token_tags[p.nextToken()]) { + .string_literal, .identifier => p.tok_i - 1, + else => blk: { + p.tok_i -= 1; + break :blk null; + }, + }; + const block_node = try p.parseBlock(); + if (block_node == 0) return p.fail(.expected_block); + return p.addNode(.{ + .tag = .test_decl, + .main_token = test_token, + .data = .{ + .lhs = name_token orelse 0, + .rhs = block_node, + }, + }); +} + +fn expectTestDeclRecoverable(p: *Parse) error{OutOfMemory}!Node.Index { + return p.expectTestDecl() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextContainerMember(); + return null_node; + }, + }; +} + +/// Decl +/// <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block) +/// / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl +/// / KEYWORD_usingnamespace Expr SEMICOLON +fn expectTopLevelDecl(p: *Parse) !Node.Index { + const extern_export_inline_token = p.nextToken(); + var is_extern: bool = false; + var expect_fn: bool = false; + var expect_var_or_fn: bool = false; + switch (p.token_tags[extern_export_inline_token]) { + .keyword_extern => { + _ = p.eatToken(.string_literal); + is_extern = true; + expect_var_or_fn = true; + }, + .keyword_export => expect_var_or_fn = true, + .keyword_inline, .keyword_noinline => expect_fn = true, + else => p.tok_i -= 1, + } + const fn_proto = try p.parseFnProto(); + if (fn_proto != 0) { + switch (p.token_tags[p.tok_i]) { + .semicolon => { + p.tok_i += 1; + return fn_proto; + }, + .l_brace => { + if (is_extern) { + try p.warnMsg(.{ .tag = .extern_fn_body, .token = extern_export_inline_token }); + return null_node; + } + const fn_decl_index = try p.reserveNode(.fn_decl); + errdefer p.unreserveNode(fn_decl_index); + + const body_block = try p.parseBlock(); + assert(body_block != 0); + return p.setNode(fn_decl_index, .{ + .tag = .fn_decl, + .main_token = p.nodes.items(.main_token)[fn_proto], + .data = .{ + .lhs = fn_proto, + .rhs = body_block, + }, + }); + }, + else => { + // Since parseBlock only return error.ParseError on + // a missing '}' we can assume this function was + // supposed to end here. + try p.warn(.expected_semi_or_lbrace); + return null_node; + }, + } + } + if (expect_fn) { + try p.warn(.expected_fn); + return error.ParseError; + } + + const thread_local_token = p.eatToken(.keyword_threadlocal); + const var_decl = try p.parseVarDecl(); + if (var_decl != 0) { + try p.expectSemicolon(.expected_semi_after_decl, false); + return var_decl; + } + if (thread_local_token != null) { + return p.fail(.expected_var_decl); + } + if (expect_var_or_fn) { + return p.fail(.expected_var_decl_or_fn); + } + if (p.token_tags[p.tok_i] != .keyword_usingnamespace) { + return p.fail(.expected_pub_item); + } + return p.expectUsingNamespace(); +} + +fn expectTopLevelDeclRecoverable(p: *Parse) error{OutOfMemory}!Node.Index { + return p.expectTopLevelDecl() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextContainerMember(); + return null_node; + }, + }; +} + +fn expectUsingNamespace(p: *Parse) !Node.Index { + const usingnamespace_token = p.assertToken(.keyword_usingnamespace); + const expr = try p.expectExpr(); + try p.expectSemicolon(.expected_semi_after_decl, false); + return p.addNode(.{ + .tag = .@"usingnamespace", + .main_token = usingnamespace_token, + .data = .{ + .lhs = expr, + .rhs = undefined, + }, + }); +} + +fn expectUsingNamespaceRecoverable(p: *Parse) error{OutOfMemory}!Node.Index { + return p.expectUsingNamespace() catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextContainerMember(); + return null_node; + }, + }; +} + +/// FnProto <- KEYWORD_fn IDENTIFIER? LPAREN ParamDeclList RPAREN ByteAlign? AddrSpace? LinkSection? CallConv? EXCLAMATIONMARK? TypeExpr +fn parseFnProto(p: *Parse) !Node.Index { + const fn_token = p.eatToken(.keyword_fn) orelse return null_node; + + // We want the fn proto node to be before its children in the array. + const fn_proto_index = try p.reserveNode(.fn_proto); + errdefer p.unreserveNode(fn_proto_index); + + _ = p.eatToken(.identifier); + const params = try p.parseParamDeclList(); + const align_expr = try p.parseByteAlign(); + const addrspace_expr = try p.parseAddrSpace(); + const section_expr = try p.parseLinkSection(); + const callconv_expr = try p.parseCallconv(); + _ = p.eatToken(.bang); + + const return_type_expr = try p.parseTypeExpr(); + if (return_type_expr == 0) { + // most likely the user forgot to specify the return type. + // Mark return type as invalid and try to continue. + try p.warn(.expected_return_type); + } + + if (align_expr == 0 and section_expr == 0 and callconv_expr == 0 and addrspace_expr == 0) { + switch (params) { + .zero_or_one => |param| return p.setNode(fn_proto_index, .{ + .tag = .fn_proto_simple, + .main_token = fn_token, + .data = .{ + .lhs = param, + .rhs = return_type_expr, + }, + }), + .multi => |span| { + return p.setNode(fn_proto_index, .{ + .tag = .fn_proto_multi, + .main_token = fn_token, + .data = .{ + .lhs = try p.addExtra(Node.SubRange{ + .start = span.start, + .end = span.end, + }), + .rhs = return_type_expr, + }, + }); + }, + } + } + switch (params) { + .zero_or_one => |param| return p.setNode(fn_proto_index, .{ + .tag = .fn_proto_one, + .main_token = fn_token, + .data = .{ + .lhs = try p.addExtra(Node.FnProtoOne{ + .param = param, + .align_expr = align_expr, + .addrspace_expr = addrspace_expr, + .section_expr = section_expr, + .callconv_expr = callconv_expr, + }), + .rhs = return_type_expr, + }, + }), + .multi => |span| { + return p.setNode(fn_proto_index, .{ + .tag = .fn_proto, + .main_token = fn_token, + .data = .{ + .lhs = try p.addExtra(Node.FnProto{ + .params_start = span.start, + .params_end = span.end, + .align_expr = align_expr, + .addrspace_expr = addrspace_expr, + .section_expr = section_expr, + .callconv_expr = callconv_expr, + }), + .rhs = return_type_expr, + }, + }); + }, + } +} + +/// VarDecl <- (KEYWORD_const / KEYWORD_var) IDENTIFIER (COLON TypeExpr)? ByteAlign? AddrSpace? LinkSection? (EQUAL Expr)? SEMICOLON +fn parseVarDecl(p: *Parse) !Node.Index { + const mut_token = p.eatToken(.keyword_const) orelse + p.eatToken(.keyword_var) orelse + return null_node; + + _ = try p.expectToken(.identifier); + const type_node: Node.Index = if (p.eatToken(.colon) == null) 0 else try p.expectTypeExpr(); + const align_node = try p.parseByteAlign(); + const addrspace_node = try p.parseAddrSpace(); + const section_node = try p.parseLinkSection(); + const init_node: Node.Index = switch (p.token_tags[p.tok_i]) { + .equal_equal => blk: { + try p.warn(.wrong_equal_var_decl); + p.tok_i += 1; + break :blk try p.expectExpr(); + }, + .equal => blk: { + p.tok_i += 1; + break :blk try p.expectExpr(); + }, + else => 0, + }; + if (section_node == 0 and addrspace_node == 0) { + if (align_node == 0) { + return p.addNode(.{ + .tag = .simple_var_decl, + .main_token = mut_token, + .data = .{ + .lhs = type_node, + .rhs = init_node, + }, + }); + } else if (type_node == 0) { + return p.addNode(.{ + .tag = .aligned_var_decl, + .main_token = mut_token, + .data = .{ + .lhs = align_node, + .rhs = init_node, + }, + }); + } else { + return p.addNode(.{ + .tag = .local_var_decl, + .main_token = mut_token, + .data = .{ + .lhs = try p.addExtra(Node.LocalVarDecl{ + .type_node = type_node, + .align_node = align_node, + }), + .rhs = init_node, + }, + }); + } + } else { + return p.addNode(.{ + .tag = .global_var_decl, + .main_token = mut_token, + .data = .{ + .lhs = try p.addExtra(Node.GlobalVarDecl{ + .type_node = type_node, + .align_node = align_node, + .addrspace_node = addrspace_node, + .section_node = section_node, + }), + .rhs = init_node, + }, + }); + } +} + +/// ContainerField +/// <- doc_comment? KEYWORD_comptime? IDENTIFIER (COLON TypeExpr)? ByteAlign? (EQUAL Expr)? +/// / doc_comment? KEYWORD_comptime? (IDENTIFIER COLON)? !KEYWORD_fn TypeExpr ByteAlign? (EQUAL Expr)? +fn expectContainerField(p: *Parse) !Node.Index { + var main_token = p.tok_i; + _ = p.eatToken(.keyword_comptime); + const tuple_like = p.token_tags[p.tok_i] != .identifier or p.token_tags[p.tok_i + 1] != .colon; + if (!tuple_like) { + main_token = p.assertToken(.identifier); + } + + var align_expr: Node.Index = 0; + var type_expr: Node.Index = 0; + if (p.eatToken(.colon) != null or tuple_like) { + type_expr = try p.expectTypeExpr(); + align_expr = try p.parseByteAlign(); + } + + const value_expr: Node.Index = if (p.eatToken(.equal) == null) 0 else try p.expectExpr(); + + if (align_expr == 0) { + return p.addNode(.{ + .tag = .container_field_init, + .main_token = main_token, + .data = .{ + .lhs = type_expr, + .rhs = value_expr, + }, + }); + } else if (value_expr == 0) { + return p.addNode(.{ + .tag = .container_field_align, + .main_token = main_token, + .data = .{ + .lhs = type_expr, + .rhs = align_expr, + }, + }); + } else { + return p.addNode(.{ + .tag = .container_field, + .main_token = main_token, + .data = .{ + .lhs = type_expr, + .rhs = try p.addExtra(Node.ContainerField{ + .value_expr = value_expr, + .align_expr = align_expr, + }), + }, + }); + } +} + +/// Statement +/// <- KEYWORD_comptime? VarDecl +/// / KEYWORD_comptime BlockExprStatement +/// / KEYWORD_nosuspend BlockExprStatement +/// / KEYWORD_suspend BlockExprStatement +/// / KEYWORD_defer BlockExprStatement +/// / KEYWORD_errdefer Payload? BlockExprStatement +/// / IfStatement +/// / LabeledStatement +/// / SwitchExpr +/// / AssignExpr SEMICOLON +fn parseStatement(p: *Parse, allow_defer_var: bool) Error!Node.Index { + const comptime_token = p.eatToken(.keyword_comptime); + + if (allow_defer_var) { + const var_decl = try p.parseVarDecl(); + if (var_decl != 0) { + try p.expectSemicolon(.expected_semi_after_decl, true); + return var_decl; + } + } + + if (comptime_token) |token| { + return p.addNode(.{ + .tag = .@"comptime", + .main_token = token, + .data = .{ + .lhs = try p.expectBlockExprStatement(), + .rhs = undefined, + }, + }); + } + + switch (p.token_tags[p.tok_i]) { + .keyword_nosuspend => { + return p.addNode(.{ + .tag = .@"nosuspend", + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.expectBlockExprStatement(), + .rhs = undefined, + }, + }); + }, + .keyword_suspend => { + const token = p.nextToken(); + const block_expr = try p.expectBlockExprStatement(); + return p.addNode(.{ + .tag = .@"suspend", + .main_token = token, + .data = .{ + .lhs = block_expr, + .rhs = undefined, + }, + }); + }, + .keyword_defer => if (allow_defer_var) return p.addNode(.{ + .tag = .@"defer", + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = try p.expectBlockExprStatement(), + }, + }), + .keyword_errdefer => if (allow_defer_var) return p.addNode(.{ + .tag = .@"errdefer", + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.parsePayload(), + .rhs = try p.expectBlockExprStatement(), + }, + }), + .keyword_switch => return p.expectSwitchExpr(), + .keyword_if => return p.expectIfStatement(), + .keyword_enum, .keyword_struct, .keyword_union => { + const identifier = p.tok_i + 1; + if (try p.parseCStyleContainer()) { + // Return something so that `expectStatement` is happy. + return p.addNode(.{ + .tag = .identifier, + .main_token = identifier, + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }); + } + }, + else => {}, + } + + const labeled_statement = try p.parseLabeledStatement(); + if (labeled_statement != 0) return labeled_statement; + + const assign_expr = try p.parseAssignExpr(); + if (assign_expr != 0) { + try p.expectSemicolon(.expected_semi_after_stmt, true); + return assign_expr; + } + + return null_node; +} + +fn expectStatement(p: *Parse, allow_defer_var: bool) !Node.Index { + const statement = try p.parseStatement(allow_defer_var); + if (statement == 0) { + return p.fail(.expected_statement); + } + return statement; +} + +/// If a parse error occurs, reports an error, but then finds the next statement +/// and returns that one instead. If a parse error occurs but there is no following +/// statement, returns 0. +fn expectStatementRecoverable(p: *Parse) Error!Node.Index { + while (true) { + return p.expectStatement(true) catch |err| switch (err) { + error.OutOfMemory => return error.OutOfMemory, + error.ParseError => { + p.findNextStmt(); // Try to skip to the next statement. + switch (p.token_tags[p.tok_i]) { + .r_brace => return null_node, + .eof => return error.ParseError, + else => continue, + } + }, + }; + } +} + +/// IfStatement +/// <- IfPrefix BlockExpr ( KEYWORD_else Payload? Statement )? +/// / IfPrefix AssignExpr ( SEMICOLON / KEYWORD_else Payload? Statement ) +fn expectIfStatement(p: *Parse) !Node.Index { + const if_token = p.assertToken(.keyword_if); + _ = try p.expectToken(.l_paren); + const condition = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.parsePtrPayload(); + + // TODO propose to change the syntax so that semicolons are always required + // inside if statements, even if there is an `else`. + var else_required = false; + const then_expr = blk: { + const block_expr = try p.parseBlockExpr(); + if (block_expr != 0) break :blk block_expr; + const assign_expr = try p.parseAssignExpr(); + if (assign_expr == 0) { + return p.fail(.expected_block_or_assignment); + } + if (p.eatToken(.semicolon)) |_| { + return p.addNode(.{ + .tag = .if_simple, + .main_token = if_token, + .data = .{ + .lhs = condition, + .rhs = assign_expr, + }, + }); + } + else_required = true; + break :blk assign_expr; + }; + _ = p.eatToken(.keyword_else) orelse { + if (else_required) { + try p.warn(.expected_semi_or_else); + } + return p.addNode(.{ + .tag = .if_simple, + .main_token = if_token, + .data = .{ + .lhs = condition, + .rhs = then_expr, + }, + }); + }; + _ = try p.parsePayload(); + const else_expr = try p.expectStatement(false); + return p.addNode(.{ + .tag = .@"if", + .main_token = if_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.If{ + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// LabeledStatement <- BlockLabel? (Block / LoopStatement) +fn parseLabeledStatement(p: *Parse) !Node.Index { + const label_token = p.parseBlockLabel(); + const block = try p.parseBlock(); + if (block != 0) return block; + + const loop_stmt = try p.parseLoopStatement(); + if (loop_stmt != 0) return loop_stmt; + + if (label_token != 0) { + const after_colon = p.tok_i; + const node = try p.parseTypeExpr(); + if (node != 0) { + const a = try p.parseByteAlign(); + const b = try p.parseAddrSpace(); + const c = try p.parseLinkSection(); + const d = if (p.eatToken(.equal) == null) 0 else try p.expectExpr(); + if (a != 0 or b != 0 or c != 0 or d != 0) { + return p.failMsg(.{ .tag = .expected_var_const, .token = label_token }); + } + } + return p.failMsg(.{ .tag = .expected_labelable, .token = after_colon }); + } + + return null_node; +} + +/// LoopStatement <- KEYWORD_inline? (ForStatement / WhileStatement) +fn parseLoopStatement(p: *Parse) !Node.Index { + const inline_token = p.eatToken(.keyword_inline); + + const for_statement = try p.parseForStatement(); + if (for_statement != 0) return for_statement; + + const while_statement = try p.parseWhileStatement(); + if (while_statement != 0) return while_statement; + + if (inline_token == null) return null_node; + + // If we've seen "inline", there should have been a "for" or "while" + return p.fail(.expected_inlinable); +} + +/// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload +/// +/// ForStatement +/// <- ForPrefix BlockExpr ( KEYWORD_else Statement )? +/// / ForPrefix AssignExpr ( SEMICOLON / KEYWORD_else Statement ) +fn parseForStatement(p: *Parse) !Node.Index { + const for_token = p.eatToken(.keyword_for) orelse return null_node; + _ = try p.expectToken(.l_paren); + const array_expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + const found_payload = try p.parsePtrIndexPayload(); + if (found_payload == 0) try p.warn(.expected_loop_payload); + + // TODO propose to change the syntax so that semicolons are always required + // inside while statements, even if there is an `else`. + var else_required = false; + const then_expr = blk: { + const block_expr = try p.parseBlockExpr(); + if (block_expr != 0) break :blk block_expr; + const assign_expr = try p.parseAssignExpr(); + if (assign_expr == 0) { + return p.fail(.expected_block_or_assignment); + } + if (p.eatToken(.semicolon)) |_| { + return p.addNode(.{ + .tag = .for_simple, + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = assign_expr, + }, + }); + } + else_required = true; + break :blk assign_expr; + }; + _ = p.eatToken(.keyword_else) orelse { + if (else_required) { + try p.warn(.expected_semi_or_else); + } + return p.addNode(.{ + .tag = .for_simple, + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = then_expr, + }, + }); + }; + return p.addNode(.{ + .tag = .@"for", + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = try p.addExtra(Node.If{ + .then_expr = then_expr, + .else_expr = try p.expectStatement(false), + }), + }, + }); +} + +/// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? +/// +/// WhileStatement +/// <- WhilePrefix BlockExpr ( KEYWORD_else Payload? Statement )? +/// / WhilePrefix AssignExpr ( SEMICOLON / KEYWORD_else Payload? Statement ) +fn parseWhileStatement(p: *Parse) !Node.Index { + const while_token = p.eatToken(.keyword_while) orelse return null_node; + _ = try p.expectToken(.l_paren); + const condition = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.parsePtrPayload(); + const cont_expr = try p.parseWhileContinueExpr(); + + // TODO propose to change the syntax so that semicolons are always required + // inside while statements, even if there is an `else`. + var else_required = false; + const then_expr = blk: { + const block_expr = try p.parseBlockExpr(); + if (block_expr != 0) break :blk block_expr; + const assign_expr = try p.parseAssignExpr(); + if (assign_expr == 0) { + return p.fail(.expected_block_or_assignment); + } + if (p.eatToken(.semicolon)) |_| { + if (cont_expr == 0) { + return p.addNode(.{ + .tag = .while_simple, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = assign_expr, + }, + }); + } else { + return p.addNode(.{ + .tag = .while_cont, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.WhileCont{ + .cont_expr = cont_expr, + .then_expr = assign_expr, + }), + }, + }); + } + } + else_required = true; + break :blk assign_expr; + }; + _ = p.eatToken(.keyword_else) orelse { + if (else_required) { + try p.warn(.expected_semi_or_else); + } + if (cont_expr == 0) { + return p.addNode(.{ + .tag = .while_simple, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = then_expr, + }, + }); + } else { + return p.addNode(.{ + .tag = .while_cont, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.WhileCont{ + .cont_expr = cont_expr, + .then_expr = then_expr, + }), + }, + }); + } + }; + _ = try p.parsePayload(); + const else_expr = try p.expectStatement(false); + return p.addNode(.{ + .tag = .@"while", + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.While{ + .cont_expr = cont_expr, + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// BlockExprStatement +/// <- BlockExpr +/// / AssignExpr SEMICOLON +fn parseBlockExprStatement(p: *Parse) !Node.Index { + const block_expr = try p.parseBlockExpr(); + if (block_expr != 0) { + return block_expr; + } + const assign_expr = try p.parseAssignExpr(); + if (assign_expr != 0) { + try p.expectSemicolon(.expected_semi_after_stmt, true); + return assign_expr; + } + return null_node; +} + +fn expectBlockExprStatement(p: *Parse) !Node.Index { + const node = try p.parseBlockExprStatement(); + if (node == 0) { + return p.fail(.expected_block_or_expr); + } + return node; +} + +/// BlockExpr <- BlockLabel? Block +fn parseBlockExpr(p: *Parse) Error!Node.Index { + switch (p.token_tags[p.tok_i]) { + .identifier => { + if (p.token_tags[p.tok_i + 1] == .colon and + p.token_tags[p.tok_i + 2] == .l_brace) + { + p.tok_i += 2; + return p.parseBlock(); + } else { + return null_node; + } + }, + .l_brace => return p.parseBlock(), + else => return null_node, + } +} + +/// AssignExpr <- Expr (AssignOp Expr)? +/// +/// AssignOp +/// <- ASTERISKEQUAL +/// / ASTERISKPIPEEQUAL +/// / SLASHEQUAL +/// / PERCENTEQUAL +/// / PLUSEQUAL +/// / PLUSPIPEEQUAL +/// / MINUSEQUAL +/// / MINUSPIPEEQUAL +/// / LARROW2EQUAL +/// / LARROW2PIPEEQUAL +/// / RARROW2EQUAL +/// / AMPERSANDEQUAL +/// / CARETEQUAL +/// / PIPEEQUAL +/// / ASTERISKPERCENTEQUAL +/// / PLUSPERCENTEQUAL +/// / MINUSPERCENTEQUAL +/// / EQUAL +fn parseAssignExpr(p: *Parse) !Node.Index { + const expr = try p.parseExpr(); + if (expr == 0) return null_node; + + const tag: Node.Tag = switch (p.token_tags[p.tok_i]) { + .asterisk_equal => .assign_mul, + .slash_equal => .assign_div, + .percent_equal => .assign_mod, + .plus_equal => .assign_add, + .minus_equal => .assign_sub, + .angle_bracket_angle_bracket_left_equal => .assign_shl, + .angle_bracket_angle_bracket_left_pipe_equal => .assign_shl_sat, + .angle_bracket_angle_bracket_right_equal => .assign_shr, + .ampersand_equal => .assign_bit_and, + .caret_equal => .assign_bit_xor, + .pipe_equal => .assign_bit_or, + .asterisk_percent_equal => .assign_mul_wrap, + .plus_percent_equal => .assign_add_wrap, + .minus_percent_equal => .assign_sub_wrap, + .asterisk_pipe_equal => .assign_mul_sat, + .plus_pipe_equal => .assign_add_sat, + .minus_pipe_equal => .assign_sub_sat, + .equal => .assign, + else => return expr, + }; + return p.addNode(.{ + .tag = tag, + .main_token = p.nextToken(), + .data = .{ + .lhs = expr, + .rhs = try p.expectExpr(), + }, + }); +} + +fn expectAssignExpr(p: *Parse) !Node.Index { + const expr = try p.parseAssignExpr(); + if (expr == 0) { + return p.fail(.expected_expr_or_assignment); + } + return expr; +} + +fn parseExpr(p: *Parse) Error!Node.Index { + return p.parseExprPrecedence(0); +} + +fn expectExpr(p: *Parse) Error!Node.Index { + const node = try p.parseExpr(); + if (node == 0) { + return p.fail(.expected_expr); + } else { + return node; + } +} + +const Assoc = enum { + left, + none, +}; + +const OperInfo = struct { + prec: i8, + tag: Node.Tag, + assoc: Assoc = Assoc.left, +}; + +// A table of binary operator information. Higher precedence numbers are +// stickier. All operators at the same precedence level should have the same +// associativity. +const operTable = std.enums.directEnumArrayDefault(Token.Tag, OperInfo, .{ .prec = -1, .tag = Node.Tag.root }, 0, .{ + .keyword_or = .{ .prec = 10, .tag = .bool_or }, + + .keyword_and = .{ .prec = 20, .tag = .bool_and }, + + .equal_equal = .{ .prec = 30, .tag = .equal_equal, .assoc = Assoc.none }, + .bang_equal = .{ .prec = 30, .tag = .bang_equal, .assoc = Assoc.none }, + .angle_bracket_left = .{ .prec = 30, .tag = .less_than, .assoc = Assoc.none }, + .angle_bracket_right = .{ .prec = 30, .tag = .greater_than, .assoc = Assoc.none }, + .angle_bracket_left_equal = .{ .prec = 30, .tag = .less_or_equal, .assoc = Assoc.none }, + .angle_bracket_right_equal = .{ .prec = 30, .tag = .greater_or_equal, .assoc = Assoc.none }, + + .ampersand = .{ .prec = 40, .tag = .bit_and }, + .caret = .{ .prec = 40, .tag = .bit_xor }, + .pipe = .{ .prec = 40, .tag = .bit_or }, + .keyword_orelse = .{ .prec = 40, .tag = .@"orelse" }, + .keyword_catch = .{ .prec = 40, .tag = .@"catch" }, + + .angle_bracket_angle_bracket_left = .{ .prec = 50, .tag = .shl }, + .angle_bracket_angle_bracket_left_pipe = .{ .prec = 50, .tag = .shl_sat }, + .angle_bracket_angle_bracket_right = .{ .prec = 50, .tag = .shr }, + + .plus = .{ .prec = 60, .tag = .add }, + .minus = .{ .prec = 60, .tag = .sub }, + .plus_plus = .{ .prec = 60, .tag = .array_cat }, + .plus_percent = .{ .prec = 60, .tag = .add_wrap }, + .minus_percent = .{ .prec = 60, .tag = .sub_wrap }, + .plus_pipe = .{ .prec = 60, .tag = .add_sat }, + .minus_pipe = .{ .prec = 60, .tag = .sub_sat }, + + .pipe_pipe = .{ .prec = 70, .tag = .merge_error_sets }, + .asterisk = .{ .prec = 70, .tag = .mul }, + .slash = .{ .prec = 70, .tag = .div }, + .percent = .{ .prec = 70, .tag = .mod }, + .asterisk_asterisk = .{ .prec = 70, .tag = .array_mult }, + .asterisk_percent = .{ .prec = 70, .tag = .mul_wrap }, + .asterisk_pipe = .{ .prec = 70, .tag = .mul_sat }, +}); + +fn parseExprPrecedence(p: *Parse, min_prec: i32) Error!Node.Index { + assert(min_prec >= 0); + var node = try p.parsePrefixExpr(); + if (node == 0) { + return null_node; + } + + var banned_prec: i8 = -1; + + while (true) { + const tok_tag = p.token_tags[p.tok_i]; + const info = operTable[@intCast(usize, @enumToInt(tok_tag))]; + if (info.prec < min_prec) { + break; + } + if (info.prec == banned_prec) { + return p.fail(.chained_comparison_operators); + } + + const oper_token = p.nextToken(); + // Special-case handling for "catch" + if (tok_tag == .keyword_catch) { + _ = try p.parsePayload(); + } + const rhs = try p.parseExprPrecedence(info.prec + 1); + if (rhs == 0) { + try p.warn(.expected_expr); + return node; + } + + { + const tok_len = tok_tag.lexeme().?.len; + const char_before = p.source[p.token_starts[oper_token] - 1]; + const char_after = p.source[p.token_starts[oper_token] + tok_len]; + if (tok_tag == .ampersand and char_after == '&') { + // without types we don't know if '&&' was intended as 'bitwise_and address_of', or a c-style logical_and + // The best the parser can do is recommend changing it to 'and' or ' & &' + try p.warnMsg(.{ .tag = .invalid_ampersand_ampersand, .token = oper_token }); + } else if (std.ascii.isWhitespace(char_before) != std.ascii.isWhitespace(char_after)) { + try p.warnMsg(.{ .tag = .mismatched_binary_op_whitespace, .token = oper_token }); + } + } + + node = try p.addNode(.{ + .tag = info.tag, + .main_token = oper_token, + .data = .{ + .lhs = node, + .rhs = rhs, + }, + }); + + if (info.assoc == Assoc.none) { + banned_prec = info.prec; + } + } + + return node; +} + +/// PrefixExpr <- PrefixOp* PrimaryExpr +/// +/// PrefixOp +/// <- EXCLAMATIONMARK +/// / MINUS +/// / TILDE +/// / MINUSPERCENT +/// / AMPERSAND +/// / KEYWORD_try +/// / KEYWORD_await +fn parsePrefixExpr(p: *Parse) Error!Node.Index { + const tag: Node.Tag = switch (p.token_tags[p.tok_i]) { + .bang => .bool_not, + .minus => .negation, + .tilde => .bit_not, + .minus_percent => .negation_wrap, + .ampersand => .address_of, + .keyword_try => .@"try", + .keyword_await => .@"await", + else => return p.parsePrimaryExpr(), + }; + return p.addNode(.{ + .tag = tag, + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.expectPrefixExpr(), + .rhs = undefined, + }, + }); +} + +fn expectPrefixExpr(p: *Parse) Error!Node.Index { + const node = try p.parsePrefixExpr(); + if (node == 0) { + return p.fail(.expected_prefix_expr); + } + return node; +} + +/// TypeExpr <- PrefixTypeOp* ErrorUnionExpr +/// +/// PrefixTypeOp +/// <- QUESTIONMARK +/// / KEYWORD_anyframe MINUSRARROW +/// / SliceTypeStart (ByteAlign / AddrSpace / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)* +/// / PtrTypeStart (AddrSpace / KEYWORD_align LPAREN Expr (COLON Expr COLON Expr)? RPAREN / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)* +/// / ArrayTypeStart +/// +/// SliceTypeStart <- LBRACKET (COLON Expr)? RBRACKET +/// +/// PtrTypeStart +/// <- ASTERISK +/// / ASTERISK2 +/// / LBRACKET ASTERISK (LETTERC / COLON Expr)? RBRACKET +/// +/// ArrayTypeStart <- LBRACKET Expr (COLON Expr)? RBRACKET +fn parseTypeExpr(p: *Parse) Error!Node.Index { + switch (p.token_tags[p.tok_i]) { + .question_mark => return p.addNode(.{ + .tag = .optional_type, + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.expectTypeExpr(), + .rhs = undefined, + }, + }), + .keyword_anyframe => switch (p.token_tags[p.tok_i + 1]) { + .arrow => return p.addNode(.{ + .tag = .anyframe_type, + .main_token = p.nextToken(), + .data = .{ + .lhs = p.nextToken(), + .rhs = try p.expectTypeExpr(), + }, + }), + else => return p.parseErrorUnionExpr(), + }, + .asterisk => { + const asterisk = p.nextToken(); + const mods = try p.parsePtrModifiers(); + const elem_type = try p.expectTypeExpr(); + if (mods.bit_range_start != 0) { + return p.addNode(.{ + .tag = .ptr_type_bit_range, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrTypeBitRange{ + .sentinel = 0, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + .bit_range_start = mods.bit_range_start, + .bit_range_end = mods.bit_range_end, + }), + .rhs = elem_type, + }, + }); + } else if (mods.addrspace_node != 0) { + return p.addNode(.{ + .tag = .ptr_type, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrType{ + .sentinel = 0, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + }), + .rhs = elem_type, + }, + }); + } else { + return p.addNode(.{ + .tag = .ptr_type_aligned, + .main_token = asterisk, + .data = .{ + .lhs = mods.align_node, + .rhs = elem_type, + }, + }); + } + }, + .asterisk_asterisk => { + const asterisk = p.nextToken(); + const mods = try p.parsePtrModifiers(); + const elem_type = try p.expectTypeExpr(); + const inner: Node.Index = inner: { + if (mods.bit_range_start != 0) { + break :inner try p.addNode(.{ + .tag = .ptr_type_bit_range, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrTypeBitRange{ + .sentinel = 0, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + .bit_range_start = mods.bit_range_start, + .bit_range_end = mods.bit_range_end, + }), + .rhs = elem_type, + }, + }); + } else if (mods.addrspace_node != 0) { + break :inner try p.addNode(.{ + .tag = .ptr_type, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrType{ + .sentinel = 0, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + }), + .rhs = elem_type, + }, + }); + } else { + break :inner try p.addNode(.{ + .tag = .ptr_type_aligned, + .main_token = asterisk, + .data = .{ + .lhs = mods.align_node, + .rhs = elem_type, + }, + }); + } + }; + return p.addNode(.{ + .tag = .ptr_type_aligned, + .main_token = asterisk, + .data = .{ + .lhs = 0, + .rhs = inner, + }, + }); + }, + .l_bracket => switch (p.token_tags[p.tok_i + 1]) { + .asterisk => { + _ = p.nextToken(); + const asterisk = p.nextToken(); + var sentinel: Node.Index = 0; + if (p.eatToken(.identifier)) |ident| { + const ident_slice = p.source[p.token_starts[ident]..p.token_starts[ident + 1]]; + if (!std.mem.eql(u8, std.mem.trimRight(u8, ident_slice, &std.ascii.whitespace), "c")) { + p.tok_i -= 1; + } + } else if (p.eatToken(.colon)) |_| { + sentinel = try p.expectExpr(); + } + _ = try p.expectToken(.r_bracket); + const mods = try p.parsePtrModifiers(); + const elem_type = try p.expectTypeExpr(); + if (mods.bit_range_start == 0) { + if (sentinel == 0 and mods.addrspace_node == 0) { + return p.addNode(.{ + .tag = .ptr_type_aligned, + .main_token = asterisk, + .data = .{ + .lhs = mods.align_node, + .rhs = elem_type, + }, + }); + } else if (mods.align_node == 0 and mods.addrspace_node == 0) { + return p.addNode(.{ + .tag = .ptr_type_sentinel, + .main_token = asterisk, + .data = .{ + .lhs = sentinel, + .rhs = elem_type, + }, + }); + } else { + return p.addNode(.{ + .tag = .ptr_type, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrType{ + .sentinel = sentinel, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + }), + .rhs = elem_type, + }, + }); + } + } else { + return p.addNode(.{ + .tag = .ptr_type_bit_range, + .main_token = asterisk, + .data = .{ + .lhs = try p.addExtra(Node.PtrTypeBitRange{ + .sentinel = sentinel, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + .bit_range_start = mods.bit_range_start, + .bit_range_end = mods.bit_range_end, + }), + .rhs = elem_type, + }, + }); + } + }, + else => { + const lbracket = p.nextToken(); + const len_expr = try p.parseExpr(); + const sentinel: Node.Index = if (p.eatToken(.colon)) |_| + try p.expectExpr() + else + 0; + _ = try p.expectToken(.r_bracket); + if (len_expr == 0) { + const mods = try p.parsePtrModifiers(); + const elem_type = try p.expectTypeExpr(); + if (mods.bit_range_start != 0) { + try p.warnMsg(.{ + .tag = .invalid_bit_range, + .token = p.nodes.items(.main_token)[mods.bit_range_start], + }); + } + if (sentinel == 0 and mods.addrspace_node == 0) { + return p.addNode(.{ + .tag = .ptr_type_aligned, + .main_token = lbracket, + .data = .{ + .lhs = mods.align_node, + .rhs = elem_type, + }, + }); + } else if (mods.align_node == 0 and mods.addrspace_node == 0) { + return p.addNode(.{ + .tag = .ptr_type_sentinel, + .main_token = lbracket, + .data = .{ + .lhs = sentinel, + .rhs = elem_type, + }, + }); + } else { + return p.addNode(.{ + .tag = .ptr_type, + .main_token = lbracket, + .data = .{ + .lhs = try p.addExtra(Node.PtrType{ + .sentinel = sentinel, + .align_node = mods.align_node, + .addrspace_node = mods.addrspace_node, + }), + .rhs = elem_type, + }, + }); + } + } else { + switch (p.token_tags[p.tok_i]) { + .keyword_align, + .keyword_const, + .keyword_volatile, + .keyword_allowzero, + .keyword_addrspace, + => return p.fail(.ptr_mod_on_array_child_type), + else => {}, + } + const elem_type = try p.expectTypeExpr(); + if (sentinel == 0) { + return p.addNode(.{ + .tag = .array_type, + .main_token = lbracket, + .data = .{ + .lhs = len_expr, + .rhs = elem_type, + }, + }); + } else { + return p.addNode(.{ + .tag = .array_type_sentinel, + .main_token = lbracket, + .data = .{ + .lhs = len_expr, + .rhs = try p.addExtra(.{ + .elem_type = elem_type, + .sentinel = sentinel, + }), + }, + }); + } + } + }, + }, + else => return p.parseErrorUnionExpr(), + } +} + +fn expectTypeExpr(p: *Parse) Error!Node.Index { + const node = try p.parseTypeExpr(); + if (node == 0) { + return p.fail(.expected_type_expr); + } + return node; +} + +/// PrimaryExpr +/// <- AsmExpr +/// / IfExpr +/// / KEYWORD_break BreakLabel? Expr? +/// / KEYWORD_comptime Expr +/// / KEYWORD_nosuspend Expr +/// / KEYWORD_continue BreakLabel? +/// / KEYWORD_resume Expr +/// / KEYWORD_return Expr? +/// / BlockLabel? LoopExpr +/// / Block +/// / CurlySuffixExpr +fn parsePrimaryExpr(p: *Parse) !Node.Index { + switch (p.token_tags[p.tok_i]) { + .keyword_asm => return p.expectAsmExpr(), + .keyword_if => return p.parseIfExpr(), + .keyword_break => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"break", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.parseBreakLabel(), + .rhs = try p.parseExpr(), + }, + }); + }, + .keyword_continue => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"continue", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.parseBreakLabel(), + .rhs = undefined, + }, + }); + }, + .keyword_comptime => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"comptime", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.expectExpr(), + .rhs = undefined, + }, + }); + }, + .keyword_nosuspend => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"nosuspend", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.expectExpr(), + .rhs = undefined, + }, + }); + }, + .keyword_resume => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"resume", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.expectExpr(), + .rhs = undefined, + }, + }); + }, + .keyword_return => { + p.tok_i += 1; + return p.addNode(.{ + .tag = .@"return", + .main_token = p.tok_i - 1, + .data = .{ + .lhs = try p.parseExpr(), + .rhs = undefined, + }, + }); + }, + .identifier => { + if (p.token_tags[p.tok_i + 1] == .colon) { + switch (p.token_tags[p.tok_i + 2]) { + .keyword_inline => { + p.tok_i += 3; + switch (p.token_tags[p.tok_i]) { + .keyword_for => return p.parseForExpr(), + .keyword_while => return p.parseWhileExpr(), + else => return p.fail(.expected_inlinable), + } + }, + .keyword_for => { + p.tok_i += 2; + return p.parseForExpr(); + }, + .keyword_while => { + p.tok_i += 2; + return p.parseWhileExpr(); + }, + .l_brace => { + p.tok_i += 2; + return p.parseBlock(); + }, + else => return p.parseCurlySuffixExpr(), + } + } else { + return p.parseCurlySuffixExpr(); + } + }, + .keyword_inline => { + p.tok_i += 1; + switch (p.token_tags[p.tok_i]) { + .keyword_for => return p.parseForExpr(), + .keyword_while => return p.parseWhileExpr(), + else => return p.fail(.expected_inlinable), + } + }, + .keyword_for => return p.parseForExpr(), + .keyword_while => return p.parseWhileExpr(), + .l_brace => return p.parseBlock(), + else => return p.parseCurlySuffixExpr(), + } +} + +/// IfExpr <- IfPrefix Expr (KEYWORD_else Payload? Expr)? +fn parseIfExpr(p: *Parse) !Node.Index { + return p.parseIf(expectExpr); +} + +/// Block <- LBRACE Statement* RBRACE +fn parseBlock(p: *Parse) !Node.Index { + const lbrace = p.eatToken(.l_brace) orelse return null_node; + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + while (true) { + if (p.token_tags[p.tok_i] == .r_brace) break; + const statement = try p.expectStatementRecoverable(); + if (statement == 0) break; + try p.scratch.append(p.gpa, statement); + } + _ = try p.expectToken(.r_brace); + const semicolon = (p.token_tags[p.tok_i - 2] == .semicolon); + const statements = p.scratch.items[scratch_top..]; + switch (statements.len) { + 0 => return p.addNode(.{ + .tag = .block_two, + .main_token = lbrace, + .data = .{ + .lhs = 0, + .rhs = 0, + }, + }), + 1 => return p.addNode(.{ + .tag = if (semicolon) .block_two_semicolon else .block_two, + .main_token = lbrace, + .data = .{ + .lhs = statements[0], + .rhs = 0, + }, + }), + 2 => return p.addNode(.{ + .tag = if (semicolon) .block_two_semicolon else .block_two, + .main_token = lbrace, + .data = .{ + .lhs = statements[0], + .rhs = statements[1], + }, + }), + else => { + const span = try p.listToSpan(statements); + return p.addNode(.{ + .tag = if (semicolon) .block_semicolon else .block, + .main_token = lbrace, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + }, + } +} + +/// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload +/// +/// ForExpr <- ForPrefix Expr (KEYWORD_else Expr)? +fn parseForExpr(p: *Parse) !Node.Index { + const for_token = p.eatToken(.keyword_for) orelse return null_node; + _ = try p.expectToken(.l_paren); + const array_expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + const found_payload = try p.parsePtrIndexPayload(); + if (found_payload == 0) try p.warn(.expected_loop_payload); + + const then_expr = try p.expectExpr(); + _ = p.eatToken(.keyword_else) orelse { + return p.addNode(.{ + .tag = .for_simple, + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = then_expr, + }, + }); + }; + const else_expr = try p.expectExpr(); + return p.addNode(.{ + .tag = .@"for", + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = try p.addExtra(Node.If{ + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? +/// +/// WhileExpr <- WhilePrefix Expr (KEYWORD_else Payload? Expr)? +fn parseWhileExpr(p: *Parse) !Node.Index { + const while_token = p.eatToken(.keyword_while) orelse return null_node; + _ = try p.expectToken(.l_paren); + const condition = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.parsePtrPayload(); + const cont_expr = try p.parseWhileContinueExpr(); + + const then_expr = try p.expectExpr(); + _ = p.eatToken(.keyword_else) orelse { + if (cont_expr == 0) { + return p.addNode(.{ + .tag = .while_simple, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = then_expr, + }, + }); + } else { + return p.addNode(.{ + .tag = .while_cont, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.WhileCont{ + .cont_expr = cont_expr, + .then_expr = then_expr, + }), + }, + }); + } + }; + _ = try p.parsePayload(); + const else_expr = try p.expectExpr(); + return p.addNode(.{ + .tag = .@"while", + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.While{ + .cont_expr = cont_expr, + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// CurlySuffixExpr <- TypeExpr InitList? +/// +/// InitList +/// <- LBRACE FieldInit (COMMA FieldInit)* COMMA? RBRACE +/// / LBRACE Expr (COMMA Expr)* COMMA? RBRACE +/// / LBRACE RBRACE +fn parseCurlySuffixExpr(p: *Parse) !Node.Index { + const lhs = try p.parseTypeExpr(); + if (lhs == 0) return null_node; + const lbrace = p.eatToken(.l_brace) orelse return lhs; + + // If there are 0 or 1 items, we can use ArrayInitOne/StructInitOne; + // otherwise we use the full ArrayInit/StructInit. + + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + const field_init = try p.parseFieldInit(); + if (field_init != 0) { + try p.scratch.append(p.gpa, field_init); + while (true) { + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_brace => { + p.tok_i += 1; + break; + }, + .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_initializer), + } + if (p.eatToken(.r_brace)) |_| break; + const next = try p.expectFieldInit(); + try p.scratch.append(p.gpa, next); + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const inits = p.scratch.items[scratch_top..]; + switch (inits.len) { + 0 => unreachable, + 1 => return p.addNode(.{ + .tag = if (comma) .struct_init_one_comma else .struct_init_one, + .main_token = lbrace, + .data = .{ + .lhs = lhs, + .rhs = inits[0], + }, + }), + else => return p.addNode(.{ + .tag = if (comma) .struct_init_comma else .struct_init, + .main_token = lbrace, + .data = .{ + .lhs = lhs, + .rhs = try p.addExtra(try p.listToSpan(inits)), + }, + }), + } + } + + while (true) { + if (p.eatToken(.r_brace)) |_| break; + const elem_init = try p.expectExpr(); + try p.scratch.append(p.gpa, elem_init); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_brace => { + p.tok_i += 1; + break; + }, + .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_initializer), + } + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const inits = p.scratch.items[scratch_top..]; + switch (inits.len) { + 0 => return p.addNode(.{ + .tag = .struct_init_one, + .main_token = lbrace, + .data = .{ + .lhs = lhs, + .rhs = 0, + }, + }), + 1 => return p.addNode(.{ + .tag = if (comma) .array_init_one_comma else .array_init_one, + .main_token = lbrace, + .data = .{ + .lhs = lhs, + .rhs = inits[0], + }, + }), + else => return p.addNode(.{ + .tag = if (comma) .array_init_comma else .array_init, + .main_token = lbrace, + .data = .{ + .lhs = lhs, + .rhs = try p.addExtra(try p.listToSpan(inits)), + }, + }), + } +} + +/// ErrorUnionExpr <- SuffixExpr (EXCLAMATIONMARK TypeExpr)? +fn parseErrorUnionExpr(p: *Parse) !Node.Index { + const suffix_expr = try p.parseSuffixExpr(); + if (suffix_expr == 0) return null_node; + const bang = p.eatToken(.bang) orelse return suffix_expr; + return p.addNode(.{ + .tag = .error_union, + .main_token = bang, + .data = .{ + .lhs = suffix_expr, + .rhs = try p.expectTypeExpr(), + }, + }); +} + +/// SuffixExpr +/// <- KEYWORD_async PrimaryTypeExpr SuffixOp* FnCallArguments +/// / PrimaryTypeExpr (SuffixOp / FnCallArguments)* +/// +/// FnCallArguments <- LPAREN ExprList RPAREN +/// +/// ExprList <- (Expr COMMA)* Expr? +fn parseSuffixExpr(p: *Parse) !Node.Index { + if (p.eatToken(.keyword_async)) |_| { + var res = try p.expectPrimaryTypeExpr(); + while (true) { + const node = try p.parseSuffixOp(res); + if (node == 0) break; + res = node; + } + const lparen = p.eatToken(.l_paren) orelse { + try p.warn(.expected_param_list); + return res; + }; + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + while (true) { + if (p.eatToken(.r_paren)) |_| break; + const param = try p.expectExpr(); + try p.scratch.append(p.gpa, param); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_paren => { + p.tok_i += 1; + break; + }, + .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_arg), + } + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const params = p.scratch.items[scratch_top..]; + switch (params.len) { + 0 => return p.addNode(.{ + .tag = if (comma) .async_call_one_comma else .async_call_one, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = 0, + }, + }), + 1 => return p.addNode(.{ + .tag = if (comma) .async_call_one_comma else .async_call_one, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = params[0], + }, + }), + else => return p.addNode(.{ + .tag = if (comma) .async_call_comma else .async_call, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = try p.addExtra(try p.listToSpan(params)), + }, + }), + } + } + + var res = try p.parsePrimaryTypeExpr(); + if (res == 0) return res; + while (true) { + const suffix_op = try p.parseSuffixOp(res); + if (suffix_op != 0) { + res = suffix_op; + continue; + } + const lparen = p.eatToken(.l_paren) orelse return res; + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + while (true) { + if (p.eatToken(.r_paren)) |_| break; + const param = try p.expectExpr(); + try p.scratch.append(p.gpa, param); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_paren => { + p.tok_i += 1; + break; + }, + .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_arg), + } + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const params = p.scratch.items[scratch_top..]; + res = switch (params.len) { + 0 => try p.addNode(.{ + .tag = if (comma) .call_one_comma else .call_one, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = 0, + }, + }), + 1 => try p.addNode(.{ + .tag = if (comma) .call_one_comma else .call_one, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = params[0], + }, + }), + else => try p.addNode(.{ + .tag = if (comma) .call_comma else .call, + .main_token = lparen, + .data = .{ + .lhs = res, + .rhs = try p.addExtra(try p.listToSpan(params)), + }, + }), + }; + } +} + +/// PrimaryTypeExpr +/// <- BUILTINIDENTIFIER FnCallArguments +/// / CHAR_LITERAL +/// / ContainerDecl +/// / DOT IDENTIFIER +/// / DOT InitList +/// / ErrorSetDecl +/// / FLOAT +/// / FnProto +/// / GroupedExpr +/// / LabeledTypeExpr +/// / IDENTIFIER +/// / IfTypeExpr +/// / INTEGER +/// / KEYWORD_comptime TypeExpr +/// / KEYWORD_error DOT IDENTIFIER +/// / KEYWORD_anyframe +/// / KEYWORD_unreachable +/// / STRINGLITERAL +/// / SwitchExpr +/// +/// ContainerDecl <- (KEYWORD_extern / KEYWORD_packed)? ContainerDeclAuto +/// +/// ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE +/// +/// InitList +/// <- LBRACE FieldInit (COMMA FieldInit)* COMMA? RBRACE +/// / LBRACE Expr (COMMA Expr)* COMMA? RBRACE +/// / LBRACE RBRACE +/// +/// ErrorSetDecl <- KEYWORD_error LBRACE IdentifierList RBRACE +/// +/// GroupedExpr <- LPAREN Expr RPAREN +/// +/// IfTypeExpr <- IfPrefix TypeExpr (KEYWORD_else Payload? TypeExpr)? +/// +/// LabeledTypeExpr +/// <- BlockLabel Block +/// / BlockLabel? LoopTypeExpr +/// +/// LoopTypeExpr <- KEYWORD_inline? (ForTypeExpr / WhileTypeExpr) +fn parsePrimaryTypeExpr(p: *Parse) !Node.Index { + switch (p.token_tags[p.tok_i]) { + .char_literal => return p.addNode(.{ + .tag = .char_literal, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + .number_literal => return p.addNode(.{ + .tag = .number_literal, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + .keyword_unreachable => return p.addNode(.{ + .tag = .unreachable_literal, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + .keyword_anyframe => return p.addNode(.{ + .tag = .anyframe_literal, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + .string_literal => { + const main_token = p.nextToken(); + return p.addNode(.{ + .tag = .string_literal, + .main_token = main_token, + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }); + }, + + .builtin => return p.parseBuiltinCall(), + .keyword_fn => return p.parseFnProto(), + .keyword_if => return p.parseIf(expectTypeExpr), + .keyword_switch => return p.expectSwitchExpr(), + + .keyword_extern, + .keyword_packed, + => { + p.tok_i += 1; + return p.parseContainerDeclAuto(); + }, + + .keyword_struct, + .keyword_opaque, + .keyword_enum, + .keyword_union, + => return p.parseContainerDeclAuto(), + + .keyword_comptime => return p.addNode(.{ + .tag = .@"comptime", + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.expectTypeExpr(), + .rhs = undefined, + }, + }), + .multiline_string_literal_line => { + const first_line = p.nextToken(); + while (p.token_tags[p.tok_i] == .multiline_string_literal_line) { + p.tok_i += 1; + } + return p.addNode(.{ + .tag = .multiline_string_literal, + .main_token = first_line, + .data = .{ + .lhs = first_line, + .rhs = p.tok_i - 1, + }, + }); + }, + .identifier => switch (p.token_tags[p.tok_i + 1]) { + .colon => switch (p.token_tags[p.tok_i + 2]) { + .keyword_inline => { + p.tok_i += 3; + switch (p.token_tags[p.tok_i]) { + .keyword_for => return p.parseForTypeExpr(), + .keyword_while => return p.parseWhileTypeExpr(), + else => return p.fail(.expected_inlinable), + } + }, + .keyword_for => { + p.tok_i += 2; + return p.parseForTypeExpr(); + }, + .keyword_while => { + p.tok_i += 2; + return p.parseWhileTypeExpr(); + }, + .l_brace => { + p.tok_i += 2; + return p.parseBlock(); + }, + else => return p.addNode(.{ + .tag = .identifier, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + }, + else => return p.addNode(.{ + .tag = .identifier, + .main_token = p.nextToken(), + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }), + }, + .keyword_inline => { + p.tok_i += 1; + switch (p.token_tags[p.tok_i]) { + .keyword_for => return p.parseForTypeExpr(), + .keyword_while => return p.parseWhileTypeExpr(), + else => return p.fail(.expected_inlinable), + } + }, + .keyword_for => return p.parseForTypeExpr(), + .keyword_while => return p.parseWhileTypeExpr(), + .period => switch (p.token_tags[p.tok_i + 1]) { + .identifier => return p.addNode(.{ + .tag = .enum_literal, + .data = .{ + .lhs = p.nextToken(), // dot + .rhs = undefined, + }, + .main_token = p.nextToken(), // identifier + }), + .l_brace => { + const lbrace = p.tok_i + 1; + p.tok_i = lbrace + 1; + + // If there are 0, 1, or 2 items, we can use ArrayInitDotTwo/StructInitDotTwo; + // otherwise we use the full ArrayInitDot/StructInitDot. + + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + const field_init = try p.parseFieldInit(); + if (field_init != 0) { + try p.scratch.append(p.gpa, field_init); + while (true) { + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_brace => { + p.tok_i += 1; + break; + }, + .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_initializer), + } + if (p.eatToken(.r_brace)) |_| break; + const next = try p.expectFieldInit(); + try p.scratch.append(p.gpa, next); + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const inits = p.scratch.items[scratch_top..]; + switch (inits.len) { + 0 => unreachable, + 1 => return p.addNode(.{ + .tag = if (comma) .struct_init_dot_two_comma else .struct_init_dot_two, + .main_token = lbrace, + .data = .{ + .lhs = inits[0], + .rhs = 0, + }, + }), + 2 => return p.addNode(.{ + .tag = if (comma) .struct_init_dot_two_comma else .struct_init_dot_two, + .main_token = lbrace, + .data = .{ + .lhs = inits[0], + .rhs = inits[1], + }, + }), + else => { + const span = try p.listToSpan(inits); + return p.addNode(.{ + .tag = if (comma) .struct_init_dot_comma else .struct_init_dot, + .main_token = lbrace, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + }, + } + } + + while (true) { + if (p.eatToken(.r_brace)) |_| break; + const elem_init = try p.expectExpr(); + try p.scratch.append(p.gpa, elem_init); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_brace => { + p.tok_i += 1; + break; + }, + .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_initializer), + } + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const inits = p.scratch.items[scratch_top..]; + switch (inits.len) { + 0 => return p.addNode(.{ + .tag = .struct_init_dot_two, + .main_token = lbrace, + .data = .{ + .lhs = 0, + .rhs = 0, + }, + }), + 1 => return p.addNode(.{ + .tag = if (comma) .array_init_dot_two_comma else .array_init_dot_two, + .main_token = lbrace, + .data = .{ + .lhs = inits[0], + .rhs = 0, + }, + }), + 2 => return p.addNode(.{ + .tag = if (comma) .array_init_dot_two_comma else .array_init_dot_two, + .main_token = lbrace, + .data = .{ + .lhs = inits[0], + .rhs = inits[1], + }, + }), + else => { + const span = try p.listToSpan(inits); + return p.addNode(.{ + .tag = if (comma) .array_init_dot_comma else .array_init_dot, + .main_token = lbrace, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + }, + } + }, + else => return null_node, + }, + .keyword_error => switch (p.token_tags[p.tok_i + 1]) { + .l_brace => { + const error_token = p.tok_i; + p.tok_i += 2; + while (true) { + if (p.eatToken(.r_brace)) |_| break; + _ = try p.eatDocComments(); + _ = try p.expectToken(.identifier); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_brace => { + p.tok_i += 1; + break; + }, + .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_field), + } + } + return p.addNode(.{ + .tag = .error_set_decl, + .main_token = error_token, + .data = .{ + .lhs = undefined, + .rhs = p.tok_i - 1, // rbrace + }, + }); + }, + else => { + const main_token = p.nextToken(); + const period = p.eatToken(.period); + if (period == null) try p.warnExpected(.period); + const identifier = p.eatToken(.identifier); + if (identifier == null) try p.warnExpected(.identifier); + return p.addNode(.{ + .tag = .error_value, + .main_token = main_token, + .data = .{ + .lhs = period orelse 0, + .rhs = identifier orelse 0, + }, + }); + }, + }, + .l_paren => return p.addNode(.{ + .tag = .grouped_expression, + .main_token = p.nextToken(), + .data = .{ + .lhs = try p.expectExpr(), + .rhs = try p.expectToken(.r_paren), + }, + }), + else => return null_node, + } +} + +fn expectPrimaryTypeExpr(p: *Parse) !Node.Index { + const node = try p.parsePrimaryTypeExpr(); + if (node == 0) { + return p.fail(.expected_primary_type_expr); + } + return node; +} + +/// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload +/// +/// ForTypeExpr <- ForPrefix TypeExpr (KEYWORD_else TypeExpr)? +fn parseForTypeExpr(p: *Parse) !Node.Index { + const for_token = p.eatToken(.keyword_for) orelse return null_node; + _ = try p.expectToken(.l_paren); + const array_expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + const found_payload = try p.parsePtrIndexPayload(); + if (found_payload == 0) try p.warn(.expected_loop_payload); + + const then_expr = try p.expectTypeExpr(); + _ = p.eatToken(.keyword_else) orelse { + return p.addNode(.{ + .tag = .for_simple, + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = then_expr, + }, + }); + }; + const else_expr = try p.expectTypeExpr(); + return p.addNode(.{ + .tag = .@"for", + .main_token = for_token, + .data = .{ + .lhs = array_expr, + .rhs = try p.addExtra(Node.If{ + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? +/// +/// WhileTypeExpr <- WhilePrefix TypeExpr (KEYWORD_else Payload? TypeExpr)? +fn parseWhileTypeExpr(p: *Parse) !Node.Index { + const while_token = p.eatToken(.keyword_while) orelse return null_node; + _ = try p.expectToken(.l_paren); + const condition = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.parsePtrPayload(); + const cont_expr = try p.parseWhileContinueExpr(); + + const then_expr = try p.expectTypeExpr(); + _ = p.eatToken(.keyword_else) orelse { + if (cont_expr == 0) { + return p.addNode(.{ + .tag = .while_simple, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = then_expr, + }, + }); + } else { + return p.addNode(.{ + .tag = .while_cont, + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.WhileCont{ + .cont_expr = cont_expr, + .then_expr = then_expr, + }), + }, + }); + } + }; + _ = try p.parsePayload(); + const else_expr = try p.expectTypeExpr(); + return p.addNode(.{ + .tag = .@"while", + .main_token = while_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.While{ + .cont_expr = cont_expr, + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// SwitchExpr <- KEYWORD_switch LPAREN Expr RPAREN LBRACE SwitchProngList RBRACE +fn expectSwitchExpr(p: *Parse) !Node.Index { + const switch_token = p.assertToken(.keyword_switch); + _ = try p.expectToken(.l_paren); + const expr_node = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.expectToken(.l_brace); + const cases = try p.parseSwitchProngList(); + const trailing_comma = p.token_tags[p.tok_i - 1] == .comma; + _ = try p.expectToken(.r_brace); + + return p.addNode(.{ + .tag = if (trailing_comma) .switch_comma else .@"switch", + .main_token = switch_token, + .data = .{ + .lhs = expr_node, + .rhs = try p.addExtra(Node.SubRange{ + .start = cases.start, + .end = cases.end, + }), + }, + }); +} + +/// AsmExpr <- KEYWORD_asm KEYWORD_volatile? LPAREN Expr AsmOutput? RPAREN +/// +/// AsmOutput <- COLON AsmOutputList AsmInput? +/// +/// AsmInput <- COLON AsmInputList AsmClobbers? +/// +/// AsmClobbers <- COLON StringList +/// +/// StringList <- (STRINGLITERAL COMMA)* STRINGLITERAL? +/// +/// AsmOutputList <- (AsmOutputItem COMMA)* AsmOutputItem? +/// +/// AsmInputList <- (AsmInputItem COMMA)* AsmInputItem? +fn expectAsmExpr(p: *Parse) !Node.Index { + const asm_token = p.assertToken(.keyword_asm); + _ = p.eatToken(.keyword_volatile); + _ = try p.expectToken(.l_paren); + const template = try p.expectExpr(); + + if (p.eatToken(.r_paren)) |rparen| { + return p.addNode(.{ + .tag = .asm_simple, + .main_token = asm_token, + .data = .{ + .lhs = template, + .rhs = rparen, + }, + }); + } + + _ = try p.expectToken(.colon); + + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + + while (true) { + const output_item = try p.parseAsmOutputItem(); + if (output_item == 0) break; + try p.scratch.append(p.gpa, output_item); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + // All possible delimiters. + .colon, .r_paren, .r_brace, .r_bracket => break, + // Likely just a missing comma; give error but continue parsing. + else => try p.warnExpected(.comma), + } + } + if (p.eatToken(.colon)) |_| { + while (true) { + const input_item = try p.parseAsmInputItem(); + if (input_item == 0) break; + try p.scratch.append(p.gpa, input_item); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + // All possible delimiters. + .colon, .r_paren, .r_brace, .r_bracket => break, + // Likely just a missing comma; give error but continue parsing. + else => try p.warnExpected(.comma), + } + } + if (p.eatToken(.colon)) |_| { + while (p.eatToken(.string_literal)) |_| { + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .colon, .r_paren, .r_brace, .r_bracket => break, + // Likely just a missing comma; give error but continue parsing. + else => try p.warnExpected(.comma), + } + } + } + } + const rparen = try p.expectToken(.r_paren); + const span = try p.listToSpan(p.scratch.items[scratch_top..]); + return p.addNode(.{ + .tag = .@"asm", + .main_token = asm_token, + .data = .{ + .lhs = template, + .rhs = try p.addExtra(Node.Asm{ + .items_start = span.start, + .items_end = span.end, + .rparen = rparen, + }), + }, + }); +} + +/// AsmOutputItem <- LBRACKET IDENTIFIER RBRACKET STRINGLITERAL LPAREN (MINUSRARROW TypeExpr / IDENTIFIER) RPAREN +fn parseAsmOutputItem(p: *Parse) !Node.Index { + _ = p.eatToken(.l_bracket) orelse return null_node; + const identifier = try p.expectToken(.identifier); + _ = try p.expectToken(.r_bracket); + _ = try p.expectToken(.string_literal); + _ = try p.expectToken(.l_paren); + const type_expr: Node.Index = blk: { + if (p.eatToken(.arrow)) |_| { + break :blk try p.expectTypeExpr(); + } else { + _ = try p.expectToken(.identifier); + break :blk null_node; + } + }; + const rparen = try p.expectToken(.r_paren); + return p.addNode(.{ + .tag = .asm_output, + .main_token = identifier, + .data = .{ + .lhs = type_expr, + .rhs = rparen, + }, + }); +} + +/// AsmInputItem <- LBRACKET IDENTIFIER RBRACKET STRINGLITERAL LPAREN Expr RPAREN +fn parseAsmInputItem(p: *Parse) !Node.Index { + _ = p.eatToken(.l_bracket) orelse return null_node; + const identifier = try p.expectToken(.identifier); + _ = try p.expectToken(.r_bracket); + _ = try p.expectToken(.string_literal); + _ = try p.expectToken(.l_paren); + const expr = try p.expectExpr(); + const rparen = try p.expectToken(.r_paren); + return p.addNode(.{ + .tag = .asm_input, + .main_token = identifier, + .data = .{ + .lhs = expr, + .rhs = rparen, + }, + }); +} + +/// BreakLabel <- COLON IDENTIFIER +fn parseBreakLabel(p: *Parse) !TokenIndex { + _ = p.eatToken(.colon) orelse return @as(TokenIndex, 0); + return p.expectToken(.identifier); +} + +/// BlockLabel <- IDENTIFIER COLON +fn parseBlockLabel(p: *Parse) TokenIndex { + if (p.token_tags[p.tok_i] == .identifier and + p.token_tags[p.tok_i + 1] == .colon) + { + const identifier = p.tok_i; + p.tok_i += 2; + return identifier; + } + return null_node; +} + +/// FieldInit <- DOT IDENTIFIER EQUAL Expr +fn parseFieldInit(p: *Parse) !Node.Index { + if (p.token_tags[p.tok_i + 0] == .period and + p.token_tags[p.tok_i + 1] == .identifier and + p.token_tags[p.tok_i + 2] == .equal) + { + p.tok_i += 3; + return p.expectExpr(); + } else { + return null_node; + } +} + +fn expectFieldInit(p: *Parse) !Node.Index { + if (p.token_tags[p.tok_i] != .period or + p.token_tags[p.tok_i + 1] != .identifier or + p.token_tags[p.tok_i + 2] != .equal) + return p.fail(.expected_initializer); + + p.tok_i += 3; + return p.expectExpr(); +} + +/// WhileContinueExpr <- COLON LPAREN AssignExpr RPAREN +fn parseWhileContinueExpr(p: *Parse) !Node.Index { + _ = p.eatToken(.colon) orelse { + if (p.token_tags[p.tok_i] == .l_paren and + p.tokensOnSameLine(p.tok_i - 1, p.tok_i)) + return p.fail(.expected_continue_expr); + return null_node; + }; + _ = try p.expectToken(.l_paren); + const node = try p.parseAssignExpr(); + if (node == 0) return p.fail(.expected_expr_or_assignment); + _ = try p.expectToken(.r_paren); + return node; +} + +/// LinkSection <- KEYWORD_linksection LPAREN Expr RPAREN +fn parseLinkSection(p: *Parse) !Node.Index { + _ = p.eatToken(.keyword_linksection) orelse return null_node; + _ = try p.expectToken(.l_paren); + const expr_node = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + return expr_node; +} + +/// CallConv <- KEYWORD_callconv LPAREN Expr RPAREN +fn parseCallconv(p: *Parse) !Node.Index { + _ = p.eatToken(.keyword_callconv) orelse return null_node; + _ = try p.expectToken(.l_paren); + const expr_node = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + return expr_node; +} + +/// AddrSpace <- KEYWORD_addrspace LPAREN Expr RPAREN +fn parseAddrSpace(p: *Parse) !Node.Index { + _ = p.eatToken(.keyword_addrspace) orelse return null_node; + _ = try p.expectToken(.l_paren); + const expr_node = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + return expr_node; +} + +/// This function can return null nodes and then still return nodes afterwards, +/// such as in the case of anytype and `...`. Caller must look for rparen to find +/// out when there are no more param decls left. +/// +/// ParamDecl +/// <- doc_comment? (KEYWORD_noalias / KEYWORD_comptime)? (IDENTIFIER COLON)? ParamType +/// / DOT3 +/// +/// ParamType +/// <- KEYWORD_anytype +/// / TypeExpr +fn expectParamDecl(p: *Parse) !Node.Index { + _ = try p.eatDocComments(); + switch (p.token_tags[p.tok_i]) { + .keyword_noalias, .keyword_comptime => p.tok_i += 1, + .ellipsis3 => { + p.tok_i += 1; + return null_node; + }, + else => {}, + } + if (p.token_tags[p.tok_i] == .identifier and + p.token_tags[p.tok_i + 1] == .colon) + { + p.tok_i += 2; + } + switch (p.token_tags[p.tok_i]) { + .keyword_anytype => { + p.tok_i += 1; + return null_node; + }, + else => return p.expectTypeExpr(), + } +} + +/// Payload <- PIPE IDENTIFIER PIPE +fn parsePayload(p: *Parse) !TokenIndex { + _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); + const identifier = try p.expectToken(.identifier); + _ = try p.expectToken(.pipe); + return identifier; +} + +/// PtrPayload <- PIPE ASTERISK? IDENTIFIER PIPE +fn parsePtrPayload(p: *Parse) !TokenIndex { + _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); + _ = p.eatToken(.asterisk); + const identifier = try p.expectToken(.identifier); + _ = try p.expectToken(.pipe); + return identifier; +} + +/// Returns the first identifier token, if any. +/// +/// PtrIndexPayload <- PIPE ASTERISK? IDENTIFIER (COMMA IDENTIFIER)? PIPE +fn parsePtrIndexPayload(p: *Parse) !TokenIndex { + _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); + _ = p.eatToken(.asterisk); + const identifier = try p.expectToken(.identifier); + if (p.eatToken(.comma) != null) { + _ = try p.expectToken(.identifier); + } + _ = try p.expectToken(.pipe); + return identifier; +} + +/// SwitchProng <- KEYWORD_inline? SwitchCase EQUALRARROW PtrIndexPayload? AssignExpr +/// +/// SwitchCase +/// <- SwitchItem (COMMA SwitchItem)* COMMA? +/// / KEYWORD_else +fn parseSwitchProng(p: *Parse) !Node.Index { + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + + const is_inline = p.eatToken(.keyword_inline) != null; + + if (p.eatToken(.keyword_else) == null) { + while (true) { + const item = try p.parseSwitchItem(); + if (item == 0) break; + try p.scratch.append(p.gpa, item); + if (p.eatToken(.comma) == null) break; + } + if (scratch_top == p.scratch.items.len) { + if (is_inline) p.tok_i -= 1; + return null_node; + } + } + const arrow_token = try p.expectToken(.equal_angle_bracket_right); + _ = try p.parsePtrIndexPayload(); + + const items = p.scratch.items[scratch_top..]; + switch (items.len) { + 0 => return p.addNode(.{ + .tag = if (is_inline) .switch_case_inline_one else .switch_case_one, + .main_token = arrow_token, + .data = .{ + .lhs = 0, + .rhs = try p.expectAssignExpr(), + }, + }), + 1 => return p.addNode(.{ + .tag = if (is_inline) .switch_case_inline_one else .switch_case_one, + .main_token = arrow_token, + .data = .{ + .lhs = items[0], + .rhs = try p.expectAssignExpr(), + }, + }), + else => return p.addNode(.{ + .tag = if (is_inline) .switch_case_inline else .switch_case, + .main_token = arrow_token, + .data = .{ + .lhs = try p.addExtra(try p.listToSpan(items)), + .rhs = try p.expectAssignExpr(), + }, + }), + } +} + +/// SwitchItem <- Expr (DOT3 Expr)? +fn parseSwitchItem(p: *Parse) !Node.Index { + const expr = try p.parseExpr(); + if (expr == 0) return null_node; + + if (p.eatToken(.ellipsis3)) |token| { + return p.addNode(.{ + .tag = .switch_range, + .main_token = token, + .data = .{ + .lhs = expr, + .rhs = try p.expectExpr(), + }, + }); + } + return expr; +} + +const PtrModifiers = struct { + align_node: Node.Index, + addrspace_node: Node.Index, + bit_range_start: Node.Index, + bit_range_end: Node.Index, +}; + +fn parsePtrModifiers(p: *Parse) !PtrModifiers { + var result: PtrModifiers = .{ + .align_node = 0, + .addrspace_node = 0, + .bit_range_start = 0, + .bit_range_end = 0, + }; + var saw_const = false; + var saw_volatile = false; + var saw_allowzero = false; + var saw_addrspace = false; + while (true) { + switch (p.token_tags[p.tok_i]) { + .keyword_align => { + if (result.align_node != 0) { + try p.warn(.extra_align_qualifier); + } + p.tok_i += 1; + _ = try p.expectToken(.l_paren); + result.align_node = try p.expectExpr(); + + if (p.eatToken(.colon)) |_| { + result.bit_range_start = try p.expectExpr(); + _ = try p.expectToken(.colon); + result.bit_range_end = try p.expectExpr(); + } + + _ = try p.expectToken(.r_paren); + }, + .keyword_const => { + if (saw_const) { + try p.warn(.extra_const_qualifier); + } + p.tok_i += 1; + saw_const = true; + }, + .keyword_volatile => { + if (saw_volatile) { + try p.warn(.extra_volatile_qualifier); + } + p.tok_i += 1; + saw_volatile = true; + }, + .keyword_allowzero => { + if (saw_allowzero) { + try p.warn(.extra_allowzero_qualifier); + } + p.tok_i += 1; + saw_allowzero = true; + }, + .keyword_addrspace => { + if (saw_addrspace) { + try p.warn(.extra_addrspace_qualifier); + } + result.addrspace_node = try p.parseAddrSpace(); + }, + else => return result, + } + } +} + +/// SuffixOp +/// <- LBRACKET Expr (DOT2 (Expr? (COLON Expr)?)?)? RBRACKET +/// / DOT IDENTIFIER +/// / DOTASTERISK +/// / DOTQUESTIONMARK +fn parseSuffixOp(p: *Parse, lhs: Node.Index) !Node.Index { + switch (p.token_tags[p.tok_i]) { + .l_bracket => { + const lbracket = p.nextToken(); + const index_expr = try p.expectExpr(); + + if (p.eatToken(.ellipsis2)) |_| { + const end_expr = try p.parseExpr(); + if (p.eatToken(.colon)) |_| { + const sentinel = try p.expectExpr(); + _ = try p.expectToken(.r_bracket); + return p.addNode(.{ + .tag = .slice_sentinel, + .main_token = lbracket, + .data = .{ + .lhs = lhs, + .rhs = try p.addExtra(Node.SliceSentinel{ + .start = index_expr, + .end = end_expr, + .sentinel = sentinel, + }), + }, + }); + } + _ = try p.expectToken(.r_bracket); + if (end_expr == 0) { + return p.addNode(.{ + .tag = .slice_open, + .main_token = lbracket, + .data = .{ + .lhs = lhs, + .rhs = index_expr, + }, + }); + } + return p.addNode(.{ + .tag = .slice, + .main_token = lbracket, + .data = .{ + .lhs = lhs, + .rhs = try p.addExtra(Node.Slice{ + .start = index_expr, + .end = end_expr, + }), + }, + }); + } + _ = try p.expectToken(.r_bracket); + return p.addNode(.{ + .tag = .array_access, + .main_token = lbracket, + .data = .{ + .lhs = lhs, + .rhs = index_expr, + }, + }); + }, + .period_asterisk => return p.addNode(.{ + .tag = .deref, + .main_token = p.nextToken(), + .data = .{ + .lhs = lhs, + .rhs = undefined, + }, + }), + .invalid_periodasterisks => { + try p.warn(.asterisk_after_ptr_deref); + return p.addNode(.{ + .tag = .deref, + .main_token = p.nextToken(), + .data = .{ + .lhs = lhs, + .rhs = undefined, + }, + }); + }, + .period => switch (p.token_tags[p.tok_i + 1]) { + .identifier => return p.addNode(.{ + .tag = .field_access, + .main_token = p.nextToken(), + .data = .{ + .lhs = lhs, + .rhs = p.nextToken(), + }, + }), + .question_mark => return p.addNode(.{ + .tag = .unwrap_optional, + .main_token = p.nextToken(), + .data = .{ + .lhs = lhs, + .rhs = p.nextToken(), + }, + }), + .l_brace => { + // this a misplaced `.{`, handle the error somewhere else + return null_node; + }, + else => { + p.tok_i += 1; + try p.warn(.expected_suffix_op); + return null_node; + }, + }, + else => return null_node, + } +} + +/// Caller must have already verified the first token. +/// +/// ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE +/// +/// ContainerDeclType +/// <- KEYWORD_struct (LPAREN Expr RPAREN)? +/// / KEYWORD_opaque +/// / KEYWORD_enum (LPAREN Expr RPAREN)? +/// / KEYWORD_union (LPAREN (KEYWORD_enum (LPAREN Expr RPAREN)? / Expr) RPAREN)? +fn parseContainerDeclAuto(p: *Parse) !Node.Index { + const main_token = p.nextToken(); + const arg_expr = switch (p.token_tags[main_token]) { + .keyword_opaque => null_node, + .keyword_struct, .keyword_enum => blk: { + if (p.eatToken(.l_paren)) |_| { + const expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + break :blk expr; + } else { + break :blk null_node; + } + }, + .keyword_union => blk: { + if (p.eatToken(.l_paren)) |_| { + if (p.eatToken(.keyword_enum)) |_| { + if (p.eatToken(.l_paren)) |_| { + const enum_tag_expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.expectToken(.r_paren); + + _ = try p.expectToken(.l_brace); + const members = try p.parseContainerMembers(); + const members_span = try members.toSpan(p); + _ = try p.expectToken(.r_brace); + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .tagged_union_enum_tag_trailing, + false => .tagged_union_enum_tag, + }, + .main_token = main_token, + .data = .{ + .lhs = enum_tag_expr, + .rhs = try p.addExtra(members_span), + }, + }); + } else { + _ = try p.expectToken(.r_paren); + + _ = try p.expectToken(.l_brace); + const members = try p.parseContainerMembers(); + _ = try p.expectToken(.r_brace); + if (members.len <= 2) { + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .tagged_union_two_trailing, + false => .tagged_union_two, + }, + .main_token = main_token, + .data = .{ + .lhs = members.lhs, + .rhs = members.rhs, + }, + }); + } else { + const span = try members.toSpan(p); + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .tagged_union_trailing, + false => .tagged_union, + }, + .main_token = main_token, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + } + } + } else { + const expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + break :blk expr; + } + } else { + break :blk null_node; + } + }, + else => { + p.tok_i -= 1; + return p.fail(.expected_container); + }, + }; + _ = try p.expectToken(.l_brace); + const members = try p.parseContainerMembers(); + _ = try p.expectToken(.r_brace); + if (arg_expr == 0) { + if (members.len <= 2) { + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .container_decl_two_trailing, + false => .container_decl_two, + }, + .main_token = main_token, + .data = .{ + .lhs = members.lhs, + .rhs = members.rhs, + }, + }); + } else { + const span = try members.toSpan(p); + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .container_decl_trailing, + false => .container_decl, + }, + .main_token = main_token, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + } + } else { + const span = try members.toSpan(p); + return p.addNode(.{ + .tag = switch (members.trailing) { + true => .container_decl_arg_trailing, + false => .container_decl_arg, + }, + .main_token = main_token, + .data = .{ + .lhs = arg_expr, + .rhs = try p.addExtra(Node.SubRange{ + .start = span.start, + .end = span.end, + }), + }, + }); + } +} + +/// Give a helpful error message for those transitioning from +/// C's 'struct Foo {};' to Zig's 'const Foo = struct {};'. +fn parseCStyleContainer(p: *Parse) Error!bool { + const main_token = p.tok_i; + switch (p.token_tags[p.tok_i]) { + .keyword_enum, .keyword_union, .keyword_struct => {}, + else => return false, + } + const identifier = p.tok_i + 1; + if (p.token_tags[identifier] != .identifier) return false; + p.tok_i += 2; + + try p.warnMsg(.{ + .tag = .c_style_container, + .token = identifier, + .extra = .{ .expected_tag = p.token_tags[main_token] }, + }); + try p.warnMsg(.{ + .tag = .zig_style_container, + .is_note = true, + .token = identifier, + .extra = .{ .expected_tag = p.token_tags[main_token] }, + }); + + _ = try p.expectToken(.l_brace); + _ = try p.parseContainerMembers(); + _ = try p.expectToken(.r_brace); + try p.expectSemicolon(.expected_semi_after_decl, true); + return true; +} + +/// Holds temporary data until we are ready to construct the full ContainerDecl AST node. +/// +/// ByteAlign <- KEYWORD_align LPAREN Expr RPAREN +fn parseByteAlign(p: *Parse) !Node.Index { + _ = p.eatToken(.keyword_align) orelse return null_node; + _ = try p.expectToken(.l_paren); + const expr = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + return expr; +} + +/// SwitchProngList <- (SwitchProng COMMA)* SwitchProng? +fn parseSwitchProngList(p: *Parse) !Node.SubRange { + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + + while (true) { + const item = try parseSwitchProng(p); + if (item == 0) break; + + try p.scratch.append(p.gpa, item); + + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + // All possible delimiters. + .colon, .r_paren, .r_brace, .r_bracket => break, + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_switch_prong), + } + } + return p.listToSpan(p.scratch.items[scratch_top..]); +} + +/// ParamDeclList <- (ParamDecl COMMA)* ParamDecl? +fn parseParamDeclList(p: *Parse) !SmallSpan { + _ = try p.expectToken(.l_paren); + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + var varargs: union(enum) { none, seen, nonfinal: TokenIndex } = .none; + while (true) { + if (p.eatToken(.r_paren)) |_| break; + if (varargs == .seen) varargs = .{ .nonfinal = p.tok_i }; + const param = try p.expectParamDecl(); + if (param != 0) { + try p.scratch.append(p.gpa, param); + } else if (p.token_tags[p.tok_i - 1] == .ellipsis3) { + if (varargs == .none) varargs = .seen; + } + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_paren => { + p.tok_i += 1; + break; + }, + .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_param), + } + } + if (varargs == .nonfinal) { + try p.warnMsg(.{ .tag = .varargs_nonfinal, .token = varargs.nonfinal }); + } + const params = p.scratch.items[scratch_top..]; + return switch (params.len) { + 0 => SmallSpan{ .zero_or_one = 0 }, + 1 => SmallSpan{ .zero_or_one = params[0] }, + else => SmallSpan{ .multi = try p.listToSpan(params) }, + }; +} + +/// FnCallArguments <- LPAREN ExprList RPAREN +/// +/// ExprList <- (Expr COMMA)* Expr? +fn parseBuiltinCall(p: *Parse) !Node.Index { + const builtin_token = p.assertToken(.builtin); + if (p.token_tags[p.nextToken()] != .l_paren) { + p.tok_i -= 1; + try p.warn(.expected_param_list); + // Pretend this was an identifier so we can continue parsing. + return p.addNode(.{ + .tag = .identifier, + .main_token = builtin_token, + .data = .{ + .lhs = undefined, + .rhs = undefined, + }, + }); + } + const scratch_top = p.scratch.items.len; + defer p.scratch.shrinkRetainingCapacity(scratch_top); + while (true) { + if (p.eatToken(.r_paren)) |_| break; + const param = try p.expectExpr(); + try p.scratch.append(p.gpa, param); + switch (p.token_tags[p.tok_i]) { + .comma => p.tok_i += 1, + .r_paren => { + p.tok_i += 1; + break; + }, + // Likely just a missing comma; give error but continue parsing. + else => try p.warn(.expected_comma_after_arg), + } + } + const comma = (p.token_tags[p.tok_i - 2] == .comma); + const params = p.scratch.items[scratch_top..]; + switch (params.len) { + 0 => return p.addNode(.{ + .tag = .builtin_call_two, + .main_token = builtin_token, + .data = .{ + .lhs = 0, + .rhs = 0, + }, + }), + 1 => return p.addNode(.{ + .tag = if (comma) .builtin_call_two_comma else .builtin_call_two, + .main_token = builtin_token, + .data = .{ + .lhs = params[0], + .rhs = 0, + }, + }), + 2 => return p.addNode(.{ + .tag = if (comma) .builtin_call_two_comma else .builtin_call_two, + .main_token = builtin_token, + .data = .{ + .lhs = params[0], + .rhs = params[1], + }, + }), + else => { + const span = try p.listToSpan(params); + return p.addNode(.{ + .tag = if (comma) .builtin_call_comma else .builtin_call, + .main_token = builtin_token, + .data = .{ + .lhs = span.start, + .rhs = span.end, + }, + }); + }, + } +} + +/// IfPrefix <- KEYWORD_if LPAREN Expr RPAREN PtrPayload? +fn parseIf(p: *Parse, comptime bodyParseFn: fn (p: *Parse) Error!Node.Index) !Node.Index { + const if_token = p.eatToken(.keyword_if) orelse return null_node; + _ = try p.expectToken(.l_paren); + const condition = try p.expectExpr(); + _ = try p.expectToken(.r_paren); + _ = try p.parsePtrPayload(); + + const then_expr = try bodyParseFn(p); + assert(then_expr != 0); + + _ = p.eatToken(.keyword_else) orelse return p.addNode(.{ + .tag = .if_simple, + .main_token = if_token, + .data = .{ + .lhs = condition, + .rhs = then_expr, + }, + }); + _ = try p.parsePayload(); + const else_expr = try bodyParseFn(p); + assert(then_expr != 0); + + return p.addNode(.{ + .tag = .@"if", + .main_token = if_token, + .data = .{ + .lhs = condition, + .rhs = try p.addExtra(Node.If{ + .then_expr = then_expr, + .else_expr = else_expr, + }), + }, + }); +} + +/// Skips over doc comment tokens. Returns the first one, if any. +fn eatDocComments(p: *Parse) !?TokenIndex { + if (p.eatToken(.doc_comment)) |tok| { + var first_line = tok; + if (tok > 0 and tokensOnSameLine(p, tok - 1, tok)) { + try p.warnMsg(.{ + .tag = .same_line_doc_comment, + .token = tok, + }); + first_line = p.eatToken(.doc_comment) orelse return null; + } + while (p.eatToken(.doc_comment)) |_| {} + return first_line; + } + return null; +} + +fn tokensOnSameLine(p: *Parse, token1: TokenIndex, token2: TokenIndex) bool { + return std.mem.indexOfScalar(u8, p.source[p.token_starts[token1]..p.token_starts[token2]], '\n') == null; +} + +fn eatToken(p: *Parse, tag: Token.Tag) ?TokenIndex { + return if (p.token_tags[p.tok_i] == tag) p.nextToken() else null; +} + +fn assertToken(p: *Parse, tag: Token.Tag) TokenIndex { + const token = p.nextToken(); + assert(p.token_tags[token] == tag); + return token; +} + +fn expectToken(p: *Parse, tag: Token.Tag) Error!TokenIndex { + if (p.token_tags[p.tok_i] != tag) { + return p.failMsg(.{ + .tag = .expected_token, + .token = p.tok_i, + .extra = .{ .expected_tag = tag }, + }); + } + return p.nextToken(); +} + +fn expectSemicolon(p: *Parse, error_tag: AstError.Tag, recoverable: bool) Error!void { + if (p.token_tags[p.tok_i] == .semicolon) { + _ = p.nextToken(); + return; + } + try p.warn(error_tag); + if (!recoverable) return error.ParseError; +} + +fn nextToken(p: *Parse) TokenIndex { + const result = p.tok_i; + p.tok_i += 1; + return result; +} + +const null_node: Node.Index = 0; + +const Parse = @This(); +const std = @import("../std.zig"); +const assert = std.debug.assert; +const Allocator = std.mem.Allocator; +const Ast = std.zig.Ast; +const Node = Ast.Node; +const AstError = Ast.Error; +const TokenIndex = Ast.TokenIndex; +const Token = std.zig.Token; + +test { + _ = @import("parser_test.zig"); +} diff --git a/lib/std/zig/parse.zig b/lib/std/zig/parse.zig deleted file mode 100644 index fdb122b19d..0000000000 --- a/lib/std/zig/parse.zig +++ /dev/null @@ -1,3852 +0,0 @@ -const std = @import("../std.zig"); -const assert = std.debug.assert; -const Allocator = std.mem.Allocator; -const Ast = std.zig.Ast; -const Node = Ast.Node; -const AstError = Ast.Error; -const TokenIndex = Ast.TokenIndex; -const Token = std.zig.Token; - -pub const Error = error{ParseError} || Allocator.Error; - -/// Result should be freed with tree.deinit() when there are -/// no more references to any of the tokens or nodes. -pub fn parse(gpa: Allocator, source: [:0]const u8) Allocator.Error!Ast { - var tokens = Ast.TokenList{}; - defer tokens.deinit(gpa); - - // Empirically, the zig std lib has an 8:1 ratio of source bytes to token count. - const estimated_token_count = source.len / 8; - try tokens.ensureTotalCapacity(gpa, estimated_token_count); - - var tokenizer = std.zig.Tokenizer.init(source); - while (true) { - const token = tokenizer.next(); - try tokens.append(gpa, .{ - .tag = token.tag, - .start = @intCast(u32, token.loc.start), - }); - if (token.tag == .eof) break; - } - - var parser: Parser = .{ - .source = source, - .gpa = gpa, - .token_tags = tokens.items(.tag), - .token_starts = tokens.items(.start), - .errors = .{}, - .nodes = .{}, - .extra_data = .{}, - .scratch = .{}, - .tok_i = 0, - }; - defer parser.errors.deinit(gpa); - defer parser.nodes.deinit(gpa); - defer parser.extra_data.deinit(gpa); - defer parser.scratch.deinit(gpa); - - // Empirically, Zig source code has a 2:1 ratio of tokens to AST nodes. - // Make sure at least 1 so we can use appendAssumeCapacity on the root node below. - const estimated_node_count = (tokens.len + 2) / 2; - try parser.nodes.ensureTotalCapacity(gpa, estimated_node_count); - - try parser.parseRoot(); - - // TODO experiment with compacting the MultiArrayList slices here - return Ast{ - .source = source, - .tokens = tokens.toOwnedSlice(), - .nodes = parser.nodes.toOwnedSlice(), - .extra_data = try parser.extra_data.toOwnedSlice(gpa), - .errors = try parser.errors.toOwnedSlice(gpa), - }; -} - -const null_node: Node.Index = 0; - -/// Represents in-progress parsing, will be converted to an Ast after completion. -const Parser = struct { - gpa: Allocator, - source: []const u8, - token_tags: []const Token.Tag, - token_starts: []const Ast.ByteOffset, - tok_i: TokenIndex, - errors: std.ArrayListUnmanaged(AstError), - nodes: Ast.NodeList, - extra_data: std.ArrayListUnmanaged(Node.Index), - scratch: std.ArrayListUnmanaged(Node.Index), - - const SmallSpan = union(enum) { - zero_or_one: Node.Index, - multi: Node.SubRange, - }; - - const Members = struct { - len: usize, - lhs: Node.Index, - rhs: Node.Index, - trailing: bool, - - fn toSpan(self: Members, p: *Parser) !Node.SubRange { - if (self.len <= 2) { - const nodes = [2]Node.Index{ self.lhs, self.rhs }; - return p.listToSpan(nodes[0..self.len]); - } else { - return Node.SubRange{ .start = self.lhs, .end = self.rhs }; - } - } - }; - - fn listToSpan(p: *Parser, list: []const Node.Index) !Node.SubRange { - try p.extra_data.appendSlice(p.gpa, list); - return Node.SubRange{ - .start = @intCast(Node.Index, p.extra_data.items.len - list.len), - .end = @intCast(Node.Index, p.extra_data.items.len), - }; - } - - fn addNode(p: *Parser, elem: Ast.NodeList.Elem) Allocator.Error!Node.Index { - const result = @intCast(Node.Index, p.nodes.len); - try p.nodes.append(p.gpa, elem); - return result; - } - - fn setNode(p: *Parser, i: usize, elem: Ast.NodeList.Elem) Node.Index { - p.nodes.set(i, elem); - return @intCast(Node.Index, i); - } - - fn reserveNode(p: *Parser, tag: Ast.Node.Tag) !usize { - try p.nodes.resize(p.gpa, p.nodes.len + 1); - p.nodes.items(.tag)[p.nodes.len - 1] = tag; - return p.nodes.len - 1; - } - - fn unreserveNode(p: *Parser, node_index: usize) void { - if (p.nodes.len == node_index) { - p.nodes.resize(p.gpa, p.nodes.len - 1) catch unreachable; - } else { - // There is zombie node left in the tree, let's make it as inoffensive as possible - // (sadly there's no no-op node) - p.nodes.items(.tag)[node_index] = .unreachable_literal; - p.nodes.items(.main_token)[node_index] = p.tok_i; - } - } - - fn addExtra(p: *Parser, extra: anytype) Allocator.Error!Node.Index { - const fields = std.meta.fields(@TypeOf(extra)); - try p.extra_data.ensureUnusedCapacity(p.gpa, fields.len); - const result = @intCast(u32, p.extra_data.items.len); - inline for (fields) |field| { - comptime assert(field.type == Node.Index); - p.extra_data.appendAssumeCapacity(@field(extra, field.name)); - } - return result; - } - - fn warnExpected(p: *Parser, expected_token: Token.Tag) error{OutOfMemory}!void { - @setCold(true); - try p.warnMsg(.{ - .tag = .expected_token, - .token = p.tok_i, - .extra = .{ .expected_tag = expected_token }, - }); - } - - fn warn(p: *Parser, error_tag: AstError.Tag) error{OutOfMemory}!void { - @setCold(true); - try p.warnMsg(.{ .tag = error_tag, .token = p.tok_i }); - } - - fn warnMsg(p: *Parser, msg: Ast.Error) error{OutOfMemory}!void { - @setCold(true); - switch (msg.tag) { - .expected_semi_after_decl, - .expected_semi_after_stmt, - .expected_comma_after_field, - .expected_comma_after_arg, - .expected_comma_after_param, - .expected_comma_after_initializer, - .expected_comma_after_switch_prong, - .expected_semi_or_else, - .expected_semi_or_lbrace, - .expected_token, - .expected_block, - .expected_block_or_assignment, - .expected_block_or_expr, - .expected_block_or_field, - .expected_expr, - .expected_expr_or_assignment, - .expected_fn, - .expected_inlinable, - .expected_labelable, - .expected_param_list, - .expected_prefix_expr, - .expected_primary_type_expr, - .expected_pub_item, - .expected_return_type, - .expected_suffix_op, - .expected_type_expr, - .expected_var_decl, - .expected_var_decl_or_fn, - .expected_loop_payload, - .expected_container, - => if (msg.token != 0 and !p.tokensOnSameLine(msg.token - 1, msg.token)) { - var copy = msg; - copy.token_is_prev = true; - copy.token -= 1; - return p.errors.append(p.gpa, copy); - }, - else => {}, - } - try p.errors.append(p.gpa, msg); - } - - fn fail(p: *Parser, tag: Ast.Error.Tag) error{ ParseError, OutOfMemory } { - @setCold(true); - return p.failMsg(.{ .tag = tag, .token = p.tok_i }); - } - - fn failExpected(p: *Parser, expected_token: Token.Tag) error{ ParseError, OutOfMemory } { - @setCold(true); - return p.failMsg(.{ - .tag = .expected_token, - .token = p.tok_i, - .extra = .{ .expected_tag = expected_token }, - }); - } - - fn failMsg(p: *Parser, msg: Ast.Error) error{ ParseError, OutOfMemory } { - @setCold(true); - try p.warnMsg(msg); - return error.ParseError; - } - - /// Root <- skip container_doc_comment? ContainerMembers eof - fn parseRoot(p: *Parser) !void { - // Root node must be index 0. - p.nodes.appendAssumeCapacity(.{ - .tag = .root, - .main_token = 0, - .data = undefined, - }); - const root_members = try p.parseContainerMembers(); - const root_decls = try root_members.toSpan(p); - if (p.token_tags[p.tok_i] != .eof) { - try p.warnExpected(.eof); - } - p.nodes.items(.data)[0] = .{ - .lhs = root_decls.start, - .rhs = root_decls.end, - }; - } - - /// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations) - /// - /// ContainerDeclarations - /// <- TestDecl ContainerDeclarations - /// / ComptimeDecl ContainerDeclarations - /// / doc_comment? KEYWORD_pub? Decl ContainerDeclarations - /// / - /// - /// ComptimeDecl <- KEYWORD_comptime Block - fn parseContainerMembers(p: *Parser) !Members { - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - - var field_state: union(enum) { - /// No fields have been seen. - none, - /// Currently parsing fields. - seen, - /// Saw fields and then a declaration after them. - /// Payload is first token of previous declaration. - end: Node.Index, - /// There was a declaration between fields, don't report more errors. - err, - } = .none; - - var last_field: TokenIndex = undefined; - - // Skip container doc comments. - while (p.eatToken(.container_doc_comment)) |_| {} - - var trailing = false; - while (true) { - const doc_comment = try p.eatDocComments(); - - switch (p.token_tags[p.tok_i]) { - .keyword_test => { - if (doc_comment) |some| { - try p.warnMsg(.{ .tag = .test_doc_comment, .token = some }); - } - const test_decl_node = try p.expectTestDeclRecoverable(); - if (test_decl_node != 0) { - if (field_state == .seen) { - field_state = .{ .end = test_decl_node }; - } - try p.scratch.append(p.gpa, test_decl_node); - } - trailing = false; - }, - .keyword_comptime => switch (p.token_tags[p.tok_i + 1]) { - .l_brace => { - if (doc_comment) |some| { - try p.warnMsg(.{ .tag = .comptime_doc_comment, .token = some }); - } - const comptime_token = p.nextToken(); - const block = p.parseBlock() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => blk: { - p.findNextContainerMember(); - break :blk null_node; - }, - }; - if (block != 0) { - const comptime_node = try p.addNode(.{ - .tag = .@"comptime", - .main_token = comptime_token, - .data = .{ - .lhs = block, - .rhs = undefined, - }, - }); - if (field_state == .seen) { - field_state = .{ .end = comptime_node }; - } - try p.scratch.append(p.gpa, comptime_node); - } - trailing = false; - }, - else => { - const identifier = p.tok_i; - defer last_field = identifier; - const container_field = p.expectContainerField() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextContainerMember(); - continue; - }, - }; - switch (field_state) { - .none => field_state = .seen, - .err, .seen => {}, - .end => |node| { - try p.warnMsg(.{ - .tag = .decl_between_fields, - .token = p.nodes.items(.main_token)[node], - }); - try p.warnMsg(.{ - .tag = .previous_field, - .is_note = true, - .token = last_field, - }); - try p.warnMsg(.{ - .tag = .next_field, - .is_note = true, - .token = identifier, - }); - // Continue parsing; error will be reported later. - field_state = .err; - }, - } - try p.scratch.append(p.gpa, container_field); - switch (p.token_tags[p.tok_i]) { - .comma => { - p.tok_i += 1; - trailing = true; - continue; - }, - .r_brace, .eof => { - trailing = false; - break; - }, - else => {}, - } - // There is not allowed to be a decl after a field with no comma. - // Report error but recover parser. - try p.warn(.expected_comma_after_field); - p.findNextContainerMember(); - }, - }, - .keyword_pub => { - p.tok_i += 1; - const top_level_decl = try p.expectTopLevelDeclRecoverable(); - if (top_level_decl != 0) { - if (field_state == .seen) { - field_state = .{ .end = top_level_decl }; - } - try p.scratch.append(p.gpa, top_level_decl); - } - trailing = p.token_tags[p.tok_i - 1] == .semicolon; - }, - .keyword_usingnamespace => { - const node = try p.expectUsingNamespaceRecoverable(); - if (node != 0) { - if (field_state == .seen) { - field_state = .{ .end = node }; - } - try p.scratch.append(p.gpa, node); - } - trailing = p.token_tags[p.tok_i - 1] == .semicolon; - }, - .keyword_const, - .keyword_var, - .keyword_threadlocal, - .keyword_export, - .keyword_extern, - .keyword_inline, - .keyword_noinline, - .keyword_fn, - => { - const top_level_decl = try p.expectTopLevelDeclRecoverable(); - if (top_level_decl != 0) { - if (field_state == .seen) { - field_state = .{ .end = top_level_decl }; - } - try p.scratch.append(p.gpa, top_level_decl); - } - trailing = p.token_tags[p.tok_i - 1] == .semicolon; - }, - .eof, .r_brace => { - if (doc_comment) |tok| { - try p.warnMsg(.{ - .tag = .unattached_doc_comment, - .token = tok, - }); - } - break; - }, - else => { - const c_container = p.parseCStyleContainer() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => false, - }; - if (c_container) continue; - - const identifier = p.tok_i; - defer last_field = identifier; - const container_field = p.expectContainerField() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextContainerMember(); - continue; - }, - }; - switch (field_state) { - .none => field_state = .seen, - .err, .seen => {}, - .end => |node| { - try p.warnMsg(.{ - .tag = .decl_between_fields, - .token = p.nodes.items(.main_token)[node], - }); - try p.warnMsg(.{ - .tag = .previous_field, - .is_note = true, - .token = last_field, - }); - try p.warnMsg(.{ - .tag = .next_field, - .is_note = true, - .token = identifier, - }); - // Continue parsing; error will be reported later. - field_state = .err; - }, - } - try p.scratch.append(p.gpa, container_field); - switch (p.token_tags[p.tok_i]) { - .comma => { - p.tok_i += 1; - trailing = true; - continue; - }, - .r_brace, .eof => { - trailing = false; - break; - }, - else => {}, - } - // There is not allowed to be a decl after a field with no comma. - // Report error but recover parser. - try p.warn(.expected_comma_after_field); - if (p.token_tags[p.tok_i] == .semicolon and p.token_tags[identifier] == .identifier) { - try p.warnMsg(.{ - .tag = .var_const_decl, - .is_note = true, - .token = identifier, - }); - } - p.findNextContainerMember(); - continue; - }, - } - } - - const items = p.scratch.items[scratch_top..]; - switch (items.len) { - 0 => return Members{ - .len = 0, - .lhs = 0, - .rhs = 0, - .trailing = trailing, - }, - 1 => return Members{ - .len = 1, - .lhs = items[0], - .rhs = 0, - .trailing = trailing, - }, - 2 => return Members{ - .len = 2, - .lhs = items[0], - .rhs = items[1], - .trailing = trailing, - }, - else => { - const span = try p.listToSpan(items); - return Members{ - .len = items.len, - .lhs = span.start, - .rhs = span.end, - .trailing = trailing, - }; - }, - } - } - - /// Attempts to find next container member by searching for certain tokens - fn findNextContainerMember(p: *Parser) void { - var level: u32 = 0; - while (true) { - const tok = p.nextToken(); - switch (p.token_tags[tok]) { - // Any of these can start a new top level declaration. - .keyword_test, - .keyword_comptime, - .keyword_pub, - .keyword_export, - .keyword_extern, - .keyword_inline, - .keyword_noinline, - .keyword_usingnamespace, - .keyword_threadlocal, - .keyword_const, - .keyword_var, - .keyword_fn, - => { - if (level == 0) { - p.tok_i -= 1; - return; - } - }, - .identifier => { - if (p.token_tags[tok + 1] == .comma and level == 0) { - p.tok_i -= 1; - return; - } - }, - .comma, .semicolon => { - // this decl was likely meant to end here - if (level == 0) { - return; - } - }, - .l_paren, .l_bracket, .l_brace => level += 1, - .r_paren, .r_bracket => { - if (level != 0) level -= 1; - }, - .r_brace => { - if (level == 0) { - // end of container, exit - p.tok_i -= 1; - return; - } - level -= 1; - }, - .eof => { - p.tok_i -= 1; - return; - }, - else => {}, - } - } - } - - /// Attempts to find the next statement by searching for a semicolon - fn findNextStmt(p: *Parser) void { - var level: u32 = 0; - while (true) { - const tok = p.nextToken(); - switch (p.token_tags[tok]) { - .l_brace => level += 1, - .r_brace => { - if (level == 0) { - p.tok_i -= 1; - return; - } - level -= 1; - }, - .semicolon => { - if (level == 0) { - return; - } - }, - .eof => { - p.tok_i -= 1; - return; - }, - else => {}, - } - } - } - - /// TestDecl <- KEYWORD_test (STRINGLITERALSINGLE / IDENTIFIER)? Block - fn expectTestDecl(p: *Parser) !Node.Index { - const test_token = p.assertToken(.keyword_test); - const name_token = switch (p.token_tags[p.nextToken()]) { - .string_literal, .identifier => p.tok_i - 1, - else => blk: { - p.tok_i -= 1; - break :blk null; - }, - }; - const block_node = try p.parseBlock(); - if (block_node == 0) return p.fail(.expected_block); - return p.addNode(.{ - .tag = .test_decl, - .main_token = test_token, - .data = .{ - .lhs = name_token orelse 0, - .rhs = block_node, - }, - }); - } - - fn expectTestDeclRecoverable(p: *Parser) error{OutOfMemory}!Node.Index { - return p.expectTestDecl() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextContainerMember(); - return null_node; - }, - }; - } - - /// Decl - /// <- (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE? / (KEYWORD_inline / KEYWORD_noinline))? FnProto (SEMICOLON / Block) - /// / (KEYWORD_export / KEYWORD_extern STRINGLITERALSINGLE?)? KEYWORD_threadlocal? VarDecl - /// / KEYWORD_usingnamespace Expr SEMICOLON - fn expectTopLevelDecl(p: *Parser) !Node.Index { - const extern_export_inline_token = p.nextToken(); - var is_extern: bool = false; - var expect_fn: bool = false; - var expect_var_or_fn: bool = false; - switch (p.token_tags[extern_export_inline_token]) { - .keyword_extern => { - _ = p.eatToken(.string_literal); - is_extern = true; - expect_var_or_fn = true; - }, - .keyword_export => expect_var_or_fn = true, - .keyword_inline, .keyword_noinline => expect_fn = true, - else => p.tok_i -= 1, - } - const fn_proto = try p.parseFnProto(); - if (fn_proto != 0) { - switch (p.token_tags[p.tok_i]) { - .semicolon => { - p.tok_i += 1; - return fn_proto; - }, - .l_brace => { - if (is_extern) { - try p.warnMsg(.{ .tag = .extern_fn_body, .token = extern_export_inline_token }); - return null_node; - } - const fn_decl_index = try p.reserveNode(.fn_decl); - errdefer p.unreserveNode(fn_decl_index); - - const body_block = try p.parseBlock(); - assert(body_block != 0); - return p.setNode(fn_decl_index, .{ - .tag = .fn_decl, - .main_token = p.nodes.items(.main_token)[fn_proto], - .data = .{ - .lhs = fn_proto, - .rhs = body_block, - }, - }); - }, - else => { - // Since parseBlock only return error.ParseError on - // a missing '}' we can assume this function was - // supposed to end here. - try p.warn(.expected_semi_or_lbrace); - return null_node; - }, - } - } - if (expect_fn) { - try p.warn(.expected_fn); - return error.ParseError; - } - - const thread_local_token = p.eatToken(.keyword_threadlocal); - const var_decl = try p.parseVarDecl(); - if (var_decl != 0) { - try p.expectSemicolon(.expected_semi_after_decl, false); - return var_decl; - } - if (thread_local_token != null) { - return p.fail(.expected_var_decl); - } - if (expect_var_or_fn) { - return p.fail(.expected_var_decl_or_fn); - } - if (p.token_tags[p.tok_i] != .keyword_usingnamespace) { - return p.fail(.expected_pub_item); - } - return p.expectUsingNamespace(); - } - - fn expectTopLevelDeclRecoverable(p: *Parser) error{OutOfMemory}!Node.Index { - return p.expectTopLevelDecl() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextContainerMember(); - return null_node; - }, - }; - } - - fn expectUsingNamespace(p: *Parser) !Node.Index { - const usingnamespace_token = p.assertToken(.keyword_usingnamespace); - const expr = try p.expectExpr(); - try p.expectSemicolon(.expected_semi_after_decl, false); - return p.addNode(.{ - .tag = .@"usingnamespace", - .main_token = usingnamespace_token, - .data = .{ - .lhs = expr, - .rhs = undefined, - }, - }); - } - - fn expectUsingNamespaceRecoverable(p: *Parser) error{OutOfMemory}!Node.Index { - return p.expectUsingNamespace() catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextContainerMember(); - return null_node; - }, - }; - } - - /// FnProto <- KEYWORD_fn IDENTIFIER? LPAREN ParamDeclList RPAREN ByteAlign? AddrSpace? LinkSection? CallConv? EXCLAMATIONMARK? TypeExpr - fn parseFnProto(p: *Parser) !Node.Index { - const fn_token = p.eatToken(.keyword_fn) orelse return null_node; - - // We want the fn proto node to be before its children in the array. - const fn_proto_index = try p.reserveNode(.fn_proto); - errdefer p.unreserveNode(fn_proto_index); - - _ = p.eatToken(.identifier); - const params = try p.parseParamDeclList(); - const align_expr = try p.parseByteAlign(); - const addrspace_expr = try p.parseAddrSpace(); - const section_expr = try p.parseLinkSection(); - const callconv_expr = try p.parseCallconv(); - _ = p.eatToken(.bang); - - const return_type_expr = try p.parseTypeExpr(); - if (return_type_expr == 0) { - // most likely the user forgot to specify the return type. - // Mark return type as invalid and try to continue. - try p.warn(.expected_return_type); - } - - if (align_expr == 0 and section_expr == 0 and callconv_expr == 0 and addrspace_expr == 0) { - switch (params) { - .zero_or_one => |param| return p.setNode(fn_proto_index, .{ - .tag = .fn_proto_simple, - .main_token = fn_token, - .data = .{ - .lhs = param, - .rhs = return_type_expr, - }, - }), - .multi => |span| { - return p.setNode(fn_proto_index, .{ - .tag = .fn_proto_multi, - .main_token = fn_token, - .data = .{ - .lhs = try p.addExtra(Node.SubRange{ - .start = span.start, - .end = span.end, - }), - .rhs = return_type_expr, - }, - }); - }, - } - } - switch (params) { - .zero_or_one => |param| return p.setNode(fn_proto_index, .{ - .tag = .fn_proto_one, - .main_token = fn_token, - .data = .{ - .lhs = try p.addExtra(Node.FnProtoOne{ - .param = param, - .align_expr = align_expr, - .addrspace_expr = addrspace_expr, - .section_expr = section_expr, - .callconv_expr = callconv_expr, - }), - .rhs = return_type_expr, - }, - }), - .multi => |span| { - return p.setNode(fn_proto_index, .{ - .tag = .fn_proto, - .main_token = fn_token, - .data = .{ - .lhs = try p.addExtra(Node.FnProto{ - .params_start = span.start, - .params_end = span.end, - .align_expr = align_expr, - .addrspace_expr = addrspace_expr, - .section_expr = section_expr, - .callconv_expr = callconv_expr, - }), - .rhs = return_type_expr, - }, - }); - }, - } - } - - /// VarDecl <- (KEYWORD_const / KEYWORD_var) IDENTIFIER (COLON TypeExpr)? ByteAlign? AddrSpace? LinkSection? (EQUAL Expr)? SEMICOLON - fn parseVarDecl(p: *Parser) !Node.Index { - const mut_token = p.eatToken(.keyword_const) orelse - p.eatToken(.keyword_var) orelse - return null_node; - - _ = try p.expectToken(.identifier); - const type_node: Node.Index = if (p.eatToken(.colon) == null) 0 else try p.expectTypeExpr(); - const align_node = try p.parseByteAlign(); - const addrspace_node = try p.parseAddrSpace(); - const section_node = try p.parseLinkSection(); - const init_node: Node.Index = switch (p.token_tags[p.tok_i]) { - .equal_equal => blk: { - try p.warn(.wrong_equal_var_decl); - p.tok_i += 1; - break :blk try p.expectExpr(); - }, - .equal => blk: { - p.tok_i += 1; - break :blk try p.expectExpr(); - }, - else => 0, - }; - if (section_node == 0 and addrspace_node == 0) { - if (align_node == 0) { - return p.addNode(.{ - .tag = .simple_var_decl, - .main_token = mut_token, - .data = .{ - .lhs = type_node, - .rhs = init_node, - }, - }); - } else if (type_node == 0) { - return p.addNode(.{ - .tag = .aligned_var_decl, - .main_token = mut_token, - .data = .{ - .lhs = align_node, - .rhs = init_node, - }, - }); - } else { - return p.addNode(.{ - .tag = .local_var_decl, - .main_token = mut_token, - .data = .{ - .lhs = try p.addExtra(Node.LocalVarDecl{ - .type_node = type_node, - .align_node = align_node, - }), - .rhs = init_node, - }, - }); - } - } else { - return p.addNode(.{ - .tag = .global_var_decl, - .main_token = mut_token, - .data = .{ - .lhs = try p.addExtra(Node.GlobalVarDecl{ - .type_node = type_node, - .align_node = align_node, - .addrspace_node = addrspace_node, - .section_node = section_node, - }), - .rhs = init_node, - }, - }); - } - } - - /// ContainerField - /// <- doc_comment? KEYWORD_comptime? IDENTIFIER (COLON TypeExpr)? ByteAlign? (EQUAL Expr)? - /// / doc_comment? KEYWORD_comptime? (IDENTIFIER COLON)? !KEYWORD_fn TypeExpr ByteAlign? (EQUAL Expr)? - fn expectContainerField(p: *Parser) !Node.Index { - var main_token = p.tok_i; - _ = p.eatToken(.keyword_comptime); - const tuple_like = p.token_tags[p.tok_i] != .identifier or p.token_tags[p.tok_i + 1] != .colon; - if (!tuple_like) { - main_token = p.assertToken(.identifier); - } - - var align_expr: Node.Index = 0; - var type_expr: Node.Index = 0; - if (p.eatToken(.colon) != null or tuple_like) { - type_expr = try p.expectTypeExpr(); - align_expr = try p.parseByteAlign(); - } - - const value_expr: Node.Index = if (p.eatToken(.equal) == null) 0 else try p.expectExpr(); - - if (align_expr == 0) { - return p.addNode(.{ - .tag = .container_field_init, - .main_token = main_token, - .data = .{ - .lhs = type_expr, - .rhs = value_expr, - }, - }); - } else if (value_expr == 0) { - return p.addNode(.{ - .tag = .container_field_align, - .main_token = main_token, - .data = .{ - .lhs = type_expr, - .rhs = align_expr, - }, - }); - } else { - return p.addNode(.{ - .tag = .container_field, - .main_token = main_token, - .data = .{ - .lhs = type_expr, - .rhs = try p.addExtra(Node.ContainerField{ - .value_expr = value_expr, - .align_expr = align_expr, - }), - }, - }); - } - } - - /// Statement - /// <- KEYWORD_comptime? VarDecl - /// / KEYWORD_comptime BlockExprStatement - /// / KEYWORD_nosuspend BlockExprStatement - /// / KEYWORD_suspend BlockExprStatement - /// / KEYWORD_defer BlockExprStatement - /// / KEYWORD_errdefer Payload? BlockExprStatement - /// / IfStatement - /// / LabeledStatement - /// / SwitchExpr - /// / AssignExpr SEMICOLON - fn parseStatement(p: *Parser, allow_defer_var: bool) Error!Node.Index { - const comptime_token = p.eatToken(.keyword_comptime); - - if (allow_defer_var) { - const var_decl = try p.parseVarDecl(); - if (var_decl != 0) { - try p.expectSemicolon(.expected_semi_after_decl, true); - return var_decl; - } - } - - if (comptime_token) |token| { - return p.addNode(.{ - .tag = .@"comptime", - .main_token = token, - .data = .{ - .lhs = try p.expectBlockExprStatement(), - .rhs = undefined, - }, - }); - } - - switch (p.token_tags[p.tok_i]) { - .keyword_nosuspend => { - return p.addNode(.{ - .tag = .@"nosuspend", - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.expectBlockExprStatement(), - .rhs = undefined, - }, - }); - }, - .keyword_suspend => { - const token = p.nextToken(); - const block_expr = try p.expectBlockExprStatement(); - return p.addNode(.{ - .tag = .@"suspend", - .main_token = token, - .data = .{ - .lhs = block_expr, - .rhs = undefined, - }, - }); - }, - .keyword_defer => if (allow_defer_var) return p.addNode(.{ - .tag = .@"defer", - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = try p.expectBlockExprStatement(), - }, - }), - .keyword_errdefer => if (allow_defer_var) return p.addNode(.{ - .tag = .@"errdefer", - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.parsePayload(), - .rhs = try p.expectBlockExprStatement(), - }, - }), - .keyword_switch => return p.expectSwitchExpr(), - .keyword_if => return p.expectIfStatement(), - .keyword_enum, .keyword_struct, .keyword_union => { - const identifier = p.tok_i + 1; - if (try p.parseCStyleContainer()) { - // Return something so that `expectStatement` is happy. - return p.addNode(.{ - .tag = .identifier, - .main_token = identifier, - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }); - } - }, - else => {}, - } - - const labeled_statement = try p.parseLabeledStatement(); - if (labeled_statement != 0) return labeled_statement; - - const assign_expr = try p.parseAssignExpr(); - if (assign_expr != 0) { - try p.expectSemicolon(.expected_semi_after_stmt, true); - return assign_expr; - } - - return null_node; - } - - fn expectStatement(p: *Parser, allow_defer_var: bool) !Node.Index { - const statement = try p.parseStatement(allow_defer_var); - if (statement == 0) { - return p.fail(.expected_statement); - } - return statement; - } - - /// If a parse error occurs, reports an error, but then finds the next statement - /// and returns that one instead. If a parse error occurs but there is no following - /// statement, returns 0. - fn expectStatementRecoverable(p: *Parser) Error!Node.Index { - while (true) { - return p.expectStatement(true) catch |err| switch (err) { - error.OutOfMemory => return error.OutOfMemory, - error.ParseError => { - p.findNextStmt(); // Try to skip to the next statement. - switch (p.token_tags[p.tok_i]) { - .r_brace => return null_node, - .eof => return error.ParseError, - else => continue, - } - }, - }; - } - } - - /// IfStatement - /// <- IfPrefix BlockExpr ( KEYWORD_else Payload? Statement )? - /// / IfPrefix AssignExpr ( SEMICOLON / KEYWORD_else Payload? Statement ) - fn expectIfStatement(p: *Parser) !Node.Index { - const if_token = p.assertToken(.keyword_if); - _ = try p.expectToken(.l_paren); - const condition = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.parsePtrPayload(); - - // TODO propose to change the syntax so that semicolons are always required - // inside if statements, even if there is an `else`. - var else_required = false; - const then_expr = blk: { - const block_expr = try p.parseBlockExpr(); - if (block_expr != 0) break :blk block_expr; - const assign_expr = try p.parseAssignExpr(); - if (assign_expr == 0) { - return p.fail(.expected_block_or_assignment); - } - if (p.eatToken(.semicolon)) |_| { - return p.addNode(.{ - .tag = .if_simple, - .main_token = if_token, - .data = .{ - .lhs = condition, - .rhs = assign_expr, - }, - }); - } - else_required = true; - break :blk assign_expr; - }; - _ = p.eatToken(.keyword_else) orelse { - if (else_required) { - try p.warn(.expected_semi_or_else); - } - return p.addNode(.{ - .tag = .if_simple, - .main_token = if_token, - .data = .{ - .lhs = condition, - .rhs = then_expr, - }, - }); - }; - _ = try p.parsePayload(); - const else_expr = try p.expectStatement(false); - return p.addNode(.{ - .tag = .@"if", - .main_token = if_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.If{ - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// LabeledStatement <- BlockLabel? (Block / LoopStatement) - fn parseLabeledStatement(p: *Parser) !Node.Index { - const label_token = p.parseBlockLabel(); - const block = try p.parseBlock(); - if (block != 0) return block; - - const loop_stmt = try p.parseLoopStatement(); - if (loop_stmt != 0) return loop_stmt; - - if (label_token != 0) { - const after_colon = p.tok_i; - const node = try p.parseTypeExpr(); - if (node != 0) { - const a = try p.parseByteAlign(); - const b = try p.parseAddrSpace(); - const c = try p.parseLinkSection(); - const d = if (p.eatToken(.equal) == null) 0 else try p.expectExpr(); - if (a != 0 or b != 0 or c != 0 or d != 0) { - return p.failMsg(.{ .tag = .expected_var_const, .token = label_token }); - } - } - return p.failMsg(.{ .tag = .expected_labelable, .token = after_colon }); - } - - return null_node; - } - - /// LoopStatement <- KEYWORD_inline? (ForStatement / WhileStatement) - fn parseLoopStatement(p: *Parser) !Node.Index { - const inline_token = p.eatToken(.keyword_inline); - - const for_statement = try p.parseForStatement(); - if (for_statement != 0) return for_statement; - - const while_statement = try p.parseWhileStatement(); - if (while_statement != 0) return while_statement; - - if (inline_token == null) return null_node; - - // If we've seen "inline", there should have been a "for" or "while" - return p.fail(.expected_inlinable); - } - - /// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload - /// - /// ForStatement - /// <- ForPrefix BlockExpr ( KEYWORD_else Statement )? - /// / ForPrefix AssignExpr ( SEMICOLON / KEYWORD_else Statement ) - fn parseForStatement(p: *Parser) !Node.Index { - const for_token = p.eatToken(.keyword_for) orelse return null_node; - _ = try p.expectToken(.l_paren); - const array_expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - const found_payload = try p.parsePtrIndexPayload(); - if (found_payload == 0) try p.warn(.expected_loop_payload); - - // TODO propose to change the syntax so that semicolons are always required - // inside while statements, even if there is an `else`. - var else_required = false; - const then_expr = blk: { - const block_expr = try p.parseBlockExpr(); - if (block_expr != 0) break :blk block_expr; - const assign_expr = try p.parseAssignExpr(); - if (assign_expr == 0) { - return p.fail(.expected_block_or_assignment); - } - if (p.eatToken(.semicolon)) |_| { - return p.addNode(.{ - .tag = .for_simple, - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = assign_expr, - }, - }); - } - else_required = true; - break :blk assign_expr; - }; - _ = p.eatToken(.keyword_else) orelse { - if (else_required) { - try p.warn(.expected_semi_or_else); - } - return p.addNode(.{ - .tag = .for_simple, - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = then_expr, - }, - }); - }; - return p.addNode(.{ - .tag = .@"for", - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = try p.addExtra(Node.If{ - .then_expr = then_expr, - .else_expr = try p.expectStatement(false), - }), - }, - }); - } - - /// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? - /// - /// WhileStatement - /// <- WhilePrefix BlockExpr ( KEYWORD_else Payload? Statement )? - /// / WhilePrefix AssignExpr ( SEMICOLON / KEYWORD_else Payload? Statement ) - fn parseWhileStatement(p: *Parser) !Node.Index { - const while_token = p.eatToken(.keyword_while) orelse return null_node; - _ = try p.expectToken(.l_paren); - const condition = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.parsePtrPayload(); - const cont_expr = try p.parseWhileContinueExpr(); - - // TODO propose to change the syntax so that semicolons are always required - // inside while statements, even if there is an `else`. - var else_required = false; - const then_expr = blk: { - const block_expr = try p.parseBlockExpr(); - if (block_expr != 0) break :blk block_expr; - const assign_expr = try p.parseAssignExpr(); - if (assign_expr == 0) { - return p.fail(.expected_block_or_assignment); - } - if (p.eatToken(.semicolon)) |_| { - if (cont_expr == 0) { - return p.addNode(.{ - .tag = .while_simple, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = assign_expr, - }, - }); - } else { - return p.addNode(.{ - .tag = .while_cont, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.WhileCont{ - .cont_expr = cont_expr, - .then_expr = assign_expr, - }), - }, - }); - } - } - else_required = true; - break :blk assign_expr; - }; - _ = p.eatToken(.keyword_else) orelse { - if (else_required) { - try p.warn(.expected_semi_or_else); - } - if (cont_expr == 0) { - return p.addNode(.{ - .tag = .while_simple, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = then_expr, - }, - }); - } else { - return p.addNode(.{ - .tag = .while_cont, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.WhileCont{ - .cont_expr = cont_expr, - .then_expr = then_expr, - }), - }, - }); - } - }; - _ = try p.parsePayload(); - const else_expr = try p.expectStatement(false); - return p.addNode(.{ - .tag = .@"while", - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.While{ - .cont_expr = cont_expr, - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// BlockExprStatement - /// <- BlockExpr - /// / AssignExpr SEMICOLON - fn parseBlockExprStatement(p: *Parser) !Node.Index { - const block_expr = try p.parseBlockExpr(); - if (block_expr != 0) { - return block_expr; - } - const assign_expr = try p.parseAssignExpr(); - if (assign_expr != 0) { - try p.expectSemicolon(.expected_semi_after_stmt, true); - return assign_expr; - } - return null_node; - } - - fn expectBlockExprStatement(p: *Parser) !Node.Index { - const node = try p.parseBlockExprStatement(); - if (node == 0) { - return p.fail(.expected_block_or_expr); - } - return node; - } - - /// BlockExpr <- BlockLabel? Block - fn parseBlockExpr(p: *Parser) Error!Node.Index { - switch (p.token_tags[p.tok_i]) { - .identifier => { - if (p.token_tags[p.tok_i + 1] == .colon and - p.token_tags[p.tok_i + 2] == .l_brace) - { - p.tok_i += 2; - return p.parseBlock(); - } else { - return null_node; - } - }, - .l_brace => return p.parseBlock(), - else => return null_node, - } - } - - /// AssignExpr <- Expr (AssignOp Expr)? - /// - /// AssignOp - /// <- ASTERISKEQUAL - /// / ASTERISKPIPEEQUAL - /// / SLASHEQUAL - /// / PERCENTEQUAL - /// / PLUSEQUAL - /// / PLUSPIPEEQUAL - /// / MINUSEQUAL - /// / MINUSPIPEEQUAL - /// / LARROW2EQUAL - /// / LARROW2PIPEEQUAL - /// / RARROW2EQUAL - /// / AMPERSANDEQUAL - /// / CARETEQUAL - /// / PIPEEQUAL - /// / ASTERISKPERCENTEQUAL - /// / PLUSPERCENTEQUAL - /// / MINUSPERCENTEQUAL - /// / EQUAL - fn parseAssignExpr(p: *Parser) !Node.Index { - const expr = try p.parseExpr(); - if (expr == 0) return null_node; - - const tag: Node.Tag = switch (p.token_tags[p.tok_i]) { - .asterisk_equal => .assign_mul, - .slash_equal => .assign_div, - .percent_equal => .assign_mod, - .plus_equal => .assign_add, - .minus_equal => .assign_sub, - .angle_bracket_angle_bracket_left_equal => .assign_shl, - .angle_bracket_angle_bracket_left_pipe_equal => .assign_shl_sat, - .angle_bracket_angle_bracket_right_equal => .assign_shr, - .ampersand_equal => .assign_bit_and, - .caret_equal => .assign_bit_xor, - .pipe_equal => .assign_bit_or, - .asterisk_percent_equal => .assign_mul_wrap, - .plus_percent_equal => .assign_add_wrap, - .minus_percent_equal => .assign_sub_wrap, - .asterisk_pipe_equal => .assign_mul_sat, - .plus_pipe_equal => .assign_add_sat, - .minus_pipe_equal => .assign_sub_sat, - .equal => .assign, - else => return expr, - }; - return p.addNode(.{ - .tag = tag, - .main_token = p.nextToken(), - .data = .{ - .lhs = expr, - .rhs = try p.expectExpr(), - }, - }); - } - - fn expectAssignExpr(p: *Parser) !Node.Index { - const expr = try p.parseAssignExpr(); - if (expr == 0) { - return p.fail(.expected_expr_or_assignment); - } - return expr; - } - - fn parseExpr(p: *Parser) Error!Node.Index { - return p.parseExprPrecedence(0); - } - - fn expectExpr(p: *Parser) Error!Node.Index { - const node = try p.parseExpr(); - if (node == 0) { - return p.fail(.expected_expr); - } else { - return node; - } - } - - const Assoc = enum { - left, - none, - }; - - const OperInfo = struct { - prec: i8, - tag: Node.Tag, - assoc: Assoc = Assoc.left, - }; - - // A table of binary operator information. Higher precedence numbers are - // stickier. All operators at the same precedence level should have the same - // associativity. - const operTable = std.enums.directEnumArrayDefault(Token.Tag, OperInfo, .{ .prec = -1, .tag = Node.Tag.root }, 0, .{ - .keyword_or = .{ .prec = 10, .tag = .bool_or }, - - .keyword_and = .{ .prec = 20, .tag = .bool_and }, - - .equal_equal = .{ .prec = 30, .tag = .equal_equal, .assoc = Assoc.none }, - .bang_equal = .{ .prec = 30, .tag = .bang_equal, .assoc = Assoc.none }, - .angle_bracket_left = .{ .prec = 30, .tag = .less_than, .assoc = Assoc.none }, - .angle_bracket_right = .{ .prec = 30, .tag = .greater_than, .assoc = Assoc.none }, - .angle_bracket_left_equal = .{ .prec = 30, .tag = .less_or_equal, .assoc = Assoc.none }, - .angle_bracket_right_equal = .{ .prec = 30, .tag = .greater_or_equal, .assoc = Assoc.none }, - - .ampersand = .{ .prec = 40, .tag = .bit_and }, - .caret = .{ .prec = 40, .tag = .bit_xor }, - .pipe = .{ .prec = 40, .tag = .bit_or }, - .keyword_orelse = .{ .prec = 40, .tag = .@"orelse" }, - .keyword_catch = .{ .prec = 40, .tag = .@"catch" }, - - .angle_bracket_angle_bracket_left = .{ .prec = 50, .tag = .shl }, - .angle_bracket_angle_bracket_left_pipe = .{ .prec = 50, .tag = .shl_sat }, - .angle_bracket_angle_bracket_right = .{ .prec = 50, .tag = .shr }, - - .plus = .{ .prec = 60, .tag = .add }, - .minus = .{ .prec = 60, .tag = .sub }, - .plus_plus = .{ .prec = 60, .tag = .array_cat }, - .plus_percent = .{ .prec = 60, .tag = .add_wrap }, - .minus_percent = .{ .prec = 60, .tag = .sub_wrap }, - .plus_pipe = .{ .prec = 60, .tag = .add_sat }, - .minus_pipe = .{ .prec = 60, .tag = .sub_sat }, - - .pipe_pipe = .{ .prec = 70, .tag = .merge_error_sets }, - .asterisk = .{ .prec = 70, .tag = .mul }, - .slash = .{ .prec = 70, .tag = .div }, - .percent = .{ .prec = 70, .tag = .mod }, - .asterisk_asterisk = .{ .prec = 70, .tag = .array_mult }, - .asterisk_percent = .{ .prec = 70, .tag = .mul_wrap }, - .asterisk_pipe = .{ .prec = 70, .tag = .mul_sat }, - }); - - fn parseExprPrecedence(p: *Parser, min_prec: i32) Error!Node.Index { - assert(min_prec >= 0); - var node = try p.parsePrefixExpr(); - if (node == 0) { - return null_node; - } - - var banned_prec: i8 = -1; - - while (true) { - const tok_tag = p.token_tags[p.tok_i]; - const info = operTable[@intCast(usize, @enumToInt(tok_tag))]; - if (info.prec < min_prec) { - break; - } - if (info.prec == banned_prec) { - return p.fail(.chained_comparison_operators); - } - - const oper_token = p.nextToken(); - // Special-case handling for "catch" - if (tok_tag == .keyword_catch) { - _ = try p.parsePayload(); - } - const rhs = try p.parseExprPrecedence(info.prec + 1); - if (rhs == 0) { - try p.warn(.expected_expr); - return node; - } - - { - const tok_len = tok_tag.lexeme().?.len; - const char_before = p.source[p.token_starts[oper_token] - 1]; - const char_after = p.source[p.token_starts[oper_token] + tok_len]; - if (tok_tag == .ampersand and char_after == '&') { - // without types we don't know if '&&' was intended as 'bitwise_and address_of', or a c-style logical_and - // The best the parser can do is recommend changing it to 'and' or ' & &' - try p.warnMsg(.{ .tag = .invalid_ampersand_ampersand, .token = oper_token }); - } else if (std.ascii.isWhitespace(char_before) != std.ascii.isWhitespace(char_after)) { - try p.warnMsg(.{ .tag = .mismatched_binary_op_whitespace, .token = oper_token }); - } - } - - node = try p.addNode(.{ - .tag = info.tag, - .main_token = oper_token, - .data = .{ - .lhs = node, - .rhs = rhs, - }, - }); - - if (info.assoc == Assoc.none) { - banned_prec = info.prec; - } - } - - return node; - } - - /// PrefixExpr <- PrefixOp* PrimaryExpr - /// - /// PrefixOp - /// <- EXCLAMATIONMARK - /// / MINUS - /// / TILDE - /// / MINUSPERCENT - /// / AMPERSAND - /// / KEYWORD_try - /// / KEYWORD_await - fn parsePrefixExpr(p: *Parser) Error!Node.Index { - const tag: Node.Tag = switch (p.token_tags[p.tok_i]) { - .bang => .bool_not, - .minus => .negation, - .tilde => .bit_not, - .minus_percent => .negation_wrap, - .ampersand => .address_of, - .keyword_try => .@"try", - .keyword_await => .@"await", - else => return p.parsePrimaryExpr(), - }; - return p.addNode(.{ - .tag = tag, - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.expectPrefixExpr(), - .rhs = undefined, - }, - }); - } - - fn expectPrefixExpr(p: *Parser) Error!Node.Index { - const node = try p.parsePrefixExpr(); - if (node == 0) { - return p.fail(.expected_prefix_expr); - } - return node; - } - - /// TypeExpr <- PrefixTypeOp* ErrorUnionExpr - /// - /// PrefixTypeOp - /// <- QUESTIONMARK - /// / KEYWORD_anyframe MINUSRARROW - /// / SliceTypeStart (ByteAlign / AddrSpace / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)* - /// / PtrTypeStart (AddrSpace / KEYWORD_align LPAREN Expr (COLON Expr COLON Expr)? RPAREN / KEYWORD_const / KEYWORD_volatile / KEYWORD_allowzero)* - /// / ArrayTypeStart - /// - /// SliceTypeStart <- LBRACKET (COLON Expr)? RBRACKET - /// - /// PtrTypeStart - /// <- ASTERISK - /// / ASTERISK2 - /// / LBRACKET ASTERISK (LETTERC / COLON Expr)? RBRACKET - /// - /// ArrayTypeStart <- LBRACKET Expr (COLON Expr)? RBRACKET - fn parseTypeExpr(p: *Parser) Error!Node.Index { - switch (p.token_tags[p.tok_i]) { - .question_mark => return p.addNode(.{ - .tag = .optional_type, - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.expectTypeExpr(), - .rhs = undefined, - }, - }), - .keyword_anyframe => switch (p.token_tags[p.tok_i + 1]) { - .arrow => return p.addNode(.{ - .tag = .anyframe_type, - .main_token = p.nextToken(), - .data = .{ - .lhs = p.nextToken(), - .rhs = try p.expectTypeExpr(), - }, - }), - else => return p.parseErrorUnionExpr(), - }, - .asterisk => { - const asterisk = p.nextToken(); - const mods = try p.parsePtrModifiers(); - const elem_type = try p.expectTypeExpr(); - if (mods.bit_range_start != 0) { - return p.addNode(.{ - .tag = .ptr_type_bit_range, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrTypeBitRange{ - .sentinel = 0, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - .bit_range_start = mods.bit_range_start, - .bit_range_end = mods.bit_range_end, - }), - .rhs = elem_type, - }, - }); - } else if (mods.addrspace_node != 0) { - return p.addNode(.{ - .tag = .ptr_type, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrType{ - .sentinel = 0, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - }), - .rhs = elem_type, - }, - }); - } else { - return p.addNode(.{ - .tag = .ptr_type_aligned, - .main_token = asterisk, - .data = .{ - .lhs = mods.align_node, - .rhs = elem_type, - }, - }); - } - }, - .asterisk_asterisk => { - const asterisk = p.nextToken(); - const mods = try p.parsePtrModifiers(); - const elem_type = try p.expectTypeExpr(); - const inner: Node.Index = inner: { - if (mods.bit_range_start != 0) { - break :inner try p.addNode(.{ - .tag = .ptr_type_bit_range, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrTypeBitRange{ - .sentinel = 0, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - .bit_range_start = mods.bit_range_start, - .bit_range_end = mods.bit_range_end, - }), - .rhs = elem_type, - }, - }); - } else if (mods.addrspace_node != 0) { - break :inner try p.addNode(.{ - .tag = .ptr_type, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrType{ - .sentinel = 0, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - }), - .rhs = elem_type, - }, - }); - } else { - break :inner try p.addNode(.{ - .tag = .ptr_type_aligned, - .main_token = asterisk, - .data = .{ - .lhs = mods.align_node, - .rhs = elem_type, - }, - }); - } - }; - return p.addNode(.{ - .tag = .ptr_type_aligned, - .main_token = asterisk, - .data = .{ - .lhs = 0, - .rhs = inner, - }, - }); - }, - .l_bracket => switch (p.token_tags[p.tok_i + 1]) { - .asterisk => { - _ = p.nextToken(); - const asterisk = p.nextToken(); - var sentinel: Node.Index = 0; - if (p.eatToken(.identifier)) |ident| { - const ident_slice = p.source[p.token_starts[ident]..p.token_starts[ident + 1]]; - if (!std.mem.eql(u8, std.mem.trimRight(u8, ident_slice, &std.ascii.whitespace), "c")) { - p.tok_i -= 1; - } - } else if (p.eatToken(.colon)) |_| { - sentinel = try p.expectExpr(); - } - _ = try p.expectToken(.r_bracket); - const mods = try p.parsePtrModifiers(); - const elem_type = try p.expectTypeExpr(); - if (mods.bit_range_start == 0) { - if (sentinel == 0 and mods.addrspace_node == 0) { - return p.addNode(.{ - .tag = .ptr_type_aligned, - .main_token = asterisk, - .data = .{ - .lhs = mods.align_node, - .rhs = elem_type, - }, - }); - } else if (mods.align_node == 0 and mods.addrspace_node == 0) { - return p.addNode(.{ - .tag = .ptr_type_sentinel, - .main_token = asterisk, - .data = .{ - .lhs = sentinel, - .rhs = elem_type, - }, - }); - } else { - return p.addNode(.{ - .tag = .ptr_type, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrType{ - .sentinel = sentinel, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - }), - .rhs = elem_type, - }, - }); - } - } else { - return p.addNode(.{ - .tag = .ptr_type_bit_range, - .main_token = asterisk, - .data = .{ - .lhs = try p.addExtra(Node.PtrTypeBitRange{ - .sentinel = sentinel, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - .bit_range_start = mods.bit_range_start, - .bit_range_end = mods.bit_range_end, - }), - .rhs = elem_type, - }, - }); - } - }, - else => { - const lbracket = p.nextToken(); - const len_expr = try p.parseExpr(); - const sentinel: Node.Index = if (p.eatToken(.colon)) |_| - try p.expectExpr() - else - 0; - _ = try p.expectToken(.r_bracket); - if (len_expr == 0) { - const mods = try p.parsePtrModifiers(); - const elem_type = try p.expectTypeExpr(); - if (mods.bit_range_start != 0) { - try p.warnMsg(.{ - .tag = .invalid_bit_range, - .token = p.nodes.items(.main_token)[mods.bit_range_start], - }); - } - if (sentinel == 0 and mods.addrspace_node == 0) { - return p.addNode(.{ - .tag = .ptr_type_aligned, - .main_token = lbracket, - .data = .{ - .lhs = mods.align_node, - .rhs = elem_type, - }, - }); - } else if (mods.align_node == 0 and mods.addrspace_node == 0) { - return p.addNode(.{ - .tag = .ptr_type_sentinel, - .main_token = lbracket, - .data = .{ - .lhs = sentinel, - .rhs = elem_type, - }, - }); - } else { - return p.addNode(.{ - .tag = .ptr_type, - .main_token = lbracket, - .data = .{ - .lhs = try p.addExtra(Node.PtrType{ - .sentinel = sentinel, - .align_node = mods.align_node, - .addrspace_node = mods.addrspace_node, - }), - .rhs = elem_type, - }, - }); - } - } else { - switch (p.token_tags[p.tok_i]) { - .keyword_align, - .keyword_const, - .keyword_volatile, - .keyword_allowzero, - .keyword_addrspace, - => return p.fail(.ptr_mod_on_array_child_type), - else => {}, - } - const elem_type = try p.expectTypeExpr(); - if (sentinel == 0) { - return p.addNode(.{ - .tag = .array_type, - .main_token = lbracket, - .data = .{ - .lhs = len_expr, - .rhs = elem_type, - }, - }); - } else { - return p.addNode(.{ - .tag = .array_type_sentinel, - .main_token = lbracket, - .data = .{ - .lhs = len_expr, - .rhs = try p.addExtra(.{ - .elem_type = elem_type, - .sentinel = sentinel, - }), - }, - }); - } - } - }, - }, - else => return p.parseErrorUnionExpr(), - } - } - - fn expectTypeExpr(p: *Parser) Error!Node.Index { - const node = try p.parseTypeExpr(); - if (node == 0) { - return p.fail(.expected_type_expr); - } - return node; - } - - /// PrimaryExpr - /// <- AsmExpr - /// / IfExpr - /// / KEYWORD_break BreakLabel? Expr? - /// / KEYWORD_comptime Expr - /// / KEYWORD_nosuspend Expr - /// / KEYWORD_continue BreakLabel? - /// / KEYWORD_resume Expr - /// / KEYWORD_return Expr? - /// / BlockLabel? LoopExpr - /// / Block - /// / CurlySuffixExpr - fn parsePrimaryExpr(p: *Parser) !Node.Index { - switch (p.token_tags[p.tok_i]) { - .keyword_asm => return p.expectAsmExpr(), - .keyword_if => return p.parseIfExpr(), - .keyword_break => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"break", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.parseBreakLabel(), - .rhs = try p.parseExpr(), - }, - }); - }, - .keyword_continue => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"continue", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.parseBreakLabel(), - .rhs = undefined, - }, - }); - }, - .keyword_comptime => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"comptime", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.expectExpr(), - .rhs = undefined, - }, - }); - }, - .keyword_nosuspend => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"nosuspend", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.expectExpr(), - .rhs = undefined, - }, - }); - }, - .keyword_resume => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"resume", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.expectExpr(), - .rhs = undefined, - }, - }); - }, - .keyword_return => { - p.tok_i += 1; - return p.addNode(.{ - .tag = .@"return", - .main_token = p.tok_i - 1, - .data = .{ - .lhs = try p.parseExpr(), - .rhs = undefined, - }, - }); - }, - .identifier => { - if (p.token_tags[p.tok_i + 1] == .colon) { - switch (p.token_tags[p.tok_i + 2]) { - .keyword_inline => { - p.tok_i += 3; - switch (p.token_tags[p.tok_i]) { - .keyword_for => return p.parseForExpr(), - .keyword_while => return p.parseWhileExpr(), - else => return p.fail(.expected_inlinable), - } - }, - .keyword_for => { - p.tok_i += 2; - return p.parseForExpr(); - }, - .keyword_while => { - p.tok_i += 2; - return p.parseWhileExpr(); - }, - .l_brace => { - p.tok_i += 2; - return p.parseBlock(); - }, - else => return p.parseCurlySuffixExpr(), - } - } else { - return p.parseCurlySuffixExpr(); - } - }, - .keyword_inline => { - p.tok_i += 1; - switch (p.token_tags[p.tok_i]) { - .keyword_for => return p.parseForExpr(), - .keyword_while => return p.parseWhileExpr(), - else => return p.fail(.expected_inlinable), - } - }, - .keyword_for => return p.parseForExpr(), - .keyword_while => return p.parseWhileExpr(), - .l_brace => return p.parseBlock(), - else => return p.parseCurlySuffixExpr(), - } - } - - /// IfExpr <- IfPrefix Expr (KEYWORD_else Payload? Expr)? - fn parseIfExpr(p: *Parser) !Node.Index { - return p.parseIf(expectExpr); - } - - /// Block <- LBRACE Statement* RBRACE - fn parseBlock(p: *Parser) !Node.Index { - const lbrace = p.eatToken(.l_brace) orelse return null_node; - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - while (true) { - if (p.token_tags[p.tok_i] == .r_brace) break; - const statement = try p.expectStatementRecoverable(); - if (statement == 0) break; - try p.scratch.append(p.gpa, statement); - } - _ = try p.expectToken(.r_brace); - const semicolon = (p.token_tags[p.tok_i - 2] == .semicolon); - const statements = p.scratch.items[scratch_top..]; - switch (statements.len) { - 0 => return p.addNode(.{ - .tag = .block_two, - .main_token = lbrace, - .data = .{ - .lhs = 0, - .rhs = 0, - }, - }), - 1 => return p.addNode(.{ - .tag = if (semicolon) .block_two_semicolon else .block_two, - .main_token = lbrace, - .data = .{ - .lhs = statements[0], - .rhs = 0, - }, - }), - 2 => return p.addNode(.{ - .tag = if (semicolon) .block_two_semicolon else .block_two, - .main_token = lbrace, - .data = .{ - .lhs = statements[0], - .rhs = statements[1], - }, - }), - else => { - const span = try p.listToSpan(statements); - return p.addNode(.{ - .tag = if (semicolon) .block_semicolon else .block, - .main_token = lbrace, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - }, - } - } - - /// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload - /// - /// ForExpr <- ForPrefix Expr (KEYWORD_else Expr)? - fn parseForExpr(p: *Parser) !Node.Index { - const for_token = p.eatToken(.keyword_for) orelse return null_node; - _ = try p.expectToken(.l_paren); - const array_expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - const found_payload = try p.parsePtrIndexPayload(); - if (found_payload == 0) try p.warn(.expected_loop_payload); - - const then_expr = try p.expectExpr(); - _ = p.eatToken(.keyword_else) orelse { - return p.addNode(.{ - .tag = .for_simple, - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = then_expr, - }, - }); - }; - const else_expr = try p.expectExpr(); - return p.addNode(.{ - .tag = .@"for", - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = try p.addExtra(Node.If{ - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? - /// - /// WhileExpr <- WhilePrefix Expr (KEYWORD_else Payload? Expr)? - fn parseWhileExpr(p: *Parser) !Node.Index { - const while_token = p.eatToken(.keyword_while) orelse return null_node; - _ = try p.expectToken(.l_paren); - const condition = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.parsePtrPayload(); - const cont_expr = try p.parseWhileContinueExpr(); - - const then_expr = try p.expectExpr(); - _ = p.eatToken(.keyword_else) orelse { - if (cont_expr == 0) { - return p.addNode(.{ - .tag = .while_simple, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = then_expr, - }, - }); - } else { - return p.addNode(.{ - .tag = .while_cont, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.WhileCont{ - .cont_expr = cont_expr, - .then_expr = then_expr, - }), - }, - }); - } - }; - _ = try p.parsePayload(); - const else_expr = try p.expectExpr(); - return p.addNode(.{ - .tag = .@"while", - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.While{ - .cont_expr = cont_expr, - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// CurlySuffixExpr <- TypeExpr InitList? - /// - /// InitList - /// <- LBRACE FieldInit (COMMA FieldInit)* COMMA? RBRACE - /// / LBRACE Expr (COMMA Expr)* COMMA? RBRACE - /// / LBRACE RBRACE - fn parseCurlySuffixExpr(p: *Parser) !Node.Index { - const lhs = try p.parseTypeExpr(); - if (lhs == 0) return null_node; - const lbrace = p.eatToken(.l_brace) orelse return lhs; - - // If there are 0 or 1 items, we can use ArrayInitOne/StructInitOne; - // otherwise we use the full ArrayInit/StructInit. - - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - const field_init = try p.parseFieldInit(); - if (field_init != 0) { - try p.scratch.append(p.gpa, field_init); - while (true) { - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_brace => { - p.tok_i += 1; - break; - }, - .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_initializer), - } - if (p.eatToken(.r_brace)) |_| break; - const next = try p.expectFieldInit(); - try p.scratch.append(p.gpa, next); - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const inits = p.scratch.items[scratch_top..]; - switch (inits.len) { - 0 => unreachable, - 1 => return p.addNode(.{ - .tag = if (comma) .struct_init_one_comma else .struct_init_one, - .main_token = lbrace, - .data = .{ - .lhs = lhs, - .rhs = inits[0], - }, - }), - else => return p.addNode(.{ - .tag = if (comma) .struct_init_comma else .struct_init, - .main_token = lbrace, - .data = .{ - .lhs = lhs, - .rhs = try p.addExtra(try p.listToSpan(inits)), - }, - }), - } - } - - while (true) { - if (p.eatToken(.r_brace)) |_| break; - const elem_init = try p.expectExpr(); - try p.scratch.append(p.gpa, elem_init); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_brace => { - p.tok_i += 1; - break; - }, - .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_initializer), - } - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const inits = p.scratch.items[scratch_top..]; - switch (inits.len) { - 0 => return p.addNode(.{ - .tag = .struct_init_one, - .main_token = lbrace, - .data = .{ - .lhs = lhs, - .rhs = 0, - }, - }), - 1 => return p.addNode(.{ - .tag = if (comma) .array_init_one_comma else .array_init_one, - .main_token = lbrace, - .data = .{ - .lhs = lhs, - .rhs = inits[0], - }, - }), - else => return p.addNode(.{ - .tag = if (comma) .array_init_comma else .array_init, - .main_token = lbrace, - .data = .{ - .lhs = lhs, - .rhs = try p.addExtra(try p.listToSpan(inits)), - }, - }), - } - } - - /// ErrorUnionExpr <- SuffixExpr (EXCLAMATIONMARK TypeExpr)? - fn parseErrorUnionExpr(p: *Parser) !Node.Index { - const suffix_expr = try p.parseSuffixExpr(); - if (suffix_expr == 0) return null_node; - const bang = p.eatToken(.bang) orelse return suffix_expr; - return p.addNode(.{ - .tag = .error_union, - .main_token = bang, - .data = .{ - .lhs = suffix_expr, - .rhs = try p.expectTypeExpr(), - }, - }); - } - - /// SuffixExpr - /// <- KEYWORD_async PrimaryTypeExpr SuffixOp* FnCallArguments - /// / PrimaryTypeExpr (SuffixOp / FnCallArguments)* - /// - /// FnCallArguments <- LPAREN ExprList RPAREN - /// - /// ExprList <- (Expr COMMA)* Expr? - fn parseSuffixExpr(p: *Parser) !Node.Index { - if (p.eatToken(.keyword_async)) |_| { - var res = try p.expectPrimaryTypeExpr(); - while (true) { - const node = try p.parseSuffixOp(res); - if (node == 0) break; - res = node; - } - const lparen = p.eatToken(.l_paren) orelse { - try p.warn(.expected_param_list); - return res; - }; - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - while (true) { - if (p.eatToken(.r_paren)) |_| break; - const param = try p.expectExpr(); - try p.scratch.append(p.gpa, param); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_paren => { - p.tok_i += 1; - break; - }, - .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_arg), - } - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const params = p.scratch.items[scratch_top..]; - switch (params.len) { - 0 => return p.addNode(.{ - .tag = if (comma) .async_call_one_comma else .async_call_one, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = 0, - }, - }), - 1 => return p.addNode(.{ - .tag = if (comma) .async_call_one_comma else .async_call_one, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = params[0], - }, - }), - else => return p.addNode(.{ - .tag = if (comma) .async_call_comma else .async_call, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = try p.addExtra(try p.listToSpan(params)), - }, - }), - } - } - - var res = try p.parsePrimaryTypeExpr(); - if (res == 0) return res; - while (true) { - const suffix_op = try p.parseSuffixOp(res); - if (suffix_op != 0) { - res = suffix_op; - continue; - } - const lparen = p.eatToken(.l_paren) orelse return res; - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - while (true) { - if (p.eatToken(.r_paren)) |_| break; - const param = try p.expectExpr(); - try p.scratch.append(p.gpa, param); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_paren => { - p.tok_i += 1; - break; - }, - .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_arg), - } - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const params = p.scratch.items[scratch_top..]; - res = switch (params.len) { - 0 => try p.addNode(.{ - .tag = if (comma) .call_one_comma else .call_one, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = 0, - }, - }), - 1 => try p.addNode(.{ - .tag = if (comma) .call_one_comma else .call_one, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = params[0], - }, - }), - else => try p.addNode(.{ - .tag = if (comma) .call_comma else .call, - .main_token = lparen, - .data = .{ - .lhs = res, - .rhs = try p.addExtra(try p.listToSpan(params)), - }, - }), - }; - } - } - - /// PrimaryTypeExpr - /// <- BUILTINIDENTIFIER FnCallArguments - /// / CHAR_LITERAL - /// / ContainerDecl - /// / DOT IDENTIFIER - /// / DOT InitList - /// / ErrorSetDecl - /// / FLOAT - /// / FnProto - /// / GroupedExpr - /// / LabeledTypeExpr - /// / IDENTIFIER - /// / IfTypeExpr - /// / INTEGER - /// / KEYWORD_comptime TypeExpr - /// / KEYWORD_error DOT IDENTIFIER - /// / KEYWORD_anyframe - /// / KEYWORD_unreachable - /// / STRINGLITERAL - /// / SwitchExpr - /// - /// ContainerDecl <- (KEYWORD_extern / KEYWORD_packed)? ContainerDeclAuto - /// - /// ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE - /// - /// InitList - /// <- LBRACE FieldInit (COMMA FieldInit)* COMMA? RBRACE - /// / LBRACE Expr (COMMA Expr)* COMMA? RBRACE - /// / LBRACE RBRACE - /// - /// ErrorSetDecl <- KEYWORD_error LBRACE IdentifierList RBRACE - /// - /// GroupedExpr <- LPAREN Expr RPAREN - /// - /// IfTypeExpr <- IfPrefix TypeExpr (KEYWORD_else Payload? TypeExpr)? - /// - /// LabeledTypeExpr - /// <- BlockLabel Block - /// / BlockLabel? LoopTypeExpr - /// - /// LoopTypeExpr <- KEYWORD_inline? (ForTypeExpr / WhileTypeExpr) - fn parsePrimaryTypeExpr(p: *Parser) !Node.Index { - switch (p.token_tags[p.tok_i]) { - .char_literal => return p.addNode(.{ - .tag = .char_literal, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - .number_literal => return p.addNode(.{ - .tag = .number_literal, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - .keyword_unreachable => return p.addNode(.{ - .tag = .unreachable_literal, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - .keyword_anyframe => return p.addNode(.{ - .tag = .anyframe_literal, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - .string_literal => { - const main_token = p.nextToken(); - return p.addNode(.{ - .tag = .string_literal, - .main_token = main_token, - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }); - }, - - .builtin => return p.parseBuiltinCall(), - .keyword_fn => return p.parseFnProto(), - .keyword_if => return p.parseIf(expectTypeExpr), - .keyword_switch => return p.expectSwitchExpr(), - - .keyword_extern, - .keyword_packed, - => { - p.tok_i += 1; - return p.parseContainerDeclAuto(); - }, - - .keyword_struct, - .keyword_opaque, - .keyword_enum, - .keyword_union, - => return p.parseContainerDeclAuto(), - - .keyword_comptime => return p.addNode(.{ - .tag = .@"comptime", - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.expectTypeExpr(), - .rhs = undefined, - }, - }), - .multiline_string_literal_line => { - const first_line = p.nextToken(); - while (p.token_tags[p.tok_i] == .multiline_string_literal_line) { - p.tok_i += 1; - } - return p.addNode(.{ - .tag = .multiline_string_literal, - .main_token = first_line, - .data = .{ - .lhs = first_line, - .rhs = p.tok_i - 1, - }, - }); - }, - .identifier => switch (p.token_tags[p.tok_i + 1]) { - .colon => switch (p.token_tags[p.tok_i + 2]) { - .keyword_inline => { - p.tok_i += 3; - switch (p.token_tags[p.tok_i]) { - .keyword_for => return p.parseForTypeExpr(), - .keyword_while => return p.parseWhileTypeExpr(), - else => return p.fail(.expected_inlinable), - } - }, - .keyword_for => { - p.tok_i += 2; - return p.parseForTypeExpr(); - }, - .keyword_while => { - p.tok_i += 2; - return p.parseWhileTypeExpr(); - }, - .l_brace => { - p.tok_i += 2; - return p.parseBlock(); - }, - else => return p.addNode(.{ - .tag = .identifier, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - }, - else => return p.addNode(.{ - .tag = .identifier, - .main_token = p.nextToken(), - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }), - }, - .keyword_inline => { - p.tok_i += 1; - switch (p.token_tags[p.tok_i]) { - .keyword_for => return p.parseForTypeExpr(), - .keyword_while => return p.parseWhileTypeExpr(), - else => return p.fail(.expected_inlinable), - } - }, - .keyword_for => return p.parseForTypeExpr(), - .keyword_while => return p.parseWhileTypeExpr(), - .period => switch (p.token_tags[p.tok_i + 1]) { - .identifier => return p.addNode(.{ - .tag = .enum_literal, - .data = .{ - .lhs = p.nextToken(), // dot - .rhs = undefined, - }, - .main_token = p.nextToken(), // identifier - }), - .l_brace => { - const lbrace = p.tok_i + 1; - p.tok_i = lbrace + 1; - - // If there are 0, 1, or 2 items, we can use ArrayInitDotTwo/StructInitDotTwo; - // otherwise we use the full ArrayInitDot/StructInitDot. - - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - const field_init = try p.parseFieldInit(); - if (field_init != 0) { - try p.scratch.append(p.gpa, field_init); - while (true) { - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_brace => { - p.tok_i += 1; - break; - }, - .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_initializer), - } - if (p.eatToken(.r_brace)) |_| break; - const next = try p.expectFieldInit(); - try p.scratch.append(p.gpa, next); - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const inits = p.scratch.items[scratch_top..]; - switch (inits.len) { - 0 => unreachable, - 1 => return p.addNode(.{ - .tag = if (comma) .struct_init_dot_two_comma else .struct_init_dot_two, - .main_token = lbrace, - .data = .{ - .lhs = inits[0], - .rhs = 0, - }, - }), - 2 => return p.addNode(.{ - .tag = if (comma) .struct_init_dot_two_comma else .struct_init_dot_two, - .main_token = lbrace, - .data = .{ - .lhs = inits[0], - .rhs = inits[1], - }, - }), - else => { - const span = try p.listToSpan(inits); - return p.addNode(.{ - .tag = if (comma) .struct_init_dot_comma else .struct_init_dot, - .main_token = lbrace, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - }, - } - } - - while (true) { - if (p.eatToken(.r_brace)) |_| break; - const elem_init = try p.expectExpr(); - try p.scratch.append(p.gpa, elem_init); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_brace => { - p.tok_i += 1; - break; - }, - .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_initializer), - } - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const inits = p.scratch.items[scratch_top..]; - switch (inits.len) { - 0 => return p.addNode(.{ - .tag = .struct_init_dot_two, - .main_token = lbrace, - .data = .{ - .lhs = 0, - .rhs = 0, - }, - }), - 1 => return p.addNode(.{ - .tag = if (comma) .array_init_dot_two_comma else .array_init_dot_two, - .main_token = lbrace, - .data = .{ - .lhs = inits[0], - .rhs = 0, - }, - }), - 2 => return p.addNode(.{ - .tag = if (comma) .array_init_dot_two_comma else .array_init_dot_two, - .main_token = lbrace, - .data = .{ - .lhs = inits[0], - .rhs = inits[1], - }, - }), - else => { - const span = try p.listToSpan(inits); - return p.addNode(.{ - .tag = if (comma) .array_init_dot_comma else .array_init_dot, - .main_token = lbrace, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - }, - } - }, - else => return null_node, - }, - .keyword_error => switch (p.token_tags[p.tok_i + 1]) { - .l_brace => { - const error_token = p.tok_i; - p.tok_i += 2; - while (true) { - if (p.eatToken(.r_brace)) |_| break; - _ = try p.eatDocComments(); - _ = try p.expectToken(.identifier); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_brace => { - p.tok_i += 1; - break; - }, - .colon, .r_paren, .r_bracket => return p.failExpected(.r_brace), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_field), - } - } - return p.addNode(.{ - .tag = .error_set_decl, - .main_token = error_token, - .data = .{ - .lhs = undefined, - .rhs = p.tok_i - 1, // rbrace - }, - }); - }, - else => { - const main_token = p.nextToken(); - const period = p.eatToken(.period); - if (period == null) try p.warnExpected(.period); - const identifier = p.eatToken(.identifier); - if (identifier == null) try p.warnExpected(.identifier); - return p.addNode(.{ - .tag = .error_value, - .main_token = main_token, - .data = .{ - .lhs = period orelse 0, - .rhs = identifier orelse 0, - }, - }); - }, - }, - .l_paren => return p.addNode(.{ - .tag = .grouped_expression, - .main_token = p.nextToken(), - .data = .{ - .lhs = try p.expectExpr(), - .rhs = try p.expectToken(.r_paren), - }, - }), - else => return null_node, - } - } - - fn expectPrimaryTypeExpr(p: *Parser) !Node.Index { - const node = try p.parsePrimaryTypeExpr(); - if (node == 0) { - return p.fail(.expected_primary_type_expr); - } - return node; - } - - /// ForPrefix <- KEYWORD_for LPAREN Expr RPAREN PtrIndexPayload - /// - /// ForTypeExpr <- ForPrefix TypeExpr (KEYWORD_else TypeExpr)? - fn parseForTypeExpr(p: *Parser) !Node.Index { - const for_token = p.eatToken(.keyword_for) orelse return null_node; - _ = try p.expectToken(.l_paren); - const array_expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - const found_payload = try p.parsePtrIndexPayload(); - if (found_payload == 0) try p.warn(.expected_loop_payload); - - const then_expr = try p.expectTypeExpr(); - _ = p.eatToken(.keyword_else) orelse { - return p.addNode(.{ - .tag = .for_simple, - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = then_expr, - }, - }); - }; - const else_expr = try p.expectTypeExpr(); - return p.addNode(.{ - .tag = .@"for", - .main_token = for_token, - .data = .{ - .lhs = array_expr, - .rhs = try p.addExtra(Node.If{ - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// WhilePrefix <- KEYWORD_while LPAREN Expr RPAREN PtrPayload? WhileContinueExpr? - /// - /// WhileTypeExpr <- WhilePrefix TypeExpr (KEYWORD_else Payload? TypeExpr)? - fn parseWhileTypeExpr(p: *Parser) !Node.Index { - const while_token = p.eatToken(.keyword_while) orelse return null_node; - _ = try p.expectToken(.l_paren); - const condition = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.parsePtrPayload(); - const cont_expr = try p.parseWhileContinueExpr(); - - const then_expr = try p.expectTypeExpr(); - _ = p.eatToken(.keyword_else) orelse { - if (cont_expr == 0) { - return p.addNode(.{ - .tag = .while_simple, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = then_expr, - }, - }); - } else { - return p.addNode(.{ - .tag = .while_cont, - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.WhileCont{ - .cont_expr = cont_expr, - .then_expr = then_expr, - }), - }, - }); - } - }; - _ = try p.parsePayload(); - const else_expr = try p.expectTypeExpr(); - return p.addNode(.{ - .tag = .@"while", - .main_token = while_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.While{ - .cont_expr = cont_expr, - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// SwitchExpr <- KEYWORD_switch LPAREN Expr RPAREN LBRACE SwitchProngList RBRACE - fn expectSwitchExpr(p: *Parser) !Node.Index { - const switch_token = p.assertToken(.keyword_switch); - _ = try p.expectToken(.l_paren); - const expr_node = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.expectToken(.l_brace); - const cases = try p.parseSwitchProngList(); - const trailing_comma = p.token_tags[p.tok_i - 1] == .comma; - _ = try p.expectToken(.r_brace); - - return p.addNode(.{ - .tag = if (trailing_comma) .switch_comma else .@"switch", - .main_token = switch_token, - .data = .{ - .lhs = expr_node, - .rhs = try p.addExtra(Node.SubRange{ - .start = cases.start, - .end = cases.end, - }), - }, - }); - } - - /// AsmExpr <- KEYWORD_asm KEYWORD_volatile? LPAREN Expr AsmOutput? RPAREN - /// - /// AsmOutput <- COLON AsmOutputList AsmInput? - /// - /// AsmInput <- COLON AsmInputList AsmClobbers? - /// - /// AsmClobbers <- COLON StringList - /// - /// StringList <- (STRINGLITERAL COMMA)* STRINGLITERAL? - /// - /// AsmOutputList <- (AsmOutputItem COMMA)* AsmOutputItem? - /// - /// AsmInputList <- (AsmInputItem COMMA)* AsmInputItem? - fn expectAsmExpr(p: *Parser) !Node.Index { - const asm_token = p.assertToken(.keyword_asm); - _ = p.eatToken(.keyword_volatile); - _ = try p.expectToken(.l_paren); - const template = try p.expectExpr(); - - if (p.eatToken(.r_paren)) |rparen| { - return p.addNode(.{ - .tag = .asm_simple, - .main_token = asm_token, - .data = .{ - .lhs = template, - .rhs = rparen, - }, - }); - } - - _ = try p.expectToken(.colon); - - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - - while (true) { - const output_item = try p.parseAsmOutputItem(); - if (output_item == 0) break; - try p.scratch.append(p.gpa, output_item); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - // All possible delimiters. - .colon, .r_paren, .r_brace, .r_bracket => break, - // Likely just a missing comma; give error but continue parsing. - else => try p.warnExpected(.comma), - } - } - if (p.eatToken(.colon)) |_| { - while (true) { - const input_item = try p.parseAsmInputItem(); - if (input_item == 0) break; - try p.scratch.append(p.gpa, input_item); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - // All possible delimiters. - .colon, .r_paren, .r_brace, .r_bracket => break, - // Likely just a missing comma; give error but continue parsing. - else => try p.warnExpected(.comma), - } - } - if (p.eatToken(.colon)) |_| { - while (p.eatToken(.string_literal)) |_| { - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .colon, .r_paren, .r_brace, .r_bracket => break, - // Likely just a missing comma; give error but continue parsing. - else => try p.warnExpected(.comma), - } - } - } - } - const rparen = try p.expectToken(.r_paren); - const span = try p.listToSpan(p.scratch.items[scratch_top..]); - return p.addNode(.{ - .tag = .@"asm", - .main_token = asm_token, - .data = .{ - .lhs = template, - .rhs = try p.addExtra(Node.Asm{ - .items_start = span.start, - .items_end = span.end, - .rparen = rparen, - }), - }, - }); - } - - /// AsmOutputItem <- LBRACKET IDENTIFIER RBRACKET STRINGLITERAL LPAREN (MINUSRARROW TypeExpr / IDENTIFIER) RPAREN - fn parseAsmOutputItem(p: *Parser) !Node.Index { - _ = p.eatToken(.l_bracket) orelse return null_node; - const identifier = try p.expectToken(.identifier); - _ = try p.expectToken(.r_bracket); - _ = try p.expectToken(.string_literal); - _ = try p.expectToken(.l_paren); - const type_expr: Node.Index = blk: { - if (p.eatToken(.arrow)) |_| { - break :blk try p.expectTypeExpr(); - } else { - _ = try p.expectToken(.identifier); - break :blk null_node; - } - }; - const rparen = try p.expectToken(.r_paren); - return p.addNode(.{ - .tag = .asm_output, - .main_token = identifier, - .data = .{ - .lhs = type_expr, - .rhs = rparen, - }, - }); - } - - /// AsmInputItem <- LBRACKET IDENTIFIER RBRACKET STRINGLITERAL LPAREN Expr RPAREN - fn parseAsmInputItem(p: *Parser) !Node.Index { - _ = p.eatToken(.l_bracket) orelse return null_node; - const identifier = try p.expectToken(.identifier); - _ = try p.expectToken(.r_bracket); - _ = try p.expectToken(.string_literal); - _ = try p.expectToken(.l_paren); - const expr = try p.expectExpr(); - const rparen = try p.expectToken(.r_paren); - return p.addNode(.{ - .tag = .asm_input, - .main_token = identifier, - .data = .{ - .lhs = expr, - .rhs = rparen, - }, - }); - } - - /// BreakLabel <- COLON IDENTIFIER - fn parseBreakLabel(p: *Parser) !TokenIndex { - _ = p.eatToken(.colon) orelse return @as(TokenIndex, 0); - return p.expectToken(.identifier); - } - - /// BlockLabel <- IDENTIFIER COLON - fn parseBlockLabel(p: *Parser) TokenIndex { - if (p.token_tags[p.tok_i] == .identifier and - p.token_tags[p.tok_i + 1] == .colon) - { - const identifier = p.tok_i; - p.tok_i += 2; - return identifier; - } - return null_node; - } - - /// FieldInit <- DOT IDENTIFIER EQUAL Expr - fn parseFieldInit(p: *Parser) !Node.Index { - if (p.token_tags[p.tok_i + 0] == .period and - p.token_tags[p.tok_i + 1] == .identifier and - p.token_tags[p.tok_i + 2] == .equal) - { - p.tok_i += 3; - return p.expectExpr(); - } else { - return null_node; - } - } - - fn expectFieldInit(p: *Parser) !Node.Index { - if (p.token_tags[p.tok_i] != .period or - p.token_tags[p.tok_i + 1] != .identifier or - p.token_tags[p.tok_i + 2] != .equal) - return p.fail(.expected_initializer); - - p.tok_i += 3; - return p.expectExpr(); - } - - /// WhileContinueExpr <- COLON LPAREN AssignExpr RPAREN - fn parseWhileContinueExpr(p: *Parser) !Node.Index { - _ = p.eatToken(.colon) orelse { - if (p.token_tags[p.tok_i] == .l_paren and - p.tokensOnSameLine(p.tok_i - 1, p.tok_i)) - return p.fail(.expected_continue_expr); - return null_node; - }; - _ = try p.expectToken(.l_paren); - const node = try p.parseAssignExpr(); - if (node == 0) return p.fail(.expected_expr_or_assignment); - _ = try p.expectToken(.r_paren); - return node; - } - - /// LinkSection <- KEYWORD_linksection LPAREN Expr RPAREN - fn parseLinkSection(p: *Parser) !Node.Index { - _ = p.eatToken(.keyword_linksection) orelse return null_node; - _ = try p.expectToken(.l_paren); - const expr_node = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - return expr_node; - } - - /// CallConv <- KEYWORD_callconv LPAREN Expr RPAREN - fn parseCallconv(p: *Parser) !Node.Index { - _ = p.eatToken(.keyword_callconv) orelse return null_node; - _ = try p.expectToken(.l_paren); - const expr_node = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - return expr_node; - } - - /// AddrSpace <- KEYWORD_addrspace LPAREN Expr RPAREN - fn parseAddrSpace(p: *Parser) !Node.Index { - _ = p.eatToken(.keyword_addrspace) orelse return null_node; - _ = try p.expectToken(.l_paren); - const expr_node = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - return expr_node; - } - - /// This function can return null nodes and then still return nodes afterwards, - /// such as in the case of anytype and `...`. Caller must look for rparen to find - /// out when there are no more param decls left. - /// - /// ParamDecl - /// <- doc_comment? (KEYWORD_noalias / KEYWORD_comptime)? (IDENTIFIER COLON)? ParamType - /// / DOT3 - /// - /// ParamType - /// <- KEYWORD_anytype - /// / TypeExpr - fn expectParamDecl(p: *Parser) !Node.Index { - _ = try p.eatDocComments(); - switch (p.token_tags[p.tok_i]) { - .keyword_noalias, .keyword_comptime => p.tok_i += 1, - .ellipsis3 => { - p.tok_i += 1; - return null_node; - }, - else => {}, - } - if (p.token_tags[p.tok_i] == .identifier and - p.token_tags[p.tok_i + 1] == .colon) - { - p.tok_i += 2; - } - switch (p.token_tags[p.tok_i]) { - .keyword_anytype => { - p.tok_i += 1; - return null_node; - }, - else => return p.expectTypeExpr(), - } - } - - /// Payload <- PIPE IDENTIFIER PIPE - fn parsePayload(p: *Parser) !TokenIndex { - _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); - const identifier = try p.expectToken(.identifier); - _ = try p.expectToken(.pipe); - return identifier; - } - - /// PtrPayload <- PIPE ASTERISK? IDENTIFIER PIPE - fn parsePtrPayload(p: *Parser) !TokenIndex { - _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); - _ = p.eatToken(.asterisk); - const identifier = try p.expectToken(.identifier); - _ = try p.expectToken(.pipe); - return identifier; - } - - /// Returns the first identifier token, if any. - /// - /// PtrIndexPayload <- PIPE ASTERISK? IDENTIFIER (COMMA IDENTIFIER)? PIPE - fn parsePtrIndexPayload(p: *Parser) !TokenIndex { - _ = p.eatToken(.pipe) orelse return @as(TokenIndex, 0); - _ = p.eatToken(.asterisk); - const identifier = try p.expectToken(.identifier); - if (p.eatToken(.comma) != null) { - _ = try p.expectToken(.identifier); - } - _ = try p.expectToken(.pipe); - return identifier; - } - - /// SwitchProng <- KEYWORD_inline? SwitchCase EQUALRARROW PtrIndexPayload? AssignExpr - /// - /// SwitchCase - /// <- SwitchItem (COMMA SwitchItem)* COMMA? - /// / KEYWORD_else - fn parseSwitchProng(p: *Parser) !Node.Index { - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - - const is_inline = p.eatToken(.keyword_inline) != null; - - if (p.eatToken(.keyword_else) == null) { - while (true) { - const item = try p.parseSwitchItem(); - if (item == 0) break; - try p.scratch.append(p.gpa, item); - if (p.eatToken(.comma) == null) break; - } - if (scratch_top == p.scratch.items.len) { - if (is_inline) p.tok_i -= 1; - return null_node; - } - } - const arrow_token = try p.expectToken(.equal_angle_bracket_right); - _ = try p.parsePtrIndexPayload(); - - const items = p.scratch.items[scratch_top..]; - switch (items.len) { - 0 => return p.addNode(.{ - .tag = if (is_inline) .switch_case_inline_one else .switch_case_one, - .main_token = arrow_token, - .data = .{ - .lhs = 0, - .rhs = try p.expectAssignExpr(), - }, - }), - 1 => return p.addNode(.{ - .tag = if (is_inline) .switch_case_inline_one else .switch_case_one, - .main_token = arrow_token, - .data = .{ - .lhs = items[0], - .rhs = try p.expectAssignExpr(), - }, - }), - else => return p.addNode(.{ - .tag = if (is_inline) .switch_case_inline else .switch_case, - .main_token = arrow_token, - .data = .{ - .lhs = try p.addExtra(try p.listToSpan(items)), - .rhs = try p.expectAssignExpr(), - }, - }), - } - } - - /// SwitchItem <- Expr (DOT3 Expr)? - fn parseSwitchItem(p: *Parser) !Node.Index { - const expr = try p.parseExpr(); - if (expr == 0) return null_node; - - if (p.eatToken(.ellipsis3)) |token| { - return p.addNode(.{ - .tag = .switch_range, - .main_token = token, - .data = .{ - .lhs = expr, - .rhs = try p.expectExpr(), - }, - }); - } - return expr; - } - - const PtrModifiers = struct { - align_node: Node.Index, - addrspace_node: Node.Index, - bit_range_start: Node.Index, - bit_range_end: Node.Index, - }; - - fn parsePtrModifiers(p: *Parser) !PtrModifiers { - var result: PtrModifiers = .{ - .align_node = 0, - .addrspace_node = 0, - .bit_range_start = 0, - .bit_range_end = 0, - }; - var saw_const = false; - var saw_volatile = false; - var saw_allowzero = false; - var saw_addrspace = false; - while (true) { - switch (p.token_tags[p.tok_i]) { - .keyword_align => { - if (result.align_node != 0) { - try p.warn(.extra_align_qualifier); - } - p.tok_i += 1; - _ = try p.expectToken(.l_paren); - result.align_node = try p.expectExpr(); - - if (p.eatToken(.colon)) |_| { - result.bit_range_start = try p.expectExpr(); - _ = try p.expectToken(.colon); - result.bit_range_end = try p.expectExpr(); - } - - _ = try p.expectToken(.r_paren); - }, - .keyword_const => { - if (saw_const) { - try p.warn(.extra_const_qualifier); - } - p.tok_i += 1; - saw_const = true; - }, - .keyword_volatile => { - if (saw_volatile) { - try p.warn(.extra_volatile_qualifier); - } - p.tok_i += 1; - saw_volatile = true; - }, - .keyword_allowzero => { - if (saw_allowzero) { - try p.warn(.extra_allowzero_qualifier); - } - p.tok_i += 1; - saw_allowzero = true; - }, - .keyword_addrspace => { - if (saw_addrspace) { - try p.warn(.extra_addrspace_qualifier); - } - result.addrspace_node = try p.parseAddrSpace(); - }, - else => return result, - } - } - } - - /// SuffixOp - /// <- LBRACKET Expr (DOT2 (Expr? (COLON Expr)?)?)? RBRACKET - /// / DOT IDENTIFIER - /// / DOTASTERISK - /// / DOTQUESTIONMARK - fn parseSuffixOp(p: *Parser, lhs: Node.Index) !Node.Index { - switch (p.token_tags[p.tok_i]) { - .l_bracket => { - const lbracket = p.nextToken(); - const index_expr = try p.expectExpr(); - - if (p.eatToken(.ellipsis2)) |_| { - const end_expr = try p.parseExpr(); - if (p.eatToken(.colon)) |_| { - const sentinel = try p.expectExpr(); - _ = try p.expectToken(.r_bracket); - return p.addNode(.{ - .tag = .slice_sentinel, - .main_token = lbracket, - .data = .{ - .lhs = lhs, - .rhs = try p.addExtra(Node.SliceSentinel{ - .start = index_expr, - .end = end_expr, - .sentinel = sentinel, - }), - }, - }); - } - _ = try p.expectToken(.r_bracket); - if (end_expr == 0) { - return p.addNode(.{ - .tag = .slice_open, - .main_token = lbracket, - .data = .{ - .lhs = lhs, - .rhs = index_expr, - }, - }); - } - return p.addNode(.{ - .tag = .slice, - .main_token = lbracket, - .data = .{ - .lhs = lhs, - .rhs = try p.addExtra(Node.Slice{ - .start = index_expr, - .end = end_expr, - }), - }, - }); - } - _ = try p.expectToken(.r_bracket); - return p.addNode(.{ - .tag = .array_access, - .main_token = lbracket, - .data = .{ - .lhs = lhs, - .rhs = index_expr, - }, - }); - }, - .period_asterisk => return p.addNode(.{ - .tag = .deref, - .main_token = p.nextToken(), - .data = .{ - .lhs = lhs, - .rhs = undefined, - }, - }), - .invalid_periodasterisks => { - try p.warn(.asterisk_after_ptr_deref); - return p.addNode(.{ - .tag = .deref, - .main_token = p.nextToken(), - .data = .{ - .lhs = lhs, - .rhs = undefined, - }, - }); - }, - .period => switch (p.token_tags[p.tok_i + 1]) { - .identifier => return p.addNode(.{ - .tag = .field_access, - .main_token = p.nextToken(), - .data = .{ - .lhs = lhs, - .rhs = p.nextToken(), - }, - }), - .question_mark => return p.addNode(.{ - .tag = .unwrap_optional, - .main_token = p.nextToken(), - .data = .{ - .lhs = lhs, - .rhs = p.nextToken(), - }, - }), - .l_brace => { - // this a misplaced `.{`, handle the error somewhere else - return null_node; - }, - else => { - p.tok_i += 1; - try p.warn(.expected_suffix_op); - return null_node; - }, - }, - else => return null_node, - } - } - - /// Caller must have already verified the first token. - /// - /// ContainerDeclAuto <- ContainerDeclType LBRACE container_doc_comment? ContainerMembers RBRACE - /// - /// ContainerDeclType - /// <- KEYWORD_struct (LPAREN Expr RPAREN)? - /// / KEYWORD_opaque - /// / KEYWORD_enum (LPAREN Expr RPAREN)? - /// / KEYWORD_union (LPAREN (KEYWORD_enum (LPAREN Expr RPAREN)? / Expr) RPAREN)? - fn parseContainerDeclAuto(p: *Parser) !Node.Index { - const main_token = p.nextToken(); - const arg_expr = switch (p.token_tags[main_token]) { - .keyword_opaque => null_node, - .keyword_struct, .keyword_enum => blk: { - if (p.eatToken(.l_paren)) |_| { - const expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - break :blk expr; - } else { - break :blk null_node; - } - }, - .keyword_union => blk: { - if (p.eatToken(.l_paren)) |_| { - if (p.eatToken(.keyword_enum)) |_| { - if (p.eatToken(.l_paren)) |_| { - const enum_tag_expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.expectToken(.r_paren); - - _ = try p.expectToken(.l_brace); - const members = try p.parseContainerMembers(); - const members_span = try members.toSpan(p); - _ = try p.expectToken(.r_brace); - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .tagged_union_enum_tag_trailing, - false => .tagged_union_enum_tag, - }, - .main_token = main_token, - .data = .{ - .lhs = enum_tag_expr, - .rhs = try p.addExtra(members_span), - }, - }); - } else { - _ = try p.expectToken(.r_paren); - - _ = try p.expectToken(.l_brace); - const members = try p.parseContainerMembers(); - _ = try p.expectToken(.r_brace); - if (members.len <= 2) { - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .tagged_union_two_trailing, - false => .tagged_union_two, - }, - .main_token = main_token, - .data = .{ - .lhs = members.lhs, - .rhs = members.rhs, - }, - }); - } else { - const span = try members.toSpan(p); - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .tagged_union_trailing, - false => .tagged_union, - }, - .main_token = main_token, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - } - } - } else { - const expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - break :blk expr; - } - } else { - break :blk null_node; - } - }, - else => { - p.tok_i -= 1; - return p.fail(.expected_container); - }, - }; - _ = try p.expectToken(.l_brace); - const members = try p.parseContainerMembers(); - _ = try p.expectToken(.r_brace); - if (arg_expr == 0) { - if (members.len <= 2) { - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .container_decl_two_trailing, - false => .container_decl_two, - }, - .main_token = main_token, - .data = .{ - .lhs = members.lhs, - .rhs = members.rhs, - }, - }); - } else { - const span = try members.toSpan(p); - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .container_decl_trailing, - false => .container_decl, - }, - .main_token = main_token, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - } - } else { - const span = try members.toSpan(p); - return p.addNode(.{ - .tag = switch (members.trailing) { - true => .container_decl_arg_trailing, - false => .container_decl_arg, - }, - .main_token = main_token, - .data = .{ - .lhs = arg_expr, - .rhs = try p.addExtra(Node.SubRange{ - .start = span.start, - .end = span.end, - }), - }, - }); - } - } - - /// Give a helpful error message for those transitioning from - /// C's 'struct Foo {};' to Zig's 'const Foo = struct {};'. - fn parseCStyleContainer(p: *Parser) Error!bool { - const main_token = p.tok_i; - switch (p.token_tags[p.tok_i]) { - .keyword_enum, .keyword_union, .keyword_struct => {}, - else => return false, - } - const identifier = p.tok_i + 1; - if (p.token_tags[identifier] != .identifier) return false; - p.tok_i += 2; - - try p.warnMsg(.{ - .tag = .c_style_container, - .token = identifier, - .extra = .{ .expected_tag = p.token_tags[main_token] }, - }); - try p.warnMsg(.{ - .tag = .zig_style_container, - .is_note = true, - .token = identifier, - .extra = .{ .expected_tag = p.token_tags[main_token] }, - }); - - _ = try p.expectToken(.l_brace); - _ = try p.parseContainerMembers(); - _ = try p.expectToken(.r_brace); - try p.expectSemicolon(.expected_semi_after_decl, true); - return true; - } - - /// Holds temporary data until we are ready to construct the full ContainerDecl AST node. - /// - /// ByteAlign <- KEYWORD_align LPAREN Expr RPAREN - fn parseByteAlign(p: *Parser) !Node.Index { - _ = p.eatToken(.keyword_align) orelse return null_node; - _ = try p.expectToken(.l_paren); - const expr = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - return expr; - } - - /// SwitchProngList <- (SwitchProng COMMA)* SwitchProng? - fn parseSwitchProngList(p: *Parser) !Node.SubRange { - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - - while (true) { - const item = try parseSwitchProng(p); - if (item == 0) break; - - try p.scratch.append(p.gpa, item); - - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - // All possible delimiters. - .colon, .r_paren, .r_brace, .r_bracket => break, - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_switch_prong), - } - } - return p.listToSpan(p.scratch.items[scratch_top..]); - } - - /// ParamDeclList <- (ParamDecl COMMA)* ParamDecl? - fn parseParamDeclList(p: *Parser) !SmallSpan { - _ = try p.expectToken(.l_paren); - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - var varargs: union(enum) { none, seen, nonfinal: TokenIndex } = .none; - while (true) { - if (p.eatToken(.r_paren)) |_| break; - if (varargs == .seen) varargs = .{ .nonfinal = p.tok_i }; - const param = try p.expectParamDecl(); - if (param != 0) { - try p.scratch.append(p.gpa, param); - } else if (p.token_tags[p.tok_i - 1] == .ellipsis3) { - if (varargs == .none) varargs = .seen; - } - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_paren => { - p.tok_i += 1; - break; - }, - .colon, .r_brace, .r_bracket => return p.failExpected(.r_paren), - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_param), - } - } - if (varargs == .nonfinal) { - try p.warnMsg(.{ .tag = .varargs_nonfinal, .token = varargs.nonfinal }); - } - const params = p.scratch.items[scratch_top..]; - return switch (params.len) { - 0 => SmallSpan{ .zero_or_one = 0 }, - 1 => SmallSpan{ .zero_or_one = params[0] }, - else => SmallSpan{ .multi = try p.listToSpan(params) }, - }; - } - - /// FnCallArguments <- LPAREN ExprList RPAREN - /// - /// ExprList <- (Expr COMMA)* Expr? - fn parseBuiltinCall(p: *Parser) !Node.Index { - const builtin_token = p.assertToken(.builtin); - if (p.token_tags[p.nextToken()] != .l_paren) { - p.tok_i -= 1; - try p.warn(.expected_param_list); - // Pretend this was an identifier so we can continue parsing. - return p.addNode(.{ - .tag = .identifier, - .main_token = builtin_token, - .data = .{ - .lhs = undefined, - .rhs = undefined, - }, - }); - } - const scratch_top = p.scratch.items.len; - defer p.scratch.shrinkRetainingCapacity(scratch_top); - while (true) { - if (p.eatToken(.r_paren)) |_| break; - const param = try p.expectExpr(); - try p.scratch.append(p.gpa, param); - switch (p.token_tags[p.tok_i]) { - .comma => p.tok_i += 1, - .r_paren => { - p.tok_i += 1; - break; - }, - // Likely just a missing comma; give error but continue parsing. - else => try p.warn(.expected_comma_after_arg), - } - } - const comma = (p.token_tags[p.tok_i - 2] == .comma); - const params = p.scratch.items[scratch_top..]; - switch (params.len) { - 0 => return p.addNode(.{ - .tag = .builtin_call_two, - .main_token = builtin_token, - .data = .{ - .lhs = 0, - .rhs = 0, - }, - }), - 1 => return p.addNode(.{ - .tag = if (comma) .builtin_call_two_comma else .builtin_call_two, - .main_token = builtin_token, - .data = .{ - .lhs = params[0], - .rhs = 0, - }, - }), - 2 => return p.addNode(.{ - .tag = if (comma) .builtin_call_two_comma else .builtin_call_two, - .main_token = builtin_token, - .data = .{ - .lhs = params[0], - .rhs = params[1], - }, - }), - else => { - const span = try p.listToSpan(params); - return p.addNode(.{ - .tag = if (comma) .builtin_call_comma else .builtin_call, - .main_token = builtin_token, - .data = .{ - .lhs = span.start, - .rhs = span.end, - }, - }); - }, - } - } - - /// IfPrefix <- KEYWORD_if LPAREN Expr RPAREN PtrPayload? - fn parseIf(p: *Parser, comptime bodyParseFn: fn (p: *Parser) Error!Node.Index) !Node.Index { - const if_token = p.eatToken(.keyword_if) orelse return null_node; - _ = try p.expectToken(.l_paren); - const condition = try p.expectExpr(); - _ = try p.expectToken(.r_paren); - _ = try p.parsePtrPayload(); - - const then_expr = try bodyParseFn(p); - assert(then_expr != 0); - - _ = p.eatToken(.keyword_else) orelse return p.addNode(.{ - .tag = .if_simple, - .main_token = if_token, - .data = .{ - .lhs = condition, - .rhs = then_expr, - }, - }); - _ = try p.parsePayload(); - const else_expr = try bodyParseFn(p); - assert(then_expr != 0); - - return p.addNode(.{ - .tag = .@"if", - .main_token = if_token, - .data = .{ - .lhs = condition, - .rhs = try p.addExtra(Node.If{ - .then_expr = then_expr, - .else_expr = else_expr, - }), - }, - }); - } - - /// Skips over doc comment tokens. Returns the first one, if any. - fn eatDocComments(p: *Parser) !?TokenIndex { - if (p.eatToken(.doc_comment)) |tok| { - var first_line = tok; - if (tok > 0 and tokensOnSameLine(p, tok - 1, tok)) { - try p.warnMsg(.{ - .tag = .same_line_doc_comment, - .token = tok, - }); - first_line = p.eatToken(.doc_comment) orelse return null; - } - while (p.eatToken(.doc_comment)) |_| {} - return first_line; - } - return null; - } - - fn tokensOnSameLine(p: *Parser, token1: TokenIndex, token2: TokenIndex) bool { - return std.mem.indexOfScalar(u8, p.source[p.token_starts[token1]..p.token_starts[token2]], '\n') == null; - } - - fn eatToken(p: *Parser, tag: Token.Tag) ?TokenIndex { - return if (p.token_tags[p.tok_i] == tag) p.nextToken() else null; - } - - fn assertToken(p: *Parser, tag: Token.Tag) TokenIndex { - const token = p.nextToken(); - assert(p.token_tags[token] == tag); - return token; - } - - fn expectToken(p: *Parser, tag: Token.Tag) Error!TokenIndex { - if (p.token_tags[p.tok_i] != tag) { - return p.failMsg(.{ - .tag = .expected_token, - .token = p.tok_i, - .extra = .{ .expected_tag = tag }, - }); - } - return p.nextToken(); - } - - fn expectSemicolon(p: *Parser, error_tag: AstError.Tag, recoverable: bool) Error!void { - if (p.token_tags[p.tok_i] == .semicolon) { - _ = p.nextToken(); - return; - } - try p.warn(error_tag); - if (!recoverable) return error.ParseError; - } - - fn nextToken(p: *Parser) TokenIndex { - const result = p.tok_i; - p.tok_i += 1; - return result; - } -}; - -test { - _ = @import("parser_test.zig"); -} diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig index 49b0715695..3c44322ccc 100644 --- a/lib/std/zig/parser_test.zig +++ b/lib/std/zig/parser_test.zig @@ -6073,7 +6073,7 @@ var fixed_buffer_mem: [100 * 1024]u8 = undefined; fn testParse(source: [:0]const u8, allocator: mem.Allocator, anything_changed: *bool) ![]u8 { const stderr = io.getStdErr().writer(); - var tree = try std.zig.parse(allocator, source); + var tree = try std.zig.Ast.parse(allocator, source, .zig); defer tree.deinit(allocator); for (tree.errors) |parse_error| { @@ -6124,7 +6124,7 @@ fn testCanonical(source: [:0]const u8) !void { const Error = std.zig.Ast.Error.Tag; fn testError(source: [:0]const u8, expected_errors: []const Error) !void { - var tree = try std.zig.parse(std.testing.allocator, source); + var tree = try std.zig.Ast.parse(std.testing.allocator, source, .zig); defer tree.deinit(std.testing.allocator); std.testing.expectEqual(expected_errors.len, tree.errors.len) catch |err| { diff --git a/lib/std/zig/perf_test.zig b/lib/std/zig/perf_test.zig index d3fc90eaea..58f7a67694 100644 --- a/lib/std/zig/perf_test.zig +++ b/lib/std/zig/perf_test.zig @@ -1,7 +1,6 @@ const std = @import("std"); const mem = std.mem; const Tokenizer = std.zig.Tokenizer; -const Parser = std.zig.Parser; const io = std.io; const fmtIntSizeBin = std.fmt.fmtIntSizeBin; @@ -34,6 +33,6 @@ pub fn main() !void { fn testOnce() usize { var fixed_buf_alloc = std.heap.FixedBufferAllocator.init(fixed_buffer_mem[0..]); var allocator = fixed_buf_alloc.allocator(); - _ = std.zig.parse(allocator, source) catch @panic("parse failure"); + _ = std.zig.Ast.parse(allocator, source, .zig) catch @panic("parse failure"); return fixed_buf_alloc.end_index; } diff --git a/src/Module.zig b/src/Module.zig index b395c0a950..3bb15e78c3 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -2057,7 +2057,7 @@ pub const File = struct { if (file.tree_loaded) return &file.tree; const source = try file.getSource(gpa); - file.tree = try std.zig.parse(gpa, source.bytes); + file.tree = try Ast.parse(gpa, source.bytes, .zig); file.tree_loaded = true; return &file.tree; } @@ -3662,7 +3662,7 @@ pub fn astGenFile(mod: *Module, file: *File) !void { file.source = source; file.source_loaded = true; - file.tree = try std.zig.parse(gpa, source); + file.tree = try Ast.parse(gpa, source, .zig); defer if (!file.tree_loaded) file.tree.deinit(gpa); if (file.tree.errors.len != 0) { @@ -3977,7 +3977,7 @@ pub fn populateBuiltinFile(mod: *Module) !void { else => |e| return e, } - file.tree = try std.zig.parse(gpa, file.source); + file.tree = try Ast.parse(gpa, file.source, .zig); file.tree_loaded = true; assert(file.tree.errors.len == 0); // builtin.zig must parse diff --git a/src/main.zig b/src/main.zig index 72e7e094e6..06c36bad87 100644 --- a/src/main.zig +++ b/src/main.zig @@ -4361,7 +4361,7 @@ pub fn cmdFmt(gpa: Allocator, arena: Allocator, args: []const []const u8) !void }; defer gpa.free(source_code); - var tree = std.zig.parse(gpa, source_code) catch |err| { + var tree = Ast.parse(gpa, source_code, .zig) catch |err| { fatal("error parsing stdin: {}", .{err}); }; defer tree.deinit(gpa); @@ -4566,7 +4566,7 @@ fn fmtPathFile( // Add to set after no longer possible to get error.IsDir. if (try fmt.seen.fetchPut(stat.inode, {})) |_| return; - var tree = try std.zig.parse(fmt.gpa, source_code); + var tree = try Ast.parse(fmt.gpa, source_code, .zig); defer tree.deinit(fmt.gpa); try printErrsMsgToStdErr(fmt.gpa, fmt.arena, tree.errors, tree, file_path, fmt.color); @@ -5312,7 +5312,7 @@ pub fn cmdAstCheck( file.pkg = try Package.create(gpa, "root", null, file.sub_file_path); defer file.pkg.destroy(gpa); - file.tree = try std.zig.parse(gpa, file.source); + file.tree = try Ast.parse(gpa, file.source, .zig); file.tree_loaded = true; defer file.tree.deinit(gpa); @@ -5438,7 +5438,7 @@ pub fn cmdChangelist( file.source = source; file.source_loaded = true; - file.tree = try std.zig.parse(gpa, file.source); + file.tree = try Ast.parse(gpa, file.source, .zig); file.tree_loaded = true; defer file.tree.deinit(gpa); @@ -5476,7 +5476,7 @@ pub fn cmdChangelist( if (new_amt != new_stat.size) return error.UnexpectedEndOfFile; - var new_tree = try std.zig.parse(gpa, new_source); + var new_tree = try Ast.parse(gpa, new_source, .zig); defer new_tree.deinit(gpa); try printErrsMsgToStdErr(gpa, arena, new_tree.errors, new_tree, new_source_file, .auto); From 81c27c74bc8ccc8087b75c5d4eb1b350ad907cd0 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 2 Feb 2023 23:45:23 -0700 Subject: [PATCH 50/65] use build.zig.zon instead of build.zig.ini for the manifest file * improve error message when build manifest file is missing * update std.zig.Ast to support ZON * Compilation.AllErrors.Message: make the notes field a const slice * move build manifest parsing logic into src/Manifest.zig and add more checks, and make the checks integrate into the standard error reporting code so that reported errors look sexy closes #14290 --- lib/std/Build.zig | 4 +- lib/std/array_hash_map.zig | 3 +- lib/std/zig/Ast.zig | 4 + lib/std/zig/Parse.zig | 13 +- src/Compilation.zig | 2 +- src/Manifest.zig | 499 +++++++++++++++++++++++++++++++++++++ src/Package.zig | 347 ++++++++++---------------- src/main.zig | 17 +- 8 files changed, 665 insertions(+), 224 deletions(-) create mode 100644 src/Manifest.zig diff --git a/lib/std/Build.zig b/lib/std/Build.zig index d695637fc3..6846007443 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -1496,8 +1496,8 @@ pub fn dependency(b: *Build, name: []const u8, args: anytype) *Dependency { } } - const full_path = b.pathFromRoot("build.zig.ini"); - std.debug.print("no dependency named '{s}' in '{s}'\n", .{ name, full_path }); + const full_path = b.pathFromRoot("build.zig.zon"); + std.debug.print("no dependency named '{s}' in '{s}'. All packages used in build.zig must be declared in this file.\n", .{ name, full_path }); std.process.exit(1); } diff --git a/lib/std/array_hash_map.zig b/lib/std/array_hash_map.zig index cf04a54116..57821d1b51 100644 --- a/lib/std/array_hash_map.zig +++ b/lib/std/array_hash_map.zig @@ -1145,7 +1145,8 @@ pub fn ArrayHashMapUnmanaged( } /// Create a copy of the hash map which can be modified separately. - /// The copy uses the same context and allocator as this instance. + /// The copy uses the same context as this instance, but is allocated + /// with the provided allocator. pub fn clone(self: Self, allocator: Allocator) !Self { if (@sizeOf(ByIndexContext) != 0) @compileError("Cannot infer context " ++ @typeName(Context) ++ ", call cloneContext instead."); diff --git a/lib/std/zig/Ast.zig b/lib/std/zig/Ast.zig index a9a02606eb..80dda052ab 100644 --- a/lib/std/zig/Ast.zig +++ b/lib/std/zig/Ast.zig @@ -1,4 +1,8 @@ //! Abstract Syntax Tree for Zig source code. +//! For Zig syntax, the root node is at nodes[0] and contains the list of +//! sub-nodes. +//! For Zon syntax, the root node is at nodes[0] and contains lhs as the node +//! index of the main expression. /// Reference to externally-owned data. source: [:0]const u8, diff --git a/lib/std/zig/Parse.zig b/lib/std/zig/Parse.zig index f599a08f55..d498366b34 100644 --- a/lib/std/zig/Parse.zig +++ b/lib/std/zig/Parse.zig @@ -181,17 +181,26 @@ pub fn parseRoot(p: *Parse) !void { /// TODO: set a flag in Parse struct, and honor that flag /// by emitting compilation errors when non-zon nodes are encountered. pub fn parseZon(p: *Parse) !void { - const node_index = p.parseExpr() catch |err| switch (err) { + // We must use index 0 so that 0 can be used as null elsewhere. + p.nodes.appendAssumeCapacity(.{ + .tag = .root, + .main_token = 0, + .data = undefined, + }); + const node_index = p.expectExpr() catch |err| switch (err) { error.ParseError => { assert(p.errors.items.len > 0); return; }, else => |e| return e, }; - assert(node_index == 0); if (p.token_tags[p.tok_i] != .eof) { try p.warnExpected(.eof); } + p.nodes.items(.data)[0] = .{ + .lhs = node_index, + .rhs = undefined, + }; } /// ContainerMembers <- ContainerDeclarations (ContainerField COMMA)* (ContainerField / ContainerDeclarations) diff --git a/src/Compilation.zig b/src/Compilation.zig index 7d42d3b610..e09b8f18ab 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -385,7 +385,7 @@ pub const AllErrors = struct { count: u32 = 1, /// Does not include the trailing newline. source_line: ?[]const u8, - notes: []Message = &.{}, + notes: []const Message = &.{}, reference_trace: []Message = &.{}, /// Splits the error message up into lines to properly indent them diff --git a/src/Manifest.zig b/src/Manifest.zig new file mode 100644 index 0000000000..c3f77aec98 --- /dev/null +++ b/src/Manifest.zig @@ -0,0 +1,499 @@ +pub const basename = "build.zig.zon"; +pub const Hash = std.crypto.hash.sha2.Sha256; + +pub const Dependency = struct { + url: []const u8, + url_tok: Ast.TokenIndex, + hash: ?[]const u8, + hash_tok: Ast.TokenIndex, +}; + +pub const ErrorMessage = struct { + msg: []const u8, + tok: Ast.TokenIndex, + off: u32, +}; + +pub const MultihashFunction = enum(u16) { + identity = 0x00, + sha1 = 0x11, + @"sha2-256" = 0x12, + @"sha2-512" = 0x13, + @"sha3-512" = 0x14, + @"sha3-384" = 0x15, + @"sha3-256" = 0x16, + @"sha3-224" = 0x17, + @"sha2-384" = 0x20, + @"sha2-256-trunc254-padded" = 0x1012, + @"sha2-224" = 0x1013, + @"sha2-512-224" = 0x1014, + @"sha2-512-256" = 0x1015, + @"blake2b-256" = 0xb220, + _, +}; + +pub const multihash_function: MultihashFunction = switch (Hash) { + std.crypto.hash.sha2.Sha256 => .@"sha2-256", + else => @compileError("unreachable"), +}; +comptime { + // We avoid unnecessary uleb128 code in hexDigest by asserting here the + // values are small enough to be contained in the one-byte encoding. + assert(@enumToInt(multihash_function) < 127); + assert(Hash.digest_length < 127); +} +pub const multihash_len = 1 + 1 + Hash.digest_length; + +name: []const u8, +version: std.SemanticVersion, +dependencies: std.StringArrayHashMapUnmanaged(Dependency), + +errors: []ErrorMessage, +arena_state: std.heap.ArenaAllocator.State, + +pub const Error = Allocator.Error; + +pub fn parse(gpa: Allocator, ast: std.zig.Ast) Error!Manifest { + const node_tags = ast.nodes.items(.tag); + const node_datas = ast.nodes.items(.data); + assert(node_tags[0] == .root); + const main_node_index = node_datas[0].lhs; + + var arena_instance = std.heap.ArenaAllocator.init(gpa); + errdefer arena_instance.deinit(); + + var p: Parse = .{ + .gpa = gpa, + .ast = ast, + .arena = arena_instance.allocator(), + .errors = .{}, + + .name = undefined, + .version = undefined, + .dependencies = .{}, + .buf = .{}, + }; + defer p.buf.deinit(gpa); + defer p.errors.deinit(gpa); + defer p.dependencies.deinit(gpa); + + p.parseRoot(main_node_index) catch |err| switch (err) { + error.ParseFailure => assert(p.errors.items.len > 0), + else => |e| return e, + }; + + return .{ + .name = p.name, + .version = p.version, + .dependencies = try p.dependencies.clone(p.arena), + .errors = try p.arena.dupe(ErrorMessage, p.errors.items), + .arena_state = arena_instance.state, + }; +} + +pub fn deinit(man: *Manifest, gpa: Allocator) void { + man.arena_state.promote(gpa).deinit(); + man.* = undefined; +} + +const hex_charset = "0123456789abcdef"; + +pub fn hex64(x: u64) [16]u8 { + var result: [16]u8 = undefined; + var i: usize = 0; + while (i < 8) : (i += 1) { + const byte = @truncate(u8, x >> @intCast(u6, 8 * i)); + result[i * 2 + 0] = hex_charset[byte >> 4]; + result[i * 2 + 1] = hex_charset[byte & 15]; + } + return result; +} + +test hex64 { + const s = "[" ++ hex64(0x12345678_abcdef00) ++ "]"; + try std.testing.expectEqualStrings("[00efcdab78563412]", s); +} + +pub fn hexDigest(digest: [Hash.digest_length]u8) [multihash_len * 2]u8 { + var result: [multihash_len * 2]u8 = undefined; + + result[0] = hex_charset[@enumToInt(multihash_function) >> 4]; + result[1] = hex_charset[@enumToInt(multihash_function) & 15]; + + result[2] = hex_charset[Hash.digest_length >> 4]; + result[3] = hex_charset[Hash.digest_length & 15]; + + for (digest) |byte, i| { + result[4 + i * 2] = hex_charset[byte >> 4]; + result[5 + i * 2] = hex_charset[byte & 15]; + } + return result; +} + +const Parse = struct { + gpa: Allocator, + ast: std.zig.Ast, + arena: Allocator, + buf: std.ArrayListUnmanaged(u8), + errors: std.ArrayListUnmanaged(ErrorMessage), + + name: []const u8, + version: std.SemanticVersion, + dependencies: std.StringArrayHashMapUnmanaged(Dependency), + + const InnerError = error{ ParseFailure, OutOfMemory }; + + fn parseRoot(p: *Parse, node: Ast.Node.Index) !void { + const ast = p.ast; + const main_tokens = ast.nodes.items(.main_token); + const main_token = main_tokens[node]; + + var buf: [2]Ast.Node.Index = undefined; + const struct_init = ast.fullStructInit(&buf, node) orelse { + return fail(p, main_token, "expected top level expression to be a struct", .{}); + }; + + var have_name = false; + var have_version = false; + + for (struct_init.ast.fields) |field_init| { + const name_token = ast.firstToken(field_init) - 2; + const field_name = try identifierTokenString(p, name_token); + // We could get fancy with reflection and comptime logic here but doing + // things manually provides an opportunity to do any additional verification + // that is desirable on a per-field basis. + if (mem.eql(u8, field_name, "dependencies")) { + try parseDependencies(p, field_init); + } else if (mem.eql(u8, field_name, "name")) { + p.name = try parseString(p, field_init); + have_name = true; + } else if (mem.eql(u8, field_name, "version")) { + const version_text = try parseString(p, field_init); + p.version = std.SemanticVersion.parse(version_text) catch |err| v: { + try appendError(p, main_tokens[field_init], "unable to parse semantic version: {s}", .{@errorName(err)}); + break :v undefined; + }; + have_version = true; + } else { + // Ignore unknown fields so that we can add fields in future zig + // versions without breaking older zig versions. + } + } + + if (!have_name) { + try appendError(p, main_token, "missing top-level 'name' field", .{}); + } + + if (!have_version) { + try appendError(p, main_token, "missing top-level 'version' field", .{}); + } + } + + fn parseDependencies(p: *Parse, node: Ast.Node.Index) !void { + const ast = p.ast; + const main_tokens = ast.nodes.items(.main_token); + + var buf: [2]Ast.Node.Index = undefined; + const struct_init = ast.fullStructInit(&buf, node) orelse { + const tok = main_tokens[node]; + return fail(p, tok, "expected dependencies expression to be a struct", .{}); + }; + + for (struct_init.ast.fields) |field_init| { + const name_token = ast.firstToken(field_init) - 2; + const dep_name = try identifierTokenString(p, name_token); + const dep = try parseDependency(p, field_init); + try p.dependencies.put(p.gpa, dep_name, dep); + } + } + + fn parseDependency(p: *Parse, node: Ast.Node.Index) !Dependency { + const ast = p.ast; + const main_tokens = ast.nodes.items(.main_token); + + var buf: [2]Ast.Node.Index = undefined; + const struct_init = ast.fullStructInit(&buf, node) orelse { + const tok = main_tokens[node]; + return fail(p, tok, "expected dependency expression to be a struct", .{}); + }; + + var dep: Dependency = .{ + .url = undefined, + .url_tok = undefined, + .hash = null, + .hash_tok = undefined, + }; + var have_url = false; + + for (struct_init.ast.fields) |field_init| { + const name_token = ast.firstToken(field_init) - 2; + const field_name = try identifierTokenString(p, name_token); + // We could get fancy with reflection and comptime logic here but doing + // things manually provides an opportunity to do any additional verification + // that is desirable on a per-field basis. + if (mem.eql(u8, field_name, "url")) { + dep.url = parseString(p, field_init) catch |err| switch (err) { + error.ParseFailure => continue, + else => |e| return e, + }; + dep.url_tok = main_tokens[field_init]; + have_url = true; + } else if (mem.eql(u8, field_name, "hash")) { + dep.hash = parseHash(p, field_init) catch |err| switch (err) { + error.ParseFailure => continue, + else => |e| return e, + }; + dep.hash_tok = main_tokens[field_init]; + } else { + // Ignore unknown fields so that we can add fields in future zig + // versions without breaking older zig versions. + } + } + + if (!have_url) { + try appendError(p, main_tokens[node], "dependency is missing 'url' field", .{}); + } + + return dep; + } + + fn parseString(p: *Parse, node: Ast.Node.Index) ![]const u8 { + const ast = p.ast; + const node_tags = ast.nodes.items(.tag); + const main_tokens = ast.nodes.items(.main_token); + if (node_tags[node] != .string_literal) { + return fail(p, main_tokens[node], "expected string literal", .{}); + } + const str_lit_token = main_tokens[node]; + const token_bytes = ast.tokenSlice(str_lit_token); + p.buf.clearRetainingCapacity(); + try parseStrLit(p, str_lit_token, &p.buf, token_bytes, 0); + const duped = try p.arena.dupe(u8, p.buf.items); + return duped; + } + + fn parseHash(p: *Parse, node: Ast.Node.Index) ![]const u8 { + const ast = p.ast; + const main_tokens = ast.nodes.items(.main_token); + const tok = main_tokens[node]; + const h = try parseString(p, node); + + if (h.len >= 2) { + const their_multihash_func = std.fmt.parseInt(u8, h[0..2], 16) catch |err| { + return fail(p, tok, "invalid multihash value: unable to parse hash function: {s}", .{ + @errorName(err), + }); + }; + if (@intToEnum(MultihashFunction, their_multihash_func) != multihash_function) { + return fail(p, tok, "unsupported hash function: only sha2-256 is supported", .{}); + } + } + + const hex_multihash_len = 2 * Manifest.multihash_len; + if (h.len != hex_multihash_len) { + return fail(p, tok, "wrong hash size. expected: {d}, found: {d}", .{ + hex_multihash_len, h.len, + }); + } + + return h; + } + + /// TODO: try to DRY this with AstGen.identifierTokenString + fn identifierTokenString(p: *Parse, token: Ast.TokenIndex) InnerError![]const u8 { + const ast = p.ast; + const token_tags = ast.tokens.items(.tag); + assert(token_tags[token] == .identifier); + const ident_name = ast.tokenSlice(token); + if (!mem.startsWith(u8, ident_name, "@")) { + return ident_name; + } + p.buf.clearRetainingCapacity(); + try parseStrLit(p, token, &p.buf, ident_name, 1); + const duped = try p.arena.dupe(u8, p.buf.items); + return duped; + } + + /// TODO: try to DRY this with AstGen.parseStrLit + fn parseStrLit( + p: *Parse, + token: Ast.TokenIndex, + buf: *std.ArrayListUnmanaged(u8), + bytes: []const u8, + offset: u32, + ) InnerError!void { + const raw_string = bytes[offset..]; + var buf_managed = buf.toManaged(p.gpa); + const result = std.zig.string_literal.parseWrite(buf_managed.writer(), raw_string); + buf.* = buf_managed.moveToUnmanaged(); + switch (try result) { + .success => {}, + .failure => |err| try p.appendStrLitError(err, token, bytes, offset), + } + } + + /// TODO: try to DRY this with AstGen.failWithStrLitError + fn appendStrLitError( + p: *Parse, + err: std.zig.string_literal.Error, + token: Ast.TokenIndex, + bytes: []const u8, + offset: u32, + ) Allocator.Error!void { + const raw_string = bytes[offset..]; + switch (err) { + .invalid_escape_character => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "invalid escape character: '{c}'", + .{raw_string[bad_index]}, + ); + }, + .expected_hex_digit => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "expected hex digit, found '{c}'", + .{raw_string[bad_index]}, + ); + }, + .empty_unicode_escape_sequence => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "empty unicode escape sequence", + .{}, + ); + }, + .expected_hex_digit_or_rbrace => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "expected hex digit or '}}', found '{c}'", + .{raw_string[bad_index]}, + ); + }, + .invalid_unicode_codepoint => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "unicode escape does not correspond to a valid codepoint", + .{}, + ); + }, + .expected_lbrace => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "expected '{{', found '{c}", + .{raw_string[bad_index]}, + ); + }, + .expected_rbrace => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "expected '}}', found '{c}", + .{raw_string[bad_index]}, + ); + }, + .expected_single_quote => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "expected single quote ('), found '{c}", + .{raw_string[bad_index]}, + ); + }, + .invalid_character => |bad_index| { + try p.appendErrorOff( + token, + offset + @intCast(u32, bad_index), + "invalid byte in string or character literal: '{c}'", + .{raw_string[bad_index]}, + ); + }, + } + } + + fn fail( + p: *Parse, + tok: Ast.TokenIndex, + comptime fmt: []const u8, + args: anytype, + ) InnerError { + try appendError(p, tok, fmt, args); + return error.ParseFailure; + } + + fn appendError(p: *Parse, tok: Ast.TokenIndex, comptime fmt: []const u8, args: anytype) !void { + return appendErrorOff(p, tok, 0, fmt, args); + } + + fn appendErrorOff( + p: *Parse, + tok: Ast.TokenIndex, + byte_offset: u32, + comptime fmt: []const u8, + args: anytype, + ) Allocator.Error!void { + try p.errors.append(p.gpa, .{ + .msg = try std.fmt.allocPrint(p.arena, fmt, args), + .tok = tok, + .off = byte_offset, + }); + } +}; + +const Manifest = @This(); +const std = @import("std"); +const mem = std.mem; +const Allocator = std.mem.Allocator; +const assert = std.debug.assert; +const Ast = std.zig.Ast; +const testing = std.testing; + +test "basic" { + const gpa = testing.allocator; + + const example = + \\.{ + \\ .name = "foo", + \\ .version = "3.2.1", + \\ .dependencies = .{ + \\ .bar = .{ + \\ .url = "https://example.com/baz.tar.gz", + \\ .hash = "1220f1b680b6065fcfc94fe777f22e73bcb7e2767e5f4d99d4255fe76ded69c7a35f", + \\ }, + \\ }, + \\} + ; + + var ast = try std.zig.Ast.parse(gpa, example, .zon); + defer ast.deinit(gpa); + + try testing.expect(ast.errors.len == 0); + + var manifest = try Manifest.parse(gpa, ast); + defer manifest.deinit(gpa); + + try testing.expectEqualStrings("foo", manifest.name); + + try testing.expectEqual(@as(std.SemanticVersion, .{ + .major = 3, + .minor = 2, + .patch = 1, + }), manifest.version); + + try testing.expect(manifest.dependencies.count() == 1); + try testing.expectEqualStrings("bar", manifest.dependencies.keys()[0]); + try testing.expectEqualStrings( + "https://example.com/baz.tar.gz", + manifest.dependencies.values()[0].url, + ); + try testing.expectEqualStrings( + "1220f1b680b6065fcfc94fe777f22e73bcb7e2767e5f4d99d4255fe76ded69c7a35f", + manifest.dependencies.values()[0].hash orelse return error.TestFailed, + ); +} diff --git a/src/Package.zig b/src/Package.zig index 35b1ff5056..401eef2121 100644 --- a/src/Package.zig +++ b/src/Package.zig @@ -6,8 +6,8 @@ const fs = std.fs; const mem = std.mem; const Allocator = mem.Allocator; const assert = std.debug.assert; -const Hash = std.crypto.hash.sha2.Sha256; const log = std.log.scoped(.package); +const main = @import("main.zig"); const Compilation = @import("Compilation.zig"); const Module = @import("Module.zig"); @@ -15,6 +15,7 @@ const ThreadPool = @import("ThreadPool.zig"); const WaitGroup = @import("WaitGroup.zig"); const Cache = @import("Cache.zig"); const build_options = @import("build_options"); +const Manifest = @import("Manifest.zig"); pub const Table = std.StringHashMapUnmanaged(*Package); @@ -141,10 +142,10 @@ pub fn addAndAdopt(parent: *Package, gpa: Allocator, child: *Package) !void { } pub const build_zig_basename = "build.zig"; -pub const ini_basename = build_zig_basename ++ ".ini"; pub fn fetchAndAddDependencies( pkg: *Package, + arena: Allocator, thread_pool: *ThreadPool, http_client: *std.http.Client, directory: Compilation.Directory, @@ -153,89 +154,77 @@ pub fn fetchAndAddDependencies( dependencies_source: *std.ArrayList(u8), build_roots_source: *std.ArrayList(u8), name_prefix: []const u8, + color: main.Color, ) !void { const max_bytes = 10 * 1024 * 1024; const gpa = thread_pool.allocator; - const build_zig_ini = directory.handle.readFileAlloc(gpa, ini_basename, max_bytes) catch |err| switch (err) { + const build_zig_zon_bytes = directory.handle.readFileAllocOptions( + arena, + Manifest.basename, + max_bytes, + null, + 1, + 0, + ) catch |err| switch (err) { error.FileNotFound => { // Handle the same as no dependencies. return; }, else => |e| return e, }; - defer gpa.free(build_zig_ini); - const ini: std.Ini = .{ .bytes = build_zig_ini }; - var any_error = false; - var it = ini.iterateSection("\n[dependency]\n"); - while (it.next()) |dep| { - var line_it = mem.split(u8, dep, "\n"); - var opt_name: ?[]const u8 = null; - var opt_url: ?[]const u8 = null; - var expected_hash: ?[]const u8 = null; - while (line_it.next()) |kv| { - const eq_pos = mem.indexOfScalar(u8, kv, '=') orelse continue; - const key = kv[0..eq_pos]; - const value = kv[eq_pos + 1 ..]; - if (mem.eql(u8, key, "name")) { - opt_name = value; - } else if (mem.eql(u8, key, "url")) { - opt_url = value; - } else if (mem.eql(u8, key, "hash")) { - expected_hash = value; - } else { - const loc = std.zig.findLineColumn(ini.bytes, @ptrToInt(key.ptr) - @ptrToInt(ini.bytes.ptr)); - std.log.warn("{s}/{s}:{d}:{d} unrecognized key: '{s}'", .{ - directory.path orelse ".", - "build.zig.ini", - loc.line, - loc.column, - key, - }); - } + var ast = try std.zig.Ast.parse(gpa, build_zig_zon_bytes, .zon); + defer ast.deinit(gpa); + + if (ast.errors.len > 0) { + const file_path = try directory.join(arena, &.{Manifest.basename}); + try main.printErrsMsgToStdErr(gpa, arena, ast, file_path, color); + return error.PackageFetchFailed; + } + + var manifest = try Manifest.parse(gpa, ast); + defer manifest.deinit(gpa); + + if (manifest.errors.len > 0) { + const ttyconf: std.debug.TTY.Config = switch (color) { + .auto => std.debug.detectTTYConfig(std.io.getStdErr()), + .on => .escape_codes, + .off => .no_color, + }; + const file_path = try directory.join(arena, &.{Manifest.basename}); + for (manifest.errors) |msg| { + Report.renderErrorMessage(ast, file_path, ttyconf, msg, &.{}); } + return error.PackageFetchFailed; + } - const name = opt_name orelse { - const loc = std.zig.findLineColumn(ini.bytes, @ptrToInt(dep.ptr) - @ptrToInt(ini.bytes.ptr)); - std.log.err("{s}/{s}:{d}:{d} missing key: 'name'", .{ - directory.path orelse ".", - "build.zig.ini", - loc.line, - loc.column, - }); - any_error = true; - continue; - }; + const report: Report = .{ + .ast = &ast, + .directory = directory, + .color = color, + .arena = arena, + }; - const url = opt_url orelse { - const loc = std.zig.findLineColumn(ini.bytes, @ptrToInt(dep.ptr) - @ptrToInt(ini.bytes.ptr)); - std.log.err("{s}/{s}:{d}:{d} missing key: 'name'", .{ - directory.path orelse ".", - "build.zig.ini", - loc.line, - loc.column, - }); - any_error = true; - continue; - }; + var any_error = false; + const deps_list = manifest.dependencies.values(); + for (manifest.dependencies.keys()) |name, i| { + const dep = deps_list[i]; - const sub_prefix = try std.fmt.allocPrint(gpa, "{s}{s}.", .{ name_prefix, name }); - defer gpa.free(sub_prefix); + const sub_prefix = try std.fmt.allocPrint(arena, "{s}{s}.", .{ name_prefix, name }); const fqn = sub_prefix[0 .. sub_prefix.len - 1]; const sub_pkg = try fetchAndUnpack( thread_pool, http_client, global_cache_directory, - url, - expected_hash, - ini, - directory, + dep, + report, build_roots_source, fqn, ); try pkg.fetchAndAddDependencies( + arena, thread_pool, http_client, sub_pkg.root_src_directory, @@ -244,6 +233,7 @@ pub fn fetchAndAddDependencies( dependencies_source, build_roots_source, sub_prefix, + color, ); try addAndAdopt(pkg, gpa, sub_pkg); @@ -253,7 +243,7 @@ pub fn fetchAndAddDependencies( }); } - if (any_error) return error.InvalidBuildZigIniFile; + if (any_error) return error.InvalidBuildManifestFile; } pub fn createFilePkg( @@ -264,7 +254,7 @@ pub fn createFilePkg( contents: []const u8, ) !*Package { const rand_int = std.crypto.random.int(u64); - const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ hex64(rand_int); + const tmp_dir_sub_path = "tmp" ++ fs.path.sep_str ++ Manifest.hex64(rand_int); { var tmp_dir = try cache_directory.handle.makeOpenPath(tmp_dir_sub_path, .{}); defer tmp_dir.close(); @@ -282,14 +272,73 @@ pub fn createFilePkg( return createWithDir(gpa, name, cache_directory, o_dir_sub_path, basename); } +const Report = struct { + ast: *const std.zig.Ast, + directory: Compilation.Directory, + color: main.Color, + arena: Allocator, + + fn fail( + report: Report, + tok: std.zig.Ast.TokenIndex, + comptime fmt_string: []const u8, + fmt_args: anytype, + ) error{ PackageFetchFailed, OutOfMemory } { + return failWithNotes(report, &.{}, tok, fmt_string, fmt_args); + } + + fn failWithNotes( + report: Report, + notes: []const Compilation.AllErrors.Message, + tok: std.zig.Ast.TokenIndex, + comptime fmt_string: []const u8, + fmt_args: anytype, + ) error{ PackageFetchFailed, OutOfMemory } { + const ttyconf: std.debug.TTY.Config = switch (report.color) { + .auto => std.debug.detectTTYConfig(std.io.getStdErr()), + .on => .escape_codes, + .off => .no_color, + }; + const file_path = try report.directory.join(report.arena, &.{Manifest.basename}); + renderErrorMessage(report.ast.*, file_path, ttyconf, .{ + .tok = tok, + .off = 0, + .msg = try std.fmt.allocPrint(report.arena, fmt_string, fmt_args), + }, notes); + return error.PackageFetchFailed; + } + + fn renderErrorMessage( + ast: std.zig.Ast, + file_path: []const u8, + ttyconf: std.debug.TTY.Config, + msg: Manifest.ErrorMessage, + notes: []const Compilation.AllErrors.Message, + ) void { + const token_starts = ast.tokens.items(.start); + const start_loc = ast.tokenLocation(0, msg.tok); + Compilation.AllErrors.Message.renderToStdErr(.{ .src = .{ + .msg = msg.msg, + .src_path = file_path, + .line = @intCast(u32, start_loc.line), + .column = @intCast(u32, start_loc.column), + .span = .{ + .start = token_starts[msg.tok], + .end = @intCast(u32, token_starts[msg.tok] + ast.tokenSlice(msg.tok).len), + .main = token_starts[msg.tok] + msg.off, + }, + .source_line = ast.source[start_loc.line_start..start_loc.line_end], + .notes = notes, + } }, ttyconf); + } +}; + fn fetchAndUnpack( thread_pool: *ThreadPool, http_client: *std.http.Client, global_cache_directory: Compilation.Directory, - url: []const u8, - expected_hash: ?[]const u8, - ini: std.Ini, - comp_directory: Compilation.Directory, + dep: Manifest.Dependency, + report: Report, build_roots_source: *std.ArrayList(u8), fqn: []const u8, ) !*Package { @@ -298,37 +347,8 @@ fn fetchAndUnpack( // Check if the expected_hash is already present in the global package // cache, and thereby avoid both fetching and unpacking. - if (expected_hash) |h| cached: { - const hex_multihash_len = 2 * multihash_len; - if (h.len >= 2) { - const their_multihash_func = std.fmt.parseInt(u8, h[0..2], 16) catch |err| { - return reportError( - ini, - comp_directory, - h.ptr, - "invalid multihash value: unable to parse hash function: {s}", - .{@errorName(err)}, - ); - }; - if (@intToEnum(MultihashFunction, their_multihash_func) != multihash_function) { - return reportError( - ini, - comp_directory, - h.ptr, - "unsupported hash function: only sha2-256 is supported", - .{}, - ); - } - } - if (h.len != hex_multihash_len) { - return reportError( - ini, - comp_directory, - h.ptr, - "wrong hash size. expected: {d}, found: {d}", - .{ hex_multihash_len, h.len }, - ); - } + if (dep.hash) |h| cached: { + const hex_multihash_len = 2 * Manifest.multihash_len; const hex_digest = h[0..hex_multihash_len]; const pkg_dir_sub_path = "p" ++ s ++ hex_digest; var pkg_dir = global_cache_directory.handle.openDir(pkg_dir_sub_path, .{}) catch |err| switch (err) { @@ -366,10 +386,10 @@ fn fetchAndUnpack( return ptr; } - const uri = try std.Uri.parse(url); + const uri = try std.Uri.parse(dep.url); const rand_int = std.crypto.random.int(u64); - const tmp_dir_sub_path = "tmp" ++ s ++ hex64(rand_int); + const tmp_dir_sub_path = "tmp" ++ s ++ Manifest.hex64(rand_int); const actual_hash = a: { var tmp_directory: Compilation.Directory = d: { @@ -398,13 +418,9 @@ fn fetchAndUnpack( // by default, so the same logic applies for buffering the reader as for gzip. try unpackTarball(gpa, &req, tmp_directory.handle, std.compress.xz); } else { - return reportError( - ini, - comp_directory, - uri.path.ptr, - "unknown file extension for path '{s}'", - .{uri.path}, - ); + return report.fail(dep.url_tok, "unknown file extension for path '{s}'", .{ + uri.path, + }); } // TODO: delete files not included in the package prior to computing the package hash. @@ -415,28 +431,21 @@ fn fetchAndUnpack( break :a try computePackageHash(thread_pool, .{ .dir = tmp_directory.handle }); }; - const pkg_dir_sub_path = "p" ++ s ++ hexDigest(actual_hash); + const pkg_dir_sub_path = "p" ++ s ++ Manifest.hexDigest(actual_hash); try renameTmpIntoCache(global_cache_directory.handle, tmp_dir_sub_path, pkg_dir_sub_path); - const actual_hex = hexDigest(actual_hash); - if (expected_hash) |h| { + const actual_hex = Manifest.hexDigest(actual_hash); + if (dep.hash) |h| { if (!mem.eql(u8, h, &actual_hex)) { - return reportError( - ini, - comp_directory, - h.ptr, - "hash mismatch: expected: {s}, found: {s}", - .{ h, actual_hex }, - ); + return report.fail(dep.hash_tok, "hash mismatch: expected: {s}, found: {s}", .{ + h, actual_hex, + }); } } else { - return reportError( - ini, - comp_directory, - url.ptr, - "url field is missing corresponding hash field: hash={s}", - .{&actual_hex}, - ); + const notes: [1]Compilation.AllErrors.Message = .{.{ .plain = .{ + .msg = try std.fmt.allocPrint(report.arena, "expected .hash = \"{s}\",", .{&actual_hex}), + } }}; + return report.failWithNotes(¬es, dep.url_tok, "url field is missing corresponding hash field", .{}); } const build_root = try global_cache_directory.join(gpa, &.{pkg_dir_sub_path}); @@ -471,29 +480,9 @@ fn unpackTarball( }); } -fn reportError( - ini: std.Ini, - comp_directory: Compilation.Directory, - src_ptr: [*]const u8, - comptime fmt_string: []const u8, - fmt_args: anytype, -) error{PackageFetchFailed} { - const loc = std.zig.findLineColumn(ini.bytes, @ptrToInt(src_ptr) - @ptrToInt(ini.bytes.ptr)); - if (comp_directory.path) |p| { - std.debug.print("{s}{c}{s}:{d}:{d}: error: " ++ fmt_string ++ "\n", .{ - p, fs.path.sep, ini_basename, loc.line + 1, loc.column + 1, - } ++ fmt_args); - } else { - std.debug.print("{s}:{d}:{d}: error: " ++ fmt_string ++ "\n", .{ - ini_basename, loc.line + 1, loc.column + 1, - } ++ fmt_args); - } - return error.PackageFetchFailed; -} - const HashedFile = struct { path: []const u8, - hash: [Hash.digest_length]u8, + hash: [Manifest.Hash.digest_length]u8, failure: Error!void, const Error = fs.File.OpenError || fs.File.ReadError || fs.File.StatError; @@ -507,7 +496,7 @@ const HashedFile = struct { fn computePackageHash( thread_pool: *ThreadPool, pkg_dir: fs.IterableDir, -) ![Hash.digest_length]u8 { +) ![Manifest.Hash.digest_length]u8 { const gpa = thread_pool.allocator; // We'll use an arena allocator for the path name strings since they all @@ -550,7 +539,7 @@ fn computePackageHash( std.sort.sort(*HashedFile, all_files.items, {}, HashedFile.lessThan); - var hasher = Hash.init(.{}); + var hasher = Manifest.Hash.init(.{}); var any_failures = false; for (all_files.items) |hashed_file| { hashed_file.failure catch |err| { @@ -571,7 +560,7 @@ fn workerHashFile(dir: fs.Dir, hashed_file: *HashedFile, wg: *WaitGroup) void { fn hashFileFallible(dir: fs.Dir, hashed_file: *HashedFile) HashedFile.Error!void { var buf: [8000]u8 = undefined; var file = try dir.openFile(hashed_file.path, .{}); - var hasher = Hash.init(.{}); + var hasher = Manifest.Hash.init(.{}); hasher.update(hashed_file.path); hasher.update(&.{ 0, @boolToInt(try isExecutable(file)) }); while (true) { @@ -595,52 +584,6 @@ fn isExecutable(file: fs.File) !bool { } } -const hex_charset = "0123456789abcdef"; - -fn hex64(x: u64) [16]u8 { - var result: [16]u8 = undefined; - var i: usize = 0; - while (i < 8) : (i += 1) { - const byte = @truncate(u8, x >> @intCast(u6, 8 * i)); - result[i * 2 + 0] = hex_charset[byte >> 4]; - result[i * 2 + 1] = hex_charset[byte & 15]; - } - return result; -} - -test hex64 { - const s = "[" ++ hex64(0x12345678_abcdef00) ++ "]"; - try std.testing.expectEqualStrings("[00efcdab78563412]", s); -} - -const multihash_function: MultihashFunction = switch (Hash) { - std.crypto.hash.sha2.Sha256 => .@"sha2-256", - else => @compileError("unreachable"), -}; -comptime { - // We avoid unnecessary uleb128 code in hexDigest by asserting here the - // values are small enough to be contained in the one-byte encoding. - assert(@enumToInt(multihash_function) < 127); - assert(Hash.digest_length < 127); -} -const multihash_len = 1 + 1 + Hash.digest_length; - -fn hexDigest(digest: [Hash.digest_length]u8) [multihash_len * 2]u8 { - var result: [multihash_len * 2]u8 = undefined; - - result[0] = hex_charset[@enumToInt(multihash_function) >> 4]; - result[1] = hex_charset[@enumToInt(multihash_function) & 15]; - - result[2] = hex_charset[Hash.digest_length >> 4]; - result[3] = hex_charset[Hash.digest_length & 15]; - - for (digest) |byte, i| { - result[4 + i * 2] = hex_charset[byte >> 4]; - result[5 + i * 2] = hex_charset[byte & 15]; - } - return result; -} - fn renameTmpIntoCache( cache_dir: fs.Dir, tmp_dir_sub_path: []const u8, @@ -669,21 +612,3 @@ fn renameTmpIntoCache( break; } } - -const MultihashFunction = enum(u16) { - identity = 0x00, - sha1 = 0x11, - @"sha2-256" = 0x12, - @"sha2-512" = 0x13, - @"sha3-512" = 0x14, - @"sha3-384" = 0x15, - @"sha3-256" = 0x16, - @"sha3-224" = 0x17, - @"sha2-384" = 0x20, - @"sha2-256-trunc254-padded" = 0x1012, - @"sha2-224" = 0x1013, - @"sha2-512-224" = 0x1014, - @"sha2-512-256" = 0x1015, - @"blake2b-256" = 0xb220, - _, -}; diff --git a/src/main.zig b/src/main.zig index 06c36bad87..f634c259ff 100644 --- a/src/main.zig +++ b/src/main.zig @@ -3915,6 +3915,7 @@ pub const usage_build = ; pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void { + var color: Color = .auto; var prominent_compile_errors: bool = false; // We want to release all the locks before executing the child process, so we make a nice @@ -4117,6 +4118,7 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi // Here we borrow main package's table and will replace it with a fresh // one after this process completes. main_pkg.fetchAndAddDependencies( + arena, &thread_pool, &http_client, build_directory, @@ -4125,6 +4127,7 @@ pub fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !voi &dependencies_source, &build_roots_source, "", + color, ) catch |err| switch (err) { error.PackageFetchFailed => process.exit(1), else => |e| return e, @@ -4366,7 +4369,7 @@ pub fn cmdFmt(gpa: Allocator, arena: Allocator, args: []const []const u8) !void }; defer tree.deinit(gpa); - try printErrsMsgToStdErr(gpa, arena, tree.errors, tree, "", color); + try printErrsMsgToStdErr(gpa, arena, tree, "", color); var has_ast_error = false; if (check_ast_flag) { const Module = @import("Module.zig"); @@ -4569,7 +4572,7 @@ fn fmtPathFile( var tree = try Ast.parse(fmt.gpa, source_code, .zig); defer tree.deinit(fmt.gpa); - try printErrsMsgToStdErr(fmt.gpa, fmt.arena, tree.errors, tree, file_path, fmt.color); + try printErrsMsgToStdErr(fmt.gpa, fmt.arena, tree, file_path, fmt.color); if (tree.errors.len != 0) { fmt.any_error = true; return; @@ -4649,14 +4652,14 @@ fn fmtPathFile( } } -fn printErrsMsgToStdErr( +pub fn printErrsMsgToStdErr( gpa: mem.Allocator, arena: mem.Allocator, - parse_errors: []const Ast.Error, tree: Ast, path: []const u8, color: Color, ) !void { + const parse_errors: []const Ast.Error = tree.errors; var i: usize = 0; while (i < parse_errors.len) : (i += 1) { const parse_error = parse_errors[i]; @@ -5316,7 +5319,7 @@ pub fn cmdAstCheck( file.tree_loaded = true; defer file.tree.deinit(gpa); - try printErrsMsgToStdErr(gpa, arena, file.tree.errors, file.tree, file.sub_file_path, color); + try printErrsMsgToStdErr(gpa, arena, file.tree, file.sub_file_path, color); if (file.tree.errors.len != 0) { process.exit(1); } @@ -5442,7 +5445,7 @@ pub fn cmdChangelist( file.tree_loaded = true; defer file.tree.deinit(gpa); - try printErrsMsgToStdErr(gpa, arena, file.tree.errors, file.tree, old_source_file, .auto); + try printErrsMsgToStdErr(gpa, arena, file.tree, old_source_file, .auto); if (file.tree.errors.len != 0) { process.exit(1); } @@ -5479,7 +5482,7 @@ pub fn cmdChangelist( var new_tree = try Ast.parse(gpa, new_source, .zig); defer new_tree.deinit(gpa); - try printErrsMsgToStdErr(gpa, arena, new_tree.errors, new_tree, new_source_file, .auto); + try printErrsMsgToStdErr(gpa, arena, new_tree, new_source_file, .auto); if (new_tree.errors.len != 0) { process.exit(1); } From 9db084f43d6f253f36484b9e3b76ea483917a893 Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Thu, 2 Feb 2023 00:54:07 -0800 Subject: [PATCH 51/65] Add test for optional error set return types Closes #5820 --- test/behavior/error.zig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/test/behavior/error.zig b/test/behavior/error.zig index b2a6cc5a50..f30290eb91 100644 --- a/test/behavior/error.zig +++ b/test/behavior/error.zig @@ -896,3 +896,18 @@ test "optional error union return type" { }; try expect(1234 == try S.foo().?); } + +test "optional error set return type" { + if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO + if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO + + const E = error{ A, B }; + const S = struct { + fn foo(return_null: bool) ?E { + return if (return_null) null else E.A; + } + }; + + try expect(null == S.foo(true)); + try expect(E.A == S.foo(false).?); +} From c181ba102234756f39207402d4932303449f1c41 Mon Sep 17 00:00:00 2001 From: Manlio Perillo Date: Thu, 2 Feb 2023 15:11:13 +0100 Subject: [PATCH 52/65] langref: remove link to closed issue #4026 In the math builtin functions documentation, remove the link to issue https://github.com/ziglang/zig/issues/4026, since it was closed by https://github.com/ziglang/zig/pull/11532. --- doc/langref.html.in | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-) diff --git a/doc/langref.html.in b/doc/langref.html.in index a6a46979c4..36711e555a 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -9206,8 +9206,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@sin#} @@ -9217,8 +9216,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} @@ -9229,8 +9227,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} @@ -9241,8 +9238,7 @@ fn doTheTest() !void { Uses a dedicated hardware instruction when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} @@ -9253,8 +9249,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@exp2#} @@ -9264,8 +9259,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@log#} @@ -9275,8 +9269,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@log2#} @@ -9286,8 +9279,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@log10#} @@ -9297,8 +9289,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@fabs#} @@ -9308,8 +9299,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@floor#} @@ -9319,8 +9309,7 @@ fn doTheTest() !void { Uses a dedicated hardware instruction when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@ceil#} @@ -9330,8 +9319,7 @@ fn doTheTest() !void { Uses a dedicated hardware instruction when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@trunc#} @@ -9341,8 +9329,7 @@ fn doTheTest() !void { Uses a dedicated hardware instruction when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} {#header_open|@round#} @@ -9352,8 +9339,7 @@ fn doTheTest() !void { when available.

- Supports {#link|Floats#} and {#link|Vectors#} of floats, with the caveat that - some float operations are not yet implemented for all float types. + Supports {#link|Floats#} and {#link|Vectors#} of floats.

{#header_close#} From 4c7f8286d53bf3df22b1a4596cfdd38d3736240e Mon Sep 17 00:00:00 2001 From: Loris Cro Date: Fri, 3 Feb 2023 18:05:07 +0100 Subject: [PATCH 53/65] autodoc: fix search regression --- lib/docs/main.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/docs/main.js b/lib/docs/main.js index 62af5866b6..fae39c5fba 100644 --- a/lib/docs/main.js +++ b/lib/docs/main.js @@ -3162,7 +3162,6 @@ const NAV_MODES = { canonTypeDecls = new Array(zigAnalysis.types.length); for (let pkgI = 0; pkgI < zigAnalysis.packages.length; pkgI += 1) { - if (pkgI === zigAnalysis.rootPkg && rootIsStd) continue; let pkg = zigAnalysis.packages[pkgI]; let pkgNames = canonPkgPaths[pkgI]; if (pkgNames === undefined) continue; From c9b957c937ef457083f1a00c1343239086ef8796 Mon Sep 17 00:00:00 2001 From: Luuk de Gram Date: Fri, 3 Feb 2023 16:46:55 +0100 Subject: [PATCH 54/65] link: remove `FnData` and make it self-owned This finishes the work started in #14502 where atoms are owned by the linker themselves. This now makes debug atoms fully owned by dwarf, and no information is left stored on the decl. --- src/Module.zig | 12 ------------ src/arch/wasm/CodeGen.zig | 6 +++--- src/link/Wasm.zig | 32 +++++++++++++++++++------------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/Module.zig b/src/Module.zig index 3bb15e78c3..3243c36ee5 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -531,9 +531,6 @@ pub const Decl = struct { /// What kind of a declaration is this. kind: Kind, - /// TODO remove this once Wasm backend catches up - fn_link: ?link.File.Wasm.FnData = null, - /// The shallow set of other decls whose typed_value could possibly change if this Decl's /// typed_value is modified. dependants: DepsTable = .{}, @@ -5247,11 +5244,6 @@ pub fn clearDecl( if (decl.has_tv) { if (decl.ty.isFnOrHasRuntimeBits()) { mod.comp.bin_file.freeDecl(decl_index); - - decl.fn_link = switch (mod.comp.bin_file.tag) { - .wasm => link.File.Wasm.FnData.empty, - else => null, - }; } if (decl.getInnerNamespace()) |namespace| { try namespace.deleteAllDecls(mod, outdated_decls); @@ -5652,10 +5644,6 @@ pub fn allocateNewDecl( .deletion_flag = false, .zir_decl_index = 0, .src_scope = src_scope, - .fn_link = switch (mod.comp.bin_file.tag) { - .wasm => link.File.Wasm.FnData.empty, - else => null, - }, .generation = 0, .is_pub = false, .is_exported = false, diff --git a/src/arch/wasm/CodeGen.zig b/src/arch/wasm/CodeGen.zig index ec494b1a57..7ce6a0482b 100644 --- a/src/arch/wasm/CodeGen.zig +++ b/src/arch/wasm/CodeGen.zig @@ -1194,7 +1194,7 @@ fn genFunc(func: *CodeGen) InnerError!void { const fn_info = func.decl.ty.fnInfo(); var func_type = try genFunctype(func.gpa, fn_info.cc, fn_info.param_types, fn_info.return_type, func.target); defer func_type.deinit(func.gpa); - func.decl.fn_link.?.type_index = try func.bin_file.putOrGetFuncType(func_type); + _ = try func.bin_file.storeDeclType(func.decl_index, func_type); var cc_result = try func.resolveCallingConventionValues(func.decl.ty); defer cc_result.deinit(func.gpa); @@ -2131,12 +2131,12 @@ fn airCall(func: *CodeGen, inst: Air.Inst.Index, modifier: std.builtin.CallModif defer func_type.deinit(func.gpa); const atom_index = try func.bin_file.getOrCreateAtomForDecl(extern_fn.data.owner_decl); const atom = func.bin_file.getAtomPtr(atom_index); - ext_decl.fn_link.?.type_index = try func.bin_file.putOrGetFuncType(func_type); + const type_index = try func.bin_file.storeDeclType(extern_fn.data.owner_decl, func_type); try func.bin_file.addOrUpdateImport( mem.sliceTo(ext_decl.name, 0), atom.getSymbolIndex().?, ext_decl.getExternFn().?.lib_name, - ext_decl.fn_link.?.type_index, + type_index, ); break :blk extern_fn.data.owner_decl; } else if (func_val.castTag(.decl_ref)) |decl_ref| { diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig index 17391b017a..9d20412788 100644 --- a/src/link/Wasm.zig +++ b/src/link/Wasm.zig @@ -46,6 +46,9 @@ host_name: []const u8 = "env", /// List of all `Decl` that are currently alive. /// Each index maps to the corresponding `Atom.Index`. decls: std.AutoHashMapUnmanaged(Module.Decl.Index, Atom.Index) = .{}, +/// Mapping between an `Atom` and its type index representing the Wasm +/// type of the function signature. +atom_types: std.AutoHashMapUnmanaged(Atom.Index, u32) = .{}, /// List of all symbols generated by Zig code. symbols: std.ArrayListUnmanaged(Symbol) = .{}, /// List of symbol indexes which are free to be used. @@ -175,15 +178,6 @@ pub const Segment = struct { offset: u32, }; -pub const FnData = struct { - /// Reference to the wasm type that represents this function. - type_index: u32, - - pub const empty: FnData = .{ - .type_index = undefined, - }; -}; - pub const Export = struct { sym_index: ?u32 = null, }; @@ -961,6 +955,7 @@ pub fn deinit(wasm: *Wasm) void { } wasm.decls.deinit(gpa); + wasm.atom_types.deinit(gpa); wasm.symbols.deinit(gpa); wasm.symbols_free_list.deinit(gpa); wasm.globals.deinit(gpa); @@ -1607,7 +1602,7 @@ const Kind = union(enum) { initialized, synthetic, }, - function: FnData, + function: void, /// Returns the segment name the data kind represents. /// Asserts `kind` has its active tag set to `data`. @@ -1626,12 +1621,13 @@ fn parseAtom(wasm: *Wasm, atom_index: Atom.Index, kind: Kind) !void { const atom = wasm.getAtomPtr(atom_index); const symbol = (SymbolLoc{ .file = null, .index = atom.sym_index }).getSymbol(wasm); const final_index: u32 = switch (kind) { - .function => |fn_data| result: { + .function => result: { const index = @intCast(u32, wasm.functions.count() + wasm.imported_functions_count); + const type_index = wasm.atom_types.get(atom_index).?; try wasm.functions.putNoClobber( wasm.base.allocator, .{ .file = null, .index = index }, - .{ .type_index = fn_data.type_index }, + .{ .type_index = type_index }, ); symbol.tag = .function; symbol.index = index; @@ -2829,7 +2825,7 @@ pub fn flushModule(wasm: *Wasm, comp: *Compilation, prog_node: *std.Progress.Nod if (decl.isExtern()) continue; const atom_index = entry.value_ptr.*; if (decl.ty.zigTypeTag() == .Fn) { - try wasm.parseAtom(atom_index, .{ .function = decl.fn_link.? }); + try wasm.parseAtom(atom_index, .function); } else if (decl.getVariable()) |variable| { if (!variable.is_mutable) { try wasm.parseAtom(atom_index, .{ .data = .read_only }); @@ -4172,3 +4168,13 @@ pub fn putOrGetFuncType(wasm: *Wasm, func_type: std.wasm.Type) !u32 { }); return index; } + +/// For the given `decl_index`, stores the corresponding type representing the function signature. +/// Asserts declaration has an associated `Atom`. +/// Returns the index into the list of types. +pub fn storeDeclType(wasm: *Wasm, decl_index: Module.Decl.Index, func_type: std.wasm.Type) !u32 { + const atom_index = wasm.decls.get(decl_index).?; + const index = try wasm.putOrGetFuncType(func_type); + try wasm.atom_types.put(wasm.base.allocator, atom_index, index); + return index; +} From 4009e0d2b1ac5b0a9a0caff676d5c73ae18c6e9e Mon Sep 17 00:00:00 2001 From: Marc Tiehuis Date: Sat, 4 Feb 2023 10:58:03 +1300 Subject: [PATCH 55/65] remove stage1 workaround for big int set Underlying fix should have been https://github.com/ziglang/zig/commit/d7b029995c8ac678598de39aa106076dca232902. u128 limb sizes are still not fully tested as we are missing compiler-rt support (__divei4, __modei4 on x86_64). Should be no zig blockers so the assertion has been removed. --- lib/std/math/big.zig | 1 - lib/std/math/big/int.zig | 11 +++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/std/math/big.zig b/lib/std/math/big.zig index c7fc0b17f5..c0d8e74eb2 100644 --- a/lib/std/math/big.zig +++ b/lib/std/math/big.zig @@ -13,7 +13,6 @@ pub const Log2Limb = std.math.Log2Int(Limb); comptime { assert(std.math.floorPowerOfTwo(usize, limb_info.bits) == limb_info.bits); - assert(limb_info.bits <= 64); // u128 set is unsupported assert(limb_info.signedness == .unsigned); } diff --git a/lib/std/math/big/int.zig b/lib/std/math/big/int.zig index d222d6913b..21f5015c6c 100644 --- a/lib/std/math/big/int.zig +++ b/lib/std/math/big/int.zig @@ -30,7 +30,7 @@ pub fn calcLimbLen(scalar: anytype) usize { } const w_value = std.math.absCast(scalar); - return @divFloor(@intCast(Limb, math.log2(w_value)), limb_bits) + 1; + return @intCast(usize, @divFloor(@intCast(Limb, math.log2(w_value)), limb_bits) + 1); } pub fn calcToStringLimbsBufferLen(a_len: usize, base: u8) usize { @@ -238,10 +238,7 @@ pub const Mutable = struct { var i: usize = 0; while (true) : (i += 1) { self.limbs[i] = @truncate(Limb, w_value); - - // TODO: shift == 64 at compile-time fails. Fails on u128 limbs. - w_value >>= limb_bits / 2; - w_value >>= limb_bits / 2; + w_value >>= limb_bits; if (w_value == 0) break; } @@ -258,9 +255,7 @@ pub const Mutable = struct { comptime var i = 0; inline while (true) : (i += 1) { self.limbs[i] = w_value & mask; - - w_value >>= limb_bits / 2; - w_value >>= limb_bits / 2; + w_value >>= limb_bits; if (w_value == 0) break; } From 693b12f8e1c1d99d33c01961c1fdc972a5255eb6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 3 Feb 2023 17:22:31 -0700 Subject: [PATCH 56/65] std.Build: support exposing and depending on zig modules New API introduced: std.Build.addModule This function exposes a zig module with the given name, which can be used by packages that depend on this one via std.Build.Dependency.module. std.Build.Pkg and related functionality is deleted. Every use case has a straightforward upgrade path using the new Module struct. std.Build.OptionsStep.getPackage is replaced by std.Build.OptionsStep.createModule. std.Build.CompileStep.addPackagePath is replaced by std.Build.CompileStep.addAnonymousModule. This partially addresses #14307 by renaming some of the instances of "package" to "module". Closes #14278 --- lib/std/Build.zig | 130 +++++++++++++-------------- lib/std/Build/CompileStep.zig | 111 +++++++++-------------- lib/std/Build/OptionsStep.zig | 7 +- test/standalone/pkg_import/build.zig | 2 +- 4 files changed, 106 insertions(+), 144 deletions(-) diff --git a/lib/std/Build.zig b/lib/std/Build.zig index 6846007443..15c1647957 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -109,6 +109,8 @@ host: NativeTargetInfo, dep_prefix: []const u8 = "", +modules: std.StringArrayHashMap(*Module), + pub const ExecError = error{ ReadFailure, ExitCodeFailure, @@ -232,6 +234,7 @@ pub fn create( .install_path = undefined, .args = null, .host = host, + .modules = std.StringArrayHashMap(*Module).init(allocator), }; try self.top_level_steps.append(&self.install_tls); try self.top_level_steps.append(&self.uninstall_tls); @@ -305,6 +308,7 @@ fn createChildOnly(parent: *Build, dep_name: []const u8, build_root: []const u8) .glibc_runtimes_dir = parent.glibc_runtimes_dir, .host = parent.host, .dep_prefix = parent.fmt("{s}{s}.", .{ parent.dep_prefix, dep_name }), + .modules = std.StringArrayHashMap(*Module).init(allocator), }; try child.top_level_steps.append(&child.install_tls); try child.top_level_steps.append(&child.uninstall_tls); @@ -539,6 +543,49 @@ pub fn addAssembly(b: *Build, options: AssemblyOptions) *CompileStep { return obj_step; } +pub const AddModuleOptions = struct { + name: []const u8, + source_file: FileSource, + dependencies: []const ModuleDependency = &.{}, +}; + +pub fn addModule(b: *Build, options: AddModuleOptions) void { + b.modules.put(b.dupe(options.name), b.createModule(.{ + .source_file = options.source_file, + .dependencies = options.dependencies, + })) catch @panic("OOM"); +} + +pub const ModuleDependency = struct { + name: []const u8, + module: *Module, +}; + +pub const CreateModuleOptions = struct { + source_file: FileSource, + dependencies: []const ModuleDependency = &.{}, +}; + +/// Prefer to use `addModule` which will make the module available to other +/// packages which depend on this package. +pub fn createModule(b: *Build, options: CreateModuleOptions) *Module { + const module = b.allocator.create(Module) catch @panic("OOM"); + module.* = .{ + .builder = b, + .source_file = options.source_file, + .dependencies = moduleDependenciesToArrayHashMap(b.allocator, options.dependencies), + }; + return module; +} + +fn moduleDependenciesToArrayHashMap(arena: Allocator, deps: []const ModuleDependency) std.StringArrayHashMap(*Module) { + var result = std.StringArrayHashMap(*Module).init(arena); + for (deps) |dep| { + result.put(dep.name, dep.module) catch @panic("OOM"); + } + return result; +} + /// Initializes a RunStep with argv, which must at least have the path to the /// executable. More command line arguments can be added with `addArg`, /// `addArgs`, and `addArtifactArg`. @@ -588,24 +635,6 @@ pub fn dupePath(self: *Build, bytes: []const u8) []u8 { return the_copy; } -/// Duplicates a package recursively. -pub fn dupePkg(self: *Build, package: Pkg) Pkg { - var the_copy = Pkg{ - .name = self.dupe(package.name), - .source = package.source.dupe(self), - }; - - if (package.dependencies) |dependencies| { - const new_dependencies = self.allocator.alloc(Pkg, dependencies.len) catch @panic("OOM"); - the_copy.dependencies = new_dependencies; - - for (dependencies) |dep_package, i| { - new_dependencies[i] = self.dupePkg(dep_package); - } - } - return the_copy; -} - pub fn addWriteFile(self: *Build, file_path: []const u8, data: []const u8) *WriteFileStep { const write_file_step = self.addWriteFiles(); write_file_step.add(file_path, data); @@ -1479,6 +1508,12 @@ pub const Dependency = struct { panic("unable to find artifact '{s}'", .{name}); }; } + + pub fn module(d: *Dependency, name: []const u8) *Module { + return d.builder.modules.get(name) orelse { + panic("unable to find module '{s}'", .{name}); + }; + } }; pub fn dependency(b: *Build, name: []const u8, args: anytype) *Dependency { @@ -1548,10 +1583,13 @@ test "builder.findProgram compiles" { _ = builder.findProgram(&[_][]const u8{}, &[_][]const u8{}) catch null; } -pub const Pkg = struct { - name: []const u8, - source: FileSource, - dependencies: ?[]const Pkg = null, +pub const Module = struct { + builder: *Build, + /// This could either be a generated file, in which case the module + /// contains exactly one file, or it could be a path to the root source + /// file of directory of files which constitute the module. + source_file: FileSource, + dependencies: std.StringArrayHashMap(*Module), }; /// A file that is generated by a build step. @@ -1713,54 +1751,6 @@ pub fn serializeCpu(allocator: Allocator, cpu: std.Target.Cpu) ![]const u8 { } } -test "dupePkg()" { - if (builtin.os.tag == .wasi) return error.SkipZigTest; - - var arena = std.heap.ArenaAllocator.init(std.testing.allocator); - defer arena.deinit(); - - const host = try NativeTargetInfo.detect(.{}); - - var builder = try Build.create( - arena.allocator(), - "test", - "test", - "test", - "test", - host, - ); - defer builder.destroy(); - - var pkg_dep = Pkg{ - .name = "pkg_dep", - .source = .{ .path = "/not/a/pkg_dep.zig" }, - }; - var pkg_top = Pkg{ - .name = "pkg_top", - .source = .{ .path = "/not/a/pkg_top.zig" }, - .dependencies = &[_]Pkg{pkg_dep}, - }; - const duped = builder.dupePkg(pkg_top); - - const original_deps = pkg_top.dependencies.?; - const dupe_deps = duped.dependencies.?; - - // probably the same top level package details - try std.testing.expectEqualStrings(pkg_top.name, duped.name); - - // probably the same dependencies - try std.testing.expectEqual(original_deps.len, dupe_deps.len); - try std.testing.expectEqual(original_deps[0].name, pkg_dep.name); - - // could segfault otherwise if pointers in duplicated package's fields are - // the same as those in stack allocated package's fields - try std.testing.expect(dupe_deps.ptr != original_deps.ptr); - try std.testing.expect(duped.name.ptr != pkg_top.name.ptr); - try std.testing.expect(duped.source.path.ptr != pkg_top.source.path.ptr); - try std.testing.expect(dupe_deps[0].name.ptr != pkg_dep.name.ptr); - try std.testing.expect(dupe_deps[0].source.path.ptr != pkg_dep.source.path.ptr); -} - test { _ = CheckFileStep; _ = CheckObjectStep; diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index 12c73bdba6..879793f781 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -16,7 +16,7 @@ const FileSource = std.Build.FileSource; const PkgConfigPkg = std.Build.PkgConfigPkg; const PkgConfigError = std.Build.PkgConfigError; const ExecError = std.Build.ExecError; -const Pkg = std.Build.Pkg; +const Module = std.Build.Module; const VcpkgRoot = std.Build.VcpkgRoot; const InstallDir = std.Build.InstallDir; const InstallArtifactStep = std.Build.InstallArtifactStep; @@ -99,7 +99,7 @@ root_src: ?FileSource, out_h_filename: []const u8, out_lib_filename: []const u8, out_pdb_filename: []const u8, -packages: ArrayList(Pkg), +modules: std.StringArrayHashMap(*Module), object_src: []const u8, @@ -334,7 +334,7 @@ pub fn create(builder: *std.Build, options: Options) *CompileStep { .out_pdb_filename = builder.fmt("{s}.pdb", .{name}), .major_only_filename = null, .name_only_filename = null, - .packages = ArrayList(Pkg).init(builder.allocator), + .modules = std.StringArrayHashMap(*Module).init(builder.allocator), .include_dirs = ArrayList(IncludeDir).init(builder.allocator), .link_objects = ArrayList(LinkObject).init(builder.allocator), .c_macros = ArrayList([]const u8).init(builder.allocator), @@ -946,31 +946,31 @@ pub fn addFrameworkPath(self: *CompileStep, dir_path: []const u8) void { self.framework_dirs.append(self.builder.dupe(dir_path)) catch @panic("OOM"); } -pub fn addPackage(self: *CompileStep, package: Pkg) void { - self.packages.append(self.builder.dupePkg(package)) catch @panic("OOM"); - self.addRecursiveBuildDeps(package); +/// Adds a module to be used with `@import` and exposing it in the current +/// package's module table using `name`. +pub fn addModule(cs: *CompileStep, name: []const u8, module: *Module) void { + cs.modules.put(cs.builder.dupe(name), module) catch @panic("OOM"); + cs.addRecursiveBuildDeps(module); } -pub fn addOptions(self: *CompileStep, package_name: []const u8, options: *OptionsStep) void { - self.addPackage(options.getPackage(package_name)); +/// Adds a module to be used with `@import` without exposing it in the current +/// package's module table. +pub fn addAnonymousModule(cs: *CompileStep, name: []const u8, options: std.Build.CreateModuleOptions) void { + const module = cs.builder.createModule(options); + return addModule(cs, name, module); } -fn addRecursiveBuildDeps(self: *CompileStep, package: Pkg) void { - package.source.addStepDependencies(&self.step); - if (package.dependencies) |deps| { - for (deps) |dep| { - self.addRecursiveBuildDeps(dep); - } +pub fn addOptions(cs: *CompileStep, module_name: []const u8, options: *OptionsStep) void { + addModule(cs, module_name, options.createModule()); +} + +fn addRecursiveBuildDeps(cs: *CompileStep, module: *Module) void { + module.source_file.addStepDependencies(&cs.step); + for (module.dependencies.values()) |dep| { + cs.addRecursiveBuildDeps(dep); } } -pub fn addPackagePath(self: *CompileStep, name: []const u8, pkg_index_path: []const u8) void { - self.addPackage(Pkg{ - .name = self.builder.dupe(name), - .source = .{ .path = self.builder.dupe(pkg_index_path) }, - }); -} - /// If Vcpkg was found on the system, it will be added to include and lib /// paths for the specified target. pub fn addVcpkgPaths(self: *CompileStep, linkage: CompileStep.Linkage) !void { @@ -1023,16 +1023,21 @@ fn linkLibraryOrObject(self: *CompileStep, other: *CompileStep) void { self.include_dirs.append(.{ .other_step = other }) catch @panic("OOM"); } -fn makePackageCmd(self: *CompileStep, pkg: Pkg, zig_args: *ArrayList([]const u8)) error{OutOfMemory}!void { - const builder = self.builder; - +fn appendModuleArgs( + cs: *CompileStep, + zig_args: *ArrayList([]const u8), + name: []const u8, + module: *Module, +) error{OutOfMemory}!void { try zig_args.append("--pkg-begin"); - try zig_args.append(pkg.name); - try zig_args.append(builder.pathFromRoot(pkg.source.getPath(self.builder))); + try zig_args.append(name); + try zig_args.append(module.builder.pathFromRoot(module.source_file.getPath(module.builder))); - if (pkg.dependencies) |dependencies| { - for (dependencies) |sub_pkg| { - try self.makePackageCmd(sub_pkg, zig_args); + { + const keys = module.dependencies.keys(); + for (module.dependencies.values()) |sub_module, i| { + const sub_name = keys[i]; + try cs.appendModuleArgs(zig_args, sub_name, sub_module); } } @@ -1563,8 +1568,12 @@ fn make(step: *Step) !void { try zig_args.append("--test-no-exec"); } - for (self.packages.items) |pkg| { - try self.makePackageCmd(pkg, &zig_args); + { + const keys = self.modules.keys(); + for (self.modules.values()) |module, i| { + const name = keys[i]; + try self.appendModuleArgs(&zig_args, name, module); + } } for (self.include_dirs.items) |include_dir| { @@ -1942,46 +1951,6 @@ fn getPkgConfigList(self: *std.Build) ![]const PkgConfigPkg { } } -test "addPackage" { - if (builtin.os.tag == .wasi) return error.SkipZigTest; - - var arena = std.heap.ArenaAllocator.init(std.testing.allocator); - defer arena.deinit(); - - const host = try NativeTargetInfo.detect(.{}); - - var builder = try std.Build.create( - arena.allocator(), - "test", - "test", - "test", - "test", - host, - ); - defer builder.destroy(); - - const pkg_dep = Pkg{ - .name = "pkg_dep", - .source = .{ .path = "/not/a/pkg_dep.zig" }, - }; - const pkg_top = Pkg{ - .name = "pkg_dep", - .source = .{ .path = "/not/a/pkg_top.zig" }, - .dependencies = &[_]Pkg{pkg_dep}, - }; - - var exe = builder.addExecutable(.{ - .name = "not_an_executable", - .root_source_file = .{ .path = "/not/an/executable.zig" }, - }); - exe.addPackage(pkg_top); - - try std.testing.expectEqual(@as(usize, 1), exe.packages.items.len); - - const dupe = exe.packages.items[0]; - try std.testing.expectEqualStrings(pkg_top.name, dupe.name); -} - fn addFlag(args: *ArrayList([]const u8), comptime name: []const u8, opt: ?bool) !void { const cond = opt orelse return; try args.ensureUnusedCapacity(1); diff --git a/lib/std/Build/OptionsStep.zig b/lib/std/Build/OptionsStep.zig index c1d2c8454a..8a50456539 100644 --- a/lib/std/Build/OptionsStep.zig +++ b/lib/std/Build/OptionsStep.zig @@ -204,8 +204,11 @@ pub fn addOptionArtifact(self: *OptionsStep, name: []const u8, artifact: *Compil self.step.dependOn(&artifact.step); } -pub fn getPackage(self: *OptionsStep, package_name: []const u8) std.Build.Pkg { - return .{ .name = package_name, .source = self.getSource() }; +pub fn createModule(self: *OptionsStep) *std.Build.Module { + return self.builder.createModule(.{ + .source_file = self.getSource(), + .dependencies = &.{}, + }); } pub fn getSource(self: *OptionsStep) FileSource { diff --git a/test/standalone/pkg_import/build.zig b/test/standalone/pkg_import/build.zig index 5fbc8a67ae..5ea6c90af7 100644 --- a/test/standalone/pkg_import/build.zig +++ b/test/standalone/pkg_import/build.zig @@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void { .root_source_file = .{ .path = "test.zig" }, .optimize = optimize, }); - exe.addPackagePath("my_pkg", "pkg.zig"); + exe.addAnonymousModule("my_pkg", .{ .source_file = .{ .path = "pkg.zig" } }); const run = exe.run(); From c1f71963a9b8c913acee0fc167e0a4ecdecd2890 Mon Sep 17 00:00:00 2001 From: Manlio Perillo Date: Fri, 3 Feb 2023 12:44:52 +0100 Subject: [PATCH 57/65] compiler_rt: fix and improve documentation - In Integer Bit Operations, use zeros consistently and fix the incorrect function descriptions - In ucmp, fix the incorrect signedness of the operands - In Integer Arithmetic, document the signedness of the operands in div, udiv, mod, umod, udivmod and divmod as it is done in LLVM documentation - In Float Conversion, replace "int_to_float" to "int to float" and "uint_to_float" to "uint to float" --- lib/compiler_rt/README.md | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/compiler_rt/README.md b/lib/compiler_rt/README.md index 8e838dfced..d8df7f5489 100644 --- a/lib/compiler_rt/README.md +++ b/lib/compiler_rt/README.md @@ -51,31 +51,31 @@ Integer and Float Operations | Done | Name | a | b | Out | Comment | | ------ | ------------- | ---- | ---- | ---- | ------------------------------ | | | | | | | **Integer Bit Operations** | -| ✓ | __clzsi2 | u32 | ∅ | i32 | count leading zeroes | -| ✓ | __clzdi2 | u64 | ∅ | i32 | count leading zeroes | -| ✓ | __clzti2 | u128 | ∅ | i32 | count trailing zeros | +| ✓ | __clzsi2 | u32 | ∅ | i32 | count leading zeros | +| ✓ | __clzdi2 | u64 | ∅ | i32 | count leading zeros | +| ✓ | __clzti2 | u128 | ∅ | i32 | count leading zeros | | ✓ | __ctzsi2 | u32 | ∅ | i32 | count trailing zeros | | ✓ | __ctzdi2 | u64 | ∅ | i32 | count trailing zeros | -| ✓ | __ctzti2 | u128 | ∅ | i32 | count leading zeroes | -| ✓ | __ffssi2 | u32 | ∅ | i32 | count leading zeroes | -| ✓ | __ffsdi2 | u64 | ∅ | i32 | count leading zeroes | -| ✓ | __ffsti2 | u128 | ∅ | i32 | count leading zeroes | -| ✓ | __paritysi2 | u32 | ∅ | i32 | find least significant 1 bit | -| ✓ | __paritydi2 | u64 | ∅ | i32 | find least significant 1 bit | -| ✓ | __parityti2 | u128 | ∅ | i32 | find least significant 1 bit | +| ✓ | __ctzti2 | u128 | ∅ | i32 | count trailing zeros | +| ✓ | __ffssi2 | u32 | ∅ | i32 | find least significant 1 bit | +| ✓ | __ffsdi2 | u64 | ∅ | i32 | find least significant 1 bit | +| ✓ | __ffsti2 | u128 | ∅ | i32 | find least significant 1 bit | +| ✓ | __paritysi2 | u32 | ∅ | i32 | bit parity | +| ✓ | __paritydi2 | u64 | ∅ | i32 | bit parity | +| ✓ | __parityti2 | u128 | ∅ | i32 | bit parity | | ✓ | __popcountsi2 | u32 | ∅ | i32 | bit population | | ✓ | __popcountdi2 | u64 | ∅ | i32 | bit population | | ✓ | __popcountti2 | u128 | ∅ | i32 | bit population | -| ✓ | __bswapsi2 | u32 | ∅ | i32 | bit parity | -| ✓ | __bswapdi2 | u64 | ∅ | i32 | bit parity | -| ✓ | __bswapti2 | u128 | ∅ | i32 | bit parity | +| ✓ | __bswapsi2 | u32 | ∅ | i32 | byte swap | +| ✓ | __bswapdi2 | u64 | ∅ | i32 | byte swap | +| ✓ | __bswapti2 | u128 | ∅ | i32 | byte swap | | | | | | | **Integer Comparison** | | ✓ | __cmpsi2 | i32 | i32 | i32 | `(a 0, (a==b) -> 1, (a>b) -> 2` | | ✓ | __cmpdi2 | i64 | i64 | i32 | .. | | ✓ | __cmpti2 | i128 | i128 | i32 | .. | -| ✓ | __ucmpsi2 | i32 | i32 | i32 | `(a 0, (a==b) -> 1, (a>b) -> 2` | -| ✓ | __ucmpdi2 | i64 | i64 | i32 | .. | -| ✓ | __ucmpti2 | i128 | i128 | i32 | .. | +| ✓ | __ucmpsi2 | u32 | u32 | i32 | `(a 0, (a==b) -> 1, (a>b) -> 2` | +| ✓ | __ucmpdi2 | u64 | u64 | i32 | .. | +| ✓ | __ucmpti2 | u128 | u128 | i32 | .. | | | | | | | **Integer Arithmetic** | | ✗ | __ashlsi3 | i32 | i32 | i32 | `a << b` [^unused_rl78] | | ✓ | __ashldi3 | i64 | i32 | i64 | .. | @@ -165,7 +165,7 @@ Integer and Float Operations | ✓ | _Qp_qtos |*f128 | ∅ | f32 | .. SPARC | | ✓ | __trunckfdf2 | f128 | ∅ | f64 | .. PPC | | ✓ | _Qp_qtod |*f128 | ∅ | f64 | .. SPARC | -| ✓ | __fixhfsi | f16 | ∅ | i32 | rounding towards zero | +| ✓ | __fixhfsi | f16 | ∅ | i32 | float to int, rounding towards zero | | ✓ | __fixsfsi | f32 | ∅ | i32 | .. | | ✓ | __fixdfsi | f64 | ∅ | i32 | .. | | ✓ | __fixtfsi | f128 | ∅ | i32 | .. | @@ -180,7 +180,7 @@ Integer and Float Operations | ✓ | __fixdfti | f64 | ∅ | i128 | .. | | ✓ | __fixtfti | f128 | ∅ | i128 | .. | | ✓ | __fixxfti | f80 | ∅ | i128 | .. | -| ✓ | __fixunshfsi | f16 | ∅ | u32 | rounding towards zero. negative values become 0. | +| ✓ | __fixunshfsi | f16 | ∅ | u32 | float to uint, rounding towards zero. negative values become 0. | | ✓ | __fixunssfsi | f32 | ∅ | u32 | .. | | ✓ | __fixunsdfsi | f64 | ∅ | u32 | .. | | ✓ | __fixunstfsi | f128 | ∅ | u32 | .. | @@ -195,7 +195,7 @@ Integer and Float Operations | ✓ | __fixunsdfti | f64 | ∅ | u128 | .. | | ✓ | __fixunstfti | f128 | ∅ | u128 | .. | | ✓ | __fixunsxfti | f80 | ∅ | u128 | .. | -| ✓ | __floatsihf | i32 | ∅ | f16 | int_to_float conversions | +| ✓ | __floatsihf | i32 | ∅ | f16 | int to float | | ✓ | __floatsisf | i32 | ∅ | f32 | .. | | ✓ | __floatsidf | i32 | ∅ | f64 | .. | | ✓ | __floatsitf | i32 | ∅ | f128 | .. | @@ -209,7 +209,7 @@ Integer and Float Operations | ✓ | __floattidf | i128 | ∅ | f64 | .. | | ✓ | __floattitf | i128 | ∅ | f128 | .. | | ✓ | __floattixf | i128 | ∅ | f80 | .. | -| ✓ | __floatunsihf | u32 | ∅ | f16 | uint_to_float conversions | +| ✓ | __floatunsihf | u32 | ∅ | f16 | uint to float | | ✓ | __floatunsisf | u32 | ∅ | f32 | .. | | ✓ | __floatunsidf | u32 | ∅ | f64 | .. | | ✓ | __floatunsitf | u32 | ∅ | f128 | .. | From 7f249937727fd58b66c00b53338e99bd8bf45e5b Mon Sep 17 00:00:00 2001 From: Suirad Date: Sat, 4 Feb 2023 00:42:43 -0600 Subject: [PATCH 58/65] Add support for mips64/mips64el --- lib/c.zig | 2 +- lib/std/os/linux.zig | 2 + lib/std/os/linux/mips64.zig | 413 ++++++++++++++++++++++++++++++++++ lib/std/os/linux/syscalls.zig | 355 +++++++++++++++++++++++++++++ lib/std/os/linux/tls.zig | 10 +- lib/std/start.zig | 2 +- 6 files changed, 777 insertions(+), 7 deletions(-) create mode 100644 lib/std/os/linux/mips64.zig diff --git a/lib/c.zig b/lib/c.zig index 82f9f5b2e1..8581ec4e14 100644 --- a/lib/c.zig +++ b/lib/c.zig @@ -354,7 +354,7 @@ fn clone() callconv(.Naked) void { \\ ecall ); }, - .mips, .mipsel => { + .mips, .mipsel, .mips64, .mips64el => { // __clone(func, stack, flags, arg, ptid, tls, ctid) // 3, 4, 5, 6, 7, 8, 9 diff --git a/lib/std/os/linux.zig b/lib/std/os/linux.zig index d9d5fb3204..5d6c9f5cc9 100644 --- a/lib/std/os/linux.zig +++ b/lib/std/os/linux.zig @@ -40,6 +40,7 @@ const arch_bits = switch (native_arch) { .riscv64 => @import("linux/riscv64.zig"), .sparc64 => @import("linux/sparc64.zig"), .mips, .mipsel => @import("linux/mips.zig"), + .mips64, .mips64el => @import("linux/mips64.zig"), .powerpc => @import("linux/powerpc.zig"), .powerpc64, .powerpc64le => @import("linux/powerpc64.zig"), else => struct {}, @@ -101,6 +102,7 @@ pub const SYS = switch (@import("builtin").cpu.arch) { .riscv64 => syscalls.RiscV64, .sparc64 => syscalls.Sparc64, .mips, .mipsel => syscalls.Mips, + .mips64, .mips64el => syscalls.Mips64, .powerpc => syscalls.PowerPC, .powerpc64, .powerpc64le => syscalls.PowerPC64, else => @compileError("The Zig Standard Library is missing syscall definitions for the target CPU architecture"), diff --git a/lib/std/os/linux/mips64.zig b/lib/std/os/linux/mips64.zig new file mode 100644 index 0000000000..dfc1c9b576 --- /dev/null +++ b/lib/std/os/linux/mips64.zig @@ -0,0 +1,413 @@ +const std = @import("../../std.zig"); +const maxInt = std.math.maxInt; +const linux = std.os.linux; +const SYS = linux.SYS; +const socklen_t = linux.socklen_t; +const iovec = std.os.iovec; +const iovec_const = std.os.iovec_const; +const uid_t = linux.uid_t; +const gid_t = linux.gid_t; +const pid_t = linux.pid_t; +const sockaddr = linux.sockaddr; +const timespec = linux.timespec; + +pub fn syscall0(number: SYS) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + : "$1", "$3", "$4", "$5", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall_pipe(fd: *[2]i32) usize { + return asm volatile ( + \\ .set noat + \\ .set noreorder + \\ syscall + \\ blez $7, 1f + \\ nop + \\ b 2f + \\ subu $2, $0, $2 + \\ 1: + \\ sw $2, 0($4) + \\ sw $3, 4($4) + \\ 2: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(SYS.pipe)), + [fd] "{$4}" (fd), + : "$1", "$3", "$5", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall1(number: SYS, arg1: usize) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + : "$1", "$3", "$5", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall2(number: SYS, arg1: usize, arg2: usize) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + : "$1", "$3", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall3(number: SYS, arg1: usize, arg2: usize, arg3: usize) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + [arg3] "{$6}" (arg3), + : "$1", "$3", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall4(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + [arg3] "{$6}" (arg3), + [arg4] "{$7}" (arg4), + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall5(number: SYS, arg1: usize, arg2: usize, arg3: usize, arg4: usize, arg5: usize) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + [arg3] "{$6}" (arg3), + [arg4] "{$7}" (arg4), + [arg5] "{$8}" (arg5), + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +// NOTE: The o32 calling convention requires the callee to reserve 16 bytes for +// the first four arguments even though they're passed in $a0-$a3. + +pub fn syscall6( + number: SYS, + arg1: usize, + arg2: usize, + arg3: usize, + arg4: usize, + arg5: usize, + arg6: usize, +) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + [arg3] "{$6}" (arg3), + [arg4] "{$7}" (arg4), + [arg5] "{$8}" (arg5), + [arg6] "{$9}" (arg6), + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn syscall7( + number: SYS, + arg1: usize, + arg2: usize, + arg3: usize, + arg4: usize, + arg5: usize, + arg6: usize, + arg7: usize, +) usize { + return asm volatile ( + \\ syscall + \\ blez $7, 1f + \\ dsubu $2, $0, $2 + \\ 1: + : [ret] "={$2}" (-> usize), + : [number] "{$2}" (@enumToInt(number)), + [arg1] "{$4}" (arg1), + [arg2] "{$5}" (arg2), + [arg3] "{$6}" (arg3), + [arg4] "{$7}" (arg4), + [arg5] "{$8}" (arg5), + [arg6] "{$9}" (arg6), + [arg7] "{$10}" (arg7), + : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +const CloneFn = *const fn (arg: usize) callconv(.C) u8; + +/// This matches the libc clone function. +pub extern fn clone(func: CloneFn, stack: usize, flags: u32, arg: usize, ptid: *i32, tls: usize, ctid: *i32) usize; + +pub fn restore() callconv(.Naked) void { + return asm volatile ("syscall" + : + : [number] "{$2}" (@enumToInt(SYS.rt_sigreturn)), + : "$1", "$3", "$4", "$5", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub fn restore_rt() callconv(.Naked) void { + return asm volatile ("syscall" + : + : [number] "{$2}" (@enumToInt(SYS.rt_sigreturn)), + : "$1", "$3", "$4", "$5", "$6", "$7", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", "$25", "hi", "lo", "memory" + ); +} + +pub const O = struct { + pub const CREAT = 0o0400; + pub const EXCL = 0o02000; + pub const NOCTTY = 0o04000; + pub const TRUNC = 0o01000; + pub const APPEND = 0o0010; + pub const NONBLOCK = 0o0200; + pub const DSYNC = 0o0020; + pub const SYNC = 0o040020; + pub const RSYNC = 0o040020; + pub const DIRECTORY = 0o0200000; + pub const NOFOLLOW = 0o0400000; + pub const CLOEXEC = 0o02000000; + + pub const ASYNC = 0o010000; + pub const DIRECT = 0o0100000; + pub const LARGEFILE = 0o020000; + pub const NOATIME = 0o01000000; + pub const PATH = 0o010000000; + pub const TMPFILE = 0o020200000; + pub const NDELAY = NONBLOCK; +}; + +pub const F = struct { + pub const DUPFD = 0; + pub const GETFD = 1; + pub const SETFD = 2; + pub const GETFL = 3; + pub const SETFL = 4; + + pub const SETOWN = 24; + pub const GETOWN = 23; + pub const SETSIG = 10; + pub const GETSIG = 11; + + pub const GETLK = 33; + pub const SETLK = 34; + pub const SETLKW = 35; + + pub const RDLCK = 0; + pub const WRLCK = 1; + pub const UNLCK = 2; + + pub const SETOWN_EX = 15; + pub const GETOWN_EX = 16; + + pub const GETOWNER_UIDS = 17; +}; + +pub const LOCK = struct { + pub const SH = 1; + pub const EX = 2; + pub const UN = 8; + pub const NB = 4; +}; + +pub const MMAP2_UNIT = 4096; + +pub const MAP = struct { + pub const NORESERVE = 0x0400; + pub const GROWSDOWN = 0x1000; + pub const DENYWRITE = 0x2000; + pub const EXECUTABLE = 0x4000; + pub const LOCKED = 0x8000; + pub const @"32BIT" = 0x40; +}; + +pub const VDSO = struct { + pub const CGT_SYM = "__kernel_clock_gettime"; + pub const CGT_VER = "LINUX_2.6.39"; +}; + +pub const Flock = extern struct { + type: i16, + whence: i16, + __pad0: [4]u8, + start: off_t, + len: off_t, + pid: pid_t, + __unused: [4]u8, +}; + +pub const msghdr = extern struct { + name: ?*sockaddr, + namelen: socklen_t, + iov: [*]iovec, + iovlen: i32, + control: ?*anyopaque, + controllen: socklen_t, + flags: i32, +}; + +pub const msghdr_const = extern struct { + name: ?*const sockaddr, + namelen: socklen_t, + iov: [*]const iovec_const, + iovlen: i32, + control: ?*const anyopaque, + controllen: socklen_t, + flags: i32, +}; + +pub const blksize_t = i32; +pub const nlink_t = u32; +pub const time_t = i32; +pub const mode_t = u32; +pub const off_t = i64; +pub const ino_t = u64; +pub const dev_t = u64; +pub const blkcnt_t = i64; + +// The `stat` definition used by the Linux kernel. +pub const Stat = extern struct { + dev: u32, + __pad0: [3]u32, // Reserved for st_dev expansion + ino: ino_t, + mode: mode_t, + nlink: nlink_t, + uid: uid_t, + gid: gid_t, + rdev: u32, + __pad1: [3]u32, + size: off_t, + atim: timespec, + mtim: timespec, + ctim: timespec, + blksize: blksize_t, + __pad3: u32, + blocks: blkcnt_t, + __pad4: [14]usize, + + pub fn atime(self: @This()) timespec { + return self.atim; + } + + pub fn mtime(self: @This()) timespec { + return self.mtim; + } + + pub fn ctime(self: @This()) timespec { + return self.ctim; + } +}; + +pub const timeval = extern struct { + tv_sec: isize, + tv_usec: isize, +}; + +pub const timezone = extern struct { + tz_minuteswest: i32, + tz_dsttime: i32, +}; + +pub const Elf_Symndx = u32; + +pub const rlimit_resource = enum(c_int) { + /// Per-process CPU limit, in seconds. + CPU, + + /// Largest file that can be created, in bytes. + FSIZE, + + /// Maximum size of data segment, in bytes. + DATA, + + /// Maximum size of stack segment, in bytes. + STACK, + + /// Largest core file that can be created, in bytes. + CORE, + + /// Number of open files. + NOFILE, + + /// Address space limit. + AS, + + /// Largest resident set size, in bytes. + /// This affects swapping; processes that are exceeding their + /// resident set size will be more likely to have physical memory + /// taken from them. + RSS, + + /// Number of processes. + NPROC, + + /// Locked-in-memory address space. + MEMLOCK, + + /// Maximum number of file locks. + LOCKS, + + /// Maximum number of pending signals. + SIGPENDING, + + /// Maximum bytes in POSIX message queues. + MSGQUEUE, + + /// Maximum nice priority allowed to raise to. + /// Nice levels 19 .. -20 correspond to 0 .. 39 + /// values of this resource limit. + NICE, + + /// Maximum realtime priority allowed for non-priviledged + /// processes. + RTPRIO, + + /// Maximum CPU time in µs that a process scheduled under a real-time + /// scheduling policy may consume without making a blocking system + /// call before being forcibly descheduled. + RTTIME, + + _, +}; diff --git a/lib/std/os/linux/syscalls.zig b/lib/std/os/linux/syscalls.zig index 6e8cee7b84..36a8bae04c 100644 --- a/lib/std/os/linux/syscalls.zig +++ b/lib/std/os/linux/syscalls.zig @@ -2032,6 +2032,361 @@ pub const Mips = enum(usize) { set_mempolicy_home_node = Linux + 450, }; +pub const Mips64 = enum(usize) { + pub const Linux = 5000; + + read = Linux + 0, + write = Linux + 1, + open = Linux + 2, + close = Linux + 3, + stat = Linux + 4, + fstat = Linux + 5, + lstat = Linux + 6, + poll = Linux + 7, + lseek = Linux + 8, + mmap = Linux + 9, + mprotect = Linux + 10, + munmap = Linux + 11, + brk = Linux + 12, + rt_sigaction = Linux + 13, + rt_sigprocmask = Linux + 14, + ioctl = Linux + 15, + pread64 = Linux + 16, + pwrite64 = Linux + 17, + readv = Linux + 18, + writev = Linux + 19, + access = Linux + 20, + pipe = Linux + 21, + select = Linux + 22, + sched_yield = Linux + 23, + mremap = Linux + 24, + msync = Linux + 25, + mincore = Linux + 26, + madvise = Linux + 27, + shmget = Linux + 28, + shmat = Linux + 29, + shmctl = Linux + 30, + dup = Linux + 31, + dup2 = Linux + 32, + pause = Linux + 33, + nanosleep = Linux + 34, + getitimer = Linux + 35, + alarm = Linux + 36, + setitimer = Linux + 37, + getpid = Linux + 38, + sendfile = Linux + 39, + socket = Linux + 40, + connect = Linux + 41, + accept = Linux + 42, + sendto = Linux + 43, + recvfrom = Linux + 44, + sendmsg = Linux + 45, + recvmsg = Linux + 46, + shutdown = Linux + 47, + bind = Linux + 48, + listen = Linux + 49, + getsockname = Linux + 50, + getpeername = Linux + 51, + socketpair = Linux + 52, + setsockopt = Linux + 53, + getsockopt = Linux + 54, + clone = Linux + 55, + fork = Linux + 56, + execve = Linux + 57, + exit = Linux + 58, + wait4 = Linux + 59, + kill = Linux + 60, + uname = Linux + 61, + semget = Linux + 62, + semop = Linux + 63, + semctl = Linux + 64, + shmdt = Linux + 65, + msgget = Linux + 66, + msgsnd = Linux + 67, + msgrcv = Linux + 68, + msgctl = Linux + 69, + fcntl = Linux + 70, + flock = Linux + 71, + fsync = Linux + 72, + fdatasync = Linux + 73, + truncate = Linux + 74, + ftruncate = Linux + 75, + getdents = Linux + 76, + getcwd = Linux + 77, + chdir = Linux + 78, + fchdir = Linux + 79, + rename = Linux + 80, + mkdir = Linux + 81, + rmdir = Linux + 82, + creat = Linux + 83, + link = Linux + 84, + unlink = Linux + 85, + symlink = Linux + 86, + readlink = Linux + 87, + chmod = Linux + 88, + fchmod = Linux + 89, + chown = Linux + 90, + fchown = Linux + 91, + lchown = Linux + 92, + umask = Linux + 93, + gettimeofday = Linux + 94, + getrlimit = Linux + 95, + getrusage = Linux + 96, + sysinfo = Linux + 97, + times = Linux + 98, + ptrace = Linux + 99, + getuid = Linux + 100, + syslog = Linux + 101, + getgid = Linux + 102, + setuid = Linux + 103, + setgid = Linux + 104, + geteuid = Linux + 105, + getegid = Linux + 106, + setpgid = Linux + 107, + getppid = Linux + 108, + getpgrp = Linux + 109, + setsid = Linux + 110, + setreuid = Linux + 111, + setregid = Linux + 112, + getgroups = Linux + 113, + setgroups = Linux + 114, + setresuid = Linux + 115, + getresuid = Linux + 116, + setresgid = Linux + 117, + getresgid = Linux + 118, + getpgid = Linux + 119, + setfsuid = Linux + 120, + setfsgid = Linux + 121, + getsid = Linux + 122, + capget = Linux + 123, + capset = Linux + 124, + rt_sigpending = Linux + 125, + rt_sigtimedwait = Linux + 126, + rt_sigqueueinfo = Linux + 127, + rt_sigsuspend = Linux + 128, + sigaltstack = Linux + 129, + utime = Linux + 130, + mknod = Linux + 131, + personality = Linux + 132, + ustat = Linux + 133, + statfs = Linux + 134, + fstatfs = Linux + 135, + sysfs = Linux + 136, + getpriority = Linux + 137, + setpriority = Linux + 138, + sched_setparam = Linux + 139, + sched_getparam = Linux + 140, + sched_setscheduler = Linux + 141, + sched_getscheduler = Linux + 142, + sched_get_priority_max = Linux + 143, + sched_get_priority_min = Linux + 144, + sched_rr_get_interval = Linux + 145, + mlock = Linux + 146, + munlock = Linux + 147, + mlockall = Linux + 148, + munlockall = Linux + 149, + vhangup = Linux + 150, + pivot_root = Linux + 151, + _sysctl = Linux + 152, + prctl = Linux + 153, + adjtimex = Linux + 154, + setrlimit = Linux + 155, + chroot = Linux + 156, + sync = Linux + 157, + acct = Linux + 158, + settimeofday = Linux + 159, + mount = Linux + 160, + umount2 = Linux + 161, + swapon = Linux + 162, + swapoff = Linux + 163, + reboot = Linux + 164, + sethostname = Linux + 165, + setdomainname = Linux + 166, + create_module = Linux + 167, + init_module = Linux + 168, + delete_module = Linux + 169, + get_kernel_syms = Linux + 170, + query_module = Linux + 171, + quotactl = Linux + 172, + nfsservctl = Linux + 173, + getpmsg = Linux + 174, + putpmsg = Linux + 175, + afs_syscall = Linux + 176, + reserved177 = Linux + 177, + gettid = Linux + 178, + readahead = Linux + 179, + setxattr = Linux + 180, + lsetxattr = Linux + 181, + fsetxattr = Linux + 182, + getxattr = Linux + 183, + lgetxattr = Linux + 184, + fgetxattr = Linux + 185, + listxattr = Linux + 186, + llistxattr = Linux + 187, + flistxattr = Linux + 188, + removexattr = Linux + 189, + lremovexattr = Linux + 190, + fremovexattr = Linux + 191, + tkill = Linux + 192, + reserved193 = Linux + 193, + futex = Linux + 194, + sched_setaffinity = Linux + 195, + sched_getaffinity = Linux + 196, + cacheflush = Linux + 197, + cachectl = Linux + 198, + sysmips = Linux + 199, + io_setup = Linux + 200, + io_destroy = Linux + 201, + io_getevents = Linux + 202, + io_submit = Linux + 203, + io_cancel = Linux + 204, + exit_group = Linux + 205, + lookup_dcookie = Linux + 206, + epoll_create = Linux + 207, + epoll_ctl = Linux + 208, + epoll_wait = Linux + 209, + remap_file_pages = Linux + 210, + rt_sigreturn = Linux + 211, + set_tid_address = Linux + 212, + restart_syscall = Linux + 213, + semtimedop = Linux + 214, + fadvise64 = Linux + 215, + timer_create = Linux + 216, + timer_settime = Linux + 217, + timer_gettime = Linux + 218, + timer_getoverrun = Linux + 219, + timer_delete = Linux + 220, + clock_settime = Linux + 221, + clock_gettime = Linux + 222, + clock_getres = Linux + 223, + clock_nanosleep = Linux + 224, + tgkill = Linux + 225, + utimes = Linux + 226, + mbind = Linux + 227, + get_mempolicy = Linux + 228, + set_mempolicy = Linux + 229, + mq_open = Linux + 230, + mq_unlink = Linux + 231, + mq_timedsend = Linux + 232, + mq_timedreceive = Linux + 233, + mq_notify = Linux + 234, + mq_getsetattr = Linux + 235, + vserver = Linux + 236, + waitid = Linux + 237, + add_key = Linux + 239, + request_key = Linux + 240, + keyctl = Linux + 241, + set_thread_area = Linux + 242, + inotify_init = Linux + 243, + inotify_add_watch = Linux + 244, + inotify_rm_watch = Linux + 245, + migrate_pages = Linux + 246, + openat = Linux + 247, + mkdirat = Linux + 248, + mknodat = Linux + 249, + fchownat = Linux + 250, + futimesat = Linux + 251, + newfstatat = Linux + 252, + unlinkat = Linux + 253, + renameat = Linux + 254, + linkat = Linux + 255, + symlinkat = Linux + 256, + readlinkat = Linux + 257, + fchmodat = Linux + 258, + faccessat = Linux + 259, + pselect6 = Linux + 260, + ppoll = Linux + 261, + unshare = Linux + 262, + splice = Linux + 263, + sync_file_range = Linux + 264, + tee = Linux + 265, + vmsplice = Linux + 266, + move_pages = Linux + 267, + set_robust_list = Linux + 268, + get_robust_list = Linux + 269, + kexec_load = Linux + 270, + getcpu = Linux + 271, + epoll_pwait = Linux + 272, + ioprio_set = Linux + 273, + ioprio_get = Linux + 274, + utimensat = Linux + 275, + signalfd = Linux + 276, + timerfd = Linux + 277, + eventfd = Linux + 278, + fallocate = Linux + 279, + timerfd_create = Linux + 280, + timerfd_settime = Linux + 281, + timerfd_gettime = Linux + 282, + signalfd4 = Linux + 283, + eventfd2 = Linux + 284, + epoll_create1 = Linux + 285, + dup3 = Linux + 286, + pipe2 = Linux + 287, + inotify_init1 = Linux + 288, + preadv = Linux + 289, + pwritev = Linux + 290, + rt_tgsigqueueinfo = Linux + 291, + perf_event_open = Linux + 292, + accept4 = Linux + 293, + recvmmsg = Linux + 294, + fanotify_init = Linux + 295, + fanotify_mark = Linux + 296, + prlimit64 = Linux + 297, + name_to_handle_at = Linux + 298, + open_by_handle_at = Linux + 299, + clock_adjtime = Linux + 300, + syncfs = Linux + 301, + sendmmsg = Linux + 302, + setns = Linux + 303, + process_vm_readv = Linux + 304, + process_vm_writev = Linux + 305, + kcmp = Linux + 306, + finit_module = Linux + 307, + getdents64 = Linux + 308, + sched_setattr = Linux + 309, + sched_getattr = Linux + 310, + renameat2 = Linux + 311, + seccomp = Linux + 312, + getrandom = Linux + 313, + memfd_create = Linux + 314, + bpf = Linux + 315, + execveat = Linux + 316, + userfaultfd = Linux + 317, + membarrier = Linux + 318, + mlock2 = Linux + 319, + copy_file_range = Linux + 320, + preadv2 = Linux + 321, + pwritev2 = Linux + 322, + pkey_mprotect = Linux + 323, + pkey_alloc = Linux + 324, + pkey_free = Linux + 325, + statx = Linux + 326, + rseq = Linux + 327, + io_pgetevents = Linux + 328, + pidfd_send_signal = Linux + 424, + io_uring_setup = Linux + 425, + io_uring_enter = Linux + 426, + io_uring_register = Linux + 427, + open_tree = Linux + 428, + move_mount = Linux + 429, + fsopen = Linux + 430, + fsconfig = Linux + 431, + fsmount = Linux + 432, + fspick = Linux + 433, + pidfd_open = Linux + 434, + clone3 = Linux + 435, + close_range = Linux + 436, + openat2 = Linux + 437, + pidfd_getfd = Linux + 438, + faccessat2 = Linux + 439, + process_madvise = Linux + 440, + epoll_pwait2 = Linux + 441, + mount_setattr = Linux + 442, + landlock_create_ruleset = Linux + 444, + landlock_add_rule = Linux + 445, + landlock_restrict_self = Linux + 446, +}; + pub const PowerPC = enum(usize) { restart_syscall = 0, exit = 1, diff --git a/lib/std/os/linux/tls.zig b/lib/std/os/linux/tls.zig index d487530f55..cffdec0424 100644 --- a/lib/std/os/linux/tls.zig +++ b/lib/std/os/linux/tls.zig @@ -48,7 +48,7 @@ const TLSVariant = enum { }; const tls_variant = switch (native_arch) { - .arm, .armeb, .thumb, .aarch64, .aarch64_be, .riscv32, .riscv64, .mips, .mipsel, .powerpc, .powerpc64, .powerpc64le => TLSVariant.VariantI, + .arm, .armeb, .thumb, .aarch64, .aarch64_be, .riscv32, .riscv64, .mips, .mipsel, .mips64, .mips64el, .powerpc, .powerpc64, .powerpc64le => TLSVariant.VariantI, .x86_64, .x86, .sparc64 => TLSVariant.VariantII, else => @compileError("undefined tls_variant for this architecture"), }; @@ -64,7 +64,7 @@ const tls_tcb_size = switch (native_arch) { // Controls if the TP points to the end of the TCB instead of its beginning const tls_tp_points_past_tcb = switch (native_arch) { - .riscv32, .riscv64, .mips, .mipsel, .powerpc, .powerpc64, .powerpc64le => true, + .riscv32, .riscv64, .mips, .mipsel, .mips64, .mips64el, .powerpc, .powerpc64, .powerpc64le => true, else => false, }; @@ -72,12 +72,12 @@ const tls_tp_points_past_tcb = switch (native_arch) { // make the generated code more efficient const tls_tp_offset = switch (native_arch) { - .mips, .mipsel, .powerpc, .powerpc64, .powerpc64le => 0x7000, + .mips, .mipsel, .mips64, .mips64el, .powerpc, .powerpc64, .powerpc64le => 0x7000, else => 0, }; const tls_dtv_offset = switch (native_arch) { - .mips, .mipsel, .powerpc, .powerpc64, .powerpc64le => 0x8000, + .mips, .mipsel, .mips64, .mips64el, .powerpc, .powerpc64, .powerpc64le => 0x8000, .riscv32, .riscv64 => 0x800, else => 0, }; @@ -156,7 +156,7 @@ pub fn setThreadPointer(addr: usize) void { : [addr] "r" (addr), ); }, - .mips, .mipsel => { + .mips, .mipsel, .mips64, .mips64el => { const rc = std.os.linux.syscall1(.set_thread_area, addr); assert(rc == 0); }, diff --git a/lib/std/start.zig b/lib/std/start.zig index 8aef63332d..ea221d1539 100644 --- a/lib/std/start.zig +++ b/lib/std/start.zig @@ -327,7 +327,7 @@ fn _start() callconv(.Naked) noreturn { : [argc] "={sp}" (-> [*]usize), ); }, - .mips, .mipsel => { + .mips, .mipsel, .mips64, .mips64el => { // The lr is already zeroed on entry, as specified by the ABI. argc_argv_ptr = asm volatile ( \\ move $fp, $0 From b7c96c3bbdc0e2172cf9edb0c9c7c52f86c2311e Mon Sep 17 00:00:00 2001 From: Nicolas Goy Date: Sat, 4 Feb 2023 03:01:47 +0100 Subject: [PATCH 59/65] Allow const for ArrayList.getLast, fix #14522 --- lib/std/array_list.zig | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/std/array_list.zig b/lib/std/array_list.zig index b6e78b07bd..2485668417 100644 --- a/lib/std/array_list.zig +++ b/lib/std/array_list.zig @@ -482,14 +482,14 @@ pub fn ArrayListAligned(comptime T: type, comptime alignment: ?u29) type { /// Return the last element from the list. /// Asserts the list has at least one item. - pub fn getLast(self: *Self) T { + pub fn getLast(self: Self) T { const val = self.items[self.items.len - 1]; return val; } /// Return the last element from the list, or /// return `null` if list is empty. - pub fn getLastOrNull(self: *Self) ?T { + pub fn getLastOrNull(self: Self) ?T { if (self.items.len == 0) return null; return self.getLast(); } @@ -961,14 +961,14 @@ pub fn ArrayListAlignedUnmanaged(comptime T: type, comptime alignment: ?u29) typ /// Return the last element from the list. /// Asserts the list has at least one item. - pub fn getLast(self: *Self) T { + pub fn getLast(self: Self) T { const val = self.items[self.items.len - 1]; return val; } /// Return the last element from the list, or /// return `null` if list is empty. - pub fn getLastOrNull(self: *Self) ?T { + pub fn getLastOrNull(self: Self) ?T { if (self.items.len == 0) return null; return self.getLast(); } @@ -1719,3 +1719,27 @@ test "std.ArrayList(?u32).popOrNull()" { try testing.expect(list.popOrNull().? == null); try testing.expect(list.popOrNull() == null); } + +test "std.ArrayList(u32).getLast()" { + const a = testing.allocator; + + var list = ArrayList(u32).init(a); + defer list.deinit(); + + try list.append(2); + const const_list = list; + try testing.expectEqual(const_list.getLast(), 2); +} + +test "std.ArrayList(u32).getLastOrNull()" { + const a = testing.allocator; + + var list = ArrayList(u32).init(a); + defer list.deinit(); + + try testing.expectEqual(list.getLastOrNull(), null); + + try list.append(2); + const const_list = list; + try testing.expectEqual(const_list.getLastOrNull().?, 2); +} From 1876eaec51cab1251a53391f4b4d0fd227e83710 Mon Sep 17 00:00:00 2001 From: Jonathan Marler Date: Sat, 4 Feb 2023 13:07:48 -0700 Subject: [PATCH 60/65] mark deprecated assumeSentinel as pub assumeSentinel was removed and replaced with a compileError, but it's not pub, so the error message indicates it's private rather than providing the compileError message. --- lib/std/meta.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/std/meta.zig b/lib/std/meta.zig index c7ec4b1702..7ab4c9f25c 100644 --- a/lib/std/meta.zig +++ b/lib/std/meta.zig @@ -332,7 +332,7 @@ pub fn Sentinel(comptime T: type, comptime sentinel_val: Elem(T)) type { @compileError("Unable to derive a sentinel pointer type from " ++ @typeName(T)); } -const assumeSentinel = @compileError("This function has been removed, consider using std.mem.sliceTo() or if needed a @ptrCast()"); +pub const assumeSentinel = @compileError("This function has been removed, consider using std.mem.sliceTo() or if needed a @ptrCast()"); pub fn containerLayout(comptime T: type) Type.ContainerLayout { return switch (@typeInfo(T)) { From 289e8fab7949bebfc39209b86a69317a53e747f8 Mon Sep 17 00:00:00 2001 From: ee7 <45465154+ee7@users.noreply.github.com> Date: Sat, 4 Feb 2023 19:08:01 +0100 Subject: [PATCH 61/65] langref, tools: rename --single-threaded to -fsingle-threaded Commit 40f5e5dfc60e ("CLI: introduce -fsingle-threaded/ -fno-single-threaded", 2021-12-01) removed the `--single-threaded` option, but didn't update all mentions of it. $ zig version 0.11.0-dev.1568+c9b957c93 $ zig build-exe --help | grep single -fsingle-threaded Code assumes there is only one thread -fno-single-threaded Code may not assume there is only one thread $ zig build-exe --single-threaded foo.zig error: unrecognized parameter: '--single-threaded' --- doc/langref.html.in | 2 +- tools/update_cpu_features.zig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/langref.html.in b/doc/langref.html.in index 36711e555a..5d087f72a2 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -9604,7 +9604,7 @@ pub fn build(b: *std.Build) void { {#header_close#} {#header_open|Single Threaded Builds#} -

Zig has a compile option --single-threaded which has the following effects:

+

Zig has a compile option -fsingle-threaded which has the following effects:

  • All {#link|Thread Local Variables#} are treated as regular {#link|Container Level Variables#}.
  • The overhead of {#link|Async Functions#} becomes equivalent to function call overhead.
    • diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig index 647d2c5a9b..ee92d63227 100644 --- a/tools/update_cpu_features.zig +++ b/tools/update_cpu_features.zig @@ -1306,7 +1306,7 @@ fn usageAndExit(file: fs.File, arg0: []const u8, code: u8) noreturn { \\ \\Updates lib/std/target/.zig from llvm/lib/Target//.td . \\ - \\On a less beefy system, or when debugging, compile with --single-threaded. + \\On a less beefy system, or when debugging, compile with -fsingle-threaded. \\ , .{arg0}) catch std.process.exit(1); std.process.exit(code); From d4ce0fe7fea14bae889e03464980e5eca7a2ed1f Mon Sep 17 00:00:00 2001 From: Stephen Gregoratto Date: Sun, 5 Feb 2023 10:40:24 +1100 Subject: [PATCH 62/65] Update Linux syscall list for 6.1, support Mips64 Follow up for #14541. --- lib/std/os/linux/syscalls.zig | 16 ++++++++++------ tools/generate_linux_syscalls.zig | 25 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/lib/std/os/linux/syscalls.zig b/lib/std/os/linux/syscalls.zig index 36a8bae04c..f176a434b4 100644 --- a/lib/std/os/linux/syscalls.zig +++ b/lib/std/os/linux/syscalls.zig @@ -2057,7 +2057,7 @@ pub const Mips64 = enum(usize) { writev = Linux + 19, access = Linux + 20, pipe = Linux + 21, - select = Linux + 22, + _newselect = Linux + 22, sched_yield = Linux + 23, mremap = Linux + 24, msync = Linux + 25, @@ -2071,8 +2071,8 @@ pub const Mips64 = enum(usize) { pause = Linux + 33, nanosleep = Linux + 34, getitimer = Linux + 35, - alarm = Linux + 36, - setitimer = Linux + 37, + setitimer = Linux + 36, + alarm = Linux + 37, getpid = Linux + 38, sendfile = Linux + 39, socket = Linux + 40, @@ -2286,7 +2286,7 @@ pub const Mips64 = enum(usize) { mknodat = Linux + 249, fchownat = Linux + 250, futimesat = Linux + 251, - newfstatat = Linux + 252, + fstatat64 = Linux + 252, unlinkat = Linux + 253, renameat = Linux + 254, linkat = Linux + 255, @@ -2315,8 +2315,8 @@ pub const Mips64 = enum(usize) { eventfd = Linux + 278, fallocate = Linux + 279, timerfd_create = Linux + 280, - timerfd_settime = Linux + 281, - timerfd_gettime = Linux + 282, + timerfd_gettime = Linux + 281, + timerfd_settime = Linux + 282, signalfd4 = Linux + 283, eventfd2 = Linux + 284, epoll_create1 = Linux + 285, @@ -2382,9 +2382,13 @@ pub const Mips64 = enum(usize) { process_madvise = Linux + 440, epoll_pwait2 = Linux + 441, mount_setattr = Linux + 442, + quotactl_fd = Linux + 443, landlock_create_ruleset = Linux + 444, landlock_add_rule = Linux + 445, landlock_restrict_self = Linux + 446, + process_mrelease = Linux + 448, + futex_waitv = Linux + 449, + set_mempolicy_home_node = Linux + 450, }; pub const PowerPC = enum(usize) { diff --git a/tools/generate_linux_syscalls.zig b/tools/generate_linux_syscalls.zig index 67f098ac4f..11b18ae3bf 100644 --- a/tools/generate_linux_syscalls.zig +++ b/tools/generate_linux_syscalls.zig @@ -167,6 +167,31 @@ pub fn main() !void { try writer.writeAll("};\n\n"); } + { + try writer.writeAll( + \\pub const Mips64 = enum(usize) { + \\ pub const Linux = 5000; + \\ + \\ + ); + + const table = try linux_dir.readFile("arch/mips/kernel/syscalls/syscall_n64.tbl", buf); + var lines = mem.tokenize(u8, table, "\n"); + while (lines.next()) |line| { + if (line[0] == '#') continue; + + var fields = mem.tokenize(u8, line, " \t"); + const number = fields.next() orelse return error.Incomplete; + // abi is always n64 + _ = fields.next() orelse return error.Incomplete; + const name = fields.next() orelse return error.Incomplete; + const fixed_name = if (stdlib_renames.get(name)) |fixed| fixed else name; + + try writer.print(" {s} = Linux + {s},\n", .{ zig.fmtId(fixed_name), number }); + } + + try writer.writeAll("};\n\n"); + } { try writer.writeAll("pub const PowerPC = enum(usize) {\n"); From 11cc1c16fa36a7eb13cba1c43fb153ee6aca7b58 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 4 Feb 2023 16:14:43 -0700 Subject: [PATCH 63/65] make `@embedFile` support module-mapped names the same way as `@import` closes #14553 --- src/Module.zig | 54 ++++++++++++++----- test/standalone.zig | 1 + .../embed_generated_file/bootloader.zig | 1 + .../standalone/embed_generated_file/build.zig | 28 ++++++++++ test/standalone/embed_generated_file/main.zig | 8 +++ 5 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 test/standalone/embed_generated_file/bootloader.zig create mode 100644 test/standalone/embed_generated_file/build.zig create mode 100644 test/standalone/embed_generated_file/main.zig diff --git a/src/Module.zig b/src/Module.zig index 3243c36ee5..e4cf0189cc 100644 --- a/src/Module.zig +++ b/src/Module.zig @@ -4865,14 +4865,31 @@ pub fn importFile( }; } -pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*EmbedFile { +pub fn embedFile(mod: *Module, cur_file: *File, import_string: []const u8) !*EmbedFile { const gpa = mod.gpa; - // The resolved path is used as the key in the table, to detect if - // a file refers to the same as another, despite different relative paths. + if (cur_file.pkg.table.get(import_string)) |pkg| { + const resolved_path = try std.fs.path.resolve(gpa, &[_][]const u8{ + pkg.root_src_directory.path orelse ".", pkg.root_src_path, + }); + var keep_resolved_path = false; + defer if (!keep_resolved_path) gpa.free(resolved_path); + + const gop = try mod.embed_table.getOrPut(gpa, resolved_path); + errdefer assert(mod.embed_table.remove(resolved_path)); + if (gop.found_existing) return gop.value_ptr.*; + + const sub_file_path = try gpa.dupe(u8, pkg.root_src_path); + errdefer gpa.free(sub_file_path); + + return newEmbedFile(mod, pkg, sub_file_path, resolved_path, &keep_resolved_path, gop); + } + + // The resolved path is used as the key in the table, to detect if a file + // refers to the same as another, despite different relative paths. const cur_pkg_dir_path = cur_file.pkg.root_src_directory.path orelse "."; const resolved_path = try std.fs.path.resolve(gpa, &[_][]const u8{ - cur_pkg_dir_path, cur_file.sub_file_path, "..", rel_file_path, + cur_pkg_dir_path, cur_file.sub_file_path, "..", import_string, }); var keep_resolved_path = false; defer if (!keep_resolved_path) gpa.free(resolved_path); @@ -4881,9 +4898,6 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb errdefer assert(mod.embed_table.remove(resolved_path)); if (gop.found_existing) return gop.value_ptr.*; - const new_file = try gpa.create(EmbedFile); - errdefer gpa.destroy(new_file); - const resolved_root_path = try std.fs.path.resolve(gpa, &[_][]const u8{cur_pkg_dir_path}); defer gpa.free(resolved_root_path); @@ -4902,7 +4916,23 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb }; errdefer gpa.free(sub_file_path); - var file = try cur_file.pkg.root_src_directory.handle.openFile(sub_file_path, .{}); + return newEmbedFile(mod, cur_file.pkg, sub_file_path, resolved_path, &keep_resolved_path, gop); +} + +fn newEmbedFile( + mod: *Module, + pkg: *Package, + sub_file_path: []const u8, + resolved_path: []const u8, + keep_resolved_path: *bool, + gop: std.StringHashMapUnmanaged(*EmbedFile).GetOrPutResult, +) !*EmbedFile { + const gpa = mod.gpa; + + const new_file = try gpa.create(EmbedFile); + errdefer gpa.destroy(new_file); + + var file = try pkg.root_src_directory.handle.openFile(sub_file_path, .{}); defer file.close(); const actual_stat = try file.stat(); @@ -4915,10 +4945,6 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb const bytes = try file.readToEndAllocOptions(gpa, std.math.maxInt(u32), size_usize, 1, 0); errdefer gpa.free(bytes); - log.debug("new embedFile. resolved_root_path={s}, resolved_path={s}, sub_file_path={s}, rel_file_path={s}", .{ - resolved_root_path, resolved_path, sub_file_path, rel_file_path, - }); - if (mod.comp.whole_cache_manifest) |whole_cache_manifest| { const copied_resolved_path = try gpa.dupe(u8, resolved_path); errdefer gpa.free(copied_resolved_path); @@ -4927,13 +4953,13 @@ pub fn embedFile(mod: *Module, cur_file: *File, rel_file_path: []const u8) !*Emb try whole_cache_manifest.addFilePostContents(copied_resolved_path, bytes, stat); } - keep_resolved_path = true; // It's now owned by embed_table. + keep_resolved_path.* = true; // It's now owned by embed_table. gop.value_ptr.* = new_file; new_file.* = .{ .sub_file_path = sub_file_path, .bytes = bytes, .stat = stat, - .pkg = cur_file.pkg, + .pkg = pkg, .owner_decl = undefined, // Set by Sema immediately after this function returns. }; return new_file; diff --git a/test/standalone.zig b/test/standalone.zig index c0cb9ff02b..af972ccb86 100644 --- a/test/standalone.zig +++ b/test/standalone.zig @@ -102,4 +102,5 @@ pub fn addCases(cases: *tests.StandaloneContext) void { cases.addBuildFile("test/standalone/issue_13030/build.zig", .{ .build_modes = true }); cases.addBuildFile("test/standalone/emit_asm_and_bin/build.zig", .{}); cases.addBuildFile("test/standalone/issue_12588/build.zig", .{}); + cases.addBuildFile("test/standalone/embed_generated_file/build.zig", .{}); } diff --git a/test/standalone/embed_generated_file/bootloader.zig b/test/standalone/embed_generated_file/bootloader.zig new file mode 100644 index 0000000000..dc79a847f4 --- /dev/null +++ b/test/standalone/embed_generated_file/bootloader.zig @@ -0,0 +1 @@ +pub export fn _start() void {} diff --git a/test/standalone/embed_generated_file/build.zig b/test/standalone/embed_generated_file/build.zig new file mode 100644 index 0000000000..3b17ff0b8f --- /dev/null +++ b/test/standalone/embed_generated_file/build.zig @@ -0,0 +1,28 @@ +const std = @import("std"); + +pub fn build(b: *std.Build) void { + const target = b.standardTargetOptions(.{}); + const optimize = b.standardOptimizeOption(.{}); + + const bootloader = b.addExecutable(.{ + .name = "bootloader", + .root_source_file = .{ .path = "bootloader.zig" }, + .target = .{ + .cpu_arch = .x86, + .os_tag = .freestanding, + }, + .optimize = .ReleaseSmall, + }); + + const exe = b.addTest(.{ + .root_source_file = .{ .path = "main.zig" }, + .target = target, + .optimize = optimize, + }); + exe.addAnonymousModule("bootloader.elf", .{ + .source_file = bootloader.getOutputSource(), + }); + + const test_step = b.step("test", "Test the program"); + test_step.dependOn(&exe.step); +} diff --git a/test/standalone/embed_generated_file/main.zig b/test/standalone/embed_generated_file/main.zig new file mode 100644 index 0000000000..31f6e8c628 --- /dev/null +++ b/test/standalone/embed_generated_file/main.zig @@ -0,0 +1,8 @@ +const std = @import("std"); +const blah = @embedFile("bootloader.elf"); + +test { + comptime { + std.debug.assert(std.mem.eql(u8, blah[1..][0..3], "ELF")); + } +} From b04e48566c58ed22fdb0dbe7ac866877ad53133c Mon Sep 17 00:00:00 2001 From: David Vanderson Date: Thu, 19 Jan 2023 21:30:43 -0500 Subject: [PATCH 64/65] std.build: support for generated c headers Add ability to generate a c header file from scratch, and then both compile with it and install it if needed. Example: ```zig const avconfig_h = b.addConfigHeader(.{ .path = "libavutil/avconfig.h" }, .generated, .{ .AV_HAVE_BIGENDIAN = 0, // TODO: detect based on target .AV_HAVE_FAST_UNALIGNED = 1, // TODO: detect based on target }); lib.addConfigHeader(avconfig_h); lib.installConfigHeader(avconfig_h); ``` --- lib/std/Build/CompileStep.zig | 6 ++ lib/std/Build/ConfigHeaderStep.zig | 126 +++++++++++++++++++++-------- 2 files changed, 99 insertions(+), 33 deletions(-) diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index 879793f781..a7f747625d 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -442,6 +442,12 @@ pub fn installHeader(a: *CompileStep, src_path: []const u8, dest_rel_path: []con a.installed_headers.append(&install_file.step) catch @panic("OOM"); } +pub fn installConfigHeader(a: *CompileStep, config_header: *ConfigHeaderStep) void { + const install_file = a.builder.addInstallFileWithDir(config_header.getOutputSource(), .header, config_header.output_path); + a.builder.getInstallStep().dependOn(&install_file.step); + a.installed_headers.append(&install_file.step) catch unreachable; +} + pub fn installHeadersDirectory( a: *CompileStep, src_dir_path: []const u8, diff --git a/lib/std/Build/ConfigHeaderStep.zig b/lib/std/Build/ConfigHeaderStep.zig index 58a78b939d..49900c7f6e 100644 --- a/lib/std/Build/ConfigHeaderStep.zig +++ b/lib/std/Build/ConfigHeaderStep.zig @@ -11,6 +11,8 @@ pub const Style = enum { /// The configure format supported by CMake. It uses `@@FOO@@` and /// `#cmakedefine` for template substitution. cmake, + /// Generate a c header from scratch with the values passed. + generated, }; pub const Value = union(enum) { @@ -27,9 +29,12 @@ builder: *std.Build, source: std.Build.FileSource, style: Style, values: std.StringHashMap(Value), +gen_keys: std.ArrayList([]const u8), +gen_values: std.ArrayList(Value), max_bytes: usize = 2 * 1024 * 1024, output_dir: []const u8, -output_basename: []const u8, +output_path: []const u8, +output_gen: std.build.GeneratedFile, pub fn create(builder: *std.Build, source: std.Build.FileSource, style: Style) *ConfigHeaderStep { const self = builder.allocator.create(ConfigHeaderStep) catch @panic("OOM"); @@ -40,64 +45,72 @@ pub fn create(builder: *std.Build, source: std.Build.FileSource, style: Style) * .source = source, .style = style, .values = std.StringHashMap(Value).init(builder.allocator), + .gen_keys = std.ArrayList([]const u8).init(builder.allocator), + .gen_values = std.ArrayList(Value).init(builder.allocator), .output_dir = undefined, - .output_basename = "config.h", + .output_path = "config.h", + .output_gen = std.build.GeneratedFile{ .step = &self.step }, }; + switch (source) { .path => |p| { - const basename = std.fs.path.basename(p); - if (std.mem.endsWith(u8, basename, ".h.in")) { - self.output_basename = basename[0 .. basename.len - 3]; + self.output_path = p; + + switch (style) { + .autoconf, .cmake => { + if (std.mem.endsWith(u8, p, ".h.in")) { + self.output_path = p[0 .. p.len - 3]; + } + }, + else => {}, } }, else => {}, } + return self; } +pub fn getOutputSource(self: *ConfigHeaderStep) std.build.FileSource { + return std.build.FileSource{ .generated = &self.output_gen }; +} + pub fn addValues(self: *ConfigHeaderStep, values: anytype) void { return addValuesInner(self, values) catch @panic("OOM"); } fn addValuesInner(self: *ConfigHeaderStep, values: anytype) !void { inline for (@typeInfo(@TypeOf(values)).Struct.fields) |field| { - try putValue(self, field.name, field.type, @field(values, field.name)); + const val = try getValue(self, field.type, @field(values, field.name)); + switch (self.style) { + .generated => { + try self.gen_keys.append(field.name); + try self.gen_values.append(val); + }, + else => try self.values.put(field.name, val), + } } } -fn putValue(self: *ConfigHeaderStep, field_name: []const u8, comptime T: type, v: T) !void { +fn getValue(self: *ConfigHeaderStep, comptime T: type, v: T) !Value { switch (@typeInfo(T)) { - .Null => { - try self.values.put(field_name, .undef); - }, - .Void => { - try self.values.put(field_name, .defined); - }, - .Bool => { - try self.values.put(field_name, .{ .boolean = v }); - }, - .Int => { - try self.values.put(field_name, .{ .int = v }); - }, - .ComptimeInt => { - try self.values.put(field_name, .{ .int = v }); - }, - .EnumLiteral => { - try self.values.put(field_name, .{ .ident = @tagName(v) }); - }, + .Null => return .undef, + .Void => return .defined, + .Bool => return .{ .boolean = v }, + .Int, .ComptimeInt => return .{ .int = v }, + .EnumLiteral => return .{ .ident = @tagName(v) }, .Optional => { if (v) |x| { - return putValue(self, field_name, @TypeOf(x), x); + return getValue(self, @TypeOf(x), x); } else { - try self.values.put(field_name, .undef); + return .undef; } }, .Pointer => |ptr| { switch (@typeInfo(ptr.child)) { .Array => |array| { if (ptr.size == .One and array.child == u8) { - try self.values.put(field_name, .{ .string = v }); - return; + return .{ .string = v }; } }, else => {}, @@ -113,7 +126,10 @@ fn make(step: *Step) !void { const self = @fieldParentPtr(ConfigHeaderStep, "step", step); const gpa = self.builder.allocator; const src_path = self.source.getPath(self.builder); - const contents = try std.fs.cwd().readFileAlloc(gpa, src_path, self.max_bytes); + const contents = switch (self.style) { + .generated => src_path, + else => try std.fs.cwd().readFileAlloc(gpa, src_path, self.max_bytes), + }; // The cache is used here not really as a way to speed things up - because writing // the data to a file would probably be very fast - but as a way to find a canonical @@ -146,8 +162,21 @@ fn make(step: *Step) !void { self.output_dir = try std.fs.path.join(gpa, &[_][]const u8{ self.builder.cache_root, "o", &hash_basename, }); - var dir = std.fs.cwd().makeOpenPath(self.output_dir, .{}) catch |err| { - std.debug.print("unable to make path {s}: {s}\n", .{ self.output_dir, @errorName(err) }); + + // If output_path has directory parts, deal with them. Example: + // output_dir is zig-cache/o/HASH + // output_path is libavutil/avconfig.h + // We want to open directory zig-cache/o/HASH/libavutil/ + // but keep output_dir as zig-cache/o/HASH for -I include + var outdir = self.output_dir; + var outpath = self.output_path; + if (std.fs.path.dirname(self.output_path)) |d| { + outdir = try std.fs.path.join(gpa, &[_][]const u8{ self.output_dir, d }); + outpath = std.fs.path.basename(self.output_path); + } + + var dir = std.fs.cwd().makeOpenPath(outdir, .{}) catch |err| { + std.debug.print("unable to make path {s}: {s}\n", .{ outdir, @errorName(err) }); return err; }; defer dir.close(); @@ -164,9 +193,12 @@ fn make(step: *Step) !void { switch (self.style) { .autoconf => try render_autoconf(contents, &output, &values_copy, src_path), .cmake => try render_cmake(contents, &output, &values_copy, src_path), + .generated => try render_generated(gpa, &output, &self.gen_keys, &self.gen_values, self.source.getDisplayName()), } - try dir.writeFile(self.output_basename, output.items); + try dir.writeFile(outpath, output.items); + + self.output_gen.path = try std.fs.path.join(gpa, &[_][]const u8{ self.output_dir, self.output_path }); } fn render_autoconf( @@ -297,3 +329,31 @@ fn renderValue(output: *std.ArrayList(u8), name: []const u8, value: Value) !void }, } } + +fn render_generated( + gpa: std.mem.Allocator, + output: *std.ArrayList(u8), + keys: *std.ArrayList([]const u8), + values: *std.ArrayList(Value), + src_path: []const u8, +) !void { + var include_guard = try gpa.dupe(u8, src_path); + defer gpa.free(include_guard); + + for (include_guard) |*ch| { + if (ch.* == '.' or std.fs.path.isSep(ch.*)) { + ch.* = '_'; + } else { + ch.* = std.ascii.toUpper(ch.*); + } + } + + try output.writer().print("#ifndef {s}\n", .{include_guard}); + try output.writer().print("#define {s}\n", .{include_guard}); + + for (keys.items) |k, i| { + try renderValue(output, k, values.items[i]); + } + + try output.writer().print("#endif /* {s} */\n", .{include_guard}); +} From b29e3fa2cd667cc967b4c7dfb5023e5ac0224d96 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 4 Feb 2023 22:44:21 -0700 Subject: [PATCH 65/65] std.Build: enhancements to ConfigHeaderStep Breaking API change to std.Build.addConfigHeader. It now uses an options struct. Introduce std.Build.CompileStep.installConfigHeader which also accepts an options struct. This is used to add a generated config file into the set of installed header files for a particular compilation artifact. std.Build.ConfigHeaderStep now additionally supports a "blank" style where a header is generated from scratch. It no longer exposes `output_dir`. Instead it exposes a FileSource via `output_file`. It now additionally accepts an `include_path` option which affects the include path of CompileStep when using the `#include` directive, as well as affecting the default installation subdirectory for header installation purposes. The hash used for the directory to store the generated config file now includes the contents of the generated file. This fixes possible race conditions when generating multiple header files simultaneously. The values hash table is now an array hash map, to preserve order for the "blank" use case. I also took the opportunity to remove output_dir from TranslateCStep and WriteFileStep. This is technically a breaking change, but it was always naughty to access these fields. --- lib/std/Build.zig | 10 +- lib/std/Build/CompileStep.zig | 27 ++- lib/std/Build/ConfigHeaderStep.zig | 279 +++++++++++++++-------------- lib/std/Build/TranslateCStep.zig | 11 +- lib/std/Build/WriteFileStep.zig | 12 +- 5 files changed, 181 insertions(+), 158 deletions(-) diff --git a/lib/std/Build.zig b/lib/std/Build.zig index 15c1647957..86b16d234c 100644 --- a/lib/std/Build.zig +++ b/lib/std/Build.zig @@ -598,13 +598,17 @@ pub fn addSystemCommand(self: *Build, argv: []const []const u8) *RunStep { return run_step; } +/// Using the `values` provided, produces a C header file, possibly based on a +/// template input file (e.g. config.h.in). +/// When an input template file is provided, this function will fail the build +/// when an option not found in the input file is provided in `values`, and +/// when an option found in the input file is missing from `values`. pub fn addConfigHeader( b: *Build, - source: FileSource, - style: ConfigHeaderStep.Style, + options: ConfigHeaderStep.Options, values: anytype, ) *ConfigHeaderStep { - const config_header_step = ConfigHeaderStep.create(b, source, style); + const config_header_step = ConfigHeaderStep.create(b, options); config_header_step.addValues(values); return config_header_step; } diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index a7f747625d..e0d90add3c 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -442,10 +442,24 @@ pub fn installHeader(a: *CompileStep, src_path: []const u8, dest_rel_path: []con a.installed_headers.append(&install_file.step) catch @panic("OOM"); } -pub fn installConfigHeader(a: *CompileStep, config_header: *ConfigHeaderStep) void { - const install_file = a.builder.addInstallFileWithDir(config_header.getOutputSource(), .header, config_header.output_path); - a.builder.getInstallStep().dependOn(&install_file.step); - a.installed_headers.append(&install_file.step) catch unreachable; +pub const InstallConfigHeaderOptions = struct { + install_dir: InstallDir = .header, + dest_rel_path: ?[]const u8 = null, +}; + +pub fn installConfigHeader( + cs: *CompileStep, + config_header: *ConfigHeaderStep, + options: InstallConfigHeaderOptions, +) void { + const dest_rel_path = options.dest_rel_path orelse config_header.include_path; + const install_file = cs.builder.addInstallFileWithDir( + .{ .generated = &config_header.output_file }, + options.install_dir, + dest_rel_path, + ); + cs.builder.getInstallStep().dependOn(&install_file.step); + cs.installed_headers.append(&install_file.step) catch @panic("OOM"); } pub fn installHeadersDirectory( @@ -1628,8 +1642,9 @@ fn make(step: *Step) !void { } }, .config_header_step => |config_header| { - try zig_args.append("-I"); - try zig_args.append(config_header.output_dir); + const full_file_path = config_header.output_file.path.?; + const header_dir_path = full_file_path[0 .. full_file_path.len - config_header.include_path.len]; + try zig_args.appendSlice(&.{ "-I", header_dir_path }); }, } } diff --git a/lib/std/Build/ConfigHeaderStep.zig b/lib/std/Build/ConfigHeaderStep.zig index 49900c7f6e..ca4d69dfa9 100644 --- a/lib/std/Build/ConfigHeaderStep.zig +++ b/lib/std/Build/ConfigHeaderStep.zig @@ -4,15 +4,22 @@ const Step = std.Build.Step; pub const base_id: Step.Id = .config_header; -pub const Style = enum { +pub const Style = union(enum) { /// The configure format supported by autotools. It uses `#undef foo` to /// mark lines that can be substituted with different values. - autoconf, + autoconf: std.Build.FileSource, /// The configure format supported by CMake. It uses `@@FOO@@` and /// `#cmakedefine` for template substitution. - cmake, - /// Generate a c header from scratch with the values passed. - generated, + cmake: std.Build.FileSource, + /// Instead of starting with an input file, start with nothing. + blank, + + pub fn getFileSource(style: Style) ?std.Build.FileSource { + switch (style) { + .autoconf, .cmake => |s| return s, + .blank => return null, + } + } }; pub const Value = union(enum) { @@ -26,91 +33,96 @@ pub const Value = union(enum) { step: Step, builder: *std.Build, -source: std.Build.FileSource, -style: Style, -values: std.StringHashMap(Value), -gen_keys: std.ArrayList([]const u8), -gen_values: std.ArrayList(Value), -max_bytes: usize = 2 * 1024 * 1024, -output_dir: []const u8, -output_path: []const u8, -output_gen: std.build.GeneratedFile, +values: std.StringArrayHashMap(Value), +output_file: std.Build.GeneratedFile, -pub fn create(builder: *std.Build, source: std.Build.FileSource, style: Style) *ConfigHeaderStep { +style: Style, +max_bytes: usize, +include_path: []const u8, + +pub const Options = struct { + style: Style = .blank, + max_bytes: usize = 2 * 1024 * 1024, + include_path: ?[]const u8 = null, +}; + +pub fn create(builder: *std.Build, options: Options) *ConfigHeaderStep { const self = builder.allocator.create(ConfigHeaderStep) catch @panic("OOM"); - const name = builder.fmt("configure header {s}", .{source.getDisplayName()}); + const name = if (options.style.getFileSource()) |s| + builder.fmt("configure {s} header {s}", .{ @tagName(options.style), s.getDisplayName() }) + else + builder.fmt("configure {s} header", .{@tagName(options.style)}); self.* = .{ .builder = builder, .step = Step.init(base_id, name, builder.allocator, make), - .source = source, - .style = style, - .values = std.StringHashMap(Value).init(builder.allocator), - .gen_keys = std.ArrayList([]const u8).init(builder.allocator), - .gen_values = std.ArrayList(Value).init(builder.allocator), - .output_dir = undefined, - .output_path = "config.h", - .output_gen = std.build.GeneratedFile{ .step = &self.step }, + .style = options.style, + .values = std.StringArrayHashMap(Value).init(builder.allocator), + + .max_bytes = options.max_bytes, + .include_path = "config.h", + .output_file = .{ .step = &self.step }, }; - switch (source) { + if (options.style.getFileSource()) |s| switch (s) { .path => |p| { - self.output_path = p; - - switch (style) { - .autoconf, .cmake => { - if (std.mem.endsWith(u8, p, ".h.in")) { - self.output_path = p[0 .. p.len - 3]; - } - }, - else => {}, + const basename = std.fs.path.basename(p); + if (std.mem.endsWith(u8, basename, ".h.in")) { + self.include_path = basename[0 .. basename.len - 3]; } }, else => {}, + }; + + if (options.include_path) |include_path| { + self.include_path = include_path; } return self; } -pub fn getOutputSource(self: *ConfigHeaderStep) std.build.FileSource { - return std.build.FileSource{ .generated = &self.output_gen }; -} - pub fn addValues(self: *ConfigHeaderStep, values: anytype) void { return addValuesInner(self, values) catch @panic("OOM"); } fn addValuesInner(self: *ConfigHeaderStep, values: anytype) !void { inline for (@typeInfo(@TypeOf(values)).Struct.fields) |field| { - const val = try getValue(self, field.type, @field(values, field.name)); - switch (self.style) { - .generated => { - try self.gen_keys.append(field.name); - try self.gen_values.append(val); - }, - else => try self.values.put(field.name, val), - } + try putValue(self, field.name, field.type, @field(values, field.name)); } } -fn getValue(self: *ConfigHeaderStep, comptime T: type, v: T) !Value { +fn putValue(self: *ConfigHeaderStep, field_name: []const u8, comptime T: type, v: T) !void { switch (@typeInfo(T)) { - .Null => return .undef, - .Void => return .defined, - .Bool => return .{ .boolean = v }, - .Int, .ComptimeInt => return .{ .int = v }, - .EnumLiteral => return .{ .ident = @tagName(v) }, + .Null => { + try self.values.put(field_name, .undef); + }, + .Void => { + try self.values.put(field_name, .defined); + }, + .Bool => { + try self.values.put(field_name, .{ .boolean = v }); + }, + .Int => { + try self.values.put(field_name, .{ .int = v }); + }, + .ComptimeInt => { + try self.values.put(field_name, .{ .int = v }); + }, + .EnumLiteral => { + try self.values.put(field_name, .{ .ident = @tagName(v) }); + }, .Optional => { if (v) |x| { - return getValue(self, @TypeOf(x), x); + return putValue(self, field_name, @TypeOf(x), x); } else { - return .undef; + try self.values.put(field_name, .undef); } }, .Pointer => |ptr| { switch (@typeInfo(ptr.child)) { .Array => |array| { if (ptr.size == .One and array.child == u8) { - return .{ .string = v }; + try self.values.put(field_name, .{ .string = v }); + return; } }, else => {}, @@ -125,11 +137,6 @@ fn getValue(self: *ConfigHeaderStep, comptime T: type, v: T) !Value { fn make(step: *Step) !void { const self = @fieldParentPtr(ConfigHeaderStep, "step", step); const gpa = self.builder.allocator; - const src_path = self.source.getPath(self.builder); - const contents = switch (self.style) { - .generated => src_path, - else => try std.fs.cwd().readFileAlloc(gpa, src_path, self.max_bytes), - }; // The cache is used here not really as a way to speed things up - because writing // the data to a file would probably be very fast - but as a way to find a canonical @@ -146,9 +153,30 @@ fn make(step: *Step) !void { // Random bytes to make ConfigHeaderStep unique. Refresh this with new // random bytes when ConfigHeaderStep implementation is modified in a // non-backwards-compatible way. - var hash = Hasher.init("X1pQzdDt91Zlh7Eh"); - hash.update(self.source.getDisplayName()); - hash.update(contents); + var hash = Hasher.init("PGuDTpidxyMqnkGM"); + + var output = std.ArrayList(u8).init(gpa); + defer output.deinit(); + + try output.appendSlice("/* This file was generated by ConfigHeaderStep using the Zig Build System. */\n"); + + switch (self.style) { + .autoconf => |file_source| { + const src_path = file_source.getPath(self.builder); + const contents = try std.fs.cwd().readFileAlloc(gpa, src_path, self.max_bytes); + try render_autoconf(contents, &output, self.values, src_path); + }, + .cmake => |file_source| { + const src_path = file_source.getPath(self.builder); + const contents = try std.fs.cwd().readFileAlloc(gpa, src_path, self.max_bytes); + try render_cmake(contents, &output, self.values, src_path); + }, + .blank => { + try render_blank(&output, self.values, self.include_path); + }, + } + + hash.update(output.items); var digest: [16]u8 = undefined; hash.final(&digest); @@ -159,7 +187,7 @@ fn make(step: *Step) !void { .{std.fmt.fmtSliceHexLower(&digest)}, ) catch unreachable; - self.output_dir = try std.fs.path.join(gpa, &[_][]const u8{ + const output_dir = try std.fs.path.join(gpa, &[_][]const u8{ self.builder.cache_root, "o", &hash_basename, }); @@ -168,45 +196,33 @@ fn make(step: *Step) !void { // output_path is libavutil/avconfig.h // We want to open directory zig-cache/o/HASH/libavutil/ // but keep output_dir as zig-cache/o/HASH for -I include - var outdir = self.output_dir; - var outpath = self.output_path; - if (std.fs.path.dirname(self.output_path)) |d| { - outdir = try std.fs.path.join(gpa, &[_][]const u8{ self.output_dir, d }); - outpath = std.fs.path.basename(self.output_path); - } + const sub_dir_path = if (std.fs.path.dirname(self.include_path)) |d| + try std.fs.path.join(gpa, &.{ output_dir, d }) + else + output_dir; - var dir = std.fs.cwd().makeOpenPath(outdir, .{}) catch |err| { - std.debug.print("unable to make path {s}: {s}\n", .{ outdir, @errorName(err) }); + var dir = std.fs.cwd().makeOpenPath(sub_dir_path, .{}) catch |err| { + std.debug.print("unable to make path {s}: {s}\n", .{ output_dir, @errorName(err) }); return err; }; defer dir.close(); - var values_copy = try self.values.clone(); - defer values_copy.deinit(); + try dir.writeFile(std.fs.path.basename(self.include_path), output.items); - var output = std.ArrayList(u8).init(gpa); - defer output.deinit(); - try output.ensureTotalCapacity(contents.len); - - try output.appendSlice("/* This file was generated by ConfigHeaderStep using the Zig Build System. */\n"); - - switch (self.style) { - .autoconf => try render_autoconf(contents, &output, &values_copy, src_path), - .cmake => try render_cmake(contents, &output, &values_copy, src_path), - .generated => try render_generated(gpa, &output, &self.gen_keys, &self.gen_values, self.source.getDisplayName()), - } - - try dir.writeFile(outpath, output.items); - - self.output_gen.path = try std.fs.path.join(gpa, &[_][]const u8{ self.output_dir, self.output_path }); + self.output_file.path = try std.fs.path.join(self.builder.allocator, &.{ + output_dir, self.include_path, + }); } fn render_autoconf( contents: []const u8, output: *std.ArrayList(u8), - values_copy: *std.StringHashMap(Value), + values: std.StringArrayHashMap(Value), src_path: []const u8, ) !void { + var values_copy = try values.clone(); + defer values_copy.deinit(); + var any_errors = false; var line_index: u32 = 0; var line_it = std.mem.split(u8, contents, "\n"); @@ -224,7 +240,7 @@ fn render_autoconf( continue; } const name = it.rest(); - const kv = values_copy.fetchRemove(name) orelse { + const kv = values_copy.fetchSwapRemove(name) orelse { std.debug.print("{s}:{d}: error: unspecified config header value: '{s}'\n", .{ src_path, line_index + 1, name, }); @@ -234,12 +250,8 @@ fn render_autoconf( try renderValue(output, name, kv.value); } - { - var it = values_copy.iterator(); - while (it.next()) |entry| { - const name = entry.key_ptr.*; - std.debug.print("{s}: error: config header value unused: '{s}'\n", .{ src_path, name }); - } + for (values_copy.keys()) |name| { + std.debug.print("{s}: error: config header value unused: '{s}'\n", .{ src_path, name }); } if (any_errors) { @@ -250,9 +262,12 @@ fn render_autoconf( fn render_cmake( contents: []const u8, output: *std.ArrayList(u8), - values_copy: *std.StringHashMap(Value), + values: std.StringArrayHashMap(Value), src_path: []const u8, ) !void { + var values_copy = try values.clone(); + defer values_copy.deinit(); + var any_errors = false; var line_index: u32 = 0; var line_it = std.mem.split(u8, contents, "\n"); @@ -276,7 +291,7 @@ fn render_cmake( any_errors = true; continue; }; - const kv = values_copy.fetchRemove(name) orelse { + const kv = values_copy.fetchSwapRemove(name) orelse { std.debug.print("{s}:{d}: error: unspecified config header value: '{s}'\n", .{ src_path, line_index + 1, name, }); @@ -286,12 +301,8 @@ fn render_cmake( try renderValue(output, name, kv.value); } - { - var it = values_copy.iterator(); - while (it.next()) |entry| { - const name = entry.key_ptr.*; - std.debug.print("{s}: error: config header value unused: '{s}'\n", .{ src_path, name }); - } + for (values_copy.keys()) |name| { + std.debug.print("{s}: error: config header value unused: '{s}'\n", .{ src_path, name }); } if (any_errors) { @@ -299,6 +310,36 @@ fn render_cmake( } } +fn render_blank( + output: *std.ArrayList(u8), + defines: std.StringArrayHashMap(Value), + include_path: []const u8, +) !void { + const include_guard_name = try output.allocator.dupe(u8, include_path); + for (include_guard_name) |*byte| { + switch (byte.*) { + 'a'...'z' => byte.* = byte.* - 'a' + 'A', + 'A'...'Z', '0'...'9' => continue, + else => byte.* = '_', + } + } + + try output.appendSlice("#ifndef "); + try output.appendSlice(include_guard_name); + try output.appendSlice("\n#define "); + try output.appendSlice(include_guard_name); + try output.appendSlice("\n"); + + const values = defines.values(); + for (defines.keys()) |name, i| { + try renderValue(output, name, values[i]); + } + + try output.appendSlice("#endif /* "); + try output.appendSlice(include_guard_name); + try output.appendSlice(" */\n"); +} + fn renderValue(output: *std.ArrayList(u8), name: []const u8, value: Value) !void { switch (value) { .undef => { @@ -329,31 +370,3 @@ fn renderValue(output: *std.ArrayList(u8), name: []const u8, value: Value) !void }, } } - -fn render_generated( - gpa: std.mem.Allocator, - output: *std.ArrayList(u8), - keys: *std.ArrayList([]const u8), - values: *std.ArrayList(Value), - src_path: []const u8, -) !void { - var include_guard = try gpa.dupe(u8, src_path); - defer gpa.free(include_guard); - - for (include_guard) |*ch| { - if (ch.* == '.' or std.fs.path.isSep(ch.*)) { - ch.* = '_'; - } else { - ch.* = std.ascii.toUpper(ch.*); - } - } - - try output.writer().print("#ifndef {s}\n", .{include_guard}); - try output.writer().print("#define {s}\n", .{include_guard}); - - for (keys.items) |k, i| { - try renderValue(output, k, values.items[i]); - } - - try output.writer().print("#endif /* {s} */\n", .{include_guard}); -} diff --git a/lib/std/Build/TranslateCStep.zig b/lib/std/Build/TranslateCStep.zig index d9874142d8..fb0adfd0ae 100644 --- a/lib/std/Build/TranslateCStep.zig +++ b/lib/std/Build/TranslateCStep.zig @@ -15,7 +15,6 @@ builder: *std.Build, source: std.Build.FileSource, include_dirs: std.ArrayList([]const u8), c_macros: std.ArrayList([]const u8), -output_dir: ?[]const u8, out_basename: []const u8, target: CrossTarget, optimize: std.builtin.OptimizeMode, @@ -36,7 +35,6 @@ pub fn create(builder: *std.Build, options: Options) *TranslateCStep { .source = source, .include_dirs = std.ArrayList([]const u8).init(builder.allocator), .c_macros = std.ArrayList([]const u8).init(builder.allocator), - .output_dir = null, .out_basename = undefined, .target = options.target, .optimize = options.optimize, @@ -122,15 +120,10 @@ fn make(step: *Step) !void { const output_path = mem.trimRight(u8, output_path_nl, "\r\n"); self.out_basename = fs.path.basename(output_path); - if (self.output_dir) |output_dir| { - const full_dest = try fs.path.join(self.builder.allocator, &[_][]const u8{ output_dir, self.out_basename }); - try self.builder.updateFile(output_path, full_dest); - } else { - self.output_dir = fs.path.dirname(output_path).?; - } + const output_dir = fs.path.dirname(output_path).?; self.output_file.path = try fs.path.join( self.builder.allocator, - &[_][]const u8{ self.output_dir.?, self.out_basename }, + &[_][]const u8{ output_dir, self.out_basename }, ); } diff --git a/lib/std/Build/WriteFileStep.zig b/lib/std/Build/WriteFileStep.zig index 9e8fcdc203..3cd447e4b8 100644 --- a/lib/std/Build/WriteFileStep.zig +++ b/lib/std/Build/WriteFileStep.zig @@ -9,7 +9,6 @@ pub const base_id = .write_file; step: Step, builder: *std.Build, -output_dir: []const u8, files: std.TailQueue(File), pub const File = struct { @@ -23,7 +22,6 @@ pub fn init(builder: *std.Build) WriteFileStep { .builder = builder, .step = Step.init(.write_file, "writefile", builder.allocator, make), .files = .{}, - .output_dir = undefined, }; } @@ -87,11 +85,11 @@ fn make(step: *Step) !void { .{std.fmt.fmtSliceHexLower(&digest)}, ) catch unreachable; - self.output_dir = try fs.path.join(self.builder.allocator, &[_][]const u8{ + const output_dir = try fs.path.join(self.builder.allocator, &[_][]const u8{ self.builder.cache_root, "o", &hash_basename, }); - var dir = fs.cwd().makeOpenPath(self.output_dir, .{}) catch |err| { - std.debug.print("unable to make path {s}: {s}\n", .{ self.output_dir, @errorName(err) }); + var dir = fs.cwd().makeOpenPath(output_dir, .{}) catch |err| { + std.debug.print("unable to make path {s}: {s}\n", .{ output_dir, @errorName(err) }); return err; }; defer dir.close(); @@ -101,14 +99,14 @@ fn make(step: *Step) !void { dir.writeFile(node.data.basename, node.data.bytes) catch |err| { std.debug.print("unable to write {s} into {s}: {s}\n", .{ node.data.basename, - self.output_dir, + output_dir, @errorName(err), }); return err; }; node.data.source.path = try fs.path.join( self.builder.allocator, - &[_][]const u8{ self.output_dir, node.data.basename }, + &[_][]const u8{ output_dir, node.data.basename }, ); } }