mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-21 16:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation: preserve "builtin" as the first dependency

Browse Source 
Previously, sorting dependencies would reorder the builtin dependency
and cause `Package.Module.getBuiltinDependency` to stop working.
This commit is contained in:
Jacob Young 2024-01-25 17:59:48 +01:00 committed by Andrew Kelley
parent ce58f68903
commit bea958df4d
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Compilation.zig
View File

@ -1143,12 +1143,14 @@ fn addModuleTableToCacheHash(
try seen_table.put(gpa, main_mod, {});
const SortByName = struct {
has_builtin: bool,
names: []const []const u8,
pub fn lessThan(ctx: @This(), lhs_index: usize, rhs_index: usize) bool {
const lhs_key = ctx.names[lhs_index];
const rhs_key = ctx.names[rhs_index];
return mem.lessThan(u8, lhs_key, rhs_key);
pub fn lessThan(ctx: @This(), lhs: usize, rhs: usize) bool {
return if (ctx.has_builtin and (lhs == 0 or rhs == 0))
lhs < rhs
else
mem.lessThan(u8, ctx.names[lhs], ctx.names[rhs]);
}
};
@ -1175,7 +1177,11 @@ fn addModuleTableToCacheHash(
},
}
mod.deps.sortUnstable(SortByName{ .names = mod.deps.keys() });
mod.deps.sortUnstable(SortByName{
.has_builtin = mod.deps.count() >= 1 and
mod.deps.values()[0].isBuiltin(),
.names = mod.deps.keys(),
});
hash.addListOfBytes(mod.deps.keys());