mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 03:03:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17967 from jacobly0/x86_64-cases

Browse Source
This commit is contained in:
Andrew Kelley 2023-11-11 04:42:33 -05:00 committed by GitHub
commit 78df899b88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Module.zig
View File

@ -1250,6 +1250,7 @@ pub const ErrorMsg = struct {
comptime format: []const u8, comptime format: []const u8,
args: anytype, args: anytype,
) !*ErrorMsg { ) !*ErrorMsg {
assert(src_loc.lazy != .unneeded);
const err_msg = try gpa.create(ErrorMsg); const err_msg = try gpa.create(ErrorMsg);
errdefer gpa.destroy(err_msg); errdefer gpa.destroy(err_msg);
err_msg.* = try ErrorMsg.init(gpa, src_loc, format, args); err_msg.* = try ErrorMsg.init(gpa, src_loc, format, args);
@ -3542,8 +3543,6 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
new_decl.ty = Type.type; new_decl.ty = Type.type;
new_decl.alignment = .none; new_decl.alignment = .none;
new_decl.@"linksection" = .none; new_decl.@"linksection" = .none;
new_decl.has_tv = true;
new_decl.owns_tv = true;
new_decl.alive = true; // This Decl corresponds to a File and is therefore always alive. new_decl.alive = true; // This Decl corresponds to a File and is therefore always alive.
new_decl.analysis = .in_progress; new_decl.analysis = .in_progress;
new_decl.generation = mod.generation; new_decl.generation = mod.generation;
@ -3593,6 +3592,8 @@ pub fn semaFile(mod: *Module, file: *File) SemaError!void {
new_namespace.ty = struct_ty.toType(); new_namespace.ty = struct_ty.toType();
new_decl.val = struct_ty.toValue(); new_decl.val = struct_ty.toValue();
new_decl.has_tv = true;
new_decl.owns_tv = true;
new_decl.analysis = .complete; new_decl.analysis = .complete;
if (mod.comp.whole_cache_manifest) |whole_cache_manifest| { if (mod.comp.whole_cache_manifest) |whole_cache_manifest| {

6
src/Sema.zig
View File

@ -2438,8 +2438,9 @@ fn errMsg(
src: LazySrcLoc, src: LazySrcLoc,
comptime format: []const u8, comptime format: []const u8,
args: anytype, args: anytype,
) error{OutOfMemory}!*Module.ErrorMsg { ) error{ NeededSourceLocation, OutOfMemory }!*Module.ErrorMsg {
const mod = sema.mod; const mod = sema.mod;
if (src == .unneeded) return error.NeededSourceLocation;
const src_decl = mod.declPtr(block.src_decl); const src_decl = mod.declPtr(block.src_decl);
return Module.ErrorMsg.create(sema.gpa, src.toSrcLoc(src_decl, mod), format, args); return Module.ErrorMsg.create(sema.gpa, src.toSrcLoc(src_decl, mod), format, args);
} }
@ -2455,14 +2456,13 @@ pub fn fail(
return sema.failWithOwnedErrorMsg(block, err_msg); return sema.failWithOwnedErrorMsg(block, err_msg);
} }
fn failWithOwnedErrorMsg(sema: *Sema, block: ?*Block, err_msg: *Module.ErrorMsg) CompileError { fn failWithOwnedErrorMsg(sema: *Sema, block: ?*Block, err_msg: *Module.ErrorMsg) error{ AnalysisFail, OutOfMemory } {
@setCold(true); @setCold(true);
const gpa = sema.gpa; const gpa = sema.gpa;
const mod = sema.mod; const mod = sema.mod;
ref: { ref: {
errdefer err_msg.destroy(gpa); errdefer err_msg.destroy(gpa);
if (err_msg.src_loc.lazy == .unneeded) return error.NeededSourceLocation;
if (crash_report.is_enabled and mod.comp.debug_compile_errors) { if (crash_report.is_enabled and mod.comp.debug_compile_errors) {
var wip_errors: std.zig.ErrorBundle.Wip = undefined; var wip_errors: std.zig.ErrorBundle.Wip = undefined;

4
src/codegen/llvm/BitcodeReader.zig
View File

@ -51,8 +51,8 @@ pub const Block = struct {
pub const Record = struct { pub const Record = struct {
name: []const u8, name: []const u8,
id: u32, id: u32,
operands: []u64, operands: []const u64,
blob: []u8, blob: []const u8,
fn toOwnedAbbrev(record: Record, allocator: std.mem.Allocator) !Abbrev { fn toOwnedAbbrev(record: Record, allocator: std.mem.Allocator) !Abbrev {
var operands = std.ArrayList(Abbrev.Operand).init(allocator); var operands = std.ArrayList(Abbrev.Operand).init(allocator);