diff options
Diffstat (limited to 'lldb/source/Plugins')
31 files changed, 104 insertions, 99 deletions
diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp index 9eb22fdf4b5..b9f7936c4e0 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp @@ -472,6 +472,10 @@ DisassemblerLLVMC::LLVMCDisassembler::LLVMCDisassembler (const char *triple, uns m_is_valid = false; } +DisassemblerLLVMC::LLVMCDisassembler::~LLVMCDisassembler() +{ +} + namespace { // This is the memory object we use in GetInstruction. class LLDBDisasmMemoryObject : public llvm::MemoryObject { @@ -563,7 +567,7 @@ DisassemblerLLVMC::CreateInstance (const ArchSpec &arch, const char *flavor) { if (arch.GetTriple().getArch() != llvm::Triple::UnknownArch) { - std::auto_ptr<DisassemblerLLVMC> disasm_ap (new DisassemblerLLVMC(arch, flavor)); + STD_UNIQUE_PTR(DisassemblerLLVMC) disasm_ap (new DisassemblerLLVMC(arch, flavor)); if (disasm_ap.get() && disasm_ap->IsValid()) return disasm_ap.release(); diff --git a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h index 7428b6b13e2..4b9cee2a608 100644 --- a/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h +++ b/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h @@ -43,7 +43,7 @@ class DisassemblerLLVMC : public lldb_private::Disassembler public: LLVMCDisassembler (const char *triple, unsigned flavor, DisassemblerLLVMC &owner); - ~LLVMCDisassembler() {}; + ~LLVMCDisassembler(); uint64_t GetMCInst (const uint8_t *opcode_data, size_t opcode_data_len, lldb::addr_t pc, llvm::MCInst &mc_inst); uint64_t PrintMCInst (llvm::MCInst &mc_inst, char *output_buffer, size_t out_buffer_len); @@ -54,14 +54,14 @@ class DisassemblerLLVMC : public lldb_private::Disassembler } private: - bool m_is_valid; - std::auto_ptr<llvm::MCContext> m_context_ap; - std::auto_ptr<llvm::MCAsmInfo> m_asm_info_ap; - std::auto_ptr<llvm::MCSubtargetInfo> m_subtarget_info_ap; - std::auto_ptr<llvm::MCInstrInfo> m_instr_info_ap; - std::auto_ptr<llvm::MCRegisterInfo> m_reg_info_ap; - std::auto_ptr<llvm::MCInstPrinter> m_instr_printer_ap; - std::auto_ptr<llvm::MCDisassembler> m_disasm_ap; + bool m_is_valid; + STD_UNIQUE_PTR(llvm::MCContext) m_context_ap; + STD_UNIQUE_PTR(llvm::MCAsmInfo) m_asm_info_ap; + STD_UNIQUE_PTR(llvm::MCSubtargetInfo) m_subtarget_info_ap; + STD_UNIQUE_PTR(llvm::MCInstrInfo) m_instr_info_ap; + STD_UNIQUE_PTR(llvm::MCRegisterInfo) m_reg_info_ap; + STD_UNIQUE_PTR(llvm::MCInstPrinter) m_instr_printer_ap; + STD_UNIQUE_PTR(llvm::MCDisassembler) m_disasm_ap; }; public: @@ -164,8 +164,8 @@ protected: lldb_private::Mutex m_mutex; bool m_data_from_file; - std::auto_ptr<LLVMCDisassembler> m_disasm_ap; - std::auto_ptr<LLVMCDisassembler> m_alternate_disasm_ap; + STD_UNIQUE_PTR(LLVMCDisassembler) m_disasm_ap; + STD_UNIQUE_PTR(LLVMCDisassembler) m_alternate_disasm_ap; }; #endif // liblldb_DisassemblerLLVM_h_ diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp index 2f3c4e4e06c..88941955847 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp @@ -98,7 +98,7 @@ DynamicLoaderPOSIXDYLD::DynamicLoaderPOSIXDYLD(Process *process) m_rendezvous(process), m_load_offset(LLDB_INVALID_ADDRESS), m_entry_point(LLDB_INVALID_ADDRESS), - m_auxv(NULL) + m_auxv() { } diff --git a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h index 4c9cbe534f2..3402afbc585 100644 --- a/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h +++ b/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h @@ -93,7 +93,7 @@ protected: lldb::addr_t m_entry_point; /// Auxiliary vector of the inferior process. - std::auto_ptr<AuxVector> m_auxv; + STD_UNIQUE_PTR(AuxVector) m_auxv; /// Enables a breakpoint on a function called by the runtime /// linker each time a module is loaded or unloaded. diff --git a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp index 5aadfe3e26c..8bceba69f40 100644 --- a/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp +++ b/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp @@ -193,14 +193,14 @@ EmulateInstructionARM::CreateInstance (const ArchSpec &arch, InstructionType ins { if (arch.GetTriple().getArch() == llvm::Triple::arm) { - std::auto_ptr<EmulateInstructionARM> emulate_insn_ap (new EmulateInstructionARM (arch)); + STD_UNIQUE_PTR(EmulateInstructionARM) emulate_insn_ap (new EmulateInstructionARM (arch)); if (emulate_insn_ap.get()) return emulate_insn_ap.release(); } else if (arch.GetTriple().getArch() == llvm::Triple::thumb) { - std::auto_ptr<EmulateInstructionARM> emulate_insn_ap (new EmulateInstructionARM (arch)); + STD_UNIQUE_PTR(EmulateInstructionARM) emulate_insn_ap (new EmulateInstructionARM (arch)); if (emulate_insn_ap.get()) return emulate_insn_ap.release(); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h index d9dd5a69be9..7eaf5ac04d4 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h @@ -104,17 +104,19 @@ protected: Address * GetPrintForDebuggerAddr(); - std::auto_ptr<Address> m_PrintForDebugger_addr; + STD_UNIQUE_PTR(Address) m_PrintForDebugger_addr; bool m_read_objc_library; - std::auto_ptr<lldb_private::AppleObjCTrampolineHandler> m_objc_trampoline_handler_ap; + STD_UNIQUE_PTR(lldb_private::AppleObjCTrampolineHandler) m_objc_trampoline_handler_ap; lldb::BreakpointSP m_objc_exception_bp_sp; lldb::ModuleWP m_objc_module_wp; AppleObjCRuntime(Process *process) : lldb_private::ObjCLanguageRuntime(process), m_read_objc_library (false), - m_objc_trampoline_handler_ap(NULL) - { } // Call CreateInstance instead. + m_objc_trampoline_handler_ap () + { + // Call CreateInstance instead. + } }; } // namespace lldb_private diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp index 944cc3507ac..ca239db43bb 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp @@ -150,7 +150,7 @@ struct BufStruct { ClangUtilityFunction * AppleObjCRuntimeV1::CreateObjectChecker(const char *name) { - std::auto_ptr<BufStruct> buf(new BufStruct); + STD_UNIQUE_PTR(BufStruct) buf(new BufStruct); assert(snprintf(&buf->contents[0], sizeof(buf->contents), "struct __objc_class \n" diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h index 419bae998b2..e84f5ff42ec 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h @@ -184,7 +184,7 @@ protected: HashTableSignature m_hash_signature; lldb::addr_t m_isa_hash_table_ptr; - std::auto_ptr<TypeVendor> m_type_vendor_ap; + STD_UNIQUE_PTR(TypeVendor) m_type_vendor_ap; private: AppleObjCRuntimeV1(Process *process); }; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp index 31916937c0b..7ab38f91770 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp @@ -11,7 +11,6 @@ #include <string> #include <vector> -#include <memory> #include <stdint.h> #include "lldb/lldb-enumerations.h" @@ -309,6 +308,10 @@ AppleObjCRuntimeV2::AppleObjCRuntimeV2 (Process *process, m_has_object_getClass = (objc_module_sp->FindFirstSymbolWithNameAndType(g_gdb_object_getClass, eSymbolTypeCode) != NULL); } +AppleObjCRuntimeV2::~AppleObjCRuntimeV2() +{ +} + bool AppleObjCRuntimeV2::GetDynamicTypeAndAddress (ValueObject &in_value, DynamicValueType use_dynamic, @@ -817,9 +820,9 @@ public: if (process) { - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return m_name; @@ -840,7 +843,7 @@ public: if (!process) return ObjCLanguageRuntime::ClassDescriptorSP(); - std::auto_ptr<objc_class_t> objc_class; + STD_UNIQUE_PTR(objc_class_t) objc_class; if (!Read_objc_class(process, objc_class)) return ObjCLanguageRuntime::ClassDescriptorSP(); @@ -869,9 +872,9 @@ public: if (process) { - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return 0; @@ -898,9 +901,9 @@ public: { lldb_private::Process *process = m_runtime.GetProcess(); - std::auto_ptr<objc_class_t> objc_class; - std::auto_ptr<class_ro_t> class_ro; - std::auto_ptr<class_rw_t> class_rw; + STD_UNIQUE_PTR(objc_class_t) objc_class; + STD_UNIQUE_PTR(class_ro_t) class_ro; + STD_UNIQUE_PTR(class_rw_t) class_rw; if (!Read_objc_class(process, objc_class)) return 0; @@ -914,7 +917,7 @@ public: if (instance_method_func) { - std::auto_ptr <method_list_t> base_method_list; + STD_UNIQUE_PTR(method_list_t) base_method_list; base_method_list.reset(new method_list_t); if (!base_method_list->Read(process, class_ro->m_baseMethods_ptr)) @@ -923,7 +926,7 @@ public: if (base_method_list->m_entsize != method_t::GetSize(process)) return false; - std::auto_ptr <method_t> method; + STD_UNIQUE_PTR(method_t) method; method.reset(new method_t); for (uint32_t i = 0, e = base_method_list->m_count; i < e; ++i) @@ -950,23 +953,20 @@ public: if (ivar_func) { - std::auto_ptr <ivar_list_t> ivar_list; - - ivar_list.reset(new ivar_list_t); - if (!ivar_list->Read(process, class_ro->m_ivars_ptr)) + ivar_list_t ivar_list; + if (!ivar_list.Read(process, class_ro->m_ivars_ptr)) return false; - if (ivar_list->m_entsize != ivar_t::GetSize(process)) + if (ivar_list.m_entsize != ivar_t::GetSize(process)) return false; - std::auto_ptr <ivar_t> ivar; - ivar.reset(new ivar_t); + ivar_t ivar; - for (uint32_t i = 0, e = ivar_list->m_count; i < e; ++i) + for (uint32_t i = 0, e = ivar_list.m_count; i < e; ++i) { - ivar->Read(process, ivar_list->m_first_ptr + (i * ivar_list->m_entsize)); + ivar.Read(process, ivar_list.m_first_ptr + (i * ivar_list.m_entsize)); - if (ivar_func(ivar->m_name.c_str(), ivar->m_type.c_str(), ivar->m_offset_ptr, ivar->m_size)) + if (ivar_func(ivar.m_name.c_str(), ivar.m_type.c_str(), ivar.m_offset_ptr, ivar.m_size)) break; } } @@ -1354,7 +1354,7 @@ private: } }; - bool Read_objc_class (Process* process, std::auto_ptr<objc_class_t> &objc_class) + bool Read_objc_class (Process* process, STD_UNIQUE_PTR(objc_class_t) &objc_class) { objc_class.reset(new objc_class_t); @@ -1366,7 +1366,7 @@ private: return ret; } - bool Read_class_row (Process* process, const objc_class_t &objc_class, std::auto_ptr<class_ro_t> &class_ro, std::auto_ptr<class_rw_t> &class_rw) + bool Read_class_row (Process* process, const objc_class_t &objc_class, STD_UNIQUE_PTR(class_ro_t) &class_ro, STD_UNIQUE_PTR(class_rw_t) &class_rw) { class_ro.reset(); class_rw.reset(); diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h index 8e801249d02..07a38fe7d75 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h @@ -29,7 +29,7 @@ class AppleObjCRuntimeV2 : public AppleObjCRuntime { public: - virtual ~AppleObjCRuntimeV2() { } + virtual ~AppleObjCRuntimeV2(); // These are generic runtime functions: virtual bool @@ -150,17 +150,17 @@ private: lldb::addr_t GetSharedCacheReadOnlyAddress(); - std::auto_ptr<ClangFunction> m_get_class_info_function; - std::auto_ptr<ClangUtilityFunction> m_get_class_info_code; + STD_UNIQUE_PTR(ClangFunction) m_get_class_info_function; + STD_UNIQUE_PTR(ClangUtilityFunction) m_get_class_info_code; lldb::addr_t m_get_class_info_args; Mutex m_get_class_info_args_mutex; - std::auto_ptr<ClangFunction> m_get_shared_cache_class_info_function; - std::auto_ptr<ClangUtilityFunction> m_get_shared_cache_class_info_code; + STD_UNIQUE_PTR(ClangFunction) m_get_shared_cache_class_info_function; + STD_UNIQUE_PTR(ClangUtilityFunction) m_get_shared_cache_class_info_code; lldb::addr_t m_get_shared_cache_class_info_args; Mutex m_get_shared_cache_class_info_args_mutex; - std::auto_ptr<TypeVendor> m_type_vendor_ap; + STD_UNIQUE_PTR(TypeVendor) m_type_vendor_ap; lldb::addr_t m_isa_hash_table_ptr; HashTableSignature m_hash_signature; bool m_has_object_getClass; diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h index a50651431e7..0ee4d48d30c 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h @@ -197,14 +197,14 @@ private: MsgsendMap m_msgSend_map; lldb::ProcessSP m_process_sp; lldb::ModuleSP m_objc_module_sp; - std::auto_ptr<ClangFunction> m_impl_function; - std::auto_ptr<ClangUtilityFunction> m_impl_code; + STD_UNIQUE_PTR(ClangFunction) m_impl_function; + STD_UNIQUE_PTR(ClangUtilityFunction) m_impl_code; Mutex m_impl_function_mutex; lldb::addr_t m_impl_fn_addr; lldb::addr_t m_impl_stret_fn_addr; lldb::addr_t m_msg_forward_addr; lldb::addr_t m_msg_forward_stret_addr; - std::auto_ptr<AppleObjCVTables> m_vtables_ap; + STD_UNIQUE_PTR(AppleObjCVTables) m_vtables_ap; }; diff --git a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp index 443eeb96388..5c87ec276f4 100644 --- a/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp +++ b/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp @@ -296,12 +296,12 @@ ObjectContainerBSDArchive::CreateInstance lldb::offset_t archive_data_offset = 0; Archive::shared_ptr archive_sp (Archive::FindCachedArchive (*file, module_sp->GetArchitecture(), module_sp->GetModificationTime())); - std::auto_ptr<ObjectContainerBSDArchive> container_ap(new ObjectContainerBSDArchive (module_sp, - archive_data_sp, - archive_data_offset, - file, - file_offset, - length)); + STD_UNIQUE_PTR(ObjectContainerBSDArchive) container_ap(new ObjectContainerBSDArchive (module_sp, + archive_data_sp, + archive_data_offset, + file, + file_offset, + length)); if (container_ap.get()) { @@ -322,7 +322,7 @@ ObjectContainerBSDArchive::CreateInstance Archive::shared_ptr archive_sp (Archive::FindCachedArchive (*file, module_sp->GetArchitecture(), module_sp->GetModificationTime())); if (archive_sp) { - std::auto_ptr<ObjectContainerBSDArchive> container_ap(new ObjectContainerBSDArchive (module_sp, data_sp, data_offset, file, file_offset, length)); + STD_UNIQUE_PTR(ObjectContainerBSDArchive) container_ap(new ObjectContainerBSDArchive (module_sp, data_sp, data_offset, file, file_offset, length)); if (container_ap.get()) { diff --git a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp index ad833ff3c31..fbc64a19b90 100644 --- a/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp +++ b/lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp @@ -67,7 +67,7 @@ ObjectContainerUniversalMachO::CreateInstance data.SetData (data_sp, data_offset, length); if (ObjectContainerUniversalMachO::MagicBytesMatch(data)) { - std::auto_ptr<ObjectContainerUniversalMachO> container_ap(new ObjectContainerUniversalMachO (module_sp, data_sp, data_offset, file, file_offset, length)); + STD_UNIQUE_PTR(ObjectContainerUniversalMachO) container_ap(new ObjectContainerUniversalMachO (module_sp, data_sp, data_offset, file, file_offset, length)); if (container_ap->ParseHeader()) { return container_ap.release(); diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp index 517c8a1b869..cfe9b877d78 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp @@ -198,7 +198,7 @@ ObjectFileELF::CreateInstance (const lldb::ModuleSP &module_sp, unsigned address_size = ELFHeader::AddressSizeInBytes(magic); if (address_size == 4 || address_size == 8) { - std::auto_ptr<ObjectFileELF> objfile_ap(new ObjectFileELF(module_sp, data_sp, data_offset, file, file_offset, length)); + STD_UNIQUE_PTR(ObjectFileELF) objfile_ap(new ObjectFileELF(module_sp, data_sp, data_offset, file, file_offset, length)); ArchSpec spec; if (objfile_ap->GetArchitecture(spec) && objfile_ap->SetModulesArchitecture(spec)) diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h index ba4057c5f3d..0870d90b6bc 100644 --- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h +++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h @@ -155,7 +155,7 @@ private: /// List of file specifications corresponding to the modules (shared /// libraries) on which this object file depends. - mutable std::auto_ptr<lldb_private::FileSpecList> m_filespec_ap; + mutable STD_UNIQUE_PTR(lldb_private::FileSpecList) m_filespec_ap; /// Data extractor holding the string table used to resolve section names. lldb_private::DataExtractor m_shstr_data; diff --git a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 49441f45ce9..46d63bc8478 100644 --- a/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/lldb/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp @@ -411,7 +411,7 @@ ObjectFileMachO::CreateInstance (const lldb::ModuleSP &module_sp, data_sp = file->MemoryMapFileContents(file_offset, length); data_offset = 0; } - std::auto_ptr<ObjectFile> objfile_ap(new ObjectFileMachO (module_sp, data_sp, data_offset, file, file_offset, length)); + STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFileMachO (module_sp, data_sp, data_offset, file, file_offset, length)); if (objfile_ap.get() && objfile_ap->ParseHeader()) return objfile_ap.release(); } @@ -426,7 +426,7 @@ ObjectFileMachO::CreateMemoryInstance (const lldb::ModuleSP &module_sp, { if (ObjectFileMachO::MagicBytesMatch(data_sp, 0, data_sp->GetByteSize())) { - std::auto_ptr<ObjectFile> objfile_ap(new ObjectFileMachO (module_sp, data_sp, process_sp, header_addr)); + STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFileMachO (module_sp, data_sp, process_sp, header_addr)); if (objfile_ap.get() && objfile_ap->ParseHeader()) return objfile_ap.release(); } diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index 78af6619975..5982874ad27 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -163,7 +163,7 @@ ObjectFilePECOFF::CreateInstance (const lldb::ModuleSP &module_sp, // Update the data to contain the entire file if it doesn't already if (data_sp->GetByteSize() < length) data_sp = file->MemoryMapFileContents(file_offset, length); - std::auto_ptr<ObjectFile> objfile_ap(new ObjectFilePECOFF (module_sp, data_sp, data_offset, file, file_offset, length)); + STD_UNIQUE_PTR(ObjectFile) objfile_ap(new ObjectFilePECOFF (module_sp, data_sp, data_offset, file, file_offset, length)); if (objfile_ap.get() && objfile_ap->ParseHeader()) return objfile_ap.release(); } diff --git a/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h b/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h index 8427f565933..de781d5d17f 100644 --- a/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h +++ b/lldb/source/Plugins/OperatingSystem/Darwin-Kernel/OperatingSystemDarwinKernel.h @@ -84,7 +84,7 @@ protected: GetDynamicRegisterInfo (); lldb::ValueObjectSP m_thread_list_valobj_sp; - std::auto_ptr<DynamicRegisterInfo> m_register_info_ap; + STD_UNIQUE_PTR(DynamicRegisterInfo) m_register_info_ap; }; diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp index acacea45549..4127506d6a4 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp @@ -60,7 +60,7 @@ OperatingSystemPython::CreateInstance (Process *process, bool force) FileSpec python_os_plugin_spec (process->GetPythonOSPluginPath()); if (python_os_plugin_spec && python_os_plugin_spec.Exists()) { - std::auto_ptr<OperatingSystemPython> os_ap (new OperatingSystemPython (process, python_os_plugin_spec)); + STD_UNIQUE_PTR(OperatingSystemPython) os_ap (new OperatingSystemPython (process, python_os_plugin_spec)); if (os_ap.get() && os_ap->IsValid()) return os_ap.release(); } diff --git a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h index bcc90c686a5..f55cc514f41 100644 --- a/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h +++ b/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.h @@ -101,7 +101,7 @@ protected: GetDynamicRegisterInfo (); lldb::ValueObjectSP m_thread_list_valobj_sp; - std::auto_ptr<DynamicRegisterInfo> m_register_info_ap; + STD_UNIQUE_PTR(DynamicRegisterInfo) m_register_info_ap; lldb_private::ScriptInterpreter *m_interpreter; lldb::ScriptInterpreterObjectSP m_python_object_sp; diff --git a/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp b/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp index bcc8c77faa4..f80e5e0967e 100644 --- a/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp @@ -691,7 +691,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, m_client_fd(-1), m_server_fd(-1) { - std::auto_ptr<LaunchArgs> args; + STD_UNIQUE_PTR(LaunchArgs) args; args.reset(new LaunchArgs(this, module, argv, envp, stdin_path, stdout_path, stderr_path, working_dir)); @@ -752,7 +752,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, m_client_fd(-1), m_server_fd(-1) { - std::auto_ptr<AttachArgs> args; + STD_UNIQUE_PTR(AttachArgs) args; args.reset(new AttachArgs(this, pid)); diff --git a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp index 381f4be68df..269a41ef102 100644 --- a/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp +++ b/lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp @@ -924,7 +924,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, m_client_fd(-1), m_server_fd(-1) { - std::auto_ptr<LaunchArgs> args; + STD_UNIQUE_PTR(LaunchArgs) args; args.reset(new LaunchArgs(this, module, argv, envp, stdin_path, stdout_path, stderr_path, working_dir)); @@ -984,7 +984,7 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process, m_client_fd(-1), m_server_fd(-1) { - std::auto_ptr<AttachArgs> args; + STD_UNIQUE_PTR(AttachArgs) args; args.reset(new AttachArgs(this, pid)); diff --git a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp index 4a57b433099..4d4e5f4876e 100644 --- a/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp +++ b/lldb/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp @@ -196,7 +196,7 @@ ProcessKDP::DoConnectRemote (Stream *strm, const char *remote_url) return error; } - std::auto_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor()); + STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap(new ConnectionFileDescriptor()); if (conn_ap.get()) { // Only try once for now. diff --git a/lldb/source/Plugins/Process/POSIX/POSIXThread.h b/lldb/source/Plugins/Process/POSIX/POSIXThread.h index 7aad6719385..d75146e5e17 100644 --- a/lldb/source/Plugins/Process/POSIX/POSIXThread.h +++ b/lldb/source/Plugins/Process/POSIX/POSIXThread.h @@ -81,7 +81,7 @@ private: return (RegisterContextPOSIX *)m_reg_context_sp.get(); } - std::auto_ptr<lldb_private::StackFrame> m_frame_ap; + STD_UNIQUE_PTR(lldb_private::StackFrame) m_frame_ap; lldb::BreakpointSiteSP m_breakpoint; lldb::StopInfoSP m_stop_info; diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 00861951116..1d1a0951cbc 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -738,7 +738,7 @@ ProcessGDBRemote::ConnectToDebugserver (const char *connect_url) { Error error; // Sleep and wait a bit for debugserver to start to listen... - std::auto_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor()); + STD_UNIQUE_PTR(ConnectionFileDescriptor) conn_ap(new ConnectionFileDescriptor()); if (conn_ap.get()) { const uint32_t max_retry_count = 50; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h index acbbdf1c2a6..08fe68c2231 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h @@ -190,7 +190,7 @@ protected: const DWARFAbbreviationDeclarationSet *m_abbrevs; void * m_user_data; DWARFDebugInfoEntry::collection m_die_array; // The compile unit debug information entry item - std::auto_ptr<DWARFDebugAranges> m_func_aranges_ap; // A table similar to the .debug_aranges table, but this one points to the exact DW_TAG_subprogram DIEs + STD_UNIQUE_PTR(DWARFDebugAranges) m_func_aranges_ap; // A table similar to the .debug_aranges table, but this one points to the exact DW_TAG_subprogram DIEs dw_addr_t m_base_addr; dw_offset_t m_offset; uint32_t m_length; diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h index c716fa423ff..58c295abc24 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.h @@ -77,7 +77,7 @@ protected: SymbolFileDWARF* m_dwarf2Data; typedef std::vector<DWARFCompileUnitSP> CompileUnitColl; CompileUnitColl m_compile_units; - std::auto_ptr<DWARFDebugAranges> m_cu_aranges_ap; // A quick address to compile unit table + STD_UNIQUE_PTR(DWARFDebugAranges) m_cu_aranges_ap; // A quick address to compile unit table private: // All parsing needs to be done partially any managed by this class as accessors are called. diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp index 625f62e775a..778f9e252a7 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp @@ -880,7 +880,7 @@ SymbolFileDWARF::ParseCompileUnitFunction (const SymbolContext& sc, DWARFCompile func_name.SetValue(ConstString(name), false); FunctionSP func_sp; - std::auto_ptr<Declaration> decl_ap; + STD_UNIQUE_PTR(Declaration) decl_ap; if (decl_file != 0 || decl_line != 0 || decl_column != 0) decl_ap.reset(new Declaration (sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(decl_file), decl_line, @@ -995,7 +995,7 @@ SymbolFileDWARF::ParseCompileUnitSupportFiles (const SymbolContext& sc, FileSpec struct ParseDWARFLineTableCallbackInfo { LineTable* line_table; - std::auto_ptr<LineSequence> sequence_ap; + STD_UNIQUE_PTR(LineSequence) sequence_ap; }; //---------------------------------------------------------------------- @@ -1060,7 +1060,7 @@ SymbolFileDWARF::ParseCompileUnitLineTable (const SymbolContext &sc) const dw_offset_t cu_line_offset = dwarf_cu_die->GetAttributeValueAsUnsigned(this, dwarf_cu, DW_AT_stmt_list, DW_INVALID_OFFSET); if (cu_line_offset != DW_INVALID_OFFSET) { - std::auto_ptr<LineTable> line_table_ap(new LineTable(sc.comp_unit)); + STD_UNIQUE_PTR(LineTable) line_table_ap(new LineTable(sc.comp_unit)); if (line_table_ap.get()) { ParseDWARFLineTableCallbackInfo info; @@ -1170,12 +1170,12 @@ SymbolFileDWARF::ParseFunctionBlocks if (tag != DW_TAG_subprogram && (name != NULL || mangled_name != NULL)) { - std::auto_ptr<Declaration> decl_ap; + STD_UNIQUE_PTR(Declaration) decl_ap; if (decl_file != 0 || decl_line != 0 || decl_column != 0) decl_ap.reset(new Declaration(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(decl_file), decl_line, decl_column)); - std::auto_ptr<Declaration> call_ap; + STD_UNIQUE_PTR(Declaration) call_ap; if (call_file != 0 || call_line != 0 || call_column != 0) call_ap.reset(new Declaration(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(call_file), call_line, call_column)); @@ -1435,7 +1435,7 @@ private: const char *m_property_setter_name; const char *m_property_getter_name; uint32_t m_property_attributes; - std::auto_ptr<ClangASTMetadata> m_metadata_ap; + STD_UNIQUE_PTR(ClangASTMetadata) m_metadata_ap; }; struct BitfieldInfo diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h index b4bbf93a1cd..4fd0ba00d13 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h +++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h @@ -13,7 +13,6 @@ // C Includes // C++ Includes #include <list> -#include <memory> #include <map> #include <vector> @@ -567,15 +566,15 @@ protected: lldb_private::DataExtractor m_data_apple_namespaces; lldb_private::DataExtractor m_data_apple_objc; - // The auto_ptr items below are generated on demand if and when someone accesses + // The unique pointer items below are generated on demand if and when someone accesses // them through a non const version of this class. - std::auto_ptr<DWARFDebugAbbrev> m_abbr; - std::auto_ptr<DWARFDebugInfo> m_info; - std::auto_ptr<DWARFDebugLine> m_line; - std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_names_ap; - std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_types_ap; - std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_namespaces_ap; - std::auto_ptr<DWARFMappedHash::MemoryTable> m_apple_objc_ap; + STD_UNIQUE_PTR(DWARFDebugAbbrev) m_abbr; + STD_UNIQUE_PTR(DWARFDebugInfo) m_info; + STD_UNIQUE_PTR(DWARFDebugLine) m_line; + STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_names_ap; + STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_types_ap; + STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_namespaces_ap; + STD_UNIQUE_PTR(DWARFMappedHash::MemoryTable) m_apple_objc_ap; NameToDIE m_function_basename_index; // All concrete functions NameToDIE m_function_fullname_index; // All concrete functions NameToDIE m_function_method_index; // All inlined functions @@ -589,7 +588,7 @@ protected: m_using_apple_tables:1; lldb_private::LazyBool m_supports_DW_AT_APPLE_objc_complete_type; - std::auto_ptr<DWARFDebugRanges> m_ranges; + STD_UNIQUE_PTR(DWARFDebugRanges) m_ranges; UniqueDWARFASTTypeMap m_unique_ast_type_map; typedef llvm::SmallPtrSet<const DWARFDebugInfoEntry *, 4> DIEPointerSet; typedef llvm::DenseMap<const DWARFDebugInfoEntry *, clang::DeclContext *> DIEToDeclContextMap; diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp index 55eb7037192..0510b743039 100644 --- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp +++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp @@ -298,7 +298,7 @@ UnwindAssemblyInstEmulation::FirstNonPrologueInsn (AddressRange& func, UnwindAssembly * UnwindAssemblyInstEmulation::CreateInstance (const ArchSpec &arch) { - std::auto_ptr<EmulateInstruction> inst_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypePrologueEpilogue, NULL)); + STD_UNIQUE_PTR(EmulateInstruction) inst_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypePrologueEpilogue, NULL)); // Make sure that all prologue instructions are handled if (inst_emulator_ap.get()) return new UnwindAssemblyInstEmulation (arch, inst_emulator_ap.release()); diff --git a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h index 2afa6bd06cf..deff8b03228 100644 --- a/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h +++ b/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h @@ -160,7 +160,7 @@ private: GetRegisterValue (const lldb_private::RegisterInfo ®_info, lldb_private::RegisterValue ®_value); - std::auto_ptr<lldb_private::EmulateInstruction> m_inst_emulator_ap; + STD_UNIQUE_PTR(lldb_private::EmulateInstruction) m_inst_emulator_ap; lldb_private::AddressRange* m_range_ptr; lldb_private::Thread* m_thread_ptr; lldb_private::UnwindPlan* m_unwind_plan_ptr; |
