From 92b69215e63a3303a5e904ab332e2eec236e0ed2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 16 Aug 2021 23:30:18 -0700 Subject: update libcxx, libcxxabi, libunwind, and tsan to llvm 13 rc1 --- src/Compilation.zig | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Compilation.zig') diff --git a/src/Compilation.zig b/src/Compilation.zig index 7987ed95df..63475821ab 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -2666,7 +2666,7 @@ fn reportRetryableCObjectError( const c_obj_err_msg = try comp.gpa.create(CObject.ErrorMsg); errdefer comp.gpa.destroy(c_obj_err_msg); - const msg = try std.fmt.allocPrint(comp.gpa, "unable to build C object: {s}", .{@errorName(err)}); + const msg = try std.fmt.allocPrint(comp.gpa, "{s}", .{@errorName(err)}); errdefer comp.gpa.free(msg); c_obj_err_msg.* = .{ .msg = msg, @@ -2742,6 +2742,8 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_obj_prog_node: *std.P const tracy = trace(@src()); defer tracy.end(); + log.debug("updating C object: {s}", .{c_object.src.src_path}); + if (c_object.clearStatus(comp.gpa)) { // There was previous failure. const lock = comp.mutex.acquire(); @@ -3271,7 +3273,7 @@ fn failCObjWithOwnedErrorMsg( defer lock.release(); { errdefer err_msg.destroy(comp.gpa); - try comp.failed_c_objects.ensureCapacity(comp.gpa, comp.failed_c_objects.count() + 1); + try comp.failed_c_objects.ensureUnusedCapacity(comp.gpa, 1); } comp.failed_c_objects.putAssumeCapacityNoClobber(c_object, err_msg); } -- cgit v1.2.3