[libcxx-commits] [PATCH] D57251: [libunwind] Use placement new to avoid dependency C++ library

[Petr Hosek via Phabricator via libcxx-commits]

phosek updated this revision to Diff 183611.
phosek marked 2 inline comments as done.

Repository:
  rUNW libunwind

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D57251/new/

https://reviews.llvm.org/D57251

Files:
  libunwind/src/libunwind.cpp


Index: libunwind/src/libunwind.cpp
===================================================================
--- libunwind/src/libunwind.cpp
+++ libunwind/src/libunwind.cpp
@@ -14,8 +14,6 @@
 #ifndef NDEBUG
 #include <cstdlib> // getenv
 #endif
-#include <new>
-#include <algorithm>
 
 #include "libunwind_ext.h"
 #include "config.h"
@@ -122,12 +120,14 @@
 _LIBUNWIND_EXPORT unw_addr_space_t unw_create_addr_space_for_task(task_t task) {
 #if __i386__
   if (is64bit(task)) {
-    unw_addr_space_x86_64 *as = new unw_addr_space_x86_64(task);
+    unw_addr_space_x86_64 *as = malloc(sizeof(unw_addr_space_x86_64));
+    new (as) unw_addr_space_x86_64(task);
     as->taskPort = task;
     as->cpuType = CPU_TYPE_X86_64;
     //as->oas
   } else {
-    unw_addr_space_i386 *as = new unw_addr_space_i386(task);
+    unw_addr_space_i386 *as = malloc(sizeof(unw_addr_space_i386));
+    new (as) unw_addr_space_i386(task);
     as->taskPort = task;
     as->cpuType = CPU_TYPE_I386;
     //as->oas
@@ -144,18 +144,21 @@
 #if __i386__ || __x86_64__
   case CPU_TYPE_I386: {
     unw_addr_space_i386 *as = (unw_addr_space_i386 *)asp;
-    delete as;
+    as->~unw_addr_space_i386();
+    free(as);
   }
   break;
   case CPU_TYPE_X86_64: {
     unw_addr_space_x86_64 *as = (unw_addr_space_x86_64 *)asp;
-    delete as;
+    as->~unw_addr_space_x86_64();
+    free(as);
   }
   break;
 #endif
   case CPU_TYPE_POWERPC: {
     unw_addr_space_ppc *as = (unw_addr_space_ppc *)asp;
-    delete as;
+    as->~unw_addr_space_ppc();
+    free(as);
   }
   break;
   }


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D57251.183611.patch
Type: text/x-patch
Size: 1546 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20190125/c590addb/attachment.bin>