| author |  Matthew Lugg <mlugg@mlugg.co.uk> 2025-05-15 13:21:36+01:00 |
| committer | Matthew Lugg <mlugg@mlugg.co.uk> 2025-05-18 17:10:04+01:00 |
| log | d32829e053af2a0f382d4d692ede85c176c9f803 |
| tree | 1b85e5aa9e44648f78a0aa56110cff226136f5a8 |
| parent | a0792e743ff41cf17343fad02bde54240df89419 |
| signature |  Commit is signed but in an unrecognized format. |
std.Build.Cache: change contract of `addFilePostContents`
This function was broken, because it took ownership of the buffer on
error *sometimes*, in a way which the caller could not tell. Rather than
trying to be clever, it's easier to just follow the same interface as
all other `addFilePost` methods, and not take ownership of the path.
This is a breaking change. The next commits will apply it to the
compiler, which is the only user of this function in the ziglang/zig
repository.1 files changed, 2 insertions(+), 3 deletions(-)
lib- std
- Build
lib/std/Build/Cache.zig+2-3
| ... | ... | @@ -1011,17 +1011,16 @@ pub const Manifest = struct { |
| 1011 | 1011 | } |
| 1012 | 1012 | |
| 1013 | 1013 | /// Like `addFilePost` but when the file contents have already been loaded from disk. |
| 1014 | /// On success, cache takes ownership of `resolved_path`. | |
| 1015 | 1014 | pub fn addFilePostContents( |
| 1016 | 1015 | self: *Manifest, |
| 1017 | resolved_path: []u8, | |
| 1016 | file_path: []const u8, | |
| 1018 | 1017 | bytes: []const u8, |
| 1019 | 1018 | stat: File.Stat, |
| 1020 | 1019 | ) !void { |
| 1021 | 1020 | assert(self.manifest_file != null); |
| 1022 | 1021 | const gpa = self.cache.gpa; |
| 1023 | 1022 | |
| 1024 | const prefixed_path = try self.cache.findPrefixResolved(resolved_path); | |
| 1023 | const prefixed_path = try self.cache.findPrefix(file_path); | |
| 1025 | 1024 | errdefer gpa.free(prefixed_path.sub_path); |
| 1026 | 1025 | |
| 1027 | 1026 | const gop = try self.files.getOrPutAdapted(gpa, prefixed_path, FilesAdapter{}); |