mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 00:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

No allocations for n.t. empty strings

Browse Source
This commit is contained in:
Layne Gustafson 2020-01-15 18:12:32 -05:00 committed by Andrew Kelley
parent 40ff359486
commit a5c9397539
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src-self-hosted/stage1.zig
View File

@ -617,6 +617,8 @@ fn printCpusForArch(arch_name: []const u8, show_dependencies: bool) !void {
}
}
const null_terminated_empty_string = (&[_]u8 { 0 })[0..0 :0];
fn toNullTerminatedStringAlloc(allocator: *std.mem.Allocator, str: []const u8) ![:0]const u8 {
var buffer = try std.Buffer.init(allocator, str);
@ -653,7 +655,7 @@ const Stage2TargetDetails = struct {
.cpu = cpu,
},
.llvm_cpu_str = try toNullTerminatedStringAlloc(allocator, cpu.name),
.llvm_features_str = try toNullTerminatedStringAlloc(allocator, ""),
.llvm_features_str = null_terminated_empty_string,
.builtin_str = builtin_str_buffer.toOwnedSlice(),
};
}
@ -697,7 +699,7 @@ const Stage2TargetDetails = struct {
.target_details = std.target.TargetDetails{
.features = features,
},
.llvm_cpu_str = try toNullTerminatedStringAlloc(allocator, ""),
.llvm_cpu_str = null_terminated_empty_string,
.llvm_features_str = llvm_features_buffer.toOwnedSlice()[0..llvm_features_buffer_len :0],
.builtin_str = builtin_str_buffer.toOwnedSlice(),
};
@ -801,7 +803,7 @@ export fn stage2_target_details_get_cache_str(target_details: ?*const Stage2Targ
});
}
return @as([*:0]const u8, "");
return @as([*:0]const u8, null_terminated_empty_string);
}
// ABI warning
@ -810,7 +812,7 @@ export fn stage2_target_details_get_llvm_cpu(target_details: ?*const Stage2Targe
return @as([*:0]const u8, td.llvm_cpu_str);
}
return @as([*:0]const u8, "");
return @as([*:0]const u8, null_terminated_empty_string);
}
// ABI warning
@ -819,7 +821,7 @@ export fn stage2_target_details_get_llvm_features(target_details: ?*const Stage2
return @as([*:0]const u8, td.llvm_features_str);
}
return @as([*:0]const u8, "");
return @as([*:0]const u8, null_terminated_empty_string);
}
// ABI warning
@ -828,7 +830,7 @@ export fn stage2_target_details_get_builtin_str(target_details: ?*const Stage2Ta
return @as([*:0]const u8, td.builtin_str);
}
return @as([*:0]const u8, "");
return @as([*:0]const u8, null_terminated_empty_string);
}
const riscv_default_features: []*const std.target.Feature = &[_]*const std.target.Feature {