replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ObjectFileMachO] Revert std::make_shared 

This caused a rather interesting error message on MSVC: error C2338 and
I'm not sure how to properly fix it.

llvm-svn: 353769
This commit is contained in:
Jonas Devlieghere 2019-02-11 23:49:13 +00:00
parent c6091d2bed
commit 55fb848e84
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
View File

@ -59,8 +59,6 @@
#include <uuid/uuid.h>
#endif
#include <memory>
#define THUMB_ADDRESS_BIT_MASK 0xfffffffffffffffeull
using namespace lldb;
using namespace lldb_private;
@ -1647,7 +1645,7 @@ void ObjectFileMachO::ProcessSegmentCommand(const load_command &load_cmd_,
// conflict with any of the sections.
SectionSP segment_sp;
if (add_section && (const_segname || is_core)) {
segment_sp = std::make_shared<Section>(
segment_sp.reset(new Section(
module_sp, // Module to which this section belongs
this, // Object file to which this sections belongs
++context.NextSegmentIdx
@ -1665,7 +1663,7 @@ void ObjectFileMachO::ProcessSegmentCommand(const load_command &load_cmd_,
load_cmd.filesize, // Size in bytes of this section as found
// in the file
0, // Segments have no alignment information
load_cmd.flags); // Flags for this section
load_cmd.flags)); // Flags for this section
segment_sp->SetIsEncrypted(segment_is_encrypted);
m_sections_ap->AddSection(segment_sp);
@ -1786,7 +1784,7 @@ void ObjectFileMachO::ProcessSegmentCommand(const load_command &load_cmd_,
}
} else {
// Create a fake section for the section's named segment
segment_sp = std::make_shared<Section>(
segment_sp.reset(new Section(
segment_sp, // Parent section
module_sp, // Module to which this section belongs
this, // Object file to which this section belongs
@ -1807,7 +1805,7 @@ void ObjectFileMachO::ProcessSegmentCommand(const load_command &load_cmd_,
// this section as
// found in the file
sect64.align,
load_cmd.flags); // Flags for this section
load_cmd.flags)); // Flags for this section
segment_sp->SetIsFake(true);
segment_sp->SetPermissions(segment_permissions);
m_sections_ap->AddSection(segment_sp);
@ -5527,23 +5525,19 @@ ObjectFileMachO::GetThreadContextAtIndex(uint32_t idx,
switch (m_header.cputype) {
case llvm::MachO::CPU_TYPE_ARM64:
reg_ctx_sp =
std::make_shared<RegisterContextDarwin_arm64_Mach>(thread, data);
reg_ctx_sp.reset(new RegisterContextDarwin_arm64_Mach(thread, data));
break;
case llvm::MachO::CPU_TYPE_ARM:
reg_ctx_sp =
std::make_shared<RegisterContextDarwin_arm_Mach>(thread, data);
reg_ctx_sp.reset(new RegisterContextDarwin_arm_Mach(thread, data));
break;
case llvm::MachO::CPU_TYPE_I386:
reg_ctx_sp =
std::make_shared<RegisterContextDarwin_i386_Mach>(thread, data);
reg_ctx_sp.reset(new RegisterContextDarwin_i386_Mach(thread, data));
break;
case llvm::MachO::CPU_TYPE_X86_64:
reg_ctx_sp =
std::make_shared<RegisterContextDarwin_x86_64_Mach>(thread, data);
reg_ctx_sp.reset(new RegisterContextDarwin_x86_64_Mach(thread, data));
break;
}
}