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

stage2: remove redundant source hash

Browse Source
This commit is contained in:
Andrew Kelley 2021-04-09 23:52:36 -07:00
parent f458192e56
commit a4bb7c8bb1
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Compilation.zig
View File

@ -1484,22 +1484,14 @@ pub fn update(self: *Compilation) !void {
continue;
}
const prev_hash = file.source_hash;
file.unloadSource(module.gpa);
// TODO handle error here by populating a retryable compile error
try file.finishGettingSource(module.gpa, f, stat);
assert(file.source_loaded);
if (mem.eql(u8, &prev_hash, &file.source_hash)) {
file.updateTreeToNewSource();
log.debug("unmodified source hash of file: {s}", .{file.sub_file_path});
continue;
}
log.debug("source contents changed: {s}", .{file.sub_file_path});
log.debug("metadata changed: {s}", .{file.sub_file_path});
if (file.status == .unloaded_parse_failure) {
module.failed_files.swapRemove(file).?.value.destroy(module.gpa);
}
file.unloadTree(module.gpa);
file.unload(module.gpa);
// TODO handle error here by populating a retryable compile error
try file.finishGettingSource(module.gpa, f, stat);
module.analyzeFile(file) catch |err| switch (err) {
error.OutOfMemory => return error.OutOfMemory,

20
src/Module.zig
View File

@ -26,7 +26,6 @@ const trace = @import("tracy.zig").trace;
const AstGen = @import("AstGen.zig");
const Sema = @import("Sema.zig");
const target_util = @import("target.zig");
const Cache = @import("Cache.zig");
/// General-purpose allocator. Used for both temporary and long-term storage.
gpa: *Allocator,
@ -706,8 +705,6 @@ pub const Scope = struct {
stat_inode: std.fs.File.INode,
/// Whether this is populated depends on `status`.
stat_mtime: i128,
/// Whether this is populated depends on `status`.
source_hash: Cache.BinDigest,
/// Whether this is populated or not depends on `status`.
tree: ast.Tree,
/// Package that this file is a part of, managed externally.
@ -734,13 +731,6 @@ pub const Scope = struct {
}
}
pub fn updateTreeToNewSource(file: *File) void {
assert(file.source_loaded);
if (file.status == .loaded_success) {
file.tree.source = file.source;
}
}
pub fn deinit(file: *File, gpa: *Allocator) void {
file.unload(gpa);
file.* = undefined;
@ -781,14 +771,11 @@ pub const Scope = struct {
return error.FileTooBig;
const source = try gpa.allocSentinel(u8, stat.size, 0);
errdefer gpa.free(source);
const amt = try f.readAll(source);
if (amt != stat.size)
return error.UnexpectedEndOfFile;
var hasher = Cache.hasher_init;
hasher.update(source);
hasher.final(&file.source_hash);
file.stat_size = stat.size;
file.stat_inode = stat.inode;
file.stat_mtime = stat.mtime;
@ -3316,7 +3303,6 @@ pub fn importFile(mod: *Module, cur_pkg: *Package, import_string: []const u8) !*
new_file.* = .{
.sub_file_path = resolved_path,
.source = undefined,
.source_hash = undefined,
.source_loaded = false,
.stat_size = undefined,
.stat_inode = undefined,
@ -3343,12 +3329,13 @@ pub fn importFile(mod: *Module, cur_pkg: *Package, import_string: []const u8) !*
.parent_name_hash = parent_name_hash,
.ty = Type.initTag(.type),
};
const top_decl = try mod.createNewDecl(
&tmp_namespace,
resolved_path,
0,
parent_name_hash,
new_file.source_hash,
std.zig.hashSrc(tree.source),
);
defer {
mod.decl_table.removeAssertDiscard(parent_name_hash);
@ -3421,6 +3408,7 @@ pub fn importFile(mod: *Module, cur_pkg: *Package, import_string: []const u8) !*
const struct_ty = try val.toType(&gen_scope_arena.allocator);
const struct_decl = struct_ty.getOwnerDecl();
struct_decl.contents_hash = top_decl.contents_hash;
new_file.namespace = struct_ty.getNamespace().?;
new_file.namespace.parent = null;
new_file.namespace.parent_name_hash = tmp_namespace.parent_name_hash;