motiejus/zig

commit 5ee04315272ba19e3d329ad21d38e9e425e21ab5 (tree)
parent 2f58efcc1f0a435846c0909fcde7b080ec4e5d3a
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed,  6 Jan 2021 17:40:25 -0700

stage2: update to new ArrayListHashMap API

Diffstat:
M
src/Compilation.zig
 | 
2
+-
M
src/Module.zig
 | 
8
++++----
M
src/link/C.zig
 | 
4
++--

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -1564,7 +1564,7 @@ pub fn performAllTheWork(self: *Compilation) error{ TimerUnsupported, OutOfMemor
                 };
 
                 fwd_decl.* = dg.fwd_decl.moveToUnmanaged();
-                fwd_decl.shrink(module.gpa, fwd_decl.items.len);
+                fwd_decl.shrinkAndFree(module.gpa, fwd_decl.items.len);
             },
         },
         .analyze_decl => |decl| {
diff --git a/src/Module.zig b/src/Module.zig
@@ -1885,10 +1885,10 @@ pub fn deleteDecl(self: *Module, decl: *Decl) !void {
     if (self.failed_decls.swapRemove(decl)) |entry| {
         entry.value.destroy(self.gpa);
     }
-    if (self.emit_h_failed_decls.remove(decl)) |entry| {
+    if (self.emit_h_failed_decls.swapRemove(decl)) |entry| {
         entry.value.destroy(self.gpa);
     }
-    if (self.compile_log_decls.remove(decl)) |*entry| {
+    if (self.compile_log_decls.swapRemove(decl)) |*entry| {
         entry.value.deinit(self.gpa);
     }
     self.deleteDeclExports(decl);
@@ -1978,10 +1978,10 @@ fn markOutdatedDecl(self: *Module, decl: *Decl) !void {
     if (self.failed_decls.swapRemove(decl)) |entry| {
         entry.value.destroy(self.gpa);
     }
-    if (self.emit_h_failed_decls.remove(decl)) |entry| {
+    if (self.emit_h_failed_decls.swapRemove(decl)) |entry| {
         entry.value.destroy(self.gpa);
     }
-    if (self.compile_log_decls.remove(decl)) |*entry| {
+    if (self.compile_log_decls.swapRemove(decl)) |*entry| {
         entry.value.deinit(self.gpa);
     }
     decl.analysis = .outdated;
diff --git a/src/link/C.zig b/src/link/C.zig
@@ -112,8 +112,8 @@ pub fn updateDecl(self: *C, module: *Module, decl: *Module.Decl) !void {
     code.* = object.code.moveToUnmanaged();
 
     // Free excess allocated memory for this Decl.
-    fwd_decl.shrink(module.gpa, fwd_decl.items.len);
-    code.shrink(module.gpa, code.items.len);
+    fwd_decl.shrinkAndFree(module.gpa, fwd_decl.items.len);
+    code.shrinkAndFree(module.gpa, code.items.len);
 }
 
 pub fn updateDeclLineNumber(self: *C, module: *Module, decl: *Module.Decl) !void {