From a0410f0170a6fe54d6097cbbddd6b3126047f605 Mon Sep 17 00:00:00 2001
From: Alkis Evlogimenos <alkis@evlogimenos.com>
Date: Sat, 8 Jun 2024 19:02:33 +0200
Subject: [PATCH] Make big_string pod (#1204)

`big_string` is not pod which means it needs to be properly constructed
and destroyed. Instead make it POD and destroy it manually in `string`
destructor.
---
 ctl/string.cc | 30 +++++++++++-------------------
 ctl/string.h  |  2 --
 2 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/ctl/string.cc b/ctl/string.cc
index 2a2b22eb1..f5184786f 100644
--- a/ctl/string.cc
+++ b/ctl/string.cc
@@ -23,27 +23,19 @@
 
 namespace ctl {
 
-namespace __ {
-
-big_string::~big_string() /* noexcept */
-{
-    if (n) {
-        if (n >= c)
-            __builtin_trap();
-        if (p[n])
-            __builtin_trap();
-    }
-    if (c && !p)
-        __builtin_trap();
-    free(p);
-}
-
-} // namespace __
-
-string::~string() /* noexcept */
+string::~string() noexcept
 {
     if (isbig()) {
-        big()->~big_string();
+        auto* b = big();
+        if (b->n) {
+            if (b->n >= b->c)
+                __builtin_trap();
+            if (b->p[b->n])
+                __builtin_trap();
+        }
+        if (b->c && !b->p)
+            __builtin_trap();
+        free(b->p);
     }
 }
 
diff --git a/ctl/string.h b/ctl/string.h
index c830fdf12..5315a0a45 100644
--- a/ctl/string.h
+++ b/ctl/string.h
@@ -38,8 +38,6 @@ struct big_string
     size_t c : sizeof(size_t) * 8 - 1;
     size_t big : 1 /* = 1 */;
 #endif
-
-    ~big_string() /* noexcept */;
 };
 
 } // namespace __