From ab307a22f627fd01ef6220d62a0312fdd610eaed Mon Sep 17 00:00:00 2001
From: Noam Preil <pleasantatk@gmail.com>
Date: Sat, 27 Jun 2020 07:16:59 -0400
Subject: [PATCH] Stage2: remove clearErrors, fix ZIR export collision
 detection

---
 src-self-hosted/Module.zig     | 31 ++++---------------------------
 test/stage2/compile_errors.zig |  2 +-
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/src-self-hosted/Module.zig b/src-self-hosted/Module.zig
index 8ac4e89807..b15f1d8822 100644
--- a/src-self-hosted/Module.zig
+++ b/src-self-hosted/Module.zig
@@ -851,8 +851,6 @@ pub fn update(self: *Module) !void {
 
     self.generation += 1;
 
-    self.clearErrors();
-
     // TODO Use the cache hash file system to detect which source files changed.
     // Until then we simulate a full cache miss. Source files could have been loaded for any reason;
     // to force a refresh we unload now.
@@ -916,31 +914,6 @@ pub fn totalErrorCount(self: *Module) usize {
     return if (total == 0) @boolToInt(self.link_error_flags.no_entry_point_found) else total;
 }
 
-pub fn clearErrors(self: *Module) void {
-    const allocator = self.allocator;
-    {
-        var it = self.failed_decls.iterator();
-        while (it.next()) |kv| {
-            kv.value.destroy(allocator);
-        }
-        self.failed_decls.clear();
-    }
-    {
-        var it = self.failed_files.iterator();
-        while (it.next()) |kv| {
-            kv.value.destroy(allocator);
-        }
-        self.failed_files.clear();
-    }
-    {
-        var it = self.failed_exports.iterator();
-        while (it.next()) |kv| {
-            kv.value.destroy(allocator);
-        }
-        self.failed_exports.clear();
-    }
-}
-
 pub fn getAllErrorsAlloc(self: *Module) !AllErrors {
     var arena = std.heap.ArenaAllocator.init(self.allocator);
     errdefer arena.deinit();
@@ -1899,6 +1872,9 @@ fn deleteDeclExports(self: *Module, decl: *Decl) void {
         }
 
         self.bin_file.deleteExport(exp.link);
+        if (self.failed_exports.remove(exp)) |entry| {
+            entry.value.destroy(self.allocator);
+        }
         self.allocator.destroy(exp);
     }
     self.allocator.free(kv.value);
@@ -2191,6 +2167,7 @@ fn analyzeExport(self: *Module, scope: *Scope, src: usize, symbol_name: []const
             "exported symbol collision: {}",
             .{symbol_name},
         ));
+        new_export.status = .failed;
     } else {
         self.bin_file.updateDeclExports(self, exported_decl, de_gop.kv.value) catch |err| switch (err) {
             error.OutOfMemory => return error.OutOfMemory,
diff --git a/test/stage2/compile_errors.zig b/test/stage2/compile_errors.zig
index bfe4bf7d48..b324cdf5d5 100644
--- a/test/stage2/compile_errors.zig
+++ b/test/stage2/compile_errors.zig
@@ -70,7 +70,7 @@ pub fn addCases(ctx: *TestContext) !void {
     );
 
     // TODO: need to make sure this works with other variants of export.
-    ctx.incrementalFailure("function redefinition", linux_x64,
+    ctx.incrementalFailure("exported symbol collision", linux_x64,
         \\export fn entry() void {}
         \\export fn entry() void {}
     , &[_][]const u8{":2:11: error: redefinition of 'entry'"},