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

fix recursive package fetching logic

Browse Source 
For path-relative dependencies, they always need to be added to the hash
table at the end. For remote dependencies, they never need to be added.
This commit is contained in:
Andrew Kelley 2023-10-06 22:16:10 -07:00
parent ddb7c40037
commit 1ca4428324
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Package/Fetch.zig
View File

@ -448,14 +448,20 @@ fn queueJobsForDeps(f: *Fetch, hash: Manifest.MultiHashHexDigest) RunError!void
try f.job_queue.all_fetches.ensureUnusedCapacity(gpa, new_fetches.len);
try f.job_queue.table.ensureUnusedCapacity(gpa, @intCast(new_fetches.len + 1));
// It is impossible for there to be a collision here. Consider all three cases:
// There are four cases here:
// * Correct hash is provided by manifest.
// - Redundant jobs are skipped in the loop below.
// - Hash map already has the entry, no need to add it again.
// * Incorrect hash is provided by manifest.
// - Hash mismatch error emitted; `queueJobsForDeps` is not called.
// * Hash is not provided by manifest.
// - Hash missing error emitted; `queueJobsForDeps` is not called.
f.job_queue.table.putAssumeCapacityNoClobber(hash, f);
// * path-based location is used without a hash.
// - We need to add `hash` to the table now.
switch (f.location) {
.remote => assert(f.job_queue.table.get(hash) == f),
.relative_path => f.job_queue.table.putAssumeCapacityNoClobber(hash, f),
.path_or_url => unreachable,
}
for (deps) |dep| {
const new_fetch = &new_fetches[new_fetch_index];