authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-04-16 05:42:25-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-04-16 05:42:25-04:00
log578a792b33d1f26c839cd6c77eaa2680601caaf2
tree1378c449be224c8b81fcb46ca4b1ad9097588c9b
parent3bfb1616db0883e6145a1fe1844eee3038bd4ca1
parent101aac92c258af9f25520c36f06b2ce8335d7f9a
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #11442 from Vexu/stage3

Make self hosted compiler capable of building itself

12 files changed, 114 insertions(+), 38 deletions(-)

lib/std/c.zig+12-4
......@@ -219,7 +219,11 @@ pub extern "c" fn utimes(path: [*:0]const u8, times: *[2]c.timeval) c_int;
219219pub extern "c" fn utimensat(dirfd: c.fd_t, pathname: [*:0]const u8, times: *[2]c.timespec, flags: u32) c_int;
220220pub extern "c" fn futimens(fd: c.fd_t, times: *const [2]c.timespec) c_int;
221221
222pub extern "c" fn pthread_create(noalias newthread: *pthread_t, noalias attr: ?*const c.pthread_attr_t, start_routine: fn (?*anyopaque) callconv(.C) ?*anyopaque, noalias arg: ?*anyopaque) c.E;
222pub extern "c" fn pthread_create(noalias newthread: *pthread_t, noalias attr: ?*const c.pthread_attr_t, start_routine: PThreadStartFn, noalias arg: ?*anyopaque) c.E;
223const PThreadStartFn = if (builtin.zig_backend == .stage1)
224 fn (?*anyopaque) callconv(.C) ?*anyopaque
225else
226 *const fn (?*anyopaque) callconv(.C) ?*anyopaque;
223227pub extern "c" fn pthread_attr_init(attr: *c.pthread_attr_t) c.E;
224228pub extern "c" fn pthread_attr_setstack(attr: *c.pthread_attr_t, stackaddr: *anyopaque, stacksize: usize) c.E;
225229pub extern "c" fn pthread_attr_setstacksize(attr: *c.pthread_attr_t, stacksize: usize) c.E;
......@@ -229,10 +233,14 @@ pub extern "c" fn pthread_self() pthread_t;
229233pub extern "c" fn pthread_join(thread: pthread_t, arg_return: ?*?*anyopaque) c.E;
230234pub extern "c" fn pthread_detach(thread: pthread_t) c.E;
231235pub extern "c" fn pthread_atfork(
232 prepare: ?fn () callconv(.C) void,
233 parent: ?fn () callconv(.C) void,
234 child: ?fn () callconv(.C) void,
236 prepare: ?PThreadForkFn,
237 parent: ?PThreadForkFn,
238 child: ?PThreadForkFn,
235239) c_int;
240const PThreadForkFn = if (builtin.zig_backend == .stage1)
241 fn () callconv(.C) void
242else
243 *const fn () callconv(.C) void;
236244pub extern "c" fn pthread_key_create(key: *c.pthread_key_t, destructor: ?fn (value: *anyopaque) callconv(.C) void) c.E;
237245pub extern "c" fn pthread_key_delete(key: c.pthread_key_t) c.E;
238246pub extern "c" fn pthread_getspecific(key: c.pthread_key_t) ?*anyopaque;
lib/std/c/tokenizer.zig+5-1
......@@ -126,7 +126,11 @@ pub const Token = struct {
126126 Keyword_error,
127127 Keyword_pragma,
128128
129 pub fn symbol(id: std.meta.Tag(Id)) []const u8 {
129 pub fn symbol(id: Id) []const u8 {
130 return symbolName(id);
131 }
132
133 pub fn symbolName(id: std.meta.Tag(Id)) []const u8 {
130134 return switch (id) {
131135 .Invalid => "Invalid",
132136 .Eof => "Eof",
lib/std/special/c.zig+2-4
......@@ -32,10 +32,8 @@ comptime {
3232 @export(wasm_start, .{ .name = "_start", .linkage = .Strong });
3333 }
3434
35 if (builtin.zig_backend == .stage1) { // TODO remove this condition
36 if (native_os == .linux) {
37 @export(clone, .{ .name = "clone" });
38 }
35 if (native_os == .linux) {
36 @export(clone, .{ .name = "clone" });
3937 }
4038
4139 @export(memset, .{ .name = "memset", .linkage = .Strong });
src/AstGen.zig+13-14
......@@ -1807,6 +1807,8 @@ fn breakExpr(parent_gz: *GenZir, parent_scope: *Scope, node: Ast.Node.Index) Inn
18071807 .@"break";
18081808
18091809 if (rhs == 0) {
1810 try genDefers(parent_gz, scope, parent_scope, .normal_only);
1811
18101812 _ = try parent_gz.addBreak(break_tag, block_inst, .void_value);
18111813 return Zir.Inst.Ref.unreachable_value;
18121814 }
......@@ -1819,12 +1821,15 @@ fn breakExpr(parent_gz: *GenZir, parent_scope: *Scope, node: Ast.Node.Index) Inn
18191821 const prev_rvalue_noresult = parent_gz.rvalue_noresult;
18201822 parent_gz.rvalue_noresult = .none;
18211823 const operand = try reachableExpr(parent_gz, parent_scope, block_gz.break_result_loc, rhs, node);
1824 const search_index = @intCast(Zir.Inst.Index, astgen.instructions.len);
18221825 parent_gz.rvalue_noresult = prev_rvalue_noresult;
18231826
1827 try genDefers(parent_gz, scope, parent_scope, .normal_only);
1828
18241829 switch (block_gz.break_result_loc) {
18251830 .block_ptr => {
18261831 const br = try parent_gz.addBreak(break_tag, block_inst, operand);
1827 try block_gz.labeled_breaks.append(astgen.gpa, br);
1832 try block_gz.labeled_breaks.append(astgen.gpa, .{ .br = br, .search = search_index });
18281833 },
18291834 .ptr => {
18301835 // In this case we don't have any mechanism to intercept it;
......@@ -1843,13 +1848,7 @@ fn breakExpr(parent_gz: *GenZir, parent_scope: *Scope, node: Ast.Node.Index) Inn
18431848 .local_val => scope = scope.cast(Scope.LocalVal).?.parent,
18441849 .local_ptr => scope = scope.cast(Scope.LocalPtr).?.parent,
18451850 .namespace => break,
1846 .defer_normal => {
1847 const defer_scope = scope.cast(Scope.Defer).?;
1848 scope = defer_scope.parent;
1849 const expr_node = node_datas[defer_scope.defer_node].rhs;
1850 try unusedResultDeferExpr(parent_gz, defer_scope, defer_scope.parent, expr_node);
1851 },
1852 .defer_error => scope = scope.cast(Scope.Defer).?.parent,
1851 .defer_normal, .defer_error => scope = scope.cast(Scope.Defer).?.parent,
18531852 .top => unreachable,
18541853 }
18551854 }
......@@ -2030,7 +2029,7 @@ fn labeledBlockExpr(
20302029 // The code took advantage of the result location as a pointer.
20312030 // Turn the break instruction operands into void.
20322031 for (block_scope.labeled_breaks.items) |br| {
2033 zir_datas[br].@"break".operand = .void_value;
2032 zir_datas[br.br].@"break".operand = .void_value;
20342033 }
20352034 try block_scope.setBlockBody(block_inst);
20362035
......@@ -2047,17 +2046,17 @@ fn labeledBlockExpr(
20472046 for (block_scope.labeled_breaks.items) |br| {
20482047 // We expect the `store_to_block_ptr` to be created between 1-3 instructions
20492048 // prior to the break.
2050 var search_index = br -| 3;
2051 while (search_index < br) : (search_index += 1) {
2049 var search_index = br.search -| 3;
2050 while (search_index < br.search) : (search_index += 1) {
20522051 if (zir_tags[search_index] == .store_to_block_ptr and
20532052 zir_datas[search_index].bin.lhs == block_scope.rl_ptr)
20542053 {
20552054 zir_tags[search_index] = .as;
20562055 zir_datas[search_index].bin = .{
20572056 .lhs = block_scope.rl_ty_inst,
2058 .rhs = zir_datas[br].@"break".operand,
2057 .rhs = zir_datas[br.br].@"break".operand,
20592058 };
2060 zir_datas[br].@"break".operand = indexToRef(search_index);
2059 zir_datas[br.br].@"break".operand = indexToRef(search_index);
20612060 break;
20622061 }
20632062 } else unreachable;
......@@ -9719,7 +9718,7 @@ const GenZir = struct {
97199718 break_count: usize = 0,
97209719 /// Tracks `break :foo bar` instructions so they can possibly be elided later if
97219720 /// the labeled block ends up not needing a result location pointer.
9722 labeled_breaks: ArrayListUnmanaged(Zir.Inst.Index) = .{},
9721 labeled_breaks: ArrayListUnmanaged(struct { br: Zir.Inst.Index, search: Zir.Inst.Index }) = .{},
97239722
97249723 suspend_node: Ast.Node.Index = 0,
97259724 nosuspend_node: Ast.Node.Index = 0,
src/clang.zig+8-3
......@@ -161,7 +161,12 @@ pub const ASTUnit = opaque {
161161 extern fn ZigClangASTUnit_getSourceManager(*ASTUnit) *SourceManager;
162162
163163 pub const visitLocalTopLevelDecls = ZigClangASTUnit_visitLocalTopLevelDecls;
164 extern fn ZigClangASTUnit_visitLocalTopLevelDecls(*ASTUnit, context: ?*anyopaque, Fn: ?fn (?*anyopaque, *const Decl) callconv(.C) bool) bool;
164 extern fn ZigClangASTUnit_visitLocalTopLevelDecls(*ASTUnit, context: ?*anyopaque, Fn: ?VisitorFn) bool;
165
166 const VisitorFn = if (@import("builtin").zig_backend == .stage1)
167 fn (?*anyopaque, *const Decl) callconv(.C) bool
168 else
169 *const fn (?*anyopaque, *const Decl) callconv(.C) bool;
165170
166171 pub const getLocalPreprocessingEntities_begin = ZigClangASTUnit_getLocalPreprocessingEntities_begin;
167172 extern fn ZigClangASTUnit_getLocalPreprocessingEntities_begin(*ASTUnit) PreprocessingRecord.iterator;
......@@ -490,8 +495,8 @@ pub const FloatingLiteral = opaque {
490495 pub const getValueAsApproximateDouble = ZigClangFloatingLiteral_getValueAsApproximateDouble;
491496 extern fn ZigClangFloatingLiteral_getValueAsApproximateDouble(*const FloatingLiteral) f64;
492497
493 pub const getBeginLoc = ZigClangIntegerLiteral_getBeginLoc;
494 extern fn ZigClangIntegerLiteral_getBeginLoc(*const FloatingLiteral) SourceLocation;
498 pub const getBeginLoc = ZigClangFloatingLiteral_getBeginLoc;
499 extern fn ZigClangFloatingLiteral_getBeginLoc(*const FloatingLiteral) SourceLocation;
495500
496501 pub const getRawSemantics = ZigClangFloatingLiteral_getRawSemantics;
497502 extern fn ZigClangFloatingLiteral_getRawSemantics(*const FloatingLiteral) APFloatBaseSemantics;
src/codegen/llvm.zig+21-6
......@@ -4732,10 +4732,11 @@ pub const FuncGen = struct {
47324732 var buf: Type.Payload.ElemType = undefined;
47334733 const payload_ty = optional_ty.optionalChild(&buf);
47344734 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) {
4735 const loaded = if (operand_is_ptr) self.builder.buildLoad(operand, "") else operand;
47354736 if (invert) {
4736 return self.builder.buildNot(operand, "");
4737 return self.builder.buildNot(loaded, "");
47374738 } else {
4738 return operand;
4739 return loaded;
47394740 }
47404741 }
47414742
......@@ -4784,12 +4785,16 @@ pub const FuncGen = struct {
47844785 const ty_op = self.air.instructions.items(.data)[inst].ty_op;
47854786 const operand = try self.resolveInst(ty_op.operand);
47864787 const optional_ty = self.air.typeOf(ty_op.operand).childType();
4788 const result_ty = self.air.getRefType(ty_op.ty);
47874789 var buf: Type.Payload.ElemType = undefined;
47884790 const payload_ty = optional_ty.optionalChild(&buf);
47894791 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) {
47904792 // We have a pointer to a zero-bit value and we need to return
47914793 // a pointer to a zero-bit value.
4792 return operand;
4794
4795 // TODO once we update to LLVM 14 this bitcast won't be necessary.
4796 const res_ptr_ty = try self.dg.llvmType(result_ty);
4797 return self.builder.buildBitCast(operand, res_ptr_ty, "");
47934798 }
47944799 if (optional_ty.isPtrLikeOptional()) {
47954800 // The payload and the optional are the same value.
......@@ -4807,13 +4812,17 @@ pub const FuncGen = struct {
48074812 const ty_op = self.air.instructions.items(.data)[inst].ty_op;
48084813 const operand = try self.resolveInst(ty_op.operand);
48094814 const optional_ty = self.air.typeOf(ty_op.operand).childType();
4815 const result_ty = self.air.getRefType(ty_op.ty);
48104816 var buf: Type.Payload.ElemType = undefined;
48114817 const payload_ty = optional_ty.optionalChild(&buf);
48124818 const non_null_bit = self.context.intType(1).constAllOnes();
48134819 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) {
48144820 // We have a pointer to a i1. We need to set it to 1 and then return the same pointer.
48154821 _ = self.builder.buildStore(non_null_bit, operand);
4816 return operand;
4822
4823 // TODO once we update to LLVM 14 this bitcast won't be necessary.
4824 const res_ptr_ty = try self.dg.llvmType(result_ty);
4825 return self.builder.buildBitCast(operand, res_ptr_ty, "");
48174826 }
48184827 if (optional_ty.isPtrLikeOptional()) {
48194828 // The payload and the optional are the same value.
......@@ -4872,7 +4881,13 @@ pub const FuncGen = struct {
48724881 const target = self.dg.module.getTarget();
48734882 const offset: u8 = if (payload_ty.abiAlignment(target) > Type.anyerror.abiSize(target)) 2 else 1;
48744883
4875 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) return null;
4884 if (!payload_ty.hasRuntimeBitsIgnoreComptime()) {
4885 if (!operand_is_ptr) return null;
4886
4887 // TODO once we update to LLVM 14 this bitcast won't be necessary.
4888 const res_ptr_ty = try self.dg.llvmType(result_ty);
4889 return self.builder.buildBitCast(operand, res_ptr_ty, "");
4890 }
48764891 if (operand_is_ptr or isByRef(payload_ty)) {
48774892 return self.builder.buildStructGEP(operand, offset, "");
48784893 }
......@@ -7205,7 +7220,7 @@ pub const FuncGen = struct {
72057220 return self.builder.buildInBoundsGEP(base_ptr, &indices, indices.len, "");
72067221 }
72077222
7208 fn getIntrinsic(self: *FuncGen, name: []const u8, types: []*const llvm.Type) *const llvm.Value {
7223 fn getIntrinsic(self: *FuncGen, name: []const u8, types: []const *const llvm.Type) *const llvm.Value {
72097224 const id = llvm.lookupIntrinsicID(name.ptr, name.len);
72107225 assert(id != 0);
72117226 return self.llvmModule().getIntrinsicDeclaration(id, types.ptr, types.len);
src/codegen/llvm/bindings.zig+2-2
......@@ -60,7 +60,7 @@ pub const Context = opaque {
6060 Packed: Bool,
6161 ) *const Type;
6262
63 const structCreateNamed = LLVMStructCreateNamed;
63 pub const structCreateNamed = LLVMStructCreateNamed;
6464 extern fn LLVMStructCreateNamed(C: *const Context, Name: [*:0]const u8) *const Type;
6565
6666 pub const constString = LLVMConstStringInContext;
......@@ -320,7 +320,7 @@ pub const Module = opaque {
320320 extern fn LLVMGetNamedFunction(*const Module, Name: [*:0]const u8) ?*const Value;
321321
322322 pub const getIntrinsicDeclaration = LLVMGetIntrinsicDeclaration;
323 extern fn LLVMGetIntrinsicDeclaration(Mod: *const Module, ID: c_uint, ParamTypes: ?[*]*const Type, ParamCount: usize) *const Value;
323 extern fn LLVMGetIntrinsicDeclaration(Mod: *const Module, ID: c_uint, ParamTypes: ?[*]const *const Type, ParamCount: usize) *const Value;
324324
325325 pub const printToString = LLVMPrintModuleToString;
326326 extern fn LLVMPrintModuleToString(*const Module) [*:0]const u8;
src/translate_c.zig+5-3
......@@ -368,11 +368,13 @@ pub fn translate(
368368 resources_path: [*:0]const u8,
369369 zig_is_stage1: bool,
370370) !std.zig.Ast {
371 // TODO stage2 bug
372 var tmp = errors;
371373 const ast_unit = clang.LoadFromCommandLine(
372374 args_begin,
373375 args_end,
374 &errors.ptr,
375 &errors.len,
376 &tmp.ptr,
377 &tmp.len,
376378 resources_path,
377379 ) orelse {
378380 if (errors.len == 0) return error.ASTUnitFailure;
......@@ -5325,7 +5327,7 @@ const MacroCtx = struct {
53255327 try self.fail(
53265328 c,
53275329 "unable to translate C expr: expected '{s}' instead got '{s}'",
5328 .{ CToken.Id.symbol(expected_id), next_id.symbol() },
5330 .{ CToken.Id.symbolName(expected_id), next_id.symbol() },
53295331 );
53305332 return error.ParseError;
53315333 }
src/translate_c/ast.zig+1-1
......@@ -779,7 +779,7 @@ const TokenTag = std.zig.Token.Tag;
779779
780780const Context = struct {
781781 gpa: Allocator,
782 buf: std.ArrayList(u8) = .{},
782 buf: std.ArrayList(u8),
783783 nodes: std.zig.Ast.NodeList = .{},
784784 extra_data: std.ArrayListUnmanaged(std.zig.Ast.Node.Index) = .{},
785785 tokens: std.zig.Ast.TokenList = .{},
src/zig_clang.cpp+5
......@@ -2706,6 +2706,11 @@ double ZigClangFloatingLiteral_getValueAsApproximateDouble(const ZigClangFloatin
27062706 return casted->getValueAsApproximateDouble();
27072707}
27082708
2709struct ZigClangSourceLocation ZigClangFloatingLiteral_getBeginLoc(const struct ZigClangFloatingLiteral *self) {
2710 auto casted = reinterpret_cast<const clang::FloatingLiteral *>(self);
2711 return bitcast(casted->getBeginLoc());
2712}
2713
27092714ZigClangAPFloatBase_Semantics ZigClangFloatingLiteral_getRawSemantics(const ZigClangFloatingLiteral *self) {
27102715 auto casted = reinterpret_cast<const clang::FloatingLiteral *>(self);
27112716 return static_cast<ZigClangAPFloatBase_Semantics>(casted->getRawSemantics());
src/zig_clang.h+1
......@@ -1245,6 +1245,7 @@ ZIG_EXTERN_C struct ZigClangSourceLocation ZigClangDeclStmt_getBeginLoc(const st
12451245ZIG_EXTERN_C unsigned ZigClangAPFloat_convertToHexString(const struct ZigClangAPFloat *self, char *DST,
12461246 unsigned HexDigits, bool UpperCase, enum ZigClangAPFloat_roundingMode RM);
12471247ZIG_EXTERN_C double ZigClangFloatingLiteral_getValueAsApproximateDouble(const ZigClangFloatingLiteral *self);
1248ZIG_EXTERN_C struct ZigClangSourceLocation ZigClangFloatingLiteral_getBeginLoc(const struct ZigClangFloatingLiteral *);
12481249ZIG_EXTERN_C ZigClangAPFloatBase_Semantics ZigClangFloatingLiteral_getRawSemantics(const ZigClangFloatingLiteral *self);
12491250
12501251ZIG_EXTERN_C enum ZigClangStringLiteral_StringKind ZigClangStringLiteral_getKind(const struct ZigClangStringLiteral *self);
test/behavior/optional.zig+39
......@@ -332,3 +332,42 @@ test "array of optional unaligned types" {
332332 i += 1;
333333 try expect(Enum.three == values[i].?.Num);
334334}
335
336test "optional pointer to zero bit optional payload" {
337 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
338 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
339 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
340 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
341
342 const B = struct {
343 fn foo(_: *@This()) void {}
344 };
345 const A = struct {
346 b: ?B = .{},
347 };
348 var a: A = .{};
349 var a_ptr = &a;
350 if (a_ptr.b) |*some| {
351 some.foo();
352 }
353}
354
355test "optional pointer to zero bit error union payload" {
356 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
357 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
358 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
359 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
360 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
361
362 const B = struct {
363 fn foo(_: *@This()) void {}
364 };
365 const A = struct {
366 b: anyerror!B = .{},
367 };
368 var a: A = .{};
369 var a_ptr = &a;
370 if (a_ptr.b) |*some| {
371 some.foo();
372 } else |_| {}
373}