authorgravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-03-05 08:15:28+00:00
committergravatar for mlugg@mlugg.co.ukMatthew Lugg <mlugg@mlugg.co.uk> 2024-03-06 21:26:38+00:00
loge043fe474ffe07d1503c6cb70e01983b8d07a1ba
treea4cfce82b6a4239f2a1d203e211db29345b4c1e3
parent20403ee41d67b02faedbee97a94fc8b9fd3781e0
signaturelock-open Commit is signed but in an unrecognized format.

Fix incorrectly resolved merge conflicts

To be honest, I can't be bothered to figure out which commits these changes should be in.

3 files changed, 115 insertions(+), 110 deletions(-)

src/Sema.zig+5-5
......@@ -2674,7 +2674,7 @@ fn analyzeAsInt(
26742674fn getCaptures(sema: *Sema, block: *Block, extra_index: usize, captures_len: u32) ![]InternPool.CaptureValue {
26752675 const zcu = sema.mod;
26762676 const ip = &zcu.intern_pool;
2677 const parent_captures: InternPool.CaptureValue.Slice = zcu.namespacePtr(block.namespace).ty.getCaptures(zcu);
2677 const parent_captures: InternPool.CaptureValue.Slice = zcu.namespacePtr(block.namespace).getType(zcu).getCaptures(zcu);
26782678
26792679 const captures = try sema.arena.alloc(InternPool.CaptureValue, captures_len);
26802680
......@@ -2796,7 +2796,7 @@ fn zirStructDecl(
27962796 .decl_index = new_decl_index,
27972797 .file_scope = block.getFileScope(mod),
27982798 })).toOptional() else .none;
2799 errdefer mod.destroyNamespace(new_namespace_index);
2799 errdefer if (new_namespace_index.unwrap()) |ns| mod.destroyNamespace(ns);
28002800
28012801 if (new_namespace_index.unwrap()) |ns| {
28022802 const decls = sema.code.bodySlice(extra_index, decls_len);
......@@ -17268,7 +17268,7 @@ fn zirThis(
1726817268fn zirClosureGet(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstData) CompileError!Air.Inst.Ref {
1726917269 const mod = sema.mod;
1727017270 const ip = &mod.intern_pool;
17271 const captures = mod.namespacePtr(block.namespace).ty.getCaptures(mod);
17271 const captures = mod.namespacePtr(block.namespace).getType(mod).getCaptures(mod);
1727217272
1727317273 const src_node: i32 = @bitCast(extended.operand);
1727417274 const src = LazySrcLoc.nodeOffset(src_node);
......@@ -21787,7 +21787,7 @@ fn reifyUnion(
2178721787 errdefer msg.destroy(gpa);
2178821788
2178921789 const src_decl = mod.declPtr(block.src_decl);
21790 try sema.explainWhyTypeIsNotExtern(msg, src.toSrcLoc(src_decl, mod), field_ty, .union_field);
21790 try sema.explainWhyTypeIsNotExtern(msg, src_decl.toSrcLoc(src, mod), field_ty, .union_field);
2179121791
2179221792 try sema.addDeclaredHereNote(msg, field_ty);
2179321793 break :msg msg;
......@@ -21798,7 +21798,7 @@ fn reifyUnion(
2179821798 errdefer msg.destroy(gpa);
2179921799
2180021800 const src_decl = mod.declPtr(block.src_decl);
21801 try sema.explainWhyTypeIsNotPacked(msg, src.toSrcLoc(src_decl, mod), field_ty);
21801 try sema.explainWhyTypeIsNotPacked(msg, src_decl.toSrcLoc(src, mod), field_ty);
2180221802
2180321803 try sema.addDeclaredHereNote(msg, field_ty);
2180421804 break :msg msg;
src/codegen/c.zig+108-103
......@@ -1376,70 +1376,24 @@ pub const DeclGen = struct {
13761376 }
13771377 try writer.writeByte('}');
13781378 },
1379 .struct_type => |struct_type| switch (struct_type.layout) {
1380 .Auto, .Extern => {
1381 if (!location.isInitializer()) {
1382 try writer.writeByte('(');
1383 try dg.renderType(writer, ty);
1384 try writer.writeByte(')');
1385 }
1386
1387 try writer.writeByte('{');
1388 var empty = true;
1389 for (0..struct_type.field_types.len) |field_index| {
1390 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1391 if (struct_type.fieldIsComptime(ip, field_index)) continue;
1392 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
1393
1394 if (!empty) try writer.writeByte(',');
1395 const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
1396 .bytes => |bytes| try ip.get(mod.gpa, .{ .int = .{
1397 .ty = field_ty.toIntern(),
1398 .storage = .{ .u64 = bytes[field_index] },
1399 } }),
1400 .elems => |elems| elems[field_index],
1401 .repeated_elem => |elem| elem,
1402 };
1403 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), initializer_type);
1404
1405 empty = false;
1406 }
1407 try writer.writeByte('}');
1408 },
1409 .Packed => {
1410 const int_info = ty.intInfo(mod);
1411
1412 const bits = Type.smallestUnsignedBits(int_info.bits - 1);
1413 const bit_offset_ty = try mod.intType(.unsigned, bits);
1414
1415 var bit_offset: u64 = 0;
1416 var eff_num_fields: usize = 0;
1417
1418 for (0..struct_type.field_types.len) |field_index| {
1419 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1420 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
1421 eff_num_fields += 1;
1422 }
1423
1424 if (eff_num_fields == 0) {
1425 try writer.writeByte('(');
1426 try dg.renderValue(writer, ty, Value.undef, initializer_type);
1427 try writer.writeByte(')');
1428 } else if (ty.bitSize(mod) > 64) {
1429 // zig_or_u128(zig_or_u128(zig_shl_u128(a, a_off), zig_shl_u128(b, b_off)), zig_shl_u128(c, c_off))
1430 var num_or = eff_num_fields - 1;
1431 while (num_or > 0) : (num_or -= 1) {
1432 try writer.writeAll("zig_or_");
1433 try dg.renderTypeForBuiltinFnName(writer, ty);
1379 .struct_type => {
1380 const struct_type = ip.loadStructType(ty.toIntern());
1381 switch (struct_type.layout) {
1382 .Auto, .Extern => {
1383 if (!location.isInitializer()) {
14341384 try writer.writeByte('(');
1385 try dg.renderType(writer, ty);
1386 try writer.writeByte(')');
14351387 }
14361388
1437 var eff_index: usize = 0;
1438 var needs_closing_paren = false;
1389 try writer.writeByte('{');
1390 var empty = true;
14391391 for (0..struct_type.field_types.len) |field_index| {
14401392 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1393 if (struct_type.fieldIsComptime(ip, field_index)) continue;
14411394 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
14421395
1396 if (!empty) try writer.writeByte(',');
14431397 const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
14441398 .bytes => |bytes| try ip.get(mod.gpa, .{ .int = .{
14451399 .ty = field_ty.toIntern(),
......@@ -1448,62 +1402,113 @@ pub const DeclGen = struct {
14481402 .elems => |elems| elems[field_index],
14491403 .repeated_elem => |elem| elem,
14501404 };
1451 const cast_context = IntCastContext{ .value = .{ .value = Value.fromInterned(field_val) } };
1452 if (bit_offset != 0) {
1453 try writer.writeAll("zig_shl_");
1454 try dg.renderTypeForBuiltinFnName(writer, ty);
1455 try writer.writeByte('(');
1456 try dg.renderIntCast(writer, ty, cast_context, field_ty, .FunctionArgument);
1457 try writer.writeAll(", ");
1458 const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1459 try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1460 try writer.writeByte(')');
1461 } else {
1462 try dg.renderIntCast(writer, ty, cast_context, field_ty, .FunctionArgument);
1463 }
1464
1465 if (needs_closing_paren) try writer.writeByte(')');
1466 if (eff_index != eff_num_fields - 1) try writer.writeAll(", ");
1405 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), initializer_type);
14671406
1468 bit_offset += field_ty.bitSize(mod);
1469 needs_closing_paren = true;
1470 eff_index += 1;
1407 empty = false;
14711408 }
1472 } else {
1473 try writer.writeByte('(');
1474 // a << a_off | b << b_off | c << c_off
1475 var empty = true;
1409 try writer.writeByte('}');
1410 },
1411 .Packed => {
1412 const int_info = ty.intInfo(mod);
1413
1414 const bits = Type.smallestUnsignedBits(int_info.bits - 1);
1415 const bit_offset_ty = try mod.intType(.unsigned, bits);
1416
1417 var bit_offset: u64 = 0;
1418 var eff_num_fields: usize = 0;
1419
14761420 for (0..struct_type.field_types.len) |field_index| {
14771421 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1478 if (struct_type.fieldIsComptime(ip, field_index)) continue;
14791422 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
1423 eff_num_fields += 1;
1424 }
14801425
1481 if (!empty) try writer.writeByte(',');
1482 const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
1483 .bytes => |bytes| try ip.get(mod.gpa, .{ .int = .{
1484 .ty = field_ty.toIntern(),
1485 .storage = .{ .u64 = bytes[field_index] },
1486 } }),
1487 .elems => |elems| elems[field_index],
1488 .repeated_elem => |elem| elem,
1489 };
1490 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), initializer_type);
1426 if (eff_num_fields == 0) {
1427 try writer.writeByte('(');
1428 try dg.renderValue(writer, ty, Value.undef, initializer_type);
1429 try writer.writeByte(')');
1430 } else if (ty.bitSize(mod) > 64) {
1431 // zig_or_u128(zig_or_u128(zig_shl_u128(a, a_off), zig_shl_u128(b, b_off)), zig_shl_u128(c, c_off))
1432 var num_or = eff_num_fields - 1;
1433 while (num_or > 0) : (num_or -= 1) {
1434 try writer.writeAll("zig_or_");
1435 try dg.renderTypeForBuiltinFnName(writer, ty);
1436 try writer.writeByte('(');
1437 }
14911438
1492 if (bit_offset != 0) {
1493 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), .Other);
1494 try writer.writeAll(" << ");
1495 const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1496 try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1497 } else {
1498 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), .Other);
1439 var eff_index: usize = 0;
1440 var needs_closing_paren = false;
1441 for (0..struct_type.field_types.len) |field_index| {
1442 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1443 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
1444
1445 const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
1446 .bytes => |bytes| try ip.get(mod.gpa, .{ .int = .{
1447 .ty = field_ty.toIntern(),
1448 .storage = .{ .u64 = bytes[field_index] },
1449 } }),
1450 .elems => |elems| elems[field_index],
1451 .repeated_elem => |elem| elem,
1452 };
1453 const cast_context = IntCastContext{ .value = .{ .value = Value.fromInterned(field_val) } };
1454 if (bit_offset != 0) {
1455 try writer.writeAll("zig_shl_");
1456 try dg.renderTypeForBuiltinFnName(writer, ty);
1457 try writer.writeByte('(');
1458 try dg.renderIntCast(writer, ty, cast_context, field_ty, .FunctionArgument);
1459 try writer.writeAll(", ");
1460 const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1461 try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1462 try writer.writeByte(')');
1463 } else {
1464 try dg.renderIntCast(writer, ty, cast_context, field_ty, .FunctionArgument);
1465 }
1466
1467 if (needs_closing_paren) try writer.writeByte(')');
1468 if (eff_index != eff_num_fields - 1) try writer.writeAll(", ");
1469
1470 bit_offset += field_ty.bitSize(mod);
1471 needs_closing_paren = true;
1472 eff_index += 1;
14991473 }
1474 } else {
1475 try writer.writeByte('(');
1476 // a << a_off | b << b_off | c << c_off
1477 var empty = true;
1478 for (0..struct_type.field_types.len) |field_index| {
1479 const field_ty = Type.fromInterned(struct_type.field_types.get(ip)[field_index]);
1480 if (!field_ty.hasRuntimeBitsIgnoreComptime(mod)) continue;
15001481
1501 bit_offset += field_ty.bitSize(mod);
1502 empty = false;
1482 if (!empty) try writer.writeAll(" | ");
1483 try writer.writeByte('(');
1484 try dg.renderType(writer, ty);
1485 try writer.writeByte(')');
1486
1487 const field_val = switch (ip.indexToKey(val.ip_index).aggregate.storage) {
1488 .bytes => |bytes| try ip.get(mod.gpa, .{ .int = .{
1489 .ty = field_ty.toIntern(),
1490 .storage = .{ .u64 = bytes[field_index] },
1491 } }),
1492 .elems => |elems| elems[field_index],
1493 .repeated_elem => |elem| elem,
1494 };
1495
1496 if (bit_offset != 0) {
1497 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), .Other);
1498 try writer.writeAll(" << ");
1499 const bit_offset_val = try mod.intValue(bit_offset_ty, bit_offset);
1500 try dg.renderValue(writer, bit_offset_ty, bit_offset_val, .FunctionArgument);
1501 } else {
1502 try dg.renderValue(writer, field_ty, Value.fromInterned(field_val), .Other);
1503 }
1504
1505 bit_offset += field_ty.bitSize(mod);
1506 empty = false;
1507 }
1508 try writer.writeByte(')');
15031509 }
1504 try writer.writeByte('}');
1505 }
1506 },
1510 },
1511 }
15071512 },
15081513 else => unreachable,
15091514 },
src/codegen/llvm.zig+2-2
......@@ -2642,7 +2642,7 @@ pub const Object = struct {
26422642 else
26432643 try o.builder.debugForwardReference();
26442644
2645 const tag_type = union_type.loadTagType();
2645 const tag_type = union_type.loadTagType(ip);
26462646
26472647 for (0..tag_type.names.len) |field_index| {
26482648 const field_ty = union_type.field_types.get(ip)[field_index];
......@@ -3552,7 +3552,7 @@ pub const Object = struct {
35523552 const gop = try o.type_map.getOrPut(o.gpa, t.toIntern());
35533553 if (!gop.found_existing) {
35543554 const decl = mod.declPtr(ip.loadOpaqueType(t.toIntern()).decl);
3555 const name = try o.builder.string(ip.stringToSlice(try decl.getFullyQualifiedName(mod)));
3555 const name = try o.builder.string(ip.stringToSlice(try decl.fullyQualifiedName(mod)));
35563556 gop.value_ptr.* = try o.builder.opaqueType(name);
35573557 }
35583558 return gop.value_ptr.*;