From 70dcdcb73d42e69df50f3a4b721a7ecb30153758 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 1 Dec 2021 15:19:29 -0700
Subject: [PATCH] std: remove double free in GPA

Merge conflict between
02a1f838e67edc4107df19ba194a925958f1c669
and
885c73f3438d108c3cbb1afd75e3fee2f4bc88c0
---
 lib/std/heap/general_purpose_allocator.zig | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/std/heap/general_purpose_allocator.zig b/lib/std/heap/general_purpose_allocator.zig
index 44417e174a..9900823d5b 100644
--- a/lib/std/heap/general_purpose_allocator.zig
+++ b/lib/std/heap/general_purpose_allocator.zig
@@ -633,8 +633,6 @@ pub fn GeneralPurposeAllocator(comptime config: Config) type {
                 self.total_requested_bytes -= entry.value_ptr.requested_size;
             }
 
-            if (!config.never_unmap) self.backing_allocator.rawFree(old_mem, old_align, ret_addr);
-
             if (config.verbose_log) {
                 log.info("large free {d} bytes at {*}", .{ old_mem.len, old_mem.ptr });
             }