maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Since we use C++11, we should switch over to using std::unique_ptr when C++11 is being used. To do this, we follow what we have done for shared pointers and we define a STD_UNIQUE_PTR macro that can be used and it will "do the right thing". Due to some API differences in std::unique_ptr and due to the fact that we need to be able to compile without C++11, we can't use move semantics so some code needed to change so that it can compile with either C++. 

Anyone wanting to use a unique_ptr or auto_ptr should now use the "STD_UNIQUE_PTR(TYPE)" macro.

llvm-svn: 179779
This commit is contained in:
Greg Clayton 2013-04-18 18:10:51 +00:00
parent 56f976f6bd
commit e01e07b6e7
132 changed files with 330 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/API/SBAddress.h
View File

@ -141,7 +141,7 @@ protected:
private:
std::auto_ptr<lldb_private::Address> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::Address) m_opaque_ap;
};

2
lldb/include/lldb/API/SBCommandReturnObject.h
View File

@ -118,7 +118,7 @@ protected:
SetLLDBObjectPtr (lldb_private::CommandReturnObject *ptr);
private:
std::auto_ptr<lldb_private::CommandReturnObject> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::CommandReturnObject) m_opaque_ap;
};
} // namespace lldb

2
lldb/include/lldb/API/SBDeclaration.h
View File

@ -80,7 +80,7 @@ namespace lldb {
void
SetDeclaration (const lldb_private::Declaration &lldb_object_ref);
std::auto_ptr<lldb_private::Declaration> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::Declaration) m_opaque_ap;
};

2
lldb/include/lldb/API/SBError.h
View File

@ -93,7 +93,7 @@ protected:
SetError (const lldb_private::Error &lldb_error);
private:
std::auto_ptr<lldb_private::Error> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::Error) m_opaque_ap;
void
CreateIfNeeded ();

3
lldb/include/lldb/API/SBExpressionOptions.h
View File

@ -12,7 +12,6 @@
#include "lldb/API/SBDefines.h"
#include <memory>
#include <vector>
namespace lldb {
@ -82,7 +81,7 @@ protected:
private:
// This auto_pointer is made in the constructor and is always valid.
mutable std::auto_ptr<lldb_private::EvaluateExpressionOptions> m_opaque_ap;
mutable STD_UNIQUE_PTR(lldb_private::EvaluateExpressionOptions) m_opaque_ap;
};
} // namespace lldb

2
lldb/include/lldb/API/SBFileSpec.h
View File

@ -84,7 +84,7 @@ private:
const lldb_private::FileSpec &
ref() const;
std::auto_ptr <lldb_private::FileSpec> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::FileSpec) m_opaque_ap;
};

2
lldb/include/lldb/API/SBFileSpecList.h
View File

@ -63,7 +63,7 @@ friend class SBTarget;
const lldb_private::FileSpecList &
ref() const;
std::auto_ptr <lldb_private::FileSpecList> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::FileSpecList) m_opaque_ap;
};

2
lldb/include/lldb/API/SBLineEntry.h
View File

@ -90,7 +90,7 @@ private:
void
SetLineEntry (const lldb_private::LineEntry &lldb_object_ref);
std::auto_ptr<lldb_private::LineEntry> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::LineEntry) m_opaque_ap;
};

2
lldb/include/lldb/API/SBSourceManager.h
View File

@ -45,7 +45,7 @@ protected:
private:
std::auto_ptr<lldb_private::SourceManagerImpl> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::SourceManagerImpl) m_opaque_ap;
};
} // namespace lldb

2
lldb/include/lldb/API/SBStream.h
View File

@ -100,7 +100,7 @@ protected:
private:
DISALLOW_COPY_AND_ASSIGN (SBStream);
std::auto_ptr<lldb_private::Stream> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::Stream) m_opaque_ap;
bool m_is_file;
};

2
lldb/include/lldb/API/SBStringList.h
View File

@ -62,7 +62,7 @@ protected:
private:
std::auto_ptr<lldb_private::StringList> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::StringList) m_opaque_ap;
};

2
lldb/include/lldb/API/SBSymbolContext.h
View File

@ -85,7 +85,7 @@ protected:
SetSymbolContext (const lldb_private::SymbolContext *sc_ptr);
private:
std::auto_ptr<lldb_private::SymbolContext> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::SymbolContext) m_opaque_ap;
};

2
lldb/include/lldb/API/SBSymbolContextList.h
View File

@ -60,7 +60,7 @@ protected:
operator*() const;
private:
std::auto_ptr<lldb_private::SymbolContextList> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::SymbolContextList) m_opaque_ap;
};

4
lldb/include/lldb/API/SBType.h
View File

@ -65,7 +65,7 @@ protected:
const lldb_private::TypeMemberImpl &
ref () const;
std::auto_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::TypeMemberImpl) m_opaque_ap;
};
class SBType
@ -234,7 +234,7 @@ public:
private:
std::auto_ptr<lldb_private::TypeListImpl> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::TypeListImpl) m_opaque_ap;
};

3
lldb/include/lldb/Breakpoint/BreakpointLocation.h
View File

@ -14,7 +14,6 @@
// C++ Includes
#include <list>
#include <memory>
// Other libraries and framework includes
@ -380,7 +379,7 @@ private:
bool m_being_created;
Address m_address; ///< The address defining this location.
Breakpoint &m_owner; ///< The breakpoint that produced this object.
std::auto_ptr<BreakpointOptions> m_options_ap; ///< Breakpoint options pointer, NULL if we're using our breakpoint's options.
STD_UNIQUE_PTR(BreakpointOptions) m_options_ap; ///< Breakpoint options pointer, NULL if we're using our breakpoint's options.
lldb::BreakpointSiteSP m_bp_site_sp; ///< Our breakpoint site (it may be shared by more than one location.)
void

5
lldb/include/lldb/Breakpoint/BreakpointOptions.h
View File

@ -12,7 +12,6 @@
// C Includes
// C++ Includes
#include <memory>
// Other libraries and framework includes
// Project includes
#include "lldb/lldb-private.h"
@ -349,8 +348,8 @@ private:
bool m_enabled;
bool m_one_shot;
uint32_t m_ignore_count; // Number of times to ignore this breakpoint
std::auto_ptr<ThreadSpec> m_thread_spec_ap; // Thread for which this breakpoint will take
std::auto_ptr<ClangUserExpression> m_condition_ap; // The condition to test.
STD_UNIQUE_PTR(ThreadSpec) m_thread_spec_ap; // Thread for which this breakpoint will take
STD_UNIQUE_PTR(ClangUserExpression) m_condition_ap; // The condition to test.
};

2
lldb/include/lldb/Breakpoint/Watchpoint.h
View File

@ -234,7 +234,7 @@ private:
// the callback machinery.
bool m_being_created;
std::auto_ptr<ClangUserExpression> m_condition_ap; // The condition to test.
STD_UNIQUE_PTR(ClangUserExpression) m_condition_ap; // The condition to test.
void SetID(lldb::watch_id_t id) { m_loc_id = id; }

3
lldb/include/lldb/Breakpoint/WatchpointOptions.h
View File

@ -12,7 +12,6 @@
// C Includes
// C++ Includes
#include <memory>
// Other libraries and framework includes
// Project includes
#include "lldb/lldb-private.h"
@ -248,7 +247,7 @@ private:
WatchpointHitCallback m_callback; // This is the callback function pointer
lldb::BatonSP m_callback_baton_sp; // This is the client data for the callback
bool m_callback_is_synchronous;
std::auto_ptr<ThreadSpec> m_thread_spec_ap; // Thread for which this watchpoint will take
STD_UNIQUE_PTR(ThreadSpec) m_thread_spec_ap; // Thread for which this watchpoint will take
};
} // namespace lldb_private

4
lldb/include/lldb/Core/Debugger.h
View File

@ -359,10 +359,10 @@ protected:
TargetList m_target_list;
PlatformList m_platform_list;
Listener m_listener;
std::auto_ptr<SourceManager> m_source_manager_ap; // This is a scratch source manager that we return if we have no targets.
STD_UNIQUE_PTR(SourceManager) m_source_manager_ap; // This is a scratch source manager that we return if we have no targets.
SourceManager::SourceFileCache m_source_file_cache; // All the source managers for targets created in this debugger used this shared
// source file cache.
std::auto_ptr<CommandInterpreter> m_command_interpreter_ap;
STD_UNIQUE_PTR(CommandInterpreter) m_command_interpreter_ap;
InputReaderStack m_input_reader_stack;
std::string m_input_reader_data;

2
lldb/include/lldb/Core/Event.h
View File

@ -205,7 +205,7 @@ private:
Broadcaster * m_broadcaster; // The broadcaster that sent this event
uint32_t m_type; // The bit describing this event
std::auto_ptr<EventData> m_data_ap; // User specific data for this event
STD_UNIQUE_PTR(EventData) m_data_ap; // User specific data for this event
DISALLOW_COPY_AND_ASSIGN (Event);

9
lldb/include/lldb/Core/Module.h
View File

@ -526,12 +526,7 @@ public:
}
void
SetSymbolFileFileSpec (const FileSpec &file)
{
m_symfile_spec = file;
m_symfile_ap.reset();
m_did_load_symbol_vendor = false;
}
SetSymbolFileFileSpec (const FileSpec &file);
const TimeValue &
GetModificationTime () const;
@ -946,7 +941,7 @@ protected:
ConstString m_object_name; ///< The name an object within this module that is selected, or empty of the module is represented by \a m_file.
uint64_t m_object_offset;
lldb::ObjectFileSP m_objfile_sp; ///< A shared pointer to the object file parser for this module as it may or may not be shared with the SymbolFile
std::auto_ptr<SymbolVendor> m_symfile_ap; ///< A pointer to the symbol vendor for this module.
STD_UNIQUE_PTR(SymbolVendor) m_symfile_ap; ///< A pointer to the symbol vendor for this module.
ClangASTContext m_ast; ///< The AST context for this module.
PathMappingList m_source_mappings; ///< Module specific source remappings for when you have debug info for a module that doesn't match where the sources currently are

1
lldb/include/lldb/Core/Timer.h
View File

@ -13,7 +13,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <memory>
#include <string>
#include "lldb/lldb-private.h"
#include "lldb/Host/TimeValue.h"

2
lldb/include/lldb/Core/ValueObjectSyntheticFilter.h
View File

@ -151,7 +151,7 @@ protected:
// we need to hold on to the SyntheticChildren because someone might delete the type binding while we are alive
lldb::SyntheticChildrenSP m_synth_sp;
std::auto_ptr<SyntheticChildrenFrontEnd> m_synth_filter_ap;
STD_UNIQUE_PTR(SyntheticChildrenFrontEnd) m_synth_filter_ap;
typedef std::map<uint32_t, ValueObject*> ByIndexMap;
typedef std::map<const char*, uint32_t> NameToIndexMap;

2
lldb/include/lldb/DataFormatters/TypeSynthetic.h
View File

@ -69,7 +69,7 @@ namespace lldb_private {
MightHaveChildren () = 0;
typedef STD_SHARED_PTR(SyntheticChildrenFrontEnd) SharedPointer;
typedef std::auto_ptr<SyntheticChildrenFrontEnd> AutoPointer;
typedef STD_UNIQUE_PTR(SyntheticChildrenFrontEnd) AutoPointer;
private:
DISALLOW_COPY_AND_ASSIGN(SyntheticChildrenFrontEnd);

1
lldb/include/lldb/Expression/ClangExpression.h
View File

@ -14,7 +14,6 @@
// C++ Includes
#include <string>
#include <map>
#include <memory>
#include <vector>
// Other libraries and framework includes

6
lldb/include/lldb/Expression/ClangExpressionDeclMap.h
View File

@ -714,7 +714,7 @@ private:
DISALLOW_COPY_AND_ASSIGN (ParserVars);
};
std::auto_ptr<ParserVars> m_parser_vars;
STD_UNIQUE_PTR(ParserVars) m_parser_vars;
//----------------------------------------------------------------------
/// Activate parser-specific variables
@ -756,7 +756,7 @@ private:
TypeFromUser m_object_pointer_type; ///< The type of the "this" variable, if one exists
};
std::auto_ptr<StructVars> m_struct_vars;
STD_UNIQUE_PTR(StructVars) m_struct_vars;
//----------------------------------------------------------------------
/// Activate struct variables
@ -795,7 +795,7 @@ private:
lldb::addr_t m_materialized_location; ///< The address at which the struct is placed. Falls inside the allocated area.
};
std::auto_ptr<MaterialVars> m_material_vars;
STD_UNIQUE_PTR(MaterialVars) m_material_vars;
//----------------------------------------------------------------------
/// Activate materialization-specific variables

23
lldb/include/lldb/Expression/ClangExpressionParser.h
View File

@ -86,7 +86,7 @@ public:
///
/// @param[in] execution_unit_ap
/// After parsing, ownership of the execution unit for
/// for the expression is handed to this auto_ptr.
/// for the expression is handed to this unique pointer.
///
/// @param[in] exe_ctx
/// The execution context to write the function into.
@ -112,7 +112,7 @@ public:
Error
PrepareForExecution (lldb::addr_t &func_addr,
lldb::addr_t &func_end,
std::auto_ptr<IRExecutionUnit> &execution_unit_ap,
STD_UNIQUE_PTR(IRExecutionUnit) &execution_unit_ap,
ExecutionContext &exe_ctx,
bool &evaluated_statically,
lldb::ClangExpressionVariableSP &const_result,
@ -136,16 +136,15 @@ public:
ExecutionContext &exe_ctx);
private:
ClangExpression &m_expr; ///< The expression to be parsed
std::auto_ptr<llvm::LLVMContext> m_llvm_context; ///< The LLVM context to generate IR into
std::auto_ptr<clang::FileManager> m_file_manager; ///< The Clang file manager object used by the compiler
std::auto_ptr<clang::CompilerInstance> m_compiler; ///< The Clang compiler used to parse expressions into IR
std::auto_ptr<clang::Builtin::Context> m_builtin_context; ///< Context for Clang built-ins
std::auto_ptr<clang::SelectorTable> m_selector_table; ///< Selector table for Objective-C methods
std::auto_ptr<clang::ASTContext> m_ast_context; ///< The AST context used to hold types and names for the parser
std::auto_ptr<clang::CodeGenerator> m_code_generator; ///< The Clang object that generates IR
std::auto_ptr<IRExecutionUnit> m_execution_unit; ///< The container for the finished Module
ClangExpression & m_expr; ///< The expression to be parsed
STD_UNIQUE_PTR(llvm::LLVMContext) m_llvm_context; ///< The LLVM context to generate IR into
STD_UNIQUE_PTR(clang::FileManager) m_file_manager; ///< The Clang file manager object used by the compiler
STD_UNIQUE_PTR(clang::CompilerInstance) m_compiler; ///< The Clang compiler used to parse expressions into IR
STD_UNIQUE_PTR(clang::Builtin::Context) m_builtin_context; ///< Context for Clang built-ins
STD_UNIQUE_PTR(clang::SelectorTable) m_selector_table; ///< Selector table for Objective-C methods
STD_UNIQUE_PTR(clang::ASTContext) m_ast_context; ///< The AST context used to hold types and names for the parser
STD_UNIQUE_PTR(clang::CodeGenerator) m_code_generator; ///< The Clang object that generates IR
STD_UNIQUE_PTR(IRExecutionUnit) m_execution_unit; ///< The container for the finished Module
};
}

4
lldb/include/lldb/Expression/ClangFunction.h
View File

@ -619,8 +619,8 @@ private:
// For ClangFunction only
//------------------------------------------------------------------
std::auto_ptr<ClangExpressionParser> m_parser; ///< The parser responsible for compiling the function.
std::auto_ptr<IRExecutionUnit> m_execution_unit_ap;
STD_UNIQUE_PTR(ClangExpressionParser) m_parser; ///< The parser responsible for compiling the function.
STD_UNIQUE_PTR(IRExecutionUnit) m_execution_unit_ap;
Function *m_function_ptr; ///< The function we're going to call. May be NULL if we don't have debug info for the function.
Address m_function_addr; ///< If we don't have the FunctionSP, we at least need the address & return type.

11
lldb/include/lldb/Expression/ClangUserExpression.h
View File

@ -14,7 +14,6 @@
// C++ Includes
#include <string>
#include <map>
#include <memory>
#include <vector>
// Other libraries and framework includes
@ -420,12 +419,10 @@ private:
std::string m_transformed_text; ///< The text of the expression, as send to the parser
ResultType m_desired_type; ///< The type to coerce the expression's result to. If eResultTypeAny, inferred from the expression.
std::auto_ptr<ClangExpressionDeclMap> m_expr_decl_map; ///< The map to use when parsing the expression.
std::auto_ptr<IRExecutionUnit> m_execution_unit_ap; ///< The execution unit the expression is stored in.
std::auto_ptr<Materializer> m_materializer_ap; ///< The materializer to use when running the expression.
std::auto_ptr<ASTResultSynthesizer> m_result_synthesizer; ///< The result synthesizer, if one is needed.
STD_UNIQUE_PTR(ClangExpressionDeclMap) m_expr_decl_map; ///< The map to use when parsing the expression.
STD_UNIQUE_PTR(IRExecutionUnit) m_execution_unit_ap; ///< The execution unit the expression is stored in.
STD_UNIQUE_PTR(Materializer) m_materializer_ap; ///< The materializer to use when running the expression.
STD_UNIQUE_PTR(ASTResultSynthesizer) m_result_synthesizer; ///< The result synthesizer, if one is needed.
bool m_enforce_valid_object; ///< True if the expression parser should enforce the presence of a valid class pointer in order to generate the expression as a method.
bool m_cplusplus; ///< True if the expression is compiled as a C++ member function (true if it was parsed when exe_ctx was in a C++ method).

5
lldb/include/lldb/Expression/ClangUtilityFunction.h
View File

@ -14,7 +14,6 @@
// C++ Includes
#include <string>
#include <map>
#include <memory>
#include <vector>
// Other libraries and framework includes
@ -168,8 +167,8 @@ public:
}
private:
std::auto_ptr<ClangExpressionDeclMap> m_expr_decl_map; ///< The map to use when parsing and materializing the expression.
std::auto_ptr<IRExecutionUnit> m_execution_unit_ap;
STD_UNIQUE_PTR(ClangExpressionDeclMap) m_expr_decl_map; ///< The map to use when parsing and materializing the expression.
STD_UNIQUE_PTR(IRExecutionUnit) m_execution_unit_ap;
std::string m_function_text; ///< The text of the function. Must be a well-formed translation unit.
std::string m_function_name; ///< The name of the function.

4
lldb/include/lldb/Expression/IRDynamicChecks.h
View File

@ -77,8 +77,8 @@ public:
bool DoCheckersExplainStop (lldb::addr_t addr, Stream &message);
std::auto_ptr<ClangUtilityFunction> m_valid_pointer_check;
std::auto_ptr<ClangUtilityFunction> m_objc_object_check;
STD_UNIQUE_PTR(ClangUtilityFunction) m_valid_pointer_check;
STD_UNIQUE_PTR(ClangUtilityFunction) m_objc_object_check;
};
//----------------------------------------------------------------------

12
lldb/include/lldb/Expression/IRExecutionUnit.h
View File

@ -66,8 +66,8 @@ public:
//------------------------------------------------------------------
/// Constructor
//------------------------------------------------------------------
IRExecutionUnit (std::auto_ptr<llvm::LLVMContext> &context_ap,
std::auto_ptr<llvm::Module> &module_ap,
IRExecutionUnit (STD_UNIQUE_PTR(llvm::LLVMContext) &context_ap,
STD_UNIQUE_PTR(llvm::Module) &module_ap,
ConstString &name,
const lldb::TargetSP &target_sp,
std::vector<std::string> &cpu_features);
@ -422,7 +422,7 @@ private:
return m_default_mm_ap->getPointerToNamedFunction(Name, AbortOnFailure);
}
private:
std::auto_ptr<JITMemoryManager> m_default_mm_ap; ///< The memory allocator to use in actually creating space. All calls are passed through to it.
STD_UNIQUE_PTR(JITMemoryManager) m_default_mm_ap; ///< The memory allocator to use in actually creating space. All calls are passed through to it.
IRExecutionUnit &m_parent; ///< The execution unit this is a proxy for.
};
@ -502,9 +502,9 @@ private:
typedef std::vector<AllocationRecord> RecordVector;
RecordVector m_records;
std::auto_ptr<llvm::LLVMContext> m_context_ap;
std::auto_ptr<llvm::ExecutionEngine> m_execution_engine_ap;
std::auto_ptr<llvm::Module> m_module_ap; ///< Holder for the module until it's been handed off
STD_UNIQUE_PTR(llvm::LLVMContext) m_context_ap;
STD_UNIQUE_PTR(llvm::ExecutionEngine) m_execution_engine_ap;
STD_UNIQUE_PTR(llvm::Module) m_module_ap; ///< Holder for the module until it's been handed off
llvm::Module *m_module; ///< Owned by the execution engine
std::vector<std::string> m_cpu_features;
llvm::SmallVector<JittedFunction, 1> m_jitted_functions; ///< A vector of all functions that have been JITted into machine code

2
lldb/include/lldb/Expression/IRForTarget.h
View File

@ -670,7 +670,7 @@ private:
lldb_private::ConstString m_result_name; ///< The name of the result variable ($0, $1, ...)
lldb_private::TypeFromParser m_result_type; ///< The type of the result variable.
llvm::Module *m_module; ///< The module being processed, or NULL if that has not been determined yet.
std::auto_ptr<llvm::DataLayout> m_target_data; ///< The target data for the module being processed, or NULL if there is no module.
STD_UNIQUE_PTR(llvm::DataLayout) m_target_data; ///< The target data for the module being processed, or NULL if there is no module.
lldb_private::ClangExpressionDeclMap *m_decl_map; ///< The DeclMap containing the Decls
StaticDataAllocator m_data_allocator; ///< The allocator to use for constant strings
lldb_private::IRMemoryMap &m_memory_map; ///< The memory map to pass to the IR interpreter

2
lldb/include/lldb/Host/Terminal.h
View File

@ -173,7 +173,7 @@ protected:
//------------------------------------------------------------------
Terminal m_tty; ///< A terminal
int m_tflags; ///< Cached tflags information.
std::auto_ptr<struct termios> m_termios_ap; ///< Cached terminal state information.
STD_UNIQUE_PTR(struct termios) m_termios_ap; ///< Cached terminal state information.
lldb::pid_t m_process_group;///< Cached process group information.
};

2
lldb/include/lldb/Interpreter/CommandInterpreter.h
View File

@ -463,7 +463,7 @@ private:
OptionArgMap m_alias_options; // Stores any options (with or without arguments) that go with any alias.
std::vector<std::string> m_command_history;
std::string m_repeat_command; // Stores the command that will be executed for an empty command string.
std::auto_ptr<ScriptInterpreter> m_script_interpreter_ap;
STD_UNIQUE_PTR(ScriptInterpreter) m_script_interpreter_ap;
char m_comment_char;
char m_repeat_char;
bool m_batch_command_mode;

2
lldb/include/lldb/Interpreter/ScriptInterpreter.h
View File

@ -425,7 +425,7 @@ public:
return lldb::ScriptInterpreterObjectSP(new ScriptInterpreterObject(object));
}
virtual std::auto_ptr<ScriptInterpreterLocker>
virtual STD_UNIQUE_PTR(ScriptInterpreterLocker)
AcquireInterpreterLock ();
const char *

2
lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
View File

@ -181,7 +181,7 @@ public:
virtual lldb::ScriptInterpreterObjectSP
MakeScriptObject (void* object);
virtual std::auto_ptr<ScriptInterpreterLocker>
virtual STD_UNIQUE_PTR(ScriptInterpreterLocker)
AcquireInterpreterLock ();
void

34
lldb/include/lldb/Symbol/ClangASTContext.h
View File

@ -11,11 +11,11 @@
#define liblldb_ClangASTContext_h_
// C Includes
#include <stdint.h>
// C++ Includes
#include <string>
#include <vector>
#include <memory>
#include <stdint.h>
// Other libraries and framework includes
#include "llvm/ADT/OwningPtr.h"
@ -1013,22 +1013,22 @@ protected:
//------------------------------------------------------------------
// Classes that inherit from ClangASTContext can see and modify these
//------------------------------------------------------------------
std::string m_target_triple;
std::auto_ptr<clang::ASTContext> m_ast_ap;
std::auto_ptr<clang::LangOptions> m_language_options_ap;
std::auto_ptr<clang::FileManager> m_file_manager_ap;
std::auto_ptr<clang::FileSystemOptions> m_file_system_options_ap;
std::auto_ptr<clang::SourceManager> m_source_manager_ap;
std::auto_ptr<clang::DiagnosticsEngine> m_diagnostics_engine_ap;
std::auto_ptr<clang::DiagnosticConsumer> m_diagnostic_consumer_ap;
std::string m_target_triple;
STD_UNIQUE_PTR(clang::ASTContext) m_ast_ap;
STD_UNIQUE_PTR(clang::LangOptions) m_language_options_ap;
STD_UNIQUE_PTR(clang::FileManager) m_file_manager_ap;
STD_UNIQUE_PTR(clang::FileSystemOptions) m_file_system_options_ap;
STD_UNIQUE_PTR(clang::SourceManager) m_source_manager_ap;
STD_UNIQUE_PTR(clang::DiagnosticsEngine) m_diagnostics_engine_ap;
STD_UNIQUE_PTR(clang::DiagnosticConsumer) m_diagnostic_consumer_ap;
llvm::IntrusiveRefCntPtr<clang::TargetOptions> m_target_options_rp;
std::auto_ptr<clang::TargetInfo> m_target_info_ap;
std::auto_ptr<clang::IdentifierTable> m_identifier_table_ap;
std::auto_ptr<clang::SelectorTable> m_selector_table_ap;
std::auto_ptr<clang::Builtin::Context> m_builtins_ap;
CompleteTagDeclCallback m_callback_tag_decl;
CompleteObjCInterfaceDeclCallback m_callback_objc_decl;
void * m_callback_baton;
STD_UNIQUE_PTR(clang::TargetInfo) m_target_info_ap;
STD_UNIQUE_PTR(clang::IdentifierTable) m_identifier_table_ap;
STD_UNIQUE_PTR(clang::SelectorTable) m_selector_table_ap;
STD_UNIQUE_PTR(clang::Builtin::Context) m_builtins_ap;
CompleteTagDeclCallback m_callback_tag_decl;
CompleteObjCInterfaceDeclCallback m_callback_objc_decl;
void * m_callback_baton;
private:
//------------------------------------------------------------------
// For ClangASTContext only

1
lldb/include/lldb/Symbol/ClangExternalASTSourceCallbacks.h
View File

@ -14,7 +14,6 @@
// C++ Includes
#include <string>
#include <vector>
#include <memory>
#include <stdint.h>
// Other libraries and framework includes

2
lldb/include/lldb/Symbol/CompileUnit.h
View File

@ -401,7 +401,7 @@ protected:
std::vector<lldb::FunctionSP> m_functions; ///< The sparsely populated list of shared pointers to functions
///< that gets populated as functions get partially parsed.
FileSpecList m_support_files; ///< Files associated with this compile unit's line table and declarations.
std::auto_ptr<LineTable> m_line_table_ap; ///< Line table that will get parsed on demand.
STD_UNIQUE_PTR(LineTable) m_line_table_ap; ///< Line table that will get parsed on demand.
lldb::VariableListSP m_variables; ///< Global and static variable list that will get parsed on demand.
private:

3
lldb/include/lldb/Symbol/FuncUnwinders.h
View File

@ -1,9 +1,6 @@
#ifndef liblldb_FuncUnwinders_h
#define liblldb_FuncUnwinders_h
#include <memory>
#include "lldb/Core/AddressRange.h"
#include "lldb/Core/ArchSpec.h"
#include "lldb/Core/AddressRange.h"

4
lldb/include/lldb/Symbol/ObjectFile.h
View File

@ -621,8 +621,8 @@ protected:
lldb_private::UnwindTable m_unwind_table; /// < Table of FuncUnwinders objects created for this ObjectFile's functions
lldb::ProcessWP m_process_wp;
const lldb::addr_t m_memory_addr;
std::auto_ptr<lldb_private::SectionList> m_sections_ap;
std::auto_ptr<lldb_private::Symtab> m_symtab_ap;
STD_UNIQUE_PTR(lldb_private::SectionList) m_sections_ap;
STD_UNIQUE_PTR(lldb_private::Symtab) m_symtab_ap;
//------------------------------------------------------------------
/// Sets the architecture for a module. At present the architecture

4
lldb/include/lldb/Symbol/SymbolContext.h
View File

@ -367,12 +367,12 @@ private:
lldb::TargetSP m_target_sp;
std::string m_module_spec;
lldb::ModuleSP m_module_sp;
std::auto_ptr<FileSpec> m_file_spec_ap;
STD_UNIQUE_PTR(FileSpec) m_file_spec_ap;
size_t m_start_line;
size_t m_end_line;
std::string m_function_spec;
std::string m_class_name;
std::auto_ptr<AddressRange> m_address_range_ap;
STD_UNIQUE_PTR(AddressRange) m_address_range_ap;
uint32_t m_type; // Or'ed bits from SpecificationType
};

2
lldb/include/lldb/Symbol/SymbolVendor.h
View File

@ -191,7 +191,7 @@ protected:
TypeList m_type_list; // Uniqued types for all parsers owned by this module
CompileUnits m_compile_units; // The current compile units
lldb::ObjectFileSP m_objfile_sp; // Keep a reference to the object file in case it isn't the same as the module object file (debug symbols in a separate file)
std::auto_ptr<SymbolFile> m_sym_file_ap; // A single symbol file. Suclasses can add more of these if needed.
STD_UNIQUE_PTR(SymbolFile) m_sym_file_ap; // A single symbol file. Suclasses can add more of these if needed.
private:
//------------------------------------------------------------------

8
lldb/include/lldb/Target/Process.h
View File

@ -3588,9 +3588,9 @@ protected:
std::vector<lldb::addr_t> m_image_tokens;
Listener &m_listener;
BreakpointSiteList m_breakpoint_site_list; ///< This is the list of breakpoint locations we intend to insert in the target.
std::auto_ptr<DynamicLoader> m_dyld_ap;
std::auto_ptr<DynamicCheckerFunctions> m_dynamic_checkers_ap; ///< The functions used by the expression parser to validate data that expressions use.
std::auto_ptr<OperatingSystem> m_os_ap;
STD_UNIQUE_PTR(DynamicLoader) m_dyld_ap;
STD_UNIQUE_PTR(DynamicCheckerFunctions) m_dynamic_checkers_ap; ///< The functions used by the expression parser to validate data that expressions use.
STD_UNIQUE_PTR(OperatingSystem) m_os_ap;
UnixSignals m_unix_signals; /// This is the current signal set for this process.
lldb::ABISP m_abi_sp;
lldb::InputReaderSP m_process_input_reader;
@ -3604,7 +3604,7 @@ protected:
AllocatedMemoryCache m_allocated_memory_cache;
bool m_should_detach; /// Should we detach if the process object goes away with an explicit call to Kill or Detach?
LanguageRuntimeCollection m_language_runtimes;
std::auto_ptr<NextEventAction> m_next_event_action_ap;
STD_UNIQUE_PTR(NextEventAction) m_next_event_action_ap;
std::vector<PreResumeCallbackAndBaton> m_pre_resume_actions;
ReadWriteLock m_public_run_lock;
#if defined(__APPLE__)

2
lldb/include/lldb/Target/StackFrameList.h
View File

@ -98,7 +98,7 @@ protected:
SetFrameAtIndex (uint32_t idx, lldb::StackFrameSP &frame_sp);
static void
Merge (std::auto_ptr<StackFrameList>& curr_ap,
Merge (STD_UNIQUE_PTR(StackFrameList)& curr_ap,
lldb::StackFrameListSP& prev_sp);
void

10
lldb/include/lldb/Target/Target.h
View File

@ -1023,7 +1023,7 @@ public:
lldb::TargetSP m_target_sp;
StringList m_commands;
lldb::SymbolContextSpecifierSP m_specifier_sp;
std::auto_ptr<ThreadSpec> m_thread_spec_ap;
STD_UNIQUE_PTR(ThreadSpec) m_thread_spec_ap;
bool m_active;
// Use AddStopHook to make a new empty stop hook. The GetCommandPointer and fill it with commands,
@ -1159,12 +1159,12 @@ protected:
bool m_valid;
lldb::SearchFilterSP m_search_filter_sp;
PathMappingList m_image_search_paths;
std::auto_ptr<ClangASTContext> m_scratch_ast_context_ap;
std::auto_ptr<ClangASTSource> m_scratch_ast_source_ap;
std::auto_ptr<ClangASTImporter> m_ast_importer_ap;
STD_UNIQUE_PTR(ClangASTContext) m_scratch_ast_context_ap;
STD_UNIQUE_PTR(ClangASTSource) m_scratch_ast_source_ap;
STD_UNIQUE_PTR(ClangASTImporter) m_ast_importer_ap;
ClangPersistentVariables m_persistent_variables; ///< These are the persistent variables associated with this process for the expression parser.
std::auto_ptr<SourceManager> m_source_manager_ap;
STD_UNIQUE_PTR(SourceManager) m_source_manager_ap;
typedef std::map<lldb::user_id_t, StopHookSP> StopHookCollection;
StopHookCollection m_stop_hooks;

2
lldb/include/lldb/Target/Thread.h
View File

@ -966,7 +966,7 @@ protected:
lldb::StateType m_resume_state; ///< This state is used to force a thread to be suspended from outside the ThreadPlan logic.
lldb::StateType m_temporary_resume_state; ///< This state records what the thread was told to do by the thread plan logic for the current resume.
/// It gets set in Thread::WillResume.
std::auto_ptr<lldb_private::Unwind> m_unwinder_ap;
STD_UNIQUE_PTR(lldb_private::Unwind) m_unwinder_ap;
bool m_destroy_called; // This is used internally to make sure derived Thread classes call DestroyThread.
uint32_t m_thread_stop_reason_stop_id; // This is the stop id for which the StopInfo is valid. Can use this so you know that
// the thread's m_actual_stop_info_sp is current and you don't have to fetch it again

2
lldb/include/lldb/Target/ThreadPlanStepInRange.h
View File

@ -93,7 +93,7 @@ private:
// from step in.
static uint32_t s_default_flag_values;
std::auto_ptr<RegularExpression> m_avoid_regexp_ap;
STD_UNIQUE_PTR(RegularExpression) m_avoid_regexp_ap;
bool m_step_past_prologue; // FIXME: For now hard-coded to true, we could put a switch in for this if there's
// demand for that.
bool m_virtual_step; // true if we've just done a "virtual step", i.e. just moved the inline stack depth.

1
lldb/include/lldb/Utility/PythonPointer.h
View File

@ -11,7 +11,6 @@
#define utility_PythonPointer_h_
#include <algorithm>
#include <memory>
#if defined (__APPLE__)
#include <Python/Python.h>

2
lldb/include/lldb/lldb-forward.h
View File

@ -18,12 +18,14 @@
#include <memory>
#define STD_SHARED_PTR(T) std::shared_ptr<T>
#define STD_WEAK_PTR(T) std::weak_ptr<T>
#define STD_UNIQUE_PTR(T) std::unique_ptr<T>
#define STD_ENABLE_SHARED_FROM_THIS(T) std::enable_shared_from_this<T>
#define STD_STATIC_POINTER_CAST(T,V) std::static_pointer_cast<T>(V)
#else
#include <tr1/memory>
#define STD_SHARED_PTR(T) std::tr1::shared_ptr<T>
#define STD_WEAK_PTR(T) std::tr1::weak_ptr<T>
#define STD_UNIQUE_PTR(T) std::auto_ptr<T>
#define STD_ENABLE_SHARED_FROM_THIS(T) std::tr1::enable_shared_from_this<T>
#define STD_STATIC_POINTER_CAST(T,V) std::tr1::static_pointer_cast<T>(V)
#endif

2
lldb/scripts/Python/interface/SBExpressionOptions.i
View File

@ -83,7 +83,7 @@ protected:
private:
// This auto_pointer is made in the constructor and is always valid.
mutable std::auto_ptr<lldb_private::EvaluateExpressionOptions> m_opaque_ap;
mutable STD_UNIQUE_PTR(lldb_private::EvaluateExpressionOptions) m_opaque_ap;
};
} // namespace lldb

2
lldb/scripts/Python/interface/SBSection.i
View File

@ -122,7 +122,7 @@ public:
private:
std::auto_ptr<lldb_private::SectionImpl> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::SectionImpl) m_opaque_ap;
};
} // namespace lldb

2
lldb/scripts/Python/interface/SBType.i
View File

@ -65,7 +65,7 @@ public:
%}
protected:
std::auto_ptr<lldb_private::TypeMemberImpl> m_opaque_ap;
STD_UNIQUE_PTR(lldb_private::TypeMemberImpl) m_opaque_ap;
};
%feature("docstring",

4
lldb/scripts/Python/python-wrapper.swig
View File

@ -652,11 +652,11 @@ LLDBSWIGPython_CastPyObjectToSBValue
return sb_ptr;
}
// Currently, SBCommandReturnObjectReleaser wraps an std::auto_ptr to an
// Currently, SBCommandReturnObjectReleaser wraps a unique pointer to an
// lldb_private::CommandReturnObject. This means that the destructor for the
// SB object will deallocate its contained CommandReturnObject. Because that
// object is used as the real return object for Python-based commands, we want
// it to stay around. Thus, we release the auto_ptr before returning from
// it to stay around. Thus, we release the unique pointer before returning from
// LLDBSwigPythonCallCommand, and to guarantee that the release will occur no
// matter how we exit from the function, we have a releaser object whose
// destructor does the right thing for us

6
lldb/source/Breakpoint/BreakpointOptions.cpp
View File

@ -41,7 +41,7 @@ BreakpointOptions::BreakpointOptions() :
m_enabled (true),
m_one_shot (false),
m_ignore_count (0),
m_thread_spec_ap (NULL),
m_thread_spec_ap (),
m_condition_ap()
{
}
@ -56,8 +56,8 @@ BreakpointOptions::BreakpointOptions(const BreakpointOptions& rhs) :
m_enabled (rhs.m_enabled),
m_one_shot (rhs.m_one_shot),
m_ignore_count (rhs.m_ignore_count),
m_thread_spec_ap (NULL),
m_condition_ap (NULL)
m_thread_spec_ap (),
m_condition_ap ()
{
if (rhs.m_thread_spec_ap.get() != NULL)
m_thread_spec_ap.reset (new ThreadSpec(*rhs.m_thread_spec_ap.get()));

4
lldb/source/Breakpoint/WatchpointOptions.cpp
View File

@ -38,7 +38,7 @@ WatchpointOptions::WatchpointOptions() :
m_callback (WatchpointOptions::NullCallback),
m_callback_baton_sp (),
m_callback_is_synchronous (false),
m_thread_spec_ap (NULL)
m_thread_spec_ap ()
{
}
@ -49,7 +49,7 @@ WatchpointOptions::WatchpointOptions(const WatchpointOptions& rhs) :
m_callback (rhs.m_callback),
m_callback_baton_sp (rhs.m_callback_baton_sp),
m_callback_is_synchronous (rhs.m_callback_is_synchronous),
m_thread_spec_ap (NULL)
m_thread_spec_ap ()
{
if (rhs.m_thread_spec_ap.get() != NULL)
m_thread_spec_ap.reset (new ThreadSpec(*rhs.m_thread_spec_ap.get()));

4
lldb/source/Commands/CommandObjectBreakpointCommand.cpp
View File

@ -206,7 +206,7 @@ one command per line.\n" );
CommandReturnObject &result)
{
InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger()));
std::auto_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
if (reader_sp && data_ap.get())
{
BatonSP baton_sp (new BreakpointOptions::CommandBaton (data_ap.release()));
@ -242,7 +242,7 @@ one command per line.\n" );
SetBreakpointCommandCallback (BreakpointOptions *bp_options,
const char *oneliner)
{
std::auto_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
// It's necessary to set both user_source and script_source to the oneliner.
// The former is used to generate callback description (as in breakpoint command list)

2
lldb/source/Commands/CommandObjectCommands.cpp
View File

@ -1066,7 +1066,7 @@ protected:
}
private:
std::auto_ptr<CommandObjectRegexCommand> m_regex_cmd_ap;
STD_UNIQUE_PTR(CommandObjectRegexCommand) m_regex_cmd_ap;
class CommandOptions : public Options
{

2
lldb/source/Commands/CommandObjectTarget.cpp
View File

@ -4882,7 +4882,7 @@ protected:
target->AddStopHook (new_hook_sp);
// First step, make the specifier.
std::auto_ptr<SymbolContextSpecifier> specifier_ap;
STD_UNIQUE_PTR(SymbolContextSpecifier) specifier_ap;
if (m_options.m_sym_ctx_specified)
{
specifier_ap.reset(new SymbolContextSpecifier(m_interpreter.GetDebugger().GetSelectedTarget()));

4
lldb/source/Commands/CommandObjectWatchpointCommand.cpp
View File

@ -190,7 +190,7 @@ but do NOT enter more than one command per line. \n" );
CommandReturnObject &result)
{
InputReaderSP reader_sp (new InputReader(m_interpreter.GetDebugger()));
std::auto_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
if (reader_sp && data_ap.get())
{
BatonSP baton_sp (new WatchpointOptions::CommandBaton (data_ap.release()));
@ -226,7 +226,7 @@ but do NOT enter more than one command per line. \n" );
SetWatchpointCommandCallback (WatchpointOptions *wp_options,
const char *oneliner)
{
std::auto_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
// It's necessary to set both user_source and script_source to the oneliner.
// The former is used to generate callback description (as in watchpoint command list)

2
lldb/source/Core/Communication.cpp
View File

@ -108,7 +108,7 @@ Communication::Disconnect (Error *error_ptr)
// don't want to pay for the overhead it might cause if every time we
// access the connection we have to take a lock.
//
// This auto_ptr will cleanup after itself when this object goes away,
// This unique pointer will cleanup after itself when this object goes away,
// so there is no need to currently have it destroy itself immediately
// upon disconnnect.
//connection_sp.reset();

6
lldb/source/Core/Disassembler.cpp
View File

@ -638,7 +638,7 @@ Instruction::Dump (lldb_private::Stream *s,
bool
Instruction::DumpEmulation (const ArchSpec &arch)
{
std::auto_ptr<EmulateInstruction> insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
if (insn_emulator_ap.get())
{
insn_emulator_ap->SetInstruction (GetOpcode(), GetAddress(), NULL);
@ -904,7 +904,7 @@ Instruction::TestEmulation (Stream *out_stream, const char *file_name)
arch.SetTriple (llvm::Triple (value_sp->GetStringValue()));
bool success = false;
std::auto_ptr<EmulateInstruction> insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
if (insn_emulator_ap.get())
success = insn_emulator_ap->TestEmulation (out_stream, arch, data_dictionary);
@ -925,7 +925,7 @@ Instruction::Emulate (const ArchSpec &arch,
EmulateInstruction::ReadRegisterCallback read_reg_callback,
EmulateInstruction::WriteRegisterCallback write_reg_callback)
{
std::auto_ptr<EmulateInstruction> insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
STD_UNIQUE_PTR(EmulateInstruction) insn_emulator_ap (EmulateInstruction::FindPlugin (arch, eInstructionTypeAny, NULL));
if (insn_emulator_ap.get())
{
insn_emulator_ap->SetBaton (baton);

4
lldb/source/Core/DynamicLoader.cpp
View File

@ -24,7 +24,7 @@ DynamicLoader::FindPlugin (Process *process, const char *plugin_name)
create_callback = PluginManager::GetDynamicLoaderCreateCallbackForPluginName (plugin_name);
if (create_callback)
{
std::auto_ptr<DynamicLoader> instance_ap(create_callback(process, true));
STD_UNIQUE_PTR(DynamicLoader) instance_ap(create_callback(process, true));
if (instance_ap.get())
return instance_ap.release();
}
@ -33,7 +33,7 @@ DynamicLoader::FindPlugin (Process *process, const char *plugin_name)
{
for (uint32_t idx = 0; (create_callback = PluginManager::GetDynamicLoaderCreateCallbackAtIndex(idx)) != NULL; ++idx)
{
std::auto_ptr<DynamicLoader> instance_ap(create_callback(process, false));
STD_UNIQUE_PTR(DynamicLoader) instance_ap(create_callback(process, false));
if (instance_ap.get())
return instance_ap.release();
}

11
lldb/source/Core/Module.cpp
View File

@ -254,7 +254,7 @@ Module::GetMemoryObjectFile (const lldb::ProcessSP &process_sp, lldb::addr_t hea
if (process_sp)
{
m_did_load_objfile = true;
std::auto_ptr<DataBufferHeap> data_ap (new DataBufferHeap (512, 0));
STD_UNIQUE_PTR(DataBufferHeap) data_ap (new DataBufferHeap (512, 0));
Error readmem_error;
const size_t bytes_read = process_sp->ReadMemory (header_addr,
data_ap->GetBytes(),
@ -1185,6 +1185,15 @@ Module::GetModificationTime () const
return m_mod_time;
}
void
Module::SetSymbolFileFileSpec (const FileSpec &file)
{
m_symfile_spec = file;
m_symfile_ap.reset();
m_did_load_symbol_vendor = false;
}
bool
Module::IsExecutable ()
{

2
lldb/source/Core/StreamAsynchronousIO.cpp
View File

@ -35,7 +35,7 @@ StreamAsynchronousIO::Flush ()
{
if (m_accumulated_data.GetSize() > 0)
{
std::auto_ptr<EventDataBytes> data_bytes_ap (new EventDataBytes);
STD_UNIQUE_PTR(EventDataBytes) data_bytes_ap (new EventDataBytes);
// Let's swap the bytes to avoid LARGE string copies.
data_bytes_ap->SwapBytes (m_accumulated_data.GetString());
EventSP new_event_sp (new Event (m_broadcast_event_type, data_bytes_ap.release()));

12
lldb/source/Expression/ClangExpressionDeclMap.cpp
View File

@ -1117,7 +1117,7 @@ ClangExpressionDeclMap::LookupDecl (clang::NamedDecl *decl, ClangExpressionVaria
if (parser_vars->m_lldb_var)
{
std::auto_ptr<Value> value(GetVariableValue(parser_vars->m_lldb_var, NULL));
STD_UNIQUE_PTR(Value) value(GetVariableValue(parser_vars->m_lldb_var, NULL));
if (is_reference && value.get() && value->GetValueType() == Value::eValueTypeLoadAddress)
{
@ -1252,7 +1252,7 @@ ClangExpressionDeclMap::GetSpecialValue (const ConstString &name)
!var->LocationIsValidForFrame (frame))
return Value();
std::auto_ptr<Value> value(GetVariableValue(var, NULL));
STD_UNIQUE_PTR(Value) value(GetVariableValue(var, NULL));
if (value.get() && value->GetValueType() == Value::eValueTypeLoadAddress)
{
@ -1347,7 +1347,7 @@ ClangExpressionDeclMap::GetObjectPointer
return false;
}
std::auto_ptr<lldb_private::Value> location_value(GetVariableValue(object_ptr_var,
STD_UNIQUE_PTR(lldb_private::Value) location_value(GetVariableValue(object_ptr_var,
NULL));
if (!location_value.get())
@ -2534,7 +2534,7 @@ ClangExpressionDeclMap::GetVariableValue
DWARFExpression &var_location_expr = var->LocationExpression();
std::auto_ptr<Value> var_location(new Value);
STD_UNIQUE_PTR(Value) var_location(new Value);
lldb::addr_t loclist_base_load_addr = LLDB_INVALID_ADDRESS;
@ -2756,7 +2756,7 @@ ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context,
m_parser_vars->m_target_info.address_byte_size));
assert (entity.get());
std::auto_ptr<Value> symbol_location(new Value);
STD_UNIQUE_PTR(Value) symbol_location(new Value);
const Address &symbol_address = symbol.GetAddress();
lldb::addr_t symbol_load_addr = symbol_address.GetLoadAddress(target);
@ -2900,7 +2900,7 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context,
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
NamedDecl *fun_decl = NULL;
std::auto_ptr<Value> fun_location(new Value);
STD_UNIQUE_PTR(Value) fun_location(new Value);
const Address *fun_address = NULL;
// only valid for Functions, not for Symbols

24
lldb/source/Expression/ClangExpressionParser.cpp
View File

@ -188,7 +188,7 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
ClangExpression &expr) :
m_expr (expr),
m_compiler (),
m_code_generator (NULL)
m_code_generator ()
{
// Initialize targets first, so that --version shows registered targets.
static struct InitializeLLVM {
@ -351,13 +351,13 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
m_selector_table.reset(new SelectorTable());
m_builtin_context.reset(new Builtin::Context());
std::auto_ptr<clang::ASTContext> ast_context(new ASTContext(m_compiler->getLangOpts(),
m_compiler->getSourceManager(),
&m_compiler->getTarget(),
m_compiler->getPreprocessor().getIdentifierTable(),
*m_selector_table.get(),
*m_builtin_context.get(),
0));
STD_UNIQUE_PTR(clang::ASTContext) ast_context(new ASTContext(m_compiler->getLangOpts(),
m_compiler->getSourceManager(),
&m_compiler->getTarget(),
m_compiler->getPreprocessor().getIdentifierTable(),
*m_selector_table.get(),
*m_builtin_context.get(),
0));
ClangExpressionDeclMap *decl_map = m_expr.DeclMap();
@ -462,7 +462,7 @@ static bool FindFunctionInModule (ConstString &mangled_name,
Error
ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr,
lldb::addr_t &func_end,
std::auto_ptr<IRExecutionUnit> &execution_unit_ap,
STD_UNIQUE_PTR(IRExecutionUnit) &execution_unit_ap,
ExecutionContext &exe_ctx,
bool &evaluated_statically,
lldb::ClangExpressionVariableSP &const_result,
@ -472,11 +472,11 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr,
func_end = LLDB_INVALID_ADDRESS;
Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
std::auto_ptr<llvm::ExecutionEngine> execution_engine_ap;
STD_UNIQUE_PTR(llvm::ExecutionEngine) execution_engine_ap;
Error err;
std::auto_ptr<llvm::Module> module_ap (m_code_generator->ReleaseModule());
STD_UNIQUE_PTR(llvm::Module) module_ap (m_code_generator->ReleaseModule());
if (!module_ap.get())
{
@ -596,7 +596,7 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_addr,
m_execution_unit->GetRunnableInfo(err, func_addr, func_end);
execution_unit_ap = m_execution_unit;
execution_unit_ap.reset (m_execution_unit.release());
return err;
}

1
lldb/source/Expression/ClangFunction.cpp
View File

@ -25,6 +25,7 @@
#include "lldb/Expression/ASTStructExtractor.h"
#include "lldb/Expression/ClangExpressionParser.h"
#include "lldb/Expression/ClangFunction.h"
#include "lldb/Expression/IRExecutionUnit.h"
#include "lldb/Symbol/Type.h"
#include "lldb/Core/DataExtractor.h"
#include "lldb/Core/State.h"

2
lldb/source/Expression/ClangUserExpression.cpp
View File

@ -396,7 +396,7 @@ ClangUserExpression::Parse (Stream &error_stream,
ApplyObjcCastHack(m_expr_text);
//ApplyUnicharHack(m_expr_text);
std::auto_ptr <ExpressionSourceCode> source_code (ExpressionSourceCode::CreateWrapped(m_expr_prefix.c_str(), m_expr_text.c_str()));
STD_UNIQUE_PTR(ExpressionSourceCode) source_code (ExpressionSourceCode::CreateWrapped(m_expr_prefix.c_str(), m_expr_text.c_str()));
lldb::LanguageType lang_type;

1
lldb/source/Expression/ClangUtilityFunction.cpp
View File

@ -23,6 +23,7 @@
#include "lldb/Expression/ClangExpressionParser.h"
#include "lldb/Expression/ClangUtilityFunction.h"
#include "lldb/Expression/ExpressionSourceCode.h"
#include "lldb/Expression/IRExecutionUnit.h"
#include "lldb/Host/Host.h"
#include "lldb/Target/ExecutionContext.h"
#include "lldb/Target/Target.h"

4
lldb/source/Expression/DWARFExpression.cpp
View File

@ -1062,8 +1062,8 @@ DWARFExpression::Update_DW_OP_addr (lldb::addr_t file_addr)
// we then replace the data for this expression
// So first we copy the data into a heap buffer
std::auto_ptr<DataBufferHeap> head_data_ap (new DataBufferHeap (m_data.GetDataStart(),
m_data.GetByteSize()));
STD_UNIQUE_PTR(DataBufferHeap) head_data_ap (new DataBufferHeap (m_data.GetDataStart(),
m_data.GetByteSize()));
// Make en encoder so we can write the address into the buffer using
// the correct byte order (endianness)

8
lldb/source/Expression/IRExecutionUnit.cpp
View File

@ -25,14 +25,14 @@
using namespace lldb_private;
IRExecutionUnit::IRExecutionUnit (std::auto_ptr<llvm::LLVMContext> &context_ap,
std::auto_ptr<llvm::Module> &module_ap,
IRExecutionUnit::IRExecutionUnit (STD_UNIQUE_PTR(llvm::LLVMContext) &context_ap,
STD_UNIQUE_PTR(llvm::Module) &module_ap,
ConstString &name,
const lldb::TargetSP &target_sp,
std::vector<std::string> &cpu_features) :
IRMemoryMap(target_sp),
m_context_ap(context_ap),
m_module_ap(module_ap),
m_context_ap(context_ap.release()),
m_module_ap(module_ap.release()),
m_module(m_module_ap.get()),
m_cpu_features(cpu_features),
m_name(name),

2
lldb/source/Expression/IRInterpreter.cpp
View File

@ -817,7 +817,7 @@ IRInterpreter::maybeRunOnFunction (lldb_private::ClangExpressionDeclMap *decl_ma
}
static const char *unsupported_opcode_error = "Interpreter doesn't handle one of the expression's opcodes";
static const char *interpreter_initialization_error = "Interpreter couldn't be initialized";
//static const char *interpreter_initialization_error = "Interpreter couldn't be initialized";
static const char *interpreter_internal_error = "Interpreter encountered an internal error";
static const char *bad_value_error = "Interpreter couldn't resolve a value during execution";
static const char *memory_allocation_error = "Interpreter couldn't allocate memory";

2
lldb/source/Host/common/File.cpp
View File

@ -556,7 +556,7 @@ File::Read (size_t &num_bytes, off_t &offset, bool null_terminate, DataBufferSP
if (num_bytes > bytes_left)
num_bytes = bytes_left;
std::auto_ptr<DataBufferHeap> data_heap_ap;
STD_UNIQUE_PTR(DataBufferHeap) data_heap_ap;
data_heap_ap.reset(new DataBufferHeap(num_bytes + (null_terminate ? 1 : 0), '\0'));
if (data_heap_ap.get())

5
lldb/source/Host/common/FileSpec.cpp
View File

@ -35,7 +35,6 @@
using namespace lldb;
using namespace lldb_private;
using namespace std;
static bool
GetFileStats (const FileSpec *file_spec, struct stat *stats_ptr)
@ -745,7 +744,7 @@ DataBufferSP
FileSpec::MemoryMapFileContents(off_t file_offset, size_t file_size) const
{
DataBufferSP data_sp;
auto_ptr<DataBufferMemoryMap> mmap_data(new DataBufferMemoryMap());
STD_UNIQUE_PTR(DataBufferMemoryMap) mmap_data(new DataBufferMemoryMap());
if (mmap_data.get())
{
if (mmap_data->MemoryMapFromFileSpec (this, file_offset, file_size) >= file_size)
@ -863,7 +862,7 @@ FileSpec::ReadFileLines (STLStringArray &lines)
char path[PATH_MAX];
if (GetPath(path, sizeof(path)))
{
ifstream file_stream (path);
std::ifstream file_stream (path);
if (file_stream)
{

4
lldb/source/Host/common/Host.cpp
View File

@ -1313,7 +1313,7 @@ Host::RunShellCommand (const char *command,
}
// The process monitor callback will delete the 'shell_info_ptr' below...
std::auto_ptr<ShellInfo> shell_info_ap (new ShellInfo());
STD_UNIQUE_PTR(ShellInfo) shell_info_ap (new ShellInfo());
const bool monitor_signals = false;
launch_info.SetMonitorProcessCallback(MonitorShellCommand, shell_info_ap.get(), monitor_signals);
@ -1324,7 +1324,7 @@ Host::RunShellCommand (const char *command,
{
// The process successfully launched, so we can defer ownership of
// "shell_info" to the MonitorShellCommand callback function that will
// get called when the process dies. We release the std::auto_ptr as it
// get called when the process dies. We release the unique pointer as it
// doesn't need to delete the ShellInfo anymore.
ShellInfo *shell_info = shell_info_ap.release();
TimeValue timeout_time(TimeValue::Now());

2
lldb/source/Host/freebsd/Host.cpp
View File

@ -294,7 +294,7 @@ Host::GetAuxvData(lldb_private::Process *process)
struct ps_strings ps_strings;
struct ptrace_io_desc pid;
DataBufferSP buf_sp;
std::auto_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(1024, 0));
STD_UNIQUE_PTR(DataBufferHeap) buf_ap(new DataBufferHeap(1024, 0));
if (::sysctl(mib, 2, &ps_strings_addr, &ps_strings_size, NULL, 0) == 0) {
pid.piod_op = PIOD_READ_D;

2
lldb/source/Host/linux/Host.cpp
View File

@ -72,7 +72,7 @@ Host::GetAuxvData(lldb_private::Process *process)
return buf_sp;
size_t bytes_read = 0;
std::auto_ptr<DataBufferHeap> buf_ap(new DataBufferHeap(1024, 0));
STD_UNIQUE_PTR(DataBufferHeap) buf_ap(new DataBufferHeap(1024, 0));
for (;;)
{
size_t avail = buf_ap->GetByteSize() - bytes_read;

24
lldb/source/Interpreter/CommandInterpreter.cpp
View File

@ -391,7 +391,7 @@ CommandInterpreter::LoadCommandDictionary ()
size_t num_regexes = sizeof break_regexes/sizeof(char *[2]);
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
break_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-break",
"Set a breakpoint using a regular expression to specify the location, where <linenum> is in decimal and <address> is in hex.",
@ -418,7 +418,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
tbreak_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-tbreak",
"Set a one shot breakpoint using a regular expression to specify the location, where <linenum> is in decimal and <address> is in hex.",
@ -449,7 +449,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
attach_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-attach",
"Attach to a process id if in decimal, otherwise treat the argument as a process name to attach to.",
@ -467,7 +467,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
down_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-down",
"Go down \"n\" frames in the stack (1 frame by default).",
@ -482,7 +482,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
up_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-up",
"Go up \"n\" frames in the stack (1 frame by default).",
@ -497,7 +497,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
display_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-display",
"Add an expression evaluation stop-hook.",
@ -511,7 +511,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
undisplay_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-undisplay",
"Remove an expression evaluation stop-hook.",
@ -525,7 +525,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
connect_gdb_remote_cmd_ap(new CommandObjectRegexCommand (*this,
"gdb-remote",
"Connect to a remote GDB server. If no hostname is provided, localhost is assumed.",
@ -540,7 +540,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
connect_kdp_remote_cmd_ap(new CommandObjectRegexCommand (*this,
"kdp-remote",
"Connect to a remote KDP server. udp port 41139 is the default port number.",
@ -555,7 +555,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
bt_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-bt",
"Show a backtrace. An optional argument is accepted; if that argument is a number, it specifies the number of frames to display. If that argument is 'all', full backtraces of all threads are displayed.",
@ -575,7 +575,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
list_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-list",
"Implements the GDB 'list' command in all of its forms except FILE:FUNCTION and maps them to the appropriate 'source list' commands.",
@ -597,7 +597,7 @@ CommandInterpreter::LoadCommandDictionary ()
}
}
std::auto_ptr<CommandObjectRegexCommand>
STD_UNIQUE_PTR(CommandObjectRegexCommand)
env_regex_cmd_ap(new CommandObjectRegexCommand (*this,
"_regexp-env",
"Implements a shortcut to viewing and setting environment variables.",

2
lldb/source/Interpreter/Options.cpp
View File

@ -901,7 +901,7 @@ Options::HandleOptionArgumentCompletion
)
{
const OptionDefinition *opt_defs = GetDefinitions();
std::auto_ptr<SearchFilter> filter_ap;
STD_UNIQUE_PTR(SearchFilter) filter_ap;
int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos;
int opt_defs_index = opt_element_vector[opt_element_index].opt_defs_index;

4
lldb/source/Interpreter/ScriptInterpreter.cpp
View File

@ -81,10 +81,10 @@ ScriptInterpreter::LanguageToString (lldb::ScriptLanguage language)
return return_value;
}
std::auto_ptr<ScriptInterpreterLocker>
STD_UNIQUE_PTR(ScriptInterpreterLocker)
ScriptInterpreter::AcquireInterpreterLock ()
{
return std::auto_ptr<ScriptInterpreterLocker>(new ScriptInterpreterLocker());
return STD_UNIQUE_PTR(ScriptInterpreterLocker)(new ScriptInterpreterLocker());
}
void

12
lldb/source/Interpreter/ScriptInterpreterPython.cpp
View File

@ -1321,7 +1321,7 @@ ScriptInterpreterPython::GenerateBreakpointOptionsCommandCallback
case eInputReaderDone:
{
BreakpointOptions *bp_options = (BreakpointOptions *)baton;
std::auto_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
data_ap->user_source.AppendList (commands_in_progress);
if (data_ap.get())
{
@ -1427,7 +1427,7 @@ ScriptInterpreterPython::GenerateWatchpointOptionsCommandCallback
case eInputReaderDone:
{
WatchpointOptions *wp_options = (WatchpointOptions *)baton;
std::auto_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
data_ap->user_source.AppendList (commands_in_progress);
if (data_ap.get())
{
@ -1534,7 +1534,7 @@ void
ScriptInterpreterPython::SetBreakpointCommandCallback (BreakpointOptions *bp_options,
const char *oneliner)
{
std::auto_ptr<BreakpointOptions::CommandData> data_ap(new BreakpointOptions::CommandData());
STD_UNIQUE_PTR(BreakpointOptions::CommandData) data_ap(new BreakpointOptions::CommandData());
// It's necessary to set both user_source and script_source to the oneliner.
// The former is used to generate callback description (as in breakpoint command list)
@ -1557,7 +1557,7 @@ void
ScriptInterpreterPython::SetWatchpointCommandCallback (WatchpointOptions *wp_options,
const char *oneliner)
{
std::auto_ptr<WatchpointOptions::CommandData> data_ap(new WatchpointOptions::CommandData());
STD_UNIQUE_PTR(WatchpointOptions::CommandData) data_ap(new WatchpointOptions::CommandData());
// It's necessary to set both user_source and script_source to the oneliner.
// The former is used to generate callback description (as in watchpoint command list)
@ -2807,10 +2807,10 @@ ScriptInterpreterPython::GetDocumentationForItem(const char* item, std::string&
}
}
std::auto_ptr<ScriptInterpreterLocker>
STD_UNIQUE_PTR(ScriptInterpreterLocker)
ScriptInterpreterPython::AcquireInterpreterLock ()
{
std::auto_ptr<ScriptInterpreterLocker> py_lock(new Locker(this,
STD_UNIQUE_PTR(ScriptInterpreterLocker) py_lock(new Locker(this,
Locker::AcquireLock | Locker::InitSession,
Locker::FreeLock | Locker::TearDownSession));
return py_lock;

6
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
View File

@ -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();

22
lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.h
View File

@ -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_

2
lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
View File

@ -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()
{
}

2
lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
View File

@ -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.

4
lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
View File

@ -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();

10
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.h
View File

@ -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

2
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.cpp
View File

@ -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"

2
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV1.h
View File

@ -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);
};

50
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.cpp
View File

@ -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();

12
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntimeV2.h
View File

@ -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;

6
lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.h
View File

@ -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;
};

14
lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
View File

@ -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())
{

2
lldb/source/Plugins/ObjectContainer/Universal-Mach-O/ObjectContainerUniversalMachO.cpp
View File

@ -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();

2
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
View File

@ -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))

2
lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
View File

@ -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;

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

@ -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();
}

2
lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp
View File

@ -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();
}

Some files were not shown because too many files have changed in this diff Show More