Skip to content

Commit

Permalink
[libunwind] Use placement new to avoid dependency C++ library
Browse files Browse the repository at this point in the history
The rest of libunwind already uses placement new, these are the only
places where non-placement new is being used introducing undesirable
C++ library dependency.

Differential Revision: https://reviews.llvm.org/D57251

llvm-svn: 352245
  • Loading branch information
petrhosek committed Jan 25, 2019
1 parent 1f9bc28 commit 90bcfaa
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions libunwind/src/libunwind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
#ifndef NDEBUG
#include <cstdlib> // getenv
#endif
#include <new>
#include <algorithm>

#include "libunwind_ext.h"
#include "config.h"
Expand Down Expand Up @@ -122,12 +120,14 @@ static bool is64bit(task_t task) {
_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
Expand All @@ -144,18 +144,21 @@ _LIBUNWIND_EXPORT void unw_destroy_addr_space(unw_addr_space_t asp) {
#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;
}
Expand Down

0 comments on commit 90bcfaa

Please sign in to comment.