authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-26 12:49:02-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-04-26 12:49:02-07:00
log646eb1fa934c413f29505f4742c67e61314acd90
tree1da1462d9f3eaf6f0fc330e475c5ad92d265a83d
parent56226449d2106448ac8cd1888a7b302020e22456

AstGen: implement opaque decls

Also move the decls to the beginning in ZIR encoding because in Sema we want to create the namespace with the decls before evaluating the fields.

2 files changed, 265 insertions(+), 99 deletions(-)

src/AstGen.zig+122-16
...@@ -3254,6 +3254,12 @@ fn structDeclInner(...@@ -3254,6 +3254,12 @@ fn structDeclInner(
3254 .fields_len = @intCast(u32, field_index),3254 .fields_len = @intCast(u32, field_index),
3255 .decls_len = @intCast(u32, wip_decls.decl_index),3255 .decls_len = @intCast(u32, wip_decls.decl_index),
3256 });3256 });
3257 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.
3258 if (wip_decls.decl_index != 0) {
3259 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);
3260 }
3261 astgen.extra.appendSliceAssumeCapacity(wip_decls.payload.items);
3262
3257 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);3263 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);
32583264
3259 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.3265 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.
...@@ -3262,12 +3268,6 @@ fn structDeclInner(...@@ -3262,12 +3268,6 @@ fn structDeclInner(
3262 }3268 }
3263 astgen.extra.appendSliceAssumeCapacity(fields_data.items);3269 astgen.extra.appendSliceAssumeCapacity(fields_data.items);
32643270
3265 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.
3266 if (wip_decls.decl_index != 0) {
3267 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);
3268 }
3269 astgen.extra.appendSliceAssumeCapacity(wip_decls.payload.items);
3270
3271 return gz.indexToRef(decl_inst);3271 return gz.indexToRef(decl_inst);
3272}3272}
32733273
...@@ -3479,18 +3479,18 @@ fn unionDeclInner(...@@ -3479,18 +3479,18 @@ fn unionDeclInner(
3479 .fields_len = @intCast(u32, field_index),3479 .fields_len = @intCast(u32, field_index),
3480 .decls_len = @intCast(u32, wip_decls.decl_index),3480 .decls_len = @intCast(u32, wip_decls.decl_index),
3481 });3481 });
3482 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);
3483
3484 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.
3485 astgen.extra.appendAssumeCapacity(cur_bit_bag);
3486 astgen.extra.appendSliceAssumeCapacity(fields_data.items);
3487
3488 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.3482 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.
3489 if (wip_decls.decl_index != 0) {3483 if (wip_decls.decl_index != 0) {
3490 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);3484 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);
3491 }3485 }
3492 astgen.extra.appendSliceAssumeCapacity(wip_decls.payload.items);3486 astgen.extra.appendSliceAssumeCapacity(wip_decls.payload.items);
34933487
3488 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);
3489
3490 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.
3491 astgen.extra.appendAssumeCapacity(cur_bit_bag);
3492 astgen.extra.appendSliceAssumeCapacity(fields_data.items);
3493
3494 return gz.indexToRef(decl_inst);3494 return gz.indexToRef(decl_inst);
3495}3495}
34963496
...@@ -3811,11 +3811,121 @@ fn containerDecl(...@@ -3811,11 +3811,121 @@ fn containerDecl(
3811 .fields_len = @intCast(u32, field_index),3811 .fields_len = @intCast(u32, field_index),
3812 .decls_len = @intCast(u32, wip_decls.decl_index),3812 .decls_len = @intCast(u32, wip_decls.decl_index),
3813 });3813 });
3814 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.
3815 if (wip_decls.decl_index != 0) {
3816 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);
3817 }
3818 astgen.extra.appendSliceAssumeCapacity(wip_decls.payload.items);
3819
3814 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);3820 astgen.extra.appendSliceAssumeCapacity(block_scope.instructions.items);
3815 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.3821 astgen.extra.appendSliceAssumeCapacity(bit_bag.items); // Likely empty.
3816 astgen.extra.appendAssumeCapacity(cur_bit_bag);3822 astgen.extra.appendAssumeCapacity(cur_bit_bag);
3817 astgen.extra.appendSliceAssumeCapacity(fields_data.items);3823 astgen.extra.appendSliceAssumeCapacity(fields_data.items);
38183824
3825 return rvalue(gz, scope, rl, gz.indexToRef(decl_inst), node);
3826 },
3827 .keyword_opaque => {
3828 var wip_decls: WipDecls = .{};
3829 defer wip_decls.deinit(gpa);
3830
3831 for (container_decl.ast.members) |member_node| {
3832 const member = switch (node_tags[member_node]) {
3833 .container_field_init => tree.containerFieldInit(member_node),
3834 .container_field_align => tree.containerFieldAlign(member_node),
3835 .container_field => tree.containerField(member_node),
3836
3837 .fn_decl => {
3838 const fn_proto = node_datas[member_node].lhs;
3839 const body = node_datas[member_node].rhs;
3840 switch (node_tags[fn_proto]) {
3841 .fn_proto_simple => {
3842 var params: [1]ast.Node.Index = undefined;
3843 try astgen.fnDecl(gz, &wip_decls, body, tree.fnProtoSimple(&params, fn_proto));
3844 continue;
3845 },
3846 .fn_proto_multi => {
3847 try astgen.fnDecl(gz, &wip_decls, body, tree.fnProtoMulti(fn_proto));
3848 continue;
3849 },
3850 .fn_proto_one => {
3851 var params: [1]ast.Node.Index = undefined;
3852 try astgen.fnDecl(gz, &wip_decls, body, tree.fnProtoOne(&params, fn_proto));
3853 continue;
3854 },
3855 .fn_proto => {
3856 try astgen.fnDecl(gz, &wip_decls, body, tree.fnProto(fn_proto));
3857 continue;
3858 },
3859 else => unreachable,
3860 }
3861 },
3862 .fn_proto_simple => {
3863 var params: [1]ast.Node.Index = undefined;
3864 try astgen.fnDecl(gz, &wip_decls, 0, tree.fnProtoSimple(&params, member_node));
3865 continue;
3866 },
3867 .fn_proto_multi => {
3868 try astgen.fnDecl(gz, &wip_decls, 0, tree.fnProtoMulti(member_node));
3869 continue;
3870 },
3871 .fn_proto_one => {
3872 var params: [1]ast.Node.Index = undefined;
3873 try astgen.fnDecl(gz, &wip_decls, 0, tree.fnProtoOne(&params, member_node));
3874 continue;
3875 },
3876 .fn_proto => {
3877 try astgen.fnDecl(gz, &wip_decls, 0, tree.fnProto(member_node));
3878 continue;
3879 },
3880
3881 .global_var_decl => {
3882 try astgen.globalVarDecl(gz, scope, &wip_decls, member_node, tree.globalVarDecl(member_node));
3883 continue;
3884 },
3885 .local_var_decl => {
3886 try astgen.globalVarDecl(gz, scope, &wip_decls, member_node, tree.localVarDecl(member_node));
3887 continue;
3888 },
3889 .simple_var_decl => {
3890 try astgen.globalVarDecl(gz, scope, &wip_decls, member_node, tree.simpleVarDecl(member_node));
3891 continue;
3892 },
3893 .aligned_var_decl => {
3894 try astgen.globalVarDecl(gz, scope, &wip_decls, member_node, tree.alignedVarDecl(member_node));
3895 continue;
3896 },
3897
3898 .@"comptime" => {
3899 try astgen.comptimeDecl(gz, scope, member_node);
3900 continue;
3901 },
3902 .@"usingnamespace" => {
3903 try astgen.usingnamespaceDecl(gz, scope, member_node);
3904 continue;
3905 },
3906 .test_decl => {
3907 try astgen.testDecl(gz, scope, member_node);
3908 continue;
3909 },
3910 else => unreachable,
3911 };
3912 }
3913 {
3914 const empty_slot_count = WipDecls.fields_per_u32 - (wip_decls.decl_index % WipDecls.fields_per_u32);
3915 if (empty_slot_count < WipDecls.fields_per_u32) {
3916 wip_decls.cur_bit_bag >>= @intCast(u5, empty_slot_count * WipDecls.bits_per_field);
3917 }
3918 }
3919 const decl_inst = try gz.addBlock(.opaque_decl, node);
3920 try gz.instructions.append(gpa, decl_inst);
3921
3922 try astgen.extra.ensureUnusedCapacity(gpa, @typeInfo(Zir.Inst.OpaqueDecl).Struct.fields.len +
3923 wip_decls.bit_bag.items.len + @boolToInt(wip_decls.decl_index != 0) +
3924 wip_decls.payload.items.len);
3925 const zir_datas = astgen.instructions.items(.data);
3926 zir_datas[decl_inst].pl_node.payload_index = astgen.addExtraAssumeCapacity(Zir.Inst.OpaqueDecl{
3927 .decls_len = @intCast(u32, wip_decls.decl_index),
3928 });
3819 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.3929 astgen.extra.appendSliceAssumeCapacity(wip_decls.bit_bag.items); // Likely empty.
3820 if (wip_decls.decl_index != 0) {3930 if (wip_decls.decl_index != 0) {
3821 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);3931 astgen.extra.appendAssumeCapacity(wip_decls.cur_bit_bag);
...@@ -3824,10 +3934,6 @@ fn containerDecl(...@@ -3824,10 +3934,6 @@ fn containerDecl(
38243934
3825 return rvalue(gz, scope, rl, gz.indexToRef(decl_inst), node);3935 return rvalue(gz, scope, rl, gz.indexToRef(decl_inst), node);
3826 },3936 },
3827 .keyword_opaque => {
3828 const result = try gz.addNode(.opaque_decl, node);
3829 return rvalue(gz, scope, rl, result, node);
3830 },
3831 else => unreachable,3937 else => unreachable,
3832 }3938 }
3833}3939}
src/Zir.zig+143-83
...@@ -312,7 +312,7 @@ pub const Inst = struct {...@@ -312,7 +312,7 @@ pub const Inst = struct {
312 /// Same as `enum_decl`, except the enum is non-exhaustive.312 /// Same as `enum_decl`, except the enum is non-exhaustive.
313 enum_decl_nonexhaustive,313 enum_decl_nonexhaustive,
314 /// An opaque type definition. Provides an AST node only.314 /// An opaque type definition. Provides an AST node only.
315 /// Uses the `node` union field.315 /// Uses the `pl_node` union field. Payload is `OpaqueDecl`.
316 opaque_decl,316 opaque_decl,
317 /// An error set type definition. Contains a list of field names.317 /// An error set type definition. Contains a list of field names.
318 /// Uses the `pl_node` union field. Payload is `ErrorSetDecl`.318 /// Uses the `pl_node` union field. Payload is `ErrorSetDecl`.
...@@ -2368,29 +2368,29 @@ pub const Inst = struct {...@@ -2368,29 +2368,29 @@ pub const Inst = struct {
2368 };2368 };
23692369
2370 /// Trailing:2370 /// Trailing:
2371 /// 0. inst: Index // for every body_len2371 /// 0. decl_bits: u32 // for every 8 decls
2372 /// 1. has_bits: u32 // for every 16 fields
2373 /// - sets of 2 bits:
2374 /// 0b0X: whether corresponding field has an align expression
2375 /// 0bX0: whether corresponding field has a default expression
2376 /// 2. fields: { // for every fields_len
2377 /// field_name: u32,
2378 /// field_type: Ref,
2379 /// align: Ref, // if corresponding bit is set
2380 /// default_value: Ref, // if corresponding bit is set
2381 /// }
2382 /// 3. decl_bits: u32 // for every 8 decls
2383 /// - sets of 4 bits:2372 /// - sets of 4 bits:
2384 /// 0b000X: whether corresponding decl is pub2373 /// 0b000X: whether corresponding decl is pub
2385 /// 0b00X0: whether corresponding decl is exported2374 /// 0b00X0: whether corresponding decl is exported
2386 /// 0b0X00: whether corresponding decl has an align expression2375 /// 0b0X00: whether corresponding decl has an align expression
2387 /// 0bX000: whether corresponding decl has a linksection expression2376 /// 0bX000: whether corresponding decl has a linksection expression
2388 /// 4. decl: { // for every decls_len2377 /// 1. decl: { // for every decls_len
2389 /// name: u32, // null terminated string index2378 /// name: u32, // null terminated string index
2390 /// value: Index,2379 /// value: Index,
2391 /// align: Ref, // if corresponding bit is set2380 /// align: Ref, // if corresponding bit is set
2392 /// link_section: Ref, // if corresponding bit is set2381 /// link_section: Ref, // if corresponding bit is set
2393 /// }2382 /// }
2383 /// 2. inst: Index // for every body_len
2384 /// 3. has_bits: u32 // for every 16 fields
2385 /// - sets of 2 bits:
2386 /// 0b0X: whether corresponding field has an align expression
2387 /// 0bX0: whether corresponding field has a default expression
2388 /// 4. fields: { // for every fields_len
2389 /// field_name: u32,
2390 /// field_type: Ref,
2391 /// align: Ref, // if corresponding bit is set
2392 /// default_value: Ref, // if corresponding bit is set
2393 /// }
2394 pub const StructDecl = struct {2394 pub const StructDecl = struct {
2395 body_len: u32,2395 body_len: u32,
2396 fields_len: u32,2396 fields_len: u32,
...@@ -2398,25 +2398,25 @@ pub const Inst = struct {...@@ -2398,25 +2398,25 @@ pub const Inst = struct {
2398 };2398 };
23992399
2400 /// Trailing:2400 /// Trailing:
2401 /// 0. inst: Index // for every body_len2401 /// 0. decl_bits: u32 // for every 8 decls
2402 /// 1. has_bits: u32 // for every 32 fields
2403 /// - the bit is whether corresponding field has an value expression
2404 /// 2. fields: { // for every fields_len
2405 /// field_name: u32,
2406 /// value: Ref, // if corresponding bit is set
2407 /// }
2408 /// 3. decl_bits: u32 // for every 8 decls
2409 /// - sets of 4 bits:2402 /// - sets of 4 bits:
2410 /// 0b000X: whether corresponding decl is pub2403 /// 0b000X: whether corresponding decl is pub
2411 /// 0b00X0: whether corresponding decl is exported2404 /// 0b00X0: whether corresponding decl is exported
2412 /// 0b0X00: whether corresponding decl has an align expression2405 /// 0b0X00: whether corresponding decl has an align expression
2413 /// 0bX000: whether corresponding decl has a linksection expression2406 /// 0bX000: whether corresponding decl has a linksection expression
2414 /// 4. decl: { // for every decls_len2407 /// 1. decl: { // for every decls_len
2415 /// name: u32, // null terminated string index2408 /// name: u32, // null terminated string index
2416 /// value: Index,2409 /// value: Index,
2417 /// align: Ref, // if corresponding bit is set2410 /// align: Ref, // if corresponding bit is set
2418 /// link_section: Ref, // if corresponding bit is set2411 /// link_section: Ref, // if corresponding bit is set
2419 /// }2412 /// }
2413 /// 2. inst: Index // for every body_len
2414 /// 3. has_bits: u32 // for every 32 fields
2415 /// - the bit is whether corresponding field has an value expression
2416 /// 4. fields: { // for every fields_len
2417 /// field_name: u32,
2418 /// value: Ref, // if corresponding bit is set
2419 /// }
2420 pub const EnumDecl = struct {2420 pub const EnumDecl = struct {
2421 /// Can be `Ref.none`.2421 /// Can be `Ref.none`.
2422 tag_type: Ref,2422 tag_type: Ref,
...@@ -2426,8 +2426,20 @@ pub const Inst = struct {...@@ -2426,8 +2426,20 @@ pub const Inst = struct {
2426 };2426 };
24272427
2428 /// Trailing:2428 /// Trailing:
2429 /// 0. inst: Index // for every body_len2429 /// 0. decl_bits: u32 // for every 8 decls
2430 /// 1. has_bits: u32 // for every 8 fields2430 /// - sets of 4 bits:
2431 /// 0b000X: whether corresponding decl is pub
2432 /// 0b00X0: whether corresponding decl is exported
2433 /// 0b0X00: whether corresponding decl has an align expression
2434 /// 0bX000: whether corresponding decl has a linksection expression
2435 /// 1. decl: { // for every decls_len
2436 /// name: u32, // null terminated string index
2437 /// value: Index,
2438 /// align: Ref, // if corresponding bit is set
2439 /// link_section: Ref, // if corresponding bit is set
2440 /// }
2441 /// 2. inst: Index // for every body_len
2442 /// 3. has_bits: u32 // for every 8 fields
2431 /// - sets of 4 bits:2443 /// - sets of 4 bits:
2432 /// 0b000X: whether corresponding field has a type expression2444 /// 0b000X: whether corresponding field has a type expression
2433 /// 0b00X0: whether corresponding field has a align expression2445 /// 0b00X0: whether corresponding field has a align expression
...@@ -2437,29 +2449,34 @@ pub const Inst = struct {...@@ -2437,29 +2449,34 @@ pub const Inst = struct {
2437 /// to indicate whether auto enum tag is enabled.2449 /// to indicate whether auto enum tag is enabled.
2438 /// 0 = union(tag_type)2450 /// 0 = union(tag_type)
2439 /// 1 = union(enum(tag_type))2451 /// 1 = union(enum(tag_type))
2440 /// 2. fields: { // for every fields_len2452 /// 4. fields: { // for every fields_len
2441 /// field_name: u32, // null terminated string index2453 /// field_name: u32, // null terminated string index
2442 /// field_type: Ref, // if corresponding bit is set2454 /// field_type: Ref, // if corresponding bit is set
2443 /// align: Ref, // if corresponding bit is set2455 /// align: Ref, // if corresponding bit is set
2444 /// tag_value: Ref, // if corresponding bit is set2456 /// tag_value: Ref, // if corresponding bit is set
2445 /// }2457 /// }
2446 /// 3. decl_bits: u32 // for every 8 decls2458 pub const UnionDecl = struct {
2459 /// Can be `Ref.none`.
2460 tag_type: Ref,
2461 body_len: u32,
2462 fields_len: u32,
2463 decls_len: u32,
2464 };
2465
2466 /// Trailing:
2467 /// 0. decl_bits: u32 // for every 8 decls
2447 /// - sets of 4 bits:2468 /// - sets of 4 bits:
2448 /// 0b000X: whether corresponding decl is pub2469 /// 0b000X: whether corresponding decl is pub
2449 /// 0b00X0: whether corresponding decl is exported2470 /// 0b00X0: whether corresponding decl is exported
2450 /// 0b0X00: whether corresponding decl has an align expression2471 /// 0b0X00: whether corresponding decl has an align expression
2451 /// 0bX000: whether corresponding decl has a linksection expression2472 /// 0bX000: whether corresponding decl has a linksection expression
2452 /// 4. decl: { // for every decls_len2473 /// 1. decl: { // for every decls_len
2453 /// name: u32, // null terminated string index2474 /// name: u32, // null terminated string index
2454 /// value: Index,2475 /// value: Index,
2455 /// align: Ref, // if corresponding bit is set2476 /// align: Ref, // if corresponding bit is set
2456 /// link_section: Ref, // if corresponding bit is set2477 /// link_section: Ref, // if corresponding bit is set
2457 /// }2478 /// }
2458 pub const UnionDecl = struct {2479 pub const OpaqueDecl = struct {
2459 /// Can be `Ref.none`.
2460 tag_type: Ref,
2461 body_len: u32,
2462 fields_len: u32,
2463 decls_len: u32,2480 decls_len: u32,
2464 };2481 };
24652482
...@@ -2897,6 +2914,8 @@ const Writer = struct {...@@ -2897,6 +2914,8 @@ const Writer = struct {
2897 .enum_decl_nonexhaustive,2914 .enum_decl_nonexhaustive,
2898 => try self.writeEnumDecl(stream, inst),2915 => try self.writeEnumDecl(stream, inst),
28992916
2917 .opaque_decl => try self.writeOpaqueDecl(stream, inst),
2918
2900 .switch_block => try self.writePlNodeSwitchBr(stream, inst, .none),2919 .switch_block => try self.writePlNodeSwitchBr(stream, inst, .none),
2901 .switch_block_else => try self.writePlNodeSwitchBr(stream, inst, .@"else"),2920 .switch_block_else => try self.writePlNodeSwitchBr(stream, inst, .@"else"),
2902 .switch_block_under => try self.writePlNodeSwitchBr(stream, inst, .under),2921 .switch_block_under => try self.writePlNodeSwitchBr(stream, inst, .under),
...@@ -2919,7 +2938,6 @@ const Writer = struct {...@@ -2919,7 +2938,6 @@ const Writer = struct {
29192938
2920 .breakpoint,2939 .breakpoint,
2921 .fence,2940 .fence,
2922 .opaque_decl,
2923 .dbg_stmt_node,2941 .dbg_stmt_node,
2924 .repeat,2942 .repeat,
2925 .repeat_inline,2943 .repeat_inline,
...@@ -3321,27 +3339,45 @@ const Writer = struct {...@@ -3321,27 +3339,45 @@ const Writer = struct {
3321 fn writeStructDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {3339 fn writeStructDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {
3322 const inst_data = self.code.instructions.items(.data)[inst].pl_node;3340 const inst_data = self.code.instructions.items(.data)[inst].pl_node;
3323 const extra = self.code.extraData(Inst.StructDecl, inst_data.payload_index);3341 const extra = self.code.extraData(Inst.StructDecl, inst_data.payload_index);
3324 const body = self.code.extra[extra.end..][0..extra.data.body_len];
3325 const fields_len = extra.data.fields_len;3342 const fields_len = extra.data.fields_len;
3326 const decls_len = extra.data.decls_len;3343 const decls_len = extra.data.decls_len;
33273344
3328 var extra_index: usize = undefined;3345 var extra_index: usize = undefined;
33293346
3347 if (decls_len == 0) {
3348 try stream.writeAll("}) ");
3349 extra_index = extra.end;
3350 } else {
3351 try stream.writeAll("\n");
3352 self.indent += 2;
3353 extra_index = try self.writeDecls(stream, decls_len, extra.end);
3354 self.indent -= 2;
3355 try stream.writeByteNTimes(' ', self.indent);
3356 try stream.writeAll("}) ");
3357 }
3358
3359 const body = self.code.extra[extra_index..][0..extra.data.body_len];
3360 extra_index += body.len;
3361
3330 if (fields_len == 0) {3362 if (fields_len == 0) {
3331 assert(body.len == 0);3363 assert(body.len == 0);
3332 try stream.writeAll("{}, {}, {");3364 try stream.writeAll("{}, {}, {");
3333 extra_index = extra.end;3365 extra_index = extra.end;
3334 } else {3366 } else {
3335 try stream.writeAll("{\n");
3336 self.indent += 2;3367 self.indent += 2;
3337 try self.writeBody(stream, body);3368 if (body.len == 0) {
3369 try stream.writeAll("{}, {\n");
3370 } else {
3371 try stream.writeAll("{\n");
3372 try self.writeBody(stream, body);
33383373
3339 try stream.writeByteNTimes(' ', self.indent - 2);3374 try stream.writeByteNTimes(' ', self.indent - 2);
3340 try stream.writeAll("}, {\n");3375 try stream.writeAll("}, {\n");
3376 }
33413377
3342 const bit_bags_count = std.math.divCeil(usize, fields_len, 16) catch unreachable;3378 const bit_bags_count = std.math.divCeil(usize, fields_len, 16) catch unreachable;
3343 const body_end = extra.end + body.len;3379 const body_end = extra_index;
3344 extra_index = body_end + bit_bags_count;3380 extra_index += bit_bags_count;
3345 var bit_bag_index: usize = body_end;3381 var bit_bag_index: usize = body_end;
3346 var cur_bit_bag: u32 = undefined;3382 var cur_bit_bag: u32 = undefined;
3347 var field_i: u32 = 0;3383 var field_i: u32 = 0;
...@@ -3386,27 +3422,30 @@ const Writer = struct {...@@ -3386,27 +3422,30 @@ const Writer = struct {
3386 try stream.writeByteNTimes(' ', self.indent);3422 try stream.writeByteNTimes(' ', self.indent);
3387 try stream.writeAll("}, {");3423 try stream.writeAll("}, {");
3388 }3424 }
3389 if (decls_len == 0) {
3390 try stream.writeAll("}) ");
3391 } else {
3392 try stream.writeAll("\n");
3393 self.indent += 2;
3394 try self.writeDecls(stream, decls_len, extra_index);
3395 self.indent -= 2;
3396 try stream.writeByteNTimes(' ', self.indent);
3397 try stream.writeAll("}) ");
3398 }
3399 try self.writeSrc(stream, inst_data.src());3425 try self.writeSrc(stream, inst_data.src());
3400 }3426 }
34013427
3402 fn writeUnionDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {3428 fn writeUnionDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {
3403 const inst_data = self.code.instructions.items(.data)[inst].pl_node;3429 const inst_data = self.code.instructions.items(.data)[inst].pl_node;
3404 const extra = self.code.extraData(Inst.UnionDecl, inst_data.payload_index);3430 const extra = self.code.extraData(Inst.UnionDecl, inst_data.payload_index);
3405 const body = self.code.extra[extra.end..][0..extra.data.body_len];
3406 const fields_len = extra.data.fields_len;3431 const fields_len = extra.data.fields_len;
3407 const decls_len = extra.data.decls_len;3432 const decls_len = extra.data.decls_len;
3408 const tag_type_ref = extra.data.tag_type;3433 const tag_type_ref = extra.data.tag_type;
34093434
3435 var extra_index: usize = undefined;
3436
3437 if (decls_len == 0) {
3438 try stream.writeAll("{}, ");
3439 extra_index = extra.end;
3440 } else {
3441 try stream.writeAll("{\n");
3442 self.indent += 2;
3443 extra_index = try self.writeDecls(stream, decls_len, extra.end);
3444 self.indent -= 2;
3445 try stream.writeByteNTimes(' ', self.indent);
3446 try stream.writeAll("}, ");
3447 }
3448
3410 assert(fields_len != 0);3449 assert(fields_len != 0);
3411 var first_has_auto_enum: ?bool = null;3450 var first_has_auto_enum: ?bool = null;
34123451
...@@ -3415,20 +3454,25 @@ const Writer = struct {...@@ -3415,20 +3454,25 @@ const Writer = struct {
3415 try stream.writeAll(", ");3454 try stream.writeAll(", ");
3416 }3455 }
34173456
3418 var extra_index: usize = undefined;3457 const body = self.code.extra[extra_index..][0..extra.data.body_len];
3458 extra_index += body.len;
34193459
3420 try stream.writeAll("{\n");
3421 self.indent += 2;3460 self.indent += 2;
3422 try self.writeBody(stream, body);3461 if (body.len == 0) {
3462 try stream.writeAll("{}, {\n");
3463 } else {
3464 try stream.writeAll("{\n");
3465 try self.writeBody(stream, body);
34233466
3424 try stream.writeByteNTimes(' ', self.indent - 2);3467 try stream.writeByteNTimes(' ', self.indent - 2);
3425 try stream.writeAll("}, {\n");3468 try stream.writeAll("}, {\n");
3469 }
34263470
3427 const bits_per_field = 4;3471 const bits_per_field = 4;
3428 const fields_per_u32 = 32 / bits_per_field;3472 const fields_per_u32 = 32 / bits_per_field;
3429 const bit_bags_count = std.math.divCeil(usize, fields_len, fields_per_u32) catch unreachable;3473 const bit_bags_count = std.math.divCeil(usize, fields_len, fields_per_u32) catch unreachable;
3430 const body_end = extra.end + body.len;3474 const body_end = extra_index;
3431 extra_index = body_end + bit_bags_count;3475 extra_index += bit_bags_count;
3432 var bit_bag_index: usize = body_end;3476 var bit_bag_index: usize = body_end;
3433 var cur_bit_bag: u32 = undefined;3477 var cur_bit_bag: u32 = undefined;
3434 var field_i: u32 = 0;3478 var field_i: u32 = 0;
...@@ -3482,23 +3526,13 @@ const Writer = struct {...@@ -3482,23 +3526,13 @@ const Writer = struct {
34823526
3483 self.indent -= 2;3527 self.indent -= 2;
3484 try stream.writeByteNTimes(' ', self.indent);3528 try stream.writeByteNTimes(' ', self.indent);
3485 try stream.writeAll("}, {");3529 try stream.writeAll("}");
3486 if (decls_len == 0) {
3487 try stream.writeAll("}");
3488 } else {
3489 try stream.writeAll("\n");
3490 self.indent += 2;
3491 try self.writeDecls(stream, decls_len, extra_index);
3492 self.indent -= 2;
3493 try stream.writeByteNTimes(' ', self.indent);
3494 try stream.writeAll("}");
3495 }
3496 try self.writeFlag(stream, ", autoenum", first_has_auto_enum.?);3530 try self.writeFlag(stream, ", autoenum", first_has_auto_enum.?);
3497 try stream.writeAll(") ");3531 try stream.writeAll(") ");
3498 try self.writeSrc(stream, inst_data.src());3532 try self.writeSrc(stream, inst_data.src());
3499 }3533 }
35003534
3501 fn writeDecls(self: *Writer, stream: anytype, decls_len: u32, extra_start: usize) !void {3535 fn writeDecls(self: *Writer, stream: anytype, decls_len: u32, extra_start: usize) !usize {
3502 const parent_decl_node = self.parent_decl_node;3536 const parent_decl_node = self.parent_decl_node;
3503 const bit_bags_count = std.math.divCeil(usize, decls_len, 8) catch unreachable;3537 const bit_bags_count = std.math.divCeil(usize, decls_len, 8) catch unreachable;
3504 var extra_index = extra_start + bit_bags_count;3538 var extra_index = extra_start + bit_bags_count;
...@@ -3561,38 +3595,56 @@ const Writer = struct {...@@ -3561,38 +3595,56 @@ const Writer = struct {
3561 try self.writeSrc(stream, decl_block_inst_data.src());3595 try self.writeSrc(stream, decl_block_inst_data.src());
3562 try stream.writeAll("\n");3596 try stream.writeAll("\n");
3563 }3597 }
3598 return extra_index;
3564 }3599 }
35653600
3566 fn writeEnumDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {3601 fn writeEnumDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {
3567 const inst_data = self.code.instructions.items(.data)[inst].pl_node;3602 const inst_data = self.code.instructions.items(.data)[inst].pl_node;
3568 const extra = self.code.extraData(Inst.EnumDecl, inst_data.payload_index);3603 const extra = self.code.extraData(Inst.EnumDecl, inst_data.payload_index);
3569 const body = self.code.extra[extra.end..][0..extra.data.body_len];
3570 const fields_len = extra.data.fields_len;3604 const fields_len = extra.data.fields_len;
3571 const decls_len = extra.data.decls_len;3605 const decls_len = extra.data.decls_len;
3572 const tag_type_ref = extra.data.tag_type;3606 const tag_type_ref = extra.data.tag_type;
35733607
3608 var extra_index: usize = undefined;
3609
3610 if (decls_len == 0) {
3611 try stream.writeAll("{}, ");
3612 extra_index = extra.end;
3613 } else {
3614 try stream.writeAll("{\n");
3615 self.indent += 2;
3616 extra_index = try self.writeDecls(stream, decls_len, extra.end);
3617 self.indent -= 2;
3618 try stream.writeByteNTimes(' ', self.indent);
3619 try stream.writeAll("}, ");
3620 }
3621
3574 if (tag_type_ref != .none) {3622 if (tag_type_ref != .none) {
3575 try self.writeInstRef(stream, tag_type_ref);3623 try self.writeInstRef(stream, tag_type_ref);
3576 try stream.writeAll(", ");3624 try stream.writeAll(", ");
3577 }3625 }
35783626
3579 var extra_index: usize = undefined;3627 const body = self.code.extra[extra_index..][0..extra.data.body_len];
3628 extra_index += body.len;
35803629
3581 if (fields_len == 0) {3630 if (fields_len == 0) {
3582 assert(body.len == 0);3631 assert(body.len == 0);
3583 try stream.writeAll("{}, {}, {");3632 try stream.writeAll("{}, {}) ");
3584 extra_index = extra.end;
3585 } else {3633 } else {
3586 try stream.writeAll("{\n");
3587 self.indent += 2;3634 self.indent += 2;
3588 try self.writeBody(stream, body);3635 if (body.len == 0) {
3636 try stream.writeAll("{}, {\n");
3637 } else {
3638 try stream.writeAll("{\n");
3639 try self.writeBody(stream, body);
35893640
3590 try stream.writeByteNTimes(' ', self.indent - 2);3641 try stream.writeByteNTimes(' ', self.indent - 2);
3591 try stream.writeAll("}, {\n");3642 try stream.writeAll("}, {\n");
3643 }
35923644
3593 const bit_bags_count = std.math.divCeil(usize, fields_len, 32) catch unreachable;3645 const bit_bags_count = std.math.divCeil(usize, fields_len, 32) catch unreachable;
3594 const body_end = extra.end + body.len;3646 const body_end = extra_index;
3595 extra_index = body_end + bit_bags_count;3647 extra_index += bit_bags_count;
3596 var bit_bag_index: usize = body_end;3648 var bit_bag_index: usize = body_end;
3597 var cur_bit_bag: u32 = undefined;3649 var cur_bit_bag: u32 = undefined;
3598 var field_i: u32 = 0;3650 var field_i: u32 = 0;
...@@ -3621,14 +3673,22 @@ const Writer = struct {...@@ -3621,14 +3673,22 @@ const Writer = struct {
3621 }3673 }
3622 self.indent -= 2;3674 self.indent -= 2;
3623 try stream.writeByteNTimes(' ', self.indent);3675 try stream.writeByteNTimes(' ', self.indent);
3624 try stream.writeAll("}, {");3676 try stream.writeAll("}) ");
3625 }3677 }
3678 try self.writeSrc(stream, inst_data.src());
3679 }
3680
3681 fn writeOpaqueDecl(self: *Writer, stream: anytype, inst: Inst.Index) !void {
3682 const inst_data = self.code.instructions.items(.data)[inst].pl_node;
3683 const extra = self.code.extraData(Inst.OpaqueDecl, inst_data.payload_index);
3684 const decls_len = extra.data.decls_len;
3685
3626 if (decls_len == 0) {3686 if (decls_len == 0) {
3627 try stream.writeAll("}) ");3687 try stream.writeAll("}) ");
3628 } else {3688 } else {
3629 try stream.writeAll("\n");3689 try stream.writeAll("\n");
3630 self.indent += 2;3690 self.indent += 2;
3631 try self.writeDecls(stream, decls_len, extra_index);3691 _ = try self.writeDecls(stream, decls_len, extra.end);
3632 self.indent -= 2;3692 self.indent -= 2;
3633 try stream.writeByteNTimes(' ', self.indent);3693 try stream.writeByteNTimes(' ', self.indent);
3634 try stream.writeAll("}) ");3694 try stream.writeAll("}) ");