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

Switch NULL to C++11 nullptr in source/Symbol and source/Utility 

Patch by Robert Matusewicz

llvm-svn: 206713
This commit is contained in:
Ed Maste 2014-04-20 13:17:36 +00:00
parent 3a3ee3e376
commit d4612ad0f3
26 changed files with 339 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lldb/source/Symbol/Block.cpp
View File

@ -24,7 +24,7 @@ using namespace lldb_private;
Block::Block(lldb::user_id_t uid) :
UserID(uid),
m_parent_scope (NULL),
m_parent_scope (nullptr),
m_children (),
m_ranges (),
m_inlineInfoSP (),
@ -62,7 +62,7 @@ Block::GetDescription(Stream *s, Function *function, lldb::DescriptionLevel leve
}
}
if (m_inlineInfoSP.get() != NULL)
if (m_inlineInfoSP.get() != nullptr)
{
bool show_fullpaths = (level == eDescriptionLevelVerbose);
m_inlineInfoSP->Dump(s, show_fullpaths);
@ -91,7 +91,7 @@ Block::Dump(Stream *s, addr_t base_addr, int32_t depth, bool show_context) const
{
s->Printf(", parent = {0x%8.8" PRIx64 "}", parent_block->GetID());
}
if (m_inlineInfoSP.get() != NULL)
if (m_inlineInfoSP.get() != nullptr)
{
bool show_fullpaths = false;
m_inlineInfoSP->Dump(s, show_fullpaths);
@ -105,7 +105,7 @@ Block::Dump(Stream *s, addr_t base_addr, int32_t depth, bool show_context) const
for (size_t i=0; i<num_ranges; ++i)
{
const Range &range = m_ranges.GetEntryRef(i);
if (parent_block != NULL && parent_block->Contains(range) == false)
if (parent_block != nullptr && parent_block->Contains(range) == false)
*s << '!';
else
*s << ' ';
@ -139,7 +139,7 @@ Block::FindBlockByID (user_id_t block_id)
if (block_id == GetID())
return this;
Block *matching_block = NULL;
Block *matching_block = nullptr;
collection::const_iterator pos, end = m_children.end();
for (pos = m_children.begin(); pos != end; ++pos)
{
@ -171,7 +171,7 @@ Block::CalculateSymbolContextCompileUnit ()
{
if (m_parent_scope)
return m_parent_scope->CalculateSymbolContextCompileUnit ();
return NULL;
return nullptr;
}
Function *
@ -179,7 +179,7 @@ Block::CalculateSymbolContextFunction ()
{
if (m_parent_scope)
return m_parent_scope->CalculateSymbolContextFunction ();
return NULL;
return nullptr;
}
Block *
@ -214,7 +214,7 @@ Block::DumpAddressRanges (Stream *s, lldb::addr_t base_addr)
bool
Block::Contains (addr_t range_offset) const
{
return m_ranges.FindEntryThatContains(range_offset) != NULL;
return m_ranges.FindEntryThatContains(range_offset) != nullptr;
}
bool
@ -226,7 +226,7 @@ Block::Contains (const Block *block) const
// Walk the parent chain for "block" and see if any if them match this block
const Block *block_parent;
for (block_parent = block->GetParent();
block_parent != NULL;
block_parent != nullptr;
block_parent = block_parent->GetParent())
{
if (this == block_parent)
@ -238,7 +238,7 @@ Block::Contains (const Block *block) const
bool
Block::Contains (const Range& range) const
{
return m_ranges.FindEntryThatContains (range) != NULL;
return m_ranges.FindEntryThatContains (range) != nullptr;
}
Block *
@ -246,7 +246,7 @@ Block::GetParent () const
{
if (m_parent_scope)
return m_parent_scope->CalculateSymbolContextBlock();
return NULL;
return nullptr;
}
Block *
@ -268,7 +268,7 @@ Block::GetInlinedParent ()
else
return parent_block->GetInlinedParent();
}
return NULL;
return nullptr;
}
@ -472,7 +472,7 @@ Block::GetBlockVariableList (bool can_create)
{
if (m_parsed_block_variables == false)
{
if (m_variable_list_sp.get() == NULL && can_create)
if (m_variable_list_sp.get() == nullptr && can_create)
{
m_parsed_block_variables = true;
SymbolContext sc;
@ -505,7 +505,7 @@ Block::AppendBlockVariables (bool can_create,
{
Block *child_block = pos->get();
if (stop_if_child_block_is_inlined_function == false ||
child_block->GetInlinedFunctionInfo() == NULL)
child_block->GetInlinedFunctionInfo() == nullptr)
{
num_variables_added += child_block->AppendBlockVariables (can_create,
get_child_block_variables,
@ -529,7 +529,7 @@ Block::AppendVariables
uint32_t num_variables_added = 0;
VariableListSP variable_list_sp(GetBlockVariableList(can_create));
bool is_inlined_function = GetInlinedFunctionInfo() != NULL;
bool is_inlined_function = GetInlinedFunctionInfo() != nullptr;
if (variable_list_sp.get())
{
num_variables_added = variable_list_sp->GetSize();
@ -556,17 +556,17 @@ Block::GetClangDeclContext()
CalculateSymbolContext (&sc);
if (!sc.module_sp)
return NULL;
return nullptr;
SymbolVendor *sym_vendor = sc.module_sp->GetSymbolVendor();
if (!sym_vendor)
return NULL;
return nullptr;
SymbolFile *sym_file = sym_vendor->GetSymbolFile();
if (!sym_file)
return NULL;
return nullptr;
return sym_file->GetClangDeclContextForTypeUID (sc, m_uid);
}
@ -606,7 +606,7 @@ Block::GetSibling() const
if (parent_block)
return parent_block->GetSiblingForChild (this);
}
return NULL;
return nullptr;
}
// A parent of child blocks can be asked to find a sibling block given
// one of its child blocks
@ -626,6 +626,6 @@ Block::GetSiblingForChild (const Block *child_block) const
}
}
}
return NULL;
return nullptr;
}

110
lldb/source/Symbol/ClangASTContext.cpp
View File

@ -276,9 +276,9 @@ ClangASTContext::ClangASTContext (const char *target_triple) :
m_identifier_table_ap(),
m_selector_table_ap(),
m_builtins_ap(),
m_callback_tag_decl (NULL),
m_callback_objc_decl (NULL),
m_callback_baton (NULL),
m_callback_tag_decl (nullptr),
m_callback_objc_decl (nullptr),
m_callback_baton (nullptr),
m_pointer_byte_size (0)
{
@ -342,7 +342,7 @@ ClangASTContext::HasExternalSource ()
{
ASTContext *ast = getASTContext();
if (ast)
return ast->getExternalSource () != NULL;
return ast->getExternalSource () != nullptr;
return false;
}
@ -377,7 +377,7 @@ ClangASTContext::RemoveExternalSource ()
ASTContext *
ClangASTContext::getASTContext()
{
if (m_ast_ap.get() == NULL)
if (m_ast_ap.get() == nullptr)
{
m_ast_ap.reset(new ASTContext (*getLanguageOptions(),
*getSourceManager(),
@ -401,7 +401,7 @@ ClangASTContext::getASTContext()
Builtin::Context *
ClangASTContext::getBuiltinContext()
{
if (m_builtins_ap.get() == NULL)
if (m_builtins_ap.get() == nullptr)
m_builtins_ap.reset (new Builtin::Context());
return m_builtins_ap.get();
}
@ -409,15 +409,15 @@ ClangASTContext::getBuiltinContext()
IdentifierTable *
ClangASTContext::getIdentifierTable()
{
if (m_identifier_table_ap.get() == NULL)
m_identifier_table_ap.reset(new IdentifierTable (*ClangASTContext::getLanguageOptions(), NULL));
if (m_identifier_table_ap.get() == nullptr)
m_identifier_table_ap.reset(new IdentifierTable (*ClangASTContext::getLanguageOptions(), nullptr));
return m_identifier_table_ap.get();
}
LangOptions *
ClangASTContext::getLanguageOptions()
{
if (m_language_options_ap.get() == NULL)
if (m_language_options_ap.get() == nullptr)
{
m_language_options_ap.reset(new LangOptions());
ParseLangArgs(*m_language_options_ap, IK_ObjCXX);
@ -429,7 +429,7 @@ ClangASTContext::getLanguageOptions()
SelectorTable *
ClangASTContext::getSelectorTable()
{
if (m_selector_table_ap.get() == NULL)
if (m_selector_table_ap.get() == nullptr)
m_selector_table_ap.reset (new SelectorTable());
return m_selector_table_ap.get();
}
@ -437,7 +437,7 @@ ClangASTContext::getSelectorTable()
clang::FileManager *
ClangASTContext::getFileManager()
{
if (m_file_manager_ap.get() == NULL)
if (m_file_manager_ap.get() == nullptr)
{
clang::FileSystemOptions file_system_options;
m_file_manager_ap.reset(new clang::FileManager(file_system_options));
@ -448,7 +448,7 @@ ClangASTContext::getFileManager()
clang::SourceManager *
ClangASTContext::getSourceManager()
{
if (m_source_manager_ap.get() == NULL)
if (m_source_manager_ap.get() == nullptr)
m_source_manager_ap.reset(new clang::SourceManager(*getDiagnosticsEngine(), *getFileManager()));
return m_source_manager_ap.get();
}
@ -456,7 +456,7 @@ ClangASTContext::getSourceManager()
clang::DiagnosticsEngine *
ClangASTContext::getDiagnosticsEngine()
{
if (m_diagnostics_engine_ap.get() == NULL)
if (m_diagnostics_engine_ap.get() == nullptr)
{
llvm::IntrusiveRefCntPtr<DiagnosticIDs> diag_id_sp(new DiagnosticIDs());
m_diagnostics_engine_ap.reset(new DiagnosticsEngine(diag_id_sp, new DiagnosticOptions()));
@ -494,7 +494,7 @@ private:
DiagnosticConsumer *
ClangASTContext::getDiagnosticConsumer()
{
if (m_diagnostic_consumer_ap.get() == NULL)
if (m_diagnostic_consumer_ap.get() == nullptr)
m_diagnostic_consumer_ap.reset(new NullDiagnosticConsumer);
return m_diagnostic_consumer_ap.get();
@ -503,11 +503,11 @@ ClangASTContext::getDiagnosticConsumer()
TargetOptions *
ClangASTContext::getTargetOptions()
{
if (m_target_options_rp.getPtr() == NULL && !m_target_triple.empty())
if (m_target_options_rp.getPtr() == nullptr && !m_target_triple.empty())
{
m_target_options_rp.reset ();
m_target_options_rp = new TargetOptions();
if (m_target_options_rp.getPtr() != NULL)
if (m_target_options_rp.getPtr() != nullptr)
m_target_options_rp->Triple = m_target_triple;
}
return m_target_options_rp.getPtr();
@ -518,7 +518,7 @@ TargetInfo *
ClangASTContext::getTargetInfo()
{
// target_triple should be something like "x86_64-apple-macosx"
if (m_target_info_ap.get() == NULL && !m_target_triple.empty())
if (m_target_info_ap.get() == nullptr && !m_target_triple.empty())
m_target_info_ap.reset (TargetInfo::CreateTargetInfo(*getDiagnosticsEngine(), getTargetOptions()));
return m_target_info_ap.get();
}
@ -696,7 +696,7 @@ ClangASTContext::GetBasicType (ASTContext *ast, lldb::BasicType basic_type)
{
if (ast)
{
clang_type_t clang_type = NULL;
clang_type_t clang_type = nullptr;
switch (basic_type)
{
@ -811,7 +811,7 @@ ClangASTContext::GetBuiltinTypeForDWARFEncodingAndBitSize (const char *type_name
ASTContext *ast = getASTContext();
#define streq(a,b) strcmp(a,b) == 0
assert (ast != NULL);
assert (ast != nullptr);
if (ast)
{
switch (dw_ate)
@ -1134,9 +1134,9 @@ ClangASTContext::CreateRecordType (DeclContext *decl_ctx,
ClangASTMetadata *metadata)
{
ASTContext *ast = getASTContext();
assert (ast != NULL);
assert (ast != nullptr);
if (decl_ctx == NULL)
if (decl_ctx == nullptr)
decl_ctx = ast->getTranslationUnitDecl();
@ -1160,7 +1160,7 @@ ClangASTContext::CreateRecordType (DeclContext *decl_ctx,
decl_ctx,
SourceLocation(),
SourceLocation(),
is_anonymous ? NULL : &ast->Idents.get(name));
is_anonymous ? nullptr : &ast->Idents.get(name));
if (is_anonymous)
decl->setAnonymousStructOrUnion(true);
@ -1194,7 +1194,7 @@ CreateTemplateParameterList (ASTContext *ast,
{
const char *name = template_param_infos.names[i];
IdentifierInfo *identifier_info = NULL;
IdentifierInfo *identifier_info = nullptr;
if (name && name[0])
identifier_info = &ast->Idents.get(name);
if (template_param_infos.args[i].getKind() == TemplateArgument::Integral)
@ -1208,7 +1208,7 @@ CreateTemplateParameterList (ASTContext *ast,
identifier_info,
template_param_infos.args[i].getIntegralType(),
parameter_pack,
NULL));
nullptr));
}
else
@ -1277,7 +1277,7 @@ ClangASTContext::CreateFunctionTemplateSpecializationInfo (FunctionDecl *func_de
func_decl->setFunctionTemplateSpecialization (func_tmpl_decl,
&template_args,
NULL);
nullptr);
}
@ -1290,8 +1290,8 @@ ClangASTContext::CreateClassTemplateDecl (DeclContext *decl_ctx,
{
ASTContext *ast = getASTContext();
ClassTemplateDecl *class_template_decl = NULL;
if (decl_ctx == NULL)
ClassTemplateDecl *class_template_decl = nullptr;
if (decl_ctx == nullptr)
decl_ctx = ast->getTranslationUnitDecl();
IdentifierInfo &identifier_info = ast->Idents.get(class_name);
@ -1337,7 +1337,7 @@ ClangASTContext::CreateClassTemplateDecl (DeclContext *decl_ctx,
decl_name,
template_param_list,
template_cxx_decl,
NULL);
nullptr);
if (class_template_decl)
{
@ -1373,7 +1373,7 @@ ClangASTContext::CreateClassTemplateSpecializationDecl (DeclContext *decl_ctx,
class_template_decl,
&template_param_infos.args.front(),
template_param_infos.args.size(),
NULL);
nullptr);
class_template_specialization_decl->setSpecializationKind(TSK_ExplicitSpecialization);
@ -1470,7 +1470,7 @@ ClangASTContext::FieldIsBitfield
uint32_t& bitfield_bit_size
)
{
if (ast == NULL || field == NULL)
if (ast == nullptr || field == nullptr)
return false;
if (field->isBitField())
@ -1492,7 +1492,7 @@ ClangASTContext::FieldIsBitfield
bool
ClangASTContext::RecordHasFields (const RecordDecl *record_decl)
{
if (record_decl == NULL)
if (record_decl == nullptr)
return false;
if (!record_decl->field_empty())
@ -1528,16 +1528,16 @@ ClangASTContext::CreateObjCClass
)
{
ASTContext *ast = getASTContext();
assert (ast != NULL);
assert (ast != nullptr);
assert (name && name[0]);
if (decl_ctx == NULL)
if (decl_ctx == nullptr)
decl_ctx = ast->getTranslationUnitDecl();
ObjCInterfaceDecl *decl = ObjCInterfaceDecl::Create (*ast,
decl_ctx,
SourceLocation(),
&ast->Idents.get(name),
NULL,
nullptr,
SourceLocation(),
/*isForwardDecl,*/
isInternal);
@ -1588,10 +1588,10 @@ ClangASTContext::GetNumBaseClasses (const CXXRecordDecl *cxx_record_decl, bool o
NamespaceDecl *
ClangASTContext::GetUniqueNamespaceDeclaration (const char *name, DeclContext *decl_ctx)
{
NamespaceDecl *namespace_decl = NULL;
NamespaceDecl *namespace_decl = nullptr;
ASTContext *ast = getASTContext();
TranslationUnitDecl *translation_unit_decl = ast->getTranslationUnitDecl ();
if (decl_ctx == NULL)
if (decl_ctx == nullptr)
decl_ctx = translation_unit_decl;
if (name)
@ -1612,7 +1612,7 @@ ClangASTContext::GetUniqueNamespaceDeclaration (const char *name, DeclContext *d
SourceLocation(),
SourceLocation(),
&identifier_info,
NULL);
nullptr);
decl_ctx->addDecl (namespace_decl);
}
@ -1629,8 +1629,8 @@ ClangASTContext::GetUniqueNamespaceDeclaration (const char *name, DeclContext *d
false,
SourceLocation(),
SourceLocation(),
NULL,
NULL);
nullptr,
nullptr);
translation_unit_decl->setAnonymousNamespace (namespace_decl);
translation_unit_decl->addDecl (namespace_decl);
assert (namespace_decl == translation_unit_decl->getAnonymousNamespace());
@ -1648,8 +1648,8 @@ ClangASTContext::GetUniqueNamespaceDeclaration (const char *name, DeclContext *d
false,
SourceLocation(),
SourceLocation(),
NULL,
NULL);
nullptr,
nullptr);
parent_namespace_decl->setAnonymousNamespace (namespace_decl);
parent_namespace_decl->addDecl (namespace_decl);
assert (namespace_decl == parent_namespace_decl->getAnonymousNamespace());
@ -1694,9 +1694,9 @@ ClangASTContext::CreateFunctionDeclaration (DeclContext *decl_ctx,
int storage,
bool is_inline)
{
FunctionDecl *func_decl = NULL;
FunctionDecl *func_decl = nullptr;
ASTContext *ast = getASTContext();
if (decl_ctx == NULL)
if (decl_ctx == nullptr)
decl_ctx = ast->getTranslationUnitDecl();
@ -1711,7 +1711,7 @@ ClangASTContext::CreateFunctionDeclaration (DeclContext *decl_ctx,
SourceLocation(),
DeclarationName (&ast->Idents.get(name)),
function_clang_type.GetQualType(),
NULL,
nullptr,
(FunctionDecl::StorageClass)storage,
is_inline,
hasWrittenPrototype,
@ -1725,7 +1725,7 @@ ClangASTContext::CreateFunctionDeclaration (DeclContext *decl_ctx,
SourceLocation(),
DeclarationName (),
function_clang_type.GetQualType(),
NULL,
nullptr,
(FunctionDecl::StorageClass)storage,
is_inline,
hasWrittenPrototype,
@ -1749,7 +1749,7 @@ ClangASTContext::CreateFunctionType (ASTContext *ast,
bool is_variadic,
unsigned type_quals)
{
assert (ast != NULL);
assert (ast != nullptr);
std::vector<QualType> qual_type_args;
for (unsigned i=0; i<num_args; ++i)
qual_type_args.push_back (args[i].GetQualType());
@ -1761,7 +1761,7 @@ ClangASTContext::CreateFunctionType (ASTContext *ast,
proto_info.TypeQuals = type_quals;
proto_info.RefQualifier = RQ_None;
proto_info.NumExceptions = 0;
proto_info.Exceptions = NULL;
proto_info.Exceptions = nullptr;
return ClangASTType (ast, ast->getFunctionType (result_type.GetQualType(),
qual_type_args,
@ -1772,16 +1772,16 @@ ParmVarDecl *
ClangASTContext::CreateParameterDeclaration (const char *name, const ClangASTType &param_type, int storage)
{
ASTContext *ast = getASTContext();
assert (ast != NULL);
assert (ast != nullptr);
return ParmVarDecl::Create(*ast,
ast->getTranslationUnitDecl(),
SourceLocation(),
SourceLocation(),
name && name[0] ? &ast->Idents.get(name) : NULL,
name && name[0] ? &ast->Idents.get(name) : nullptr,
param_type.GetQualType(),
NULL,
nullptr,
(VarDecl::StorageClass)storage,
0);
nullptr);
}
void
@ -1802,7 +1802,7 @@ ClangASTContext::CreateArrayType (const ClangASTType &element_type,
if (element_type.IsValid())
{
ASTContext *ast = getASTContext();
assert (ast != NULL);
assert (ast != nullptr);
if (is_vector)
{
@ -1855,8 +1855,8 @@ ClangASTContext::CreateEnumerationType
decl_ctx,
SourceLocation(),
SourceLocation(),
name && name[0] ? &ast->Idents.get(name) : NULL,
NULL,
name && name[0] ? &ast->Idents.get(name) : nullptr,
nullptr,
false, // IsScoped
false, // IsScopedUsingClassTag
false); // IsFixed
@ -2007,7 +2007,7 @@ ClangASTContext::GetMetadata (clang::ASTContext *ast,
if (external_source && external_source->HasMetadata(object))
return external_source->GetMetadata(object);
else
return NULL;
return nullptr;
}
clang::DeclContext *

18
lldb/source/Symbol/ClangASTImporter.cpp
View File

@ -106,7 +106,7 @@ ClangASTImporter::CopyDecl (clang::ASTContext *dst_ast,
return result;
}
return NULL;
return nullptr;
}
lldb::clang_type_t
@ -117,7 +117,7 @@ ClangASTImporter::DeportType (clang::ASTContext *dst_ctx,
MinionSP minion_sp (GetMinion (dst_ctx, src_ctx));
if (!minion_sp)
return NULL;
return nullptr;
std::set<NamedDecl *> decls_to_deport;
std::set<NamedDecl *> decls_already_deported;
@ -130,7 +130,7 @@ ClangASTImporter::DeportType (clang::ASTContext *dst_ctx,
minion_sp->ExecuteDeportWorkQueues();
if (!result)
return NULL;
return nullptr;
return result;
@ -152,7 +152,7 @@ ClangASTImporter::DeportDecl (clang::ASTContext *dst_ctx,
MinionSP minion_sp (GetMinion (dst_ctx, src_ctx));
if (!minion_sp)
return NULL;
return nullptr;
std::set<NamedDecl *> decls_to_deport;
std::set<NamedDecl *> decls_already_deported;
@ -165,7 +165,7 @@ ClangASTImporter::DeportDecl (clang::ASTContext *dst_ctx,
minion_sp->ExecuteDeportWorkQueues();
if (!result)
return NULL;
return nullptr;
if (log)
log->Printf(" [ClangASTImporter] DeportDecl deported (%sDecl*)%p to (%sDecl*)%p",
@ -501,8 +501,8 @@ ClangASTImporter::Minion::ExecuteDeportWorkQueues ()
to_context_md->m_origins.erase(decl);
}
m_decls_to_deport = NULL;
m_decls_already_deported = NULL;
m_decls_to_deport = nullptr;
m_decls_already_deported = nullptr;
}
void
@ -716,12 +716,12 @@ clang::Decl *ClangASTImporter::Minion::GetOriginalDecl (clang::Decl *To)
ASTContextMetadataSP to_context_md = m_master.GetContextMetadata(&To->getASTContext());
if (!to_context_md)
return NULL;
return nullptr;
OriginMap::iterator iter = to_context_md->m_origins.find(To);
if (iter == to_context_md->m_origins.end())
return NULL;
return nullptr;
return const_cast<clang::Decl*>(iter->second.decl);
}

164
lldb/source/Symbol/ClangASTType.cpp
View File

@ -800,7 +800,7 @@ ClangASTType::IsDefined() const
{
ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterface();
if (class_interface_decl)
return class_interface_decl->getDefinition() != NULL;
return class_interface_decl->getDefinition() != nullptr;
return false;
}
}
@ -1047,7 +1047,7 @@ ClangASTType::IsScalarType () const
if (!IsValid())
return false;
return (GetTypeInfo (NULL) & eTypeIsScalar) != 0;
return (GetTypeInfo (nullptr) & eTypeIsScalar) != 0;
}
bool
@ -1079,7 +1079,7 @@ bool
ClangASTType::IsArrayOfScalarType () const
{
ClangASTType element_type;
if (IsArrayType(&element_type, NULL, NULL))
if (IsArrayType(&element_type, nullptr, nullptr))
return element_type.IsScalarType();
return false;
}
@ -1111,7 +1111,7 @@ ClangASTType::IsCXXClassType () const
return false;
QualType qual_type (GetCanonicalQualType());
if (qual_type->getAsCXXRecordDecl() != NULL)
if (qual_type->getAsCXXRecordDecl() != nullptr)
return true;
return false;
}
@ -1144,7 +1144,7 @@ ClangASTType::IsObjCObjectPointerType (ClangASTType *class_type_ptr)
!qual_type->isObjCIdType())
{
const ObjCObjectPointerType *obj_pointer_type = dyn_cast<ObjCObjectPointerType>(qual_type);
if (obj_pointer_type == NULL)
if (obj_pointer_type == nullptr)
class_type_ptr->Clear();
else
class_type_ptr->SetClangType (m_ast, QualType(obj_pointer_type->getInterfaceType(), 0));
@ -1438,7 +1438,7 @@ ClangASTType::GetMinimumLanguage ()
return lldb::eLanguageTypeObjC;
QualType pointee_type (qual_type->getPointeeType());
if (pointee_type->getPointeeCXXRecordDecl() != NULL)
if (pointee_type->getPointeeCXXRecordDecl() != nullptr)
return lldb::eLanguageTypeC_plus_plus;
if (pointee_type->isObjCObjectOrInterfaceType())
return lldb::eLanguageTypeObjC;
@ -1772,7 +1772,7 @@ ClangASTType::CreateTypedefType (const char *typedef_name,
if (IsValid() && typedef_name && typedef_name[0])
{
QualType qual_type (GetQualType());
if (decl_ctx == NULL)
if (decl_ctx == nullptr)
decl_ctx = m_ast->getTranslationUnitDecl();
TypedefDecl *decl = TypedefDecl::Create (*m_ast,
decl_ctx,
@ -2810,7 +2810,7 @@ GetObjCFieldAtIndex (clang::ASTContext *ast,
}
}
}
return NULL;
return nullptr;
}
ClangASTType
@ -3123,7 +3123,7 @@ ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
base_class != base_class_end;
++base_class)
{
const CXXRecordDecl *base_class_decl = NULL;
const CXXRecordDecl *base_class_decl = nullptr;
// Skip empty base classes
if (omit_empty_base_classes)
@ -3135,7 +3135,7 @@ ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
if (idx == child_idx)
{
if (base_class_decl == NULL)
if (base_class_decl == nullptr)
base_class_decl = cast<CXXRecordDecl>(base_class->getType()->getAs<RecordType>()->getDecl());
@ -3262,13 +3262,13 @@ ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
// the changing size of base classes that are newer than this class.
// So if we have a process around that we can ask about this object, do so.
child_byte_offset = LLDB_INVALID_IVAR_OFFSET;
Process *process = NULL;
Process *process = nullptr;
if (exe_ctx)
process = exe_ctx->GetProcessPtr();
if (process)
{
ObjCLanguageRuntime *objc_runtime = process->GetObjCLanguageRuntime();
if (objc_runtime != NULL)
if (objc_runtime != nullptr)
{
ClangASTType parent_ast_type (m_ast, parent_qual_type);
child_byte_offset = objc_runtime->GetByteOffsetForIvar (parent_ast_type, ivar_decl->getNameAsString().c_str());
@ -4233,13 +4233,13 @@ ClangASTType::GetTemplateArgument (size_t arg_idx, lldb::TemplateArgumentKind &k
static bool
IsOperator (const char *name, OverloadedOperatorKind &op_kind)
{
if (name == NULL || name[0] == '\0')
if (name == nullptr || name[0] == '\0')
return false;
#define OPERATOR_PREFIX "operator"
#define OPERATOR_PREFIX_LENGTH (sizeof (OPERATOR_PREFIX) - 1)
const char *post_op_name = NULL;
const char *post_op_name = nullptr;
bool no_space = true;
@ -4452,7 +4452,7 @@ ClangASTType::GetAsRecordDecl () const
const RecordType *record_type = dyn_cast<RecordType>(GetCanonicalQualType());
if (record_type)
return record_type->getDecl();
return NULL;
return nullptr;
}
clang::CXXRecordDecl *
@ -4467,7 +4467,7 @@ ClangASTType::GetAsObjCInterfaceDecl () const
const ObjCObjectType *objc_class_type = dyn_cast<ObjCObjectType>(GetCanonicalQualType());
if (objc_class_type)
return objc_class_type->getInterface();
return NULL;
return nullptr;
}
clang::FieldDecl *
@ -4477,11 +4477,11 @@ ClangASTType::AddFieldToRecordType (const char *name,
uint32_t bitfield_bit_size)
{
if (!IsValid() || !field_clang_type.IsValid())
return NULL;
return nullptr;
FieldDecl *field = NULL;
FieldDecl *field = nullptr;
clang::Expr *bit_width = NULL;
clang::Expr *bit_width = nullptr;
if (bitfield_bit_size != 0)
{
APInt bitfield_bit_size_apint(m_ast->getTypeSize(m_ast->IntTy), bitfield_bit_size);
@ -4495,9 +4495,9 @@ ClangASTType::AddFieldToRecordType (const char *name,
record_decl,
SourceLocation(),
SourceLocation(),
name ? &m_ast->Idents.get(name) : NULL, // Identifier
name ? &m_ast->Idents.get(name) : nullptr, // Identifier
field_clang_type.GetQualType(), // Field type
NULL, // TInfo *
nullptr, // TInfo *
bit_width, // BitWidth
false, // Mutable
ICIS_NoInit); // HasInit
@ -4541,9 +4541,9 @@ ClangASTType::AddFieldToRecordType (const char *name,
class_interface_decl,
SourceLocation(),
SourceLocation(),
name ? &m_ast->Idents.get(name) : NULL, // Identifier
name ? &m_ast->Idents.get(name) : nullptr, // Identifier
field_clang_type.GetQualType(), // Field type
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
ConvertAccessTypeToObjCIvarAccessControl (access),
bit_width,
is_synthesized);
@ -4671,10 +4671,10 @@ ClangASTType::AddVariableToRecordType (const char *name,
const ClangASTType &var_type,
AccessType access)
{
clang::VarDecl *var_decl = NULL;
clang::VarDecl *var_decl = nullptr;
if (!IsValid() || !var_type.IsValid())
return NULL;
return nullptr;
RecordDecl *record_decl = GetAsRecordDecl ();
if (record_decl)
@ -4683,9 +4683,9 @@ ClangASTType::AddVariableToRecordType (const char *name,
record_decl, // DeclContext *
SourceLocation(), // SourceLocation StartLoc
SourceLocation(), // SourceLocation IdLoc
name ? &m_ast->Idents.get(name) : NULL, // IdentifierInfo *
name ? &m_ast->Idents.get(name) : nullptr, // IdentifierInfo *
var_type.GetQualType(), // Variable QualType
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
SC_Static); // StorageClass
if (var_decl)
{
@ -4712,39 +4712,39 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
bool is_attr_used,
bool is_artificial)
{
if (!IsValid() || !method_clang_type.IsValid() || name == NULL || name[0] == '\0')
return NULL;
if (!IsValid() || !method_clang_type.IsValid() || name == nullptr || name[0] == '\0')
return nullptr;
QualType record_qual_type(GetCanonicalQualType());
CXXRecordDecl *cxx_record_decl = record_qual_type->getAsCXXRecordDecl();
if (cxx_record_decl == NULL)
return NULL;
if (cxx_record_decl == nullptr)
return nullptr;
QualType method_qual_type (method_clang_type.GetQualType());
CXXMethodDecl *cxx_method_decl = NULL;
CXXMethodDecl *cxx_method_decl = nullptr;
DeclarationName decl_name (&m_ast->Idents.get(name));
const clang::FunctionType *function_type = dyn_cast<FunctionType>(method_qual_type.getTypePtr());
if (function_type == NULL)
return NULL;
if (function_type == nullptr)
return nullptr;
const FunctionProtoType *method_function_prototype (dyn_cast<FunctionProtoType>(function_type));
if (!method_function_prototype)
return NULL;
return nullptr;
unsigned int num_params = method_function_prototype->getNumParams();
CXXDestructorDecl *cxx_dtor_decl(NULL);
CXXConstructorDecl *cxx_ctor_decl(NULL);
CXXDestructorDecl *cxx_dtor_decl(nullptr);
CXXConstructorDecl *cxx_ctor_decl(nullptr);
if (is_artificial)
return NULL; // skip everything artificial
return nullptr; // skip everything artificial
if (name[0] == '~')
{
@ -4753,7 +4753,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
SourceLocation(),
DeclarationNameInfo (m_ast->DeclarationNames.getCXXDestructorName (m_ast->getCanonicalType (record_qual_type)), SourceLocation()),
method_qual_type,
NULL,
nullptr,
is_inline,
is_artificial);
cxx_method_decl = cxx_dtor_decl;
@ -4765,7 +4765,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
SourceLocation(),
DeclarationNameInfo (m_ast->DeclarationNames.getCXXConstructorName (m_ast->getCanonicalType (record_qual_type)), SourceLocation()),
method_qual_type,
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
is_explicit,
is_inline,
is_artificial,
@ -4787,13 +4787,13 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
// will assert and crash, so we need to make sure things are
// acceptable.
if (!ClangASTContext::CheckOverloadedOperatorKindParameterCount (op_kind, num_params))
return NULL;
return nullptr;
cxx_method_decl = CXXMethodDecl::Create (*m_ast,
cxx_record_decl,
SourceLocation(),
DeclarationNameInfo (m_ast->DeclarationNames.getCXXOperatorName (op_kind), SourceLocation()),
method_qual_type,
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
SC,
is_inline,
false /*is_constexpr*/,
@ -4807,7 +4807,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
SourceLocation(),
DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getReturnType())), SourceLocation()),
method_qual_type,
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
is_inline,
is_explicit,
false /*is_constexpr*/,
@ -4815,14 +4815,14 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
}
}
if (cxx_method_decl == NULL)
if (cxx_method_decl == nullptr)
{
cxx_method_decl = CXXMethodDecl::Create (*m_ast,
cxx_record_decl,
SourceLocation(),
DeclarationNameInfo (decl_name, SourceLocation()),
method_qual_type,
NULL, // TypeSourceInfo *
nullptr, // TypeSourceInfo *
SC,
is_inline,
false /*is_constexpr*/,
@ -4850,11 +4850,11 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
cxx_method_decl,
SourceLocation(),
SourceLocation(),
NULL, // anonymous
nullptr, // anonymous
method_function_prototype->getParamType(param_index),
NULL,
nullptr,
SC_None,
NULL));
nullptr));
}
cxx_method_decl->setParams (ArrayRef<ParmVarDecl*>(params));
@ -4923,7 +4923,7 @@ ClangASTType::CreateBaseClassSpecifier (AccessType access, bool is_virtual, bool
ClangASTContext::ConvertAccessTypeToAccessSpecifier (access),
m_ast->getTrivialTypeSourceInfo (GetQualType()),
SourceLocation());
return NULL;
return nullptr;
}
void
@ -4932,7 +4932,7 @@ ClangASTType::DeleteBaseClassSpecifiers (CXXBaseSpecifier **base_classes, unsign
for (unsigned i=0; i<num_base_classes; ++i)
{
delete base_classes[i];
base_classes[i] = NULL;
base_classes[i] = nullptr;
}
}
@ -4977,7 +4977,7 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
uint32_t property_attributes,
ClangASTMetadata *metadata)
{
if (!IsValid() || !property_clang_type.IsValid() || property_name == NULL || property_name[0] == '\0')
if (!IsValid() || !property_clang_type.IsValid() || property_name == nullptr || property_name[0] == '\0')
return false;
ObjCInterfaceDecl *class_interface_decl = GetAsObjCInterfaceDecl ();
@ -5016,7 +5016,7 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
Selector setter_sel, getter_sel;
if (property_setter_name != NULL)
if (property_setter_name != nullptr)
{
std::string property_setter_no_colon(property_setter_name, strlen(property_setter_name) - 1);
clang::IdentifierInfo *setter_ident = &m_ast->Idents.get(property_setter_no_colon.c_str());
@ -5033,7 +5033,7 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
property_decl->setSetterName(setter_sel);
property_decl->setPropertyAttributes (clang::ObjCPropertyDecl::OBJC_PR_setter);
if (property_getter_name != NULL)
if (property_getter_name != nullptr)
{
clang::IdentifierInfo *getter_ident = &m_ast->Idents.get(property_getter_name);
getter_sel = m_ast->Selectors.getSelector(0, &getter_ident);
@ -5077,7 +5077,7 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
SourceLocation(),
getter_sel,
property_clang_type_to_access.GetQualType(),
NULL,
nullptr,
class_interface_decl,
isInstance,
isVariadic,
@ -5112,7 +5112,7 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
SourceLocation(),
setter_sel,
result_type,
NULL,
nullptr,
class_interface_decl,
isInstance,
isVariadic,
@ -5131,11 +5131,11 @@ ClangASTType::AddObjCClassProperty (const char *property_name,
setter,
SourceLocation(),
SourceLocation(),
NULL, // anonymous
nullptr, // anonymous
property_clang_type_to_access.GetQualType(),
NULL,
nullptr,
SC_Auto,
NULL));
nullptr));
setter->setMethodParams(*m_ast, ArrayRef<ParmVarDecl*>(params), ArrayRef<SourceLocation>());
@ -5166,16 +5166,16 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
bool is_artificial)
{
if (!IsValid() || !method_clang_type.IsValid())
return NULL;
return nullptr;
ObjCInterfaceDecl *class_interface_decl = GetAsObjCInterfaceDecl();
if (class_interface_decl == NULL)
return NULL;
if (class_interface_decl == nullptr)
return nullptr;
const char *selector_start = ::strchr (name, ' ');
if (selector_start == NULL)
return NULL;
if (selector_start == nullptr)
return nullptr;
selector_start++;
llvm::SmallVector<IdentifierInfo *, 12> selector_idents;
@ -5200,7 +5200,7 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
if (selector_idents.size() == 0)
return 0;
return nullptr;
clang::Selector method_selector = m_ast->Selectors.getSelector (num_selectors_with_args ? selector_idents.size() : 0,
selector_idents.data());
@ -5210,13 +5210,13 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
// Populate the method decl with parameter decls
const clang::Type *method_type(method_qual_type.getTypePtr());
if (method_type == NULL)
return NULL;
if (method_type == nullptr)
return nullptr;
const FunctionProtoType *method_function_prototype (dyn_cast<FunctionProtoType>(method_type));
if (!method_function_prototype)
return NULL;
return nullptr;
bool is_variadic = false;
@ -5227,14 +5227,14 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
const unsigned num_args = method_function_prototype->getNumParams();
if (num_args != num_selectors_with_args)
return NULL; // some debug information is corrupt. We are not going to deal with it.
return nullptr; // some debug information is corrupt. We are not going to deal with it.
ObjCMethodDecl *objc_method_decl = ObjCMethodDecl::Create (*m_ast,
SourceLocation(), // beginLoc,
SourceLocation(), // endLoc,
method_selector,
method_function_prototype->getReturnType(),
NULL, // TypeSourceInfo *ResultTInfo,
nullptr, // TypeSourceInfo *ResultTInfo,
GetDeclContextForType (),
name[0] == '-',
is_variadic,
@ -5245,8 +5245,8 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
false /*has_related_result_type*/);
if (objc_method_decl == NULL)
return NULL;
if (objc_method_decl == nullptr)
return nullptr;
if (num_args > 0)
{
@ -5258,11 +5258,11 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
objc_method_decl,
SourceLocation(),
SourceLocation(),
NULL, // anonymous
nullptr, // anonymous
method_function_prototype->getParamType(param_index),
NULL,
nullptr,
SC_Auto,
NULL));
nullptr));
}
objc_method_decl->setMethodParams(*m_ast, ArrayRef<ParmVarDecl*>(params), ArrayRef<SourceLocation>());
@ -5282,7 +5282,7 @@ clang::DeclContext *
ClangASTType::GetDeclContextForType () const
{
if (!IsValid())
return NULL;
return nullptr;
QualType qual_type(GetCanonicalQualType());
const clang::Type::TypeClass type_class = qual_type->getTypeClass();
@ -5334,7 +5334,7 @@ ClangASTType::GetDeclContextForType () const
case clang::Type::Decayed: break;
}
// No DeclContext in this type...
return NULL;
return nullptr;
}
bool
@ -5577,9 +5577,9 @@ ClangASTType::AddEnumerationValueToEnumerationType (const ClangASTType &enumerat
EnumConstantDecl::Create (*m_ast,
enum_type->getDecl(),
SourceLocation(),
name ? &m_ast->Idents.get(name) : NULL, // Identifier
name ? &m_ast->Idents.get(name) : nullptr, // Identifier
enumerator_clang_type.GetQualType(),
NULL,
nullptr,
enum_llvm_apsint);
if (enumerator_decl)
@ -6561,19 +6561,19 @@ ClangASTType::ReadFromMemory (lldb_private::ExecutionContext *exe_ctx,
}
uint8_t* dst = (uint8_t*)data.PeekData(0, byte_size);
if (dst != NULL)
if (dst != nullptr)
{
if (address_type == eAddressTypeHost)
{
if (addr == 0)
return false;
// The address is an address in this process, so just copy it
memcpy (dst, (uint8_t*)NULL + addr, byte_size);
memcpy (dst, (uint8_t*)nullptr + addr, byte_size);
return true;
}
else
{
Process *process = NULL;
Process *process = nullptr;
if (exe_ctx)
process = exe_ctx->GetProcessPtr();
if (process)
@ -6615,7 +6615,7 @@ ClangASTType::WriteToMemory (lldb_private::ExecutionContext *exe_ctx,
}
else
{
Process *process = NULL;
Process *process = nullptr;
if (exe_ctx)
process = exe_ctx->GetProcessPtr();
if (process)

2
lldb/source/Symbol/ClangExternalASTSourceCommon.cpp
View File

@ -36,7 +36,7 @@ ClangExternalASTSourceCommon::GetMetadata (const void *object)
if (HasMetadata (object))
return &m_metadata[object];
else
return NULL;
return nullptr;
}
void

8
lldb/source/Symbol/CompileUnit.cpp
View File

@ -237,7 +237,7 @@ CompileUnit::GetLanguage()
LineTable*
CompileUnit::GetLineTable()
{
if (m_line_table_ap.get() == NULL)
if (m_line_table_ap.get() == nullptr)
{
if (m_flags.IsClear(flagsParsedLineTable))
{
@ -257,7 +257,7 @@ CompileUnit::GetLineTable()
void
CompileUnit::SetLineTable(LineTable* line_table)
{
if (line_table == NULL)
if (line_table == nullptr)
m_flags.Clear(flagsParsedLineTable);
else
m_flags.Set(flagsParsedLineTable);
@ -267,7 +267,7 @@ CompileUnit::SetLineTable(LineTable* line_table)
VariableListSP
CompileUnit::GetVariableList(bool can_create)
{
if (m_variables.get() == NULL && can_create)
if (m_variables.get() == nullptr && can_create)
{
SymbolContext sc;
CalculateSymbolContext(&sc);
@ -353,7 +353,7 @@ CompileUnit::ResolveSymbolContext
{
LineTable *line_table = sc.comp_unit->GetLineTable();
if (line_table != NULL)
if (line_table != nullptr)
{
uint32_t found_line;
uint32_t line_idx;

20
lldb/source/Symbol/DWARFCallFrameInfo.cpp
View File

@ -55,7 +55,7 @@ DWARFCallFrameInfo::GetUnwindPlan (Address addr, UnwindPlan& unwind_plan)
// Make sure that the Address we're searching for is the same object file
// as this DWARFCallFrameInfo, we only store File offsets in m_fde_index.
ModuleSP module_sp = addr.GetModule();
if (module_sp.get() == NULL || module_sp->GetObjectFile() == NULL || module_sp->GetObjectFile() != &m_objfile)
if (module_sp.get() == nullptr || module_sp->GetObjectFile() == nullptr || module_sp->GetObjectFile() != &m_objfile)
return false;
if (GetFDEEntryByFileAddress (addr.GetFileAddress(), fde_entry) == false)
@ -70,10 +70,10 @@ DWARFCallFrameInfo::GetAddressRange (Address addr, AddressRange &range)
// Make sure that the Address we're searching for is the same object file
// as this DWARFCallFrameInfo, we only store File offsets in m_fde_index.
ModuleSP module_sp = addr.GetModule();
if (module_sp.get() == NULL || module_sp->GetObjectFile() == NULL || module_sp->GetObjectFile() != &m_objfile)
if (module_sp.get() == nullptr || module_sp->GetObjectFile() == nullptr || module_sp->GetObjectFile() != &m_objfile)
return false;
if (m_section_sp.get() == NULL || m_section_sp->IsEncrypted())
if (m_section_sp.get() == nullptr || m_section_sp->IsEncrypted())
return false;
GetFDEIndex();
FDEEntryMap::Entry *fde_entry = m_fde_index.FindEntryThatContains (addr.GetFileAddress());
@ -87,7 +87,7 @@ DWARFCallFrameInfo::GetAddressRange (Address addr, AddressRange &range)
bool
DWARFCallFrameInfo::GetFDEEntryByFileAddress (addr_t file_addr, FDEEntryMap::Entry &fde_entry)
{
if (m_section_sp.get() == NULL || m_section_sp->IsEncrypted())
if (m_section_sp.get() == nullptr || m_section_sp->IsEncrypted())
return false;
GetFDEIndex();
@ -97,7 +97,7 @@ DWARFCallFrameInfo::GetFDEEntryByFileAddress (addr_t file_addr, FDEEntryMap::Ent
FDEEntryMap::Entry *fde = m_fde_index.FindEntryThatContains (file_addr);
if (fde == NULL)
if (fde == nullptr)
return false;
fde_entry = *fde;
@ -131,12 +131,12 @@ DWARFCallFrameInfo::GetCIE(dw_offset_t cie_offset)
if (pos != m_cie_map.end())
{
// Parse and cache the CIE
if (pos->second.get() == NULL)
if (pos->second.get() == nullptr)
pos->second = ParseCIE (cie_offset);
return pos->second.get();
}
return NULL;
return nullptr;
}
DWARFCallFrameInfo::CIESP
@ -318,7 +318,7 @@ DWARFCallFrameInfo::GetCFIData()
void
DWARFCallFrameInfo::GetFDEIndex ()
{
if (m_section_sp.get() == NULL || m_section_sp->IsEncrypted())
if (m_section_sp.get() == nullptr || m_section_sp->IsEncrypted())
return;
if (m_fde_index_initialized)
@ -381,7 +381,7 @@ DWARFCallFrameInfo::FDEToUnwindPlan (dw_offset_t dwarf_offset, Address startaddr
lldb::offset_t offset = dwarf_offset;
lldb::offset_t current_entry = offset;
if (m_section_sp.get() == NULL || m_section_sp->IsEncrypted())
if (m_section_sp.get() == nullptr || m_section_sp->IsEncrypted())
return false;
if (m_cfi_data_initialized == false)
@ -413,7 +413,7 @@ DWARFCallFrameInfo::FDEToUnwindPlan (dw_offset_t dwarf_offset, Address startaddr
unwind_plan.SetSourcedFromCompiler (eLazyBoolYes);
const CIE *cie = GetCIE (cie_offset);
assert (cie != NULL);
assert (cie != nullptr);
const dw_offset_t end_offset = current_entry + length + 4;

10
lldb/source/Symbol/FuncUnwinders.cpp
View File

@ -68,7 +68,7 @@ FuncUnwinders::GetUnwindPlanAtCallSite (int current_offset)
// if (best_unwind_plan == NULL)
// best_unwind_plan = GetUnwindPlanAtNonCallSite (...)
Mutex::Locker locker (m_mutex);
if (m_tried_unwind_at_call_site == false && m_unwind_plan_call_site_sp.get() == NULL)
if (m_tried_unwind_at_call_site == false && m_unwind_plan_call_site_sp.get() == nullptr)
{
m_tried_unwind_at_call_site = true;
// We have cases (e.g. with _sigtramp on Mac OS X) where the hand-written eh_frame unwind info for a
@ -111,7 +111,7 @@ FuncUnwinders::GetUnwindPlanAtNonCallSite (Thread& thread)
// if (best_unwind_plan == NULL)
// best_unwind_plan = GetUnwindPlanAtNonCallSite (...)
Mutex::Locker locker (m_mutex);
if (m_tried_unwind_at_non_call_site == false && m_unwind_plan_non_call_site_sp.get() == NULL)
if (m_tried_unwind_at_non_call_site == false && m_unwind_plan_non_call_site_sp.get() == nullptr)
{
m_tried_unwind_at_non_call_site = true;
if (m_assembly_profiler)
@ -140,7 +140,7 @@ FuncUnwinders::GetUnwindPlanFastUnwind (Thread& thread)
// if (best_unwind_plan == NULL)
// best_unwind_plan = GetUnwindPlanAtNonCallSite (...)
Mutex::Locker locker (m_mutex);
if (m_tried_unwind_fast == false && m_unwind_plan_fast_sp.get() == NULL)
if (m_tried_unwind_fast == false && m_unwind_plan_fast_sp.get() == nullptr)
{
m_tried_unwind_fast = true;
if (m_assembly_profiler)
@ -169,7 +169,7 @@ FuncUnwinders::GetUnwindPlanArchitectureDefault (Thread& thread)
// if (best_unwind_plan == NULL)
// best_unwind_plan = GetUnwindPlanAtNonCallSite (...)
Mutex::Locker locker (m_mutex);
if (m_tried_unwind_arch_default == false && m_unwind_plan_arch_default_sp.get() == NULL)
if (m_tried_unwind_arch_default == false && m_unwind_plan_arch_default_sp.get() == nullptr)
{
m_tried_unwind_arch_default = true;
Address current_pc;
@ -205,7 +205,7 @@ FuncUnwinders::GetUnwindPlanArchitectureDefaultAtFunctionEntry (Thread& thread)
// if (best_unwind_plan == NULL)
// best_unwind_plan = GetUnwindPlanAtNonCallSite (...)
Mutex::Locker locker (m_mutex);
if (m_tried_unwind_arch_default_at_func_entry == false && m_unwind_plan_arch_default_at_func_entry_sp.get() == NULL)
if (m_tried_unwind_arch_default_at_func_entry == false && m_unwind_plan_arch_default_at_func_entry_sp.get() == nullptr)
{
m_tried_unwind_arch_default_at_func_entry = true;
Address current_pc;

36
lldb/source/Symbol/Function.cpp
View File

@ -215,7 +215,7 @@ Function::Function
m_prologue_byte_size (0)
{
m_block.SetParentScope(this);
assert(comp_unit != NULL);
assert(comp_unit != nullptr);
}
Function::Function
@ -239,7 +239,7 @@ Function::Function
m_prologue_byte_size (0)
{
m_block.SetParentScope(this);
assert(comp_unit != NULL);
assert(comp_unit != nullptr);
}
@ -253,10 +253,10 @@ Function::GetStartLineSourceInfo (FileSpec &source_file, uint32_t &line_no)
line_no = 0;
source_file.Clear();
if (m_comp_unit == NULL)
if (m_comp_unit == nullptr)
return;
if (m_type != NULL && m_type->GetDeclaration().GetLine() != 0)
if (m_type != nullptr && m_type->GetDeclaration().GetLine() != 0)
{
source_file = m_type->GetDeclaration().GetFile();
line_no = m_type->GetDeclaration().GetLine();
@ -264,11 +264,11 @@ Function::GetStartLineSourceInfo (FileSpec &source_file, uint32_t &line_no)
else
{
LineTable *line_table = m_comp_unit->GetLineTable();
if (line_table == NULL)
if (line_table == nullptr)
return;
LineEntry line_entry;
if (line_table->FindLineEntryByAddress (GetAddressRange().GetBaseAddress(), line_entry, NULL))
if (line_table->FindLineEntryByAddress (GetAddressRange().GetBaseAddress(), line_entry, nullptr))
{
line_no = line_entry.line;
source_file = line_entry.file;
@ -288,11 +288,11 @@ Function::GetEndLineSourceInfo (FileSpec &source_file, uint32_t &line_no)
scratch_addr.SetOffset (scratch_addr.GetOffset() + GetAddressRange().GetByteSize() - 1);
LineTable *line_table = m_comp_unit->GetLineTable();
if (line_table == NULL)
if (line_table == nullptr)
return;
LineEntry line_entry;
if (line_table->FindLineEntryByAddress (scratch_addr, line_entry, NULL))
if (line_table->FindLineEntryByAddress (scratch_addr, line_entry, nullptr))
{
line_no = line_entry.line;
source_file = line_entry.file;
@ -411,7 +411,7 @@ Function::GetInstructions (const ExecutionContext &exe_ctx,
{
const bool prefer_file_cache = false;
return Disassembler::DisassembleRange (module_sp->GetArchitecture(),
NULL,
nullptr,
flavor,
exe_ctx,
GetAddressRange(),
@ -467,17 +467,17 @@ Function::GetClangDeclContext()
CalculateSymbolContext (&sc);
if (!sc.module_sp)
return NULL;
return nullptr;
SymbolVendor *sym_vendor = sc.module_sp->GetSymbolVendor();
if (!sym_vendor)
return NULL;
return nullptr;
SymbolFile *sym_file = sym_vendor->GetSymbolFile();
if (!sym_file)
return NULL;
return nullptr;
return sym_file->GetClangDeclContextForTypeUID (sc, m_uid);
}
@ -485,24 +485,24 @@ Function::GetClangDeclContext()
Type*
Function::GetType()
{
if (m_type == NULL)
if (m_type == nullptr)
{
SymbolContext sc;
CalculateSymbolContext (&sc);
if (!sc.module_sp)
return NULL;
return nullptr;
SymbolVendor *sym_vendor = sc.module_sp->GetSymbolVendor();
if (sym_vendor == NULL)
return NULL;
if (sym_vendor == nullptr)
return nullptr;
SymbolFile *sym_file = sym_vendor->GetSymbolFile();
if (sym_file == NULL)
return NULL;
if (sym_file == nullptr)
return nullptr;
m_type = sym_file->ResolveTypeUID(m_type_uid);
}

18
lldb/source/Symbol/LineTable.cpp
View File

@ -93,7 +93,7 @@ LineTable::AppendLineEntryToSequence
bool is_terminal_entry
)
{
assert(sequence != NULL);
assert(sequence != nullptr);
LineSequenceImpl* seq = reinterpret_cast<LineSequenceImpl*>(sequence);
Entry entry(file_addr, line, column, file_idx, is_start_of_statement, is_start_of_basic_block, is_prologue_end, is_epilogue_begin, is_terminal_entry);
seq->m_entries.push_back (entry);
@ -102,7 +102,7 @@ LineTable::AppendLineEntryToSequence
void
LineTable::InsertSequence (LineSequence* sequence)
{
assert(sequence != NULL);
assert(sequence != nullptr);
LineSequenceImpl* seq = reinterpret_cast<LineSequenceImpl*>(sequence);
if (seq->m_entries.empty())
return;
@ -183,7 +183,7 @@ LineTable::GetLineEntryAtIndex(uint32_t idx, LineEntry& line_entry)
bool
LineTable::FindLineEntryByAddress (const Address &so_addr, LineEntry& line_entry, uint32_t *index_ptr)
{
if (index_ptr != NULL )
if (index_ptr != nullptr )
*index_ptr = UINT32_MAX;
bool success = false;
@ -247,7 +247,7 @@ LineTable::FindLineEntryByAddress (const Address &so_addr, LineEntry& line_entry
{
uint32_t match_idx = std::distance (begin_pos, pos);
success = ConvertEntryAtIndexToLineEntry(match_idx, line_entry);
if (index_ptr != NULL && success)
if (index_ptr != nullptr && success)
*index_ptr = match_idx;
}
}
@ -493,8 +493,8 @@ LineTable::LinkLineTable (const FileRangeMap &file_range_map)
LineSequenceImpl sequence;
const size_t count = m_entries.size();
LineEntry line_entry;
const FileRangeMap::Entry *file_range_entry = NULL;
const FileRangeMap::Entry *prev_file_range_entry = NULL;
const FileRangeMap::Entry *file_range_entry = nullptr;
const FileRangeMap::Entry *prev_file_range_entry = nullptr;
lldb::addr_t prev_file_addr = LLDB_INVALID_ADDRESS;
bool prev_entry_was_linked = false;
bool range_changed = false;
@ -504,7 +504,7 @@ LineTable::LinkLineTable (const FileRangeMap &file_range_map)
const bool end_sequence = entry.is_terminal_entry;
const lldb::addr_t lookup_file_addr = entry.file_addr - (end_sequence ? 1 : 0);
if (file_range_entry == NULL || !file_range_entry->Contains(lookup_file_addr))
if (file_range_entry == nullptr || !file_range_entry->Contains(lookup_file_addr))
{
prev_file_range_entry = file_range_entry;
file_range_entry = file_range_map.FindEntryThatContains(lookup_file_addr);
@ -573,13 +573,13 @@ LineTable::LinkLineTable (const FileRangeMap &file_range_map)
}
else
{
prev_entry_was_linked = file_range_entry != NULL;
prev_entry_was_linked = file_range_entry != nullptr;
}
prev_file_addr = entry.file_addr;
range_changed = false;
}
if (line_table_ap->m_entries.empty())
return NULL;
return nullptr;
return line_table_ap.release();
}

16
lldb/source/Symbol/ObjectFile.cpp
View File

@ -59,7 +59,7 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp,
// first
if (file_exists && module_sp->GetObjectName())
{
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
std::unique_ptr<ObjectContainer> object_container_ap(create_object_container_callback(module_sp, data_sp, data_offset, file, file_offset, file_size));
@ -101,7 +101,7 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp,
// from the container plugins since we had a name. Also, don't read
// ANY data in case there is data cached in the container plug-ins
// (like BSD archives caching the contained objects within an file).
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
std::unique_ptr<ObjectContainer> object_container_ap(create_object_container_callback(module_sp, data_sp, data_offset, file, file_offset, file_size));
@ -123,7 +123,7 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp,
// Check if this is a normal object file by iterating through
// all object file plugin instances.
ObjectFileCreateInstance create_object_file_callback;
for (uint32_t idx = 0; (create_object_file_callback = PluginManager::GetObjectFileCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (uint32_t idx = 0; (create_object_file_callback = PluginManager::GetObjectFileCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
object_file_sp.reset (create_object_file_callback(module_sp, data_sp, data_offset, file, file_offset, file_size));
if (object_file_sp.get())
@ -133,7 +133,7 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp,
// Check if this is a object container by iterating through
// all object container plugin instances and then trying to get
// an object file from the container.
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (uint32_t idx = 0; (create_object_container_callback = PluginManager::GetObjectContainerCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
std::unique_ptr<ObjectContainer> object_container_ap(create_object_container_callback(module_sp, data_sp, data_offset, file, file_offset, file_size));
@ -171,7 +171,7 @@ ObjectFile::FindPlugin (const lldb::ModuleSP &module_sp,
// Check if this is a normal object file by iterating through
// all object file plugin instances.
ObjectFileCreateMemoryInstance create_callback;
for (idx = 0; (create_callback = PluginManager::GetObjectFileCreateMemoryCallbackAtIndex(idx)) != NULL; ++idx)
for (idx = 0; (create_callback = PluginManager::GetObjectFileCreateMemoryCallbackAtIndex(idx)) != nullptr; ++idx)
{
object_file_sp.reset (create_callback(module_sp, data_sp, process_sp, header_addr));
if (object_file_sp.get())
@ -222,14 +222,14 @@ ObjectFile::GetModuleSpecifications (const lldb_private::FileSpec& file,
ObjectFileGetModuleSpecifications callback;
uint32_t i;
// Try the ObjectFile plug-ins
for (i = 0; (callback = PluginManager::GetObjectFileGetModuleSpecificationsCallbackAtIndex(i)) != NULL; ++i)
for (i = 0; (callback = PluginManager::GetObjectFileGetModuleSpecificationsCallbackAtIndex(i)) != nullptr; ++i)
{
if (callback (file, data_sp, data_offset, file_offset, file_size, specs) > 0)
return specs.GetSize() - initial_count;
}
// Try the ObjectContainer plug-ins
for (i = 0; (callback = PluginManager::GetObjectContainerGetModuleSpecificationsCallbackAtIndex(i)) != NULL; ++i)
for (i = 0; (callback = PluginManager::GetObjectContainerGetModuleSpecificationsCallbackAtIndex(i)) != nullptr; ++i)
{
if (callback (file, data_sp, data_offset, file_offset, file_size, specs) > 0)
return specs.GetSize() - initial_count;
@ -601,7 +601,7 @@ ObjectFile::ClearSymtab ()
SectionList *
ObjectFile::GetSectionList()
{
if (m_sections_ap.get() == NULL)
if (m_sections_ap.get() == nullptr)
{
ModuleSP module_sp(GetModule());
if (module_sp)

8
lldb/source/Symbol/Symbol.cpp
View File

@ -174,7 +174,7 @@ Symbol::Clear()
bool
Symbol::ValueIsAddress() const
{
return m_addr_range.GetBaseAddress().GetSection().get() != NULL;
return m_addr_range.GetBaseAddress().GetSection().get() != nullptr;
}
ConstString
@ -312,7 +312,7 @@ Symbol::Dump(Stream *s, Target *target, uint32_t index) const
if (ValueIsAddress())
{
if (!m_addr_range.GetBaseAddress().Dump(s, NULL, Address::DumpStyleFileAddress))
if (!m_addr_range.GetBaseAddress().Dump(s, nullptr, Address::DumpStyleFileAddress))
s->Printf("%*s", 18, "");
s->PutChar(' ');
@ -578,7 +578,7 @@ Symbol::ResolveReExportedSymbol (Target &target)
}
}
}
return NULL;
return nullptr;
}
@ -592,7 +592,7 @@ Symbol::GetInstructions (const ExecutionContext &exe_ctx,
{
const bool prefer_file_cache = false;
return Disassembler::DisassembleRange (module_sp->GetArchitecture(),
NULL,
nullptr,
flavor,
exe_ctx,
m_addr_range,

96
lldb/source/Symbol/SymbolContext.cpp
View File

@ -29,11 +29,11 @@ using namespace lldb_private;
SymbolContext::SymbolContext() :
target_sp (),
module_sp (),
comp_unit (NULL),
function (NULL),
block (NULL),
comp_unit (nullptr),
function (nullptr),
block (nullptr),
line_entry (),
symbol (NULL)
symbol (nullptr)
{
}
@ -78,11 +78,11 @@ SymbolContext::SymbolContext(const SymbolContext& rhs) :
SymbolContext::SymbolContext (SymbolContextScope *sc_scope) :
target_sp (),
module_sp (),
comp_unit (NULL),
function (NULL),
block (NULL),
comp_unit (nullptr),
function (nullptr),
block (nullptr),
line_entry (),
symbol (NULL)
symbol (nullptr)
{
sc_scope->CalculateSymbolContext (this);
}
@ -113,11 +113,11 @@ SymbolContext::Clear(bool clear_target)
if (clear_target)
target_sp.reset();
module_sp.reset();
comp_unit = NULL;
function = NULL;
block = NULL;
comp_unit = nullptr;
function = nullptr;
block = nullptr;
line_entry.Clear();
symbol = NULL;
symbol = nullptr;
}
bool
@ -142,7 +142,7 @@ SymbolContext::DumpStopContext
dumped_something = true;
}
if (function != NULL)
if (function != nullptr)
{
SymbolContext inline_parent_sc;
Address inline_parent_addr;
@ -202,7 +202,7 @@ SymbolContext::DumpStopContext
}
}
}
else if (symbol != NULL)
else if (symbol != nullptr)
{
if (symbol->GetMangled().GetName())
{
@ -243,14 +243,14 @@ SymbolContext::GetDescription(Stream *s, lldb::DescriptionLevel level, Target *t
s->EOL();
}
if (comp_unit != NULL)
if (comp_unit != nullptr)
{
s->Indent("CompileUnit: ");
comp_unit->GetDescription (s, level);
s->EOL();
}
if (function != NULL)
if (function != nullptr)
{
s->Indent(" Function: ");
function->GetDescription (s, level, target);
@ -265,7 +265,7 @@ SymbolContext::GetDescription(Stream *s, lldb::DescriptionLevel level, Target *t
}
}
if (block != NULL)
if (block != nullptr)
{
std::vector<Block *> blocks;
blocks.push_back (block);
@ -297,7 +297,7 @@ SymbolContext::GetDescription(Stream *s, lldb::DescriptionLevel level, Target *t
s->EOL();
}
if (symbol != NULL)
if (symbol != nullptr)
{
s->Indent(" Symbol: ");
symbol->GetDescription(s, level, target);
@ -335,12 +335,12 @@ SymbolContext::Dump(Stream *s, Target *target) const
s->EOL();
s->Indent();
*s << "CompileUnit = " << (void *)comp_unit;
if (comp_unit != NULL)
if (comp_unit != nullptr)
*s << " {0x" << comp_unit->GetID() << "} " << *(static_cast<FileSpec*> (comp_unit));
s->EOL();
s->Indent();
*s << "Function = " << (void *)function;
if (function != NULL)
if (function != nullptr)
{
*s << " {0x" << function->GetID() << "} " << function->GetType()->GetName() << ", address-range = ";
function->GetAddressRange().Dump(s, target, Address::DumpStyleLoadAddress, Address::DumpStyleModuleWithFileAddress);
@ -356,7 +356,7 @@ SymbolContext::Dump(Stream *s, Target *target) const
s->EOL();
s->Indent();
*s << "Block = " << (void *)block;
if (block != NULL)
if (block != nullptr)
*s << " {0x" << block->GetID() << '}';
// Dump the block and pass it a negative depth to we print all the parent blocks
//if (block != NULL)
@ -368,7 +368,7 @@ SymbolContext::Dump(Stream *s, Target *target) const
s->EOL();
s->Indent();
*s << "Symbol = " << (void *)symbol;
if (symbol != NULL && symbol->GetMangled())
if (symbol != nullptr && symbol->GetMangled())
*s << ' ' << symbol->GetMangled().GetName().AsCString();
s->EOL();
s->IndentLess();
@ -409,7 +409,7 @@ SymbolContext::GetAddressRange (uint32_t scope,
return true;
}
if ((scope & eSymbolContextBlock) && (block != NULL))
if ((scope & eSymbolContextBlock) && (block != nullptr))
{
if (use_inline_block_range)
{
@ -423,7 +423,7 @@ SymbolContext::GetAddressRange (uint32_t scope,
}
}
if ((scope & eSymbolContextFunction) && (function != NULL))
if ((scope & eSymbolContextFunction) && (function != nullptr))
{
if (range_idx == 0)
{
@ -432,7 +432,7 @@ SymbolContext::GetAddressRange (uint32_t scope,
}
}
if ((scope & eSymbolContextSymbol) && (symbol != NULL))
if ((scope & eSymbolContextSymbol) && (symbol != nullptr))
{
if (range_idx == 0)
{
@ -562,7 +562,7 @@ SymbolContext::GetFunctionBlock ()
// the function itself.
return &function->GetBlock(true);
}
return NULL;
return nullptr;
}
bool
@ -777,7 +777,7 @@ SymbolContextSpecifier::SymbolContextMatches(SymbolContext &sc)
{
if (sc.module_sp)
{
if (m_module_sp.get() != NULL)
if (m_module_sp.get() != nullptr)
{
if (m_module_sp.get() != sc.module_sp.get())
return false;
@ -795,15 +795,15 @@ SymbolContextSpecifier::SymbolContextMatches(SymbolContext &sc)
if (m_file_spec_ap.get())
{
// If we don't have a block or a comp_unit, then we aren't going to match a source file.
if (sc.block == NULL && sc.comp_unit == NULL)
if (sc.block == nullptr && sc.comp_unit == nullptr)
return false;
// Check if the block is present, and if so is it inlined:
bool was_inlined = false;
if (sc.block != NULL)
if (sc.block != nullptr)
{
const InlineFunctionInfo *inline_info = sc.block->GetInlinedFunctionInfo();
if (inline_info != NULL)
if (inline_info != nullptr)
{
was_inlined = true;
if (!FileSpec::Equal (inline_info->GetDeclaration().GetFile(), *(m_file_spec_ap.get()), false))
@ -812,7 +812,7 @@ SymbolContextSpecifier::SymbolContextMatches(SymbolContext &sc)
}
// Next check the comp unit, but only if the SymbolContext was not inlined.
if (!was_inlined && sc.comp_unit != NULL)
if (!was_inlined && sc.comp_unit != nullptr)
{
if (!FileSpec::Equal (*(sc.comp_unit), *(m_file_spec_ap.get()), false))
return false;
@ -832,10 +832,10 @@ SymbolContextSpecifier::SymbolContextMatches(SymbolContext &sc)
bool was_inlined = false;
ConstString func_name(m_function_spec.c_str());
if (sc.block != NULL)
if (sc.block != nullptr)
{
const InlineFunctionInfo *inline_info = sc.block->GetInlinedFunctionInfo();
if (inline_info != NULL)
if (inline_info != nullptr)
{
was_inlined = true;
const Mangled &name = inline_info->GetMangled();
@ -846,12 +846,12 @@ SymbolContextSpecifier::SymbolContextMatches(SymbolContext &sc)
// If it wasn't inlined, check the name in the function or symbol:
if (!was_inlined)
{
if (sc.function != NULL)
if (sc.function != nullptr)
{
if (!sc.function->GetMangled().NameMatches(func_name))
return false;
}
else if (sc.symbol != NULL)
else if (sc.symbol != nullptr)
{
if (!sc.symbol->GetMangled().NameMatches(func_name))
return false;
@ -873,7 +873,7 @@ SymbolContextSpecifier::AddressMatches(lldb::addr_t addr)
}
else
{
Address match_address (addr, NULL);
Address match_address (addr, nullptr);
SymbolContext sc;
m_target_sp->GetImages().ResolveSymbolContextForAddress(match_address, eSymbolContextEverything, sc);
return SymbolContextMatches(sc);
@ -903,7 +903,7 @@ SymbolContextSpecifier::GetDescription (Stream *s, lldb::DescriptionLevel level)
s->Printf ("Module: %s\n", m_module_spec.c_str());
}
if (m_type == eFileSpecified && m_file_spec_ap.get() != NULL)
if (m_type == eFileSpecified && m_file_spec_ap.get() != nullptr)
{
m_file_spec_ap->GetPath (path_str, PATH_MAX);
s->Indent();
@ -950,7 +950,7 @@ SymbolContextSpecifier::GetDescription (Stream *s, lldb::DescriptionLevel level)
s->Printf ("Class name: %s.\n", m_class_name.c_str());
}
if (m_type == eAddressRangeSpecified && m_address_range_ap.get() != NULL)
if (m_type == eAddressRangeSpecified && m_address_range_ap.get() != nullptr)
{
s->Indent();
s->PutCString ("Address range: ");
@ -1013,10 +1013,10 @@ SymbolContextList::AppendIfUnique (const SymbolContext& sc, bool merge_symbol_in
return false;
}
if (merge_symbol_into_function
&& sc.symbol != NULL
&& sc.comp_unit == NULL
&& sc.function == NULL
&& sc.block == NULL
&& sc.symbol != nullptr
&& sc.comp_unit == nullptr
&& sc.function == nullptr
&& sc.block == nullptr
&& sc.line_entry.IsValid() == false)
{
if (sc.symbol->ValueIsAddress())
@ -1034,7 +1034,7 @@ SymbolContextList::AppendIfUnique (const SymbolContext& sc, bool merge_symbol_in
// Do we already have a function with this symbol?
if (pos->symbol == sc.symbol)
return false;
if (pos->symbol == NULL)
if (pos->symbol == nullptr)
{
pos->symbol = sc.symbol;
return false;
@ -1053,10 +1053,10 @@ SymbolContextList::MergeSymbolContextIntoFunctionContext (const SymbolContext& s
uint32_t start_idx,
uint32_t stop_idx)
{
if (symbol_sc.symbol != NULL
&& symbol_sc.comp_unit == NULL
&& symbol_sc.function == NULL
&& symbol_sc.block == NULL
if (symbol_sc.symbol != nullptr
&& symbol_sc.comp_unit == nullptr
&& symbol_sc.function == nullptr
&& symbol_sc.block == nullptr
&& symbol_sc.line_entry.IsValid() == false)
{
if (symbol_sc.symbol->ValueIsAddress())
@ -1077,7 +1077,7 @@ SymbolContextList::MergeSymbolContextIntoFunctionContext (const SymbolContext& s
if (function_sc.symbol == symbol_sc.symbol)
return true; // Already have a symbol context with this symbol, return true
if (function_sc.symbol == NULL)
if (function_sc.symbol == nullptr)
{
// We successfully merged this symbol into an existing symbol context
m_symbol_contexts[i].symbol = symbol_sc.symbol;

6
lldb/source/Symbol/SymbolFile.cpp
View File

@ -22,7 +22,7 @@ SymbolFile*
SymbolFile::FindPlugin (ObjectFile* obj_file)
{
std::unique_ptr<SymbolFile> best_symfile_ap;
if (obj_file != NULL)
if (obj_file != nullptr)
{
// We need to test the abilities of this section list. So create what it would
@ -46,7 +46,7 @@ SymbolFile::FindPlugin (ObjectFile* obj_file)
uint32_t best_symfile_abilities = 0;
SymbolFileCreateInstance create_callback;
for (uint32_t idx = 0; (create_callback = PluginManager::GetSymbolFileCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (uint32_t idx = 0; (create_callback = PluginManager::GetSymbolFileCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
std::unique_ptr<SymbolFile> curr_symfile_ap(create_callback(obj_file));
@ -79,7 +79,7 @@ SymbolFile::GetTypeList ()
{
if (m_obj_file)
return m_obj_file->GetModule()->GetTypeList();
return NULL;
return nullptr;
}
lldb_private::ClangASTContext &

10
lldb/source/Symbol/SymbolVendor.cpp
View File

@ -37,7 +37,7 @@ SymbolVendor::FindPlugin (const lldb::ModuleSP &module_sp, lldb_private::Stream
std::unique_ptr<SymbolVendor> instance_ap;
SymbolVendorCreateInstance create_callback;
for (size_t idx = 0; (create_callback = PluginManager::GetSymbolVendorCreateCallbackAtIndex(idx)) != NULL; ++idx)
for (size_t idx = 0; (create_callback = PluginManager::GetSymbolVendorCreateCallbackAtIndex(idx)) != nullptr; ++idx)
{
instance_ap.reset(create_callback(module_sp, feedback_strm));
@ -109,7 +109,7 @@ SymbolVendor::SetCompileUnitAtIndex (size_t idx, const CompUnitSP &cu_sp)
// unit once, so if this assertion fails, we need to make sure that
// we don't have a race condition, or have a second parse of the same
// compile unit.
assert(m_compile_units[idx].get() == NULL);
assert(m_compile_units[idx].get() == nullptr);
m_compile_units[idx] = cu_sp;
return true;
}
@ -247,7 +247,7 @@ SymbolVendor::ResolveTypeUID(lldb::user_id_t type_uid)
if (m_sym_file_ap.get())
return m_sym_file_ap->ResolveTypeUID(type_uid);
}
return NULL;
return nullptr;
}
@ -427,7 +427,7 @@ SymbolVendor::GetCompileUnitAtIndex(size_t idx)
if (idx < num_compile_units)
{
cu_sp = m_compile_units[idx];
if (cu_sp.get() == NULL)
if (cu_sp.get() == nullptr)
{
m_compile_units[idx] = m_sym_file_ap->ParseCompileUnitAtIndex(idx);
cu_sp = m_compile_units[idx];
@ -450,7 +450,7 @@ SymbolVendor::GetSymtab ()
return objfile->GetSymtab ();
}
}
return NULL;
return nullptr;
}
void

26
lldb/source/Symbol/Symtab.cpp
View File

@ -85,7 +85,7 @@ Symtab::Dump (Stream *s, Target *target, SortOrder sort_order)
// s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
s->Indent();
const FileSpec &file_spec = m_objfile->GetFileSpec();
const char * object_name = NULL;
const char * object_name = nullptr;
if (m_objfile->GetModule())
object_name = m_objfile->GetModule()->GetObjectName().GetCString();
@ -232,7 +232,7 @@ Symtab::SymbolAtIndex(size_t idx)
// when calling this function to avoid performance issues.
if (idx < m_symbols.size())
return &m_symbols[idx];
return NULL;
return nullptr;
}
@ -243,7 +243,7 @@ Symtab::SymbolAtIndex(size_t idx) const
// when calling this function to avoid performance issues.
if (idx < m_symbols.size())
return &m_symbols[idx];
return NULL;
return nullptr;
}
//----------------------------------------------------------------------
@ -286,7 +286,7 @@ Symtab::InitNameIndexes()
// The "const char *" in "class_contexts" must come from a ConstString::GetCString()
std::set<const char *> class_contexts;
UniqueCStringMap<uint32_t> mangled_name_to_index;
std::vector<const char *> symbol_contexts(num_symbols, NULL);
std::vector<const char *> symbol_contexts(num_symbols, nullptr);
for (entry.value = 0; entry.value<num_symbols; ++entry.value)
{
@ -776,7 +776,7 @@ Symtab::FindSymbolWithType (SymbolType symbol_type, Debug symbol_debug_type, Vis
}
}
}
return NULL;
return nullptr;
}
size_t
@ -854,7 +854,7 @@ Symtab::FindFirstSymbolWithNameAndType (const ConstString &name, SymbolType symb
}
}
}
return NULL;
return nullptr;
}
typedef struct
@ -870,7 +870,7 @@ static int
SymbolWithClosestFileAddress (SymbolSearchInfo *info, const uint32_t *index_ptr)
{
const Symbol *symbol = info->symtab->SymbolAtIndex (index_ptr[0]);
if (symbol == NULL)
if (symbol == nullptr)
return -1;
const addr_t info_file_addr = info->file_addr;
@ -995,7 +995,7 @@ Symtab::FindSymbolContainingFileAddress (addr_t file_addr, const uint32_t* index
Mutex::Locker locker (m_mutex);
SymbolSearchInfo info = { this, file_addr, NULL, NULL, 0 };
SymbolSearchInfo info = { this, file_addr, nullptr, nullptr, 0 };
::bsearch (&info,
indexes,
@ -1025,7 +1025,7 @@ Symtab::FindSymbolContainingFileAddress (addr_t file_addr, const uint32_t* index
if (info.match_offset < symbol_byte_size)
return info.match_symbol;
}
return NULL;
return nullptr;
}
Symbol *
@ -1039,7 +1039,7 @@ Symtab::FindSymbolContainingFileAddress (addr_t file_addr)
const FileRangeToIndexMap::Entry *entry = m_file_addr_to_index.FindEntryThatContains(file_addr);
if (entry)
return SymbolAtIndex(entry->data);
return NULL;
return nullptr;
}
void
@ -1118,7 +1118,7 @@ Symtab::FindFunctionSymbols (const ConstString &name,
{
const UniqueCStringMap<uint32_t>::Entry *match;
for (match = m_basename_to_index.FindFirstValueForName(name_cstr);
match != NULL;
match != nullptr;
match = m_basename_to_index.FindNextValueForName(match))
{
symbol_indexes.push_back(match->value);
@ -1135,7 +1135,7 @@ Symtab::FindFunctionSymbols (const ConstString &name,
{
const UniqueCStringMap<uint32_t>::Entry *match;
for (match = m_method_to_index.FindFirstValueForName(name_cstr);
match != NULL;
match != nullptr;
match = m_method_to_index.FindNextValueForName(match))
{
symbol_indexes.push_back(match->value);
@ -1152,7 +1152,7 @@ Symtab::FindFunctionSymbols (const ConstString &name,
{
const UniqueCStringMap<uint32_t>::Entry *match;
for (match = m_selector_to_index.FindFirstValueForName(name_cstr);
match != NULL;
match != nullptr;
match = m_selector_to_index.FindNextValueForName(match))
{
symbol_indexes.push_back(match->value);

24
lldb/source/Symbol/Type.cpp
View File

@ -91,7 +91,7 @@ Type::Type
m_name (name),
m_symbol_file (symbol_file),
m_context (context),
m_encoding_type (NULL),
m_encoding_type (nullptr),
m_encoding_uid (encoding_uid),
m_encoding_uid_type (encoding_uid_type),
m_byte_size (byte_size),
@ -106,9 +106,9 @@ Type::Type () :
std::enable_shared_from_this<Type> (),
UserID (0),
m_name ("<INVALID TYPE>"),
m_symbol_file (NULL),
m_context (NULL),
m_encoding_type (NULL),
m_symbol_file (nullptr),
m_context (nullptr),
m_encoding_type (nullptr),
m_encoding_uid (LLDB_INVALID_UID),
m_encoding_uid_type (eEncodingInvalid),
m_byte_size (0),
@ -210,7 +210,7 @@ Type::Dump (Stream *s, bool show_context)
if (m_byte_size != 0)
s->Printf(", size = %" PRIu64, m_byte_size);
if (show_context && m_context != NULL)
if (show_context && m_context != nullptr)
{
s->PutCString(", context = ( ");
m_context->DumpSymbolContext(s);
@ -306,7 +306,7 @@ Type::DumpValue
Type *
Type::GetEncodingType ()
{
if (m_encoding_type == NULL && m_encoding_uid != LLDB_INVALID_UID)
if (m_encoding_type == nullptr && m_encoding_uid != LLDB_INVALID_UID)
m_encoding_type = m_symbol_file->ResolveTypeUID(m_encoding_uid);
return m_encoding_type;
}
@ -406,7 +406,7 @@ Type::DumpValueInMemory
if (address != LLDB_INVALID_ADDRESS)
{
DataExtractor data;
Target *target = NULL;
Target *target = nullptr;
if (exe_ctx)
target = exe_ctx->GetTargetPtr();
if (target)
@ -439,14 +439,14 @@ Type::ReadFromMemory (ExecutionContext *exe_ctx, lldb::addr_t addr, AddressType
}
uint8_t* dst = (uint8_t*)data.PeekData(0, byte_size);
if (dst != NULL)
if (dst != nullptr)
{
if (address_type == eAddressTypeHost)
{
// The address is an address in this process, so just copy it
if (addr == 0)
return false;
memcpy (dst, (uint8_t*)NULL + addr, byte_size);
memcpy (dst, (uint8_t*)nullptr + addr, byte_size);
return true;
}
else
@ -488,7 +488,7 @@ Type::GetDeclaration () const
bool
Type::ResolveClangType (ResolveState clang_type_resolve_state)
{
Type *encoding_type = NULL;
Type *encoding_type = nullptr;
if (!m_clang_type.IsValid())
{
encoding_type = GetEncodingType();
@ -603,7 +603,7 @@ Type::ResolveClangType (ResolveState clang_type_resolve_state)
// resolved appropriately.
if (m_encoding_uid != LLDB_INVALID_UID)
{
if (encoding_type == NULL)
if (encoding_type == nullptr)
encoding_type = GetEncodingType();
if (encoding_type)
{
@ -777,7 +777,7 @@ Type::GetTypeScopeAndBasename (const char* &name_cstr,
if (namespace_separator)
{
const char* template_arg_char = ::strchr (basename_cstr, '<');
while (namespace_separator != NULL)
while (namespace_separator != nullptr)
{
if (template_arg_char && namespace_separator > template_arg_char) // but namespace'd template arguments are still good to go
break;

10
lldb/source/Symbol/UnwindPlan.cpp
View File

@ -126,7 +126,7 @@ UnwindPlan::Row::RegisterLocation::Dump (Stream &s, const UnwindPlan* unwind_pla
case inOtherRegister:
{
const RegisterInfo *other_reg_info = NULL;
const RegisterInfo *other_reg_info = nullptr;
if (unwind_plan)
other_reg_info = unwind_plan->GetRegisterInfo (thread, m_location.reg_num);
if (other_reg_info)
@ -381,7 +381,7 @@ UnwindPlan::PlanValidAtAddress (Address addr)
if (log)
{
StreamString s;
if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset))
if (addr.Dump (&s, nullptr, Address::DumpStyleSectionNameOffset))
{
log->Printf ("UnwindPlan is invalid -- no unwind rows for UnwindPlan '%s' at address %s",
m_source_name.GetCString(), s.GetData());
@ -397,13 +397,13 @@ UnwindPlan::PlanValidAtAddress (Address addr)
// If the 0th Row of unwind instructions is missing, or if it doesn't provide
// a register to use to find the Canonical Frame Address, this is not a valid UnwindPlan.
if (GetRowAtIndex(0).get() == NULL || GetRowAtIndex(0)->GetCFARegister() == LLDB_INVALID_REGNUM)
if (GetRowAtIndex(0).get() == nullptr || GetRowAtIndex(0)->GetCFARegister() == LLDB_INVALID_REGNUM)
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
if (log)
{
StreamString s;
if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset))
if (addr.Dump (&s, nullptr, Address::DumpStyleSectionNameOffset))
{
log->Printf ("UnwindPlan is invalid -- no CFA register defined in row 0 for UnwindPlan '%s' at address %s",
m_source_name.GetCString(), s.GetData());
@ -480,6 +480,6 @@ UnwindPlan::GetRegisterInfo (Thread* thread, uint32_t unwind_reg) const
return reg_ctx->GetRegisterInfoAtIndex (reg);
}
}
return NULL;
return nullptr;
}

8
lldb/source/Symbol/UnwindTable.cpp
View File

@ -30,8 +30,8 @@ UnwindTable::UnwindTable (ObjectFile& objfile) :
m_object_file (objfile),
m_unwinds (),
m_initialized (false),
m_assembly_profiler (NULL),
m_eh_frame (NULL)
m_assembly_profiler (nullptr),
m_eh_frame (nullptr)
{
}
@ -94,7 +94,7 @@ UnwindTable::GetFuncUnwindersContainingAddress (const Address& addr, SymbolConte
if (!sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, 0, false, range) || !range.GetBaseAddress().IsValid())
{
// Does the eh_frame unwind info has a function bounds for this addr?
if (m_eh_frame == NULL || !m_eh_frame->GetAddressRange (addr, range))
if (m_eh_frame == nullptr || !m_eh_frame->GetAddressRange (addr, range))
{
return no_unwind_found;
}
@ -121,7 +121,7 @@ UnwindTable::GetUncachedFuncUnwindersContainingAddress (const Address& addr, Sym
if (!sc.GetAddressRange(eSymbolContextFunction | eSymbolContextSymbol, 0, false, range) || !range.GetBaseAddress().IsValid())
{
// Does the eh_frame unwind info has a function bounds for this addr?
if (m_eh_frame == NULL || !m_eh_frame->GetAddressRange (addr, range))
if (m_eh_frame == nullptr || !m_eh_frame->GetAddressRange (addr, range))
{
return no_unwind_found;
}

24
lldb/source/Symbol/Variable.cpp
View File

@ -87,7 +87,7 @@ Variable::GetType()
{
if (m_symfile_type_sp)
return m_symfile_type_sp->GetType();
return NULL;
return nullptr;
}
void
@ -123,7 +123,7 @@ Variable::Dump(Stream *s, bool show_context) const
}
}
if (show_context && m_owner_scope != NULL)
if (show_context && m_owner_scope != nullptr)
{
s->PutCString(", context = ( ");
m_owner_scope->DumpSymbolContext(s);
@ -144,7 +144,7 @@ Variable::Dump(Stream *s, bool show_context) const
if (variable_sc.function)
loclist_base_addr = variable_sc.function->GetAddressRange().GetBaseAddress().GetFileAddress();
}
ABI *abi = NULL;
ABI *abi = nullptr;
if (m_owner_scope)
{
ModuleSP module_sp (m_owner_scope->CalculateSymbolContextModule());
@ -171,12 +171,12 @@ Variable::DumpDeclaration (Stream *s, bool show_fullpaths, bool show_module)
{
SymbolContext sc;
m_owner_scope->CalculateSymbolContext(&sc);
sc.block = NULL;
sc.block = nullptr;
sc.line_entry.Clear();
bool show_inlined_frames = false;
dumped_declaration_info = sc.DumpStopContext (s,
NULL,
nullptr,
Address(),
show_fullpaths,
show_module,
@ -277,7 +277,7 @@ Variable::IsInScope (StackFrame *frame)
{
case eValueTypeRegister:
case eValueTypeRegisterSet:
return frame != NULL;
return frame != nullptr;
case eValueTypeConstResult:
case eValueTypeVariableGlobal:
@ -297,7 +297,7 @@ Variable::IsInScope (StackFrame *frame)
CalculateSymbolContext (&variable_sc);
// Check for static or global variable defined at the compile unit
// level that wasn't defined in a block
if (variable_sc.block == NULL)
if (variable_sc.block == nullptr)
return true;
if (variable_sc.block == deepest_frame_block)
@ -419,7 +419,7 @@ Variable::GetValuesForVariableExpressionPath (const char *variable_expr_path,
const char *variable_sub_expr_path = variable_expr_path + variable_name.size();
if (*variable_sub_expr_path)
{
const char* first_unparsed = NULL;
const char* first_unparsed = nullptr;
ValueObject::ExpressionPathScanEndReason reason_to_stop;
ValueObject::ExpressionPathEndResultType final_value_type;
ValueObject::GetValueForExpressionPathOptions options;
@ -485,7 +485,7 @@ Variable::DumpLocationForAddress (Stream *s, const Address &address)
CalculateSymbolContext(&sc);
if (sc.module_sp == address.GetModule())
{
ABI *abi = NULL;
ABI *abi = nullptr;
if (m_owner_scope)
{
ModuleSP module_sp (m_owner_scope->CalculateSymbolContextModule());
@ -553,7 +553,7 @@ PrivateAutoCompleteMembers (StackFrame *frame,
{
for (uint32_t i = 0; i < num_bases; ++i)
{
ClangASTType base_class_type (clang_type.GetDirectBaseClassAtIndex (i, NULL));
ClangASTType base_class_type (clang_type.GetDirectBaseClassAtIndex (i, nullptr));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@ -571,7 +571,7 @@ PrivateAutoCompleteMembers (StackFrame *frame,
{
for (uint32_t i = 0; i < num_vbases; ++i)
{
ClangASTType vbase_class_type (clang_type.GetVirtualBaseClassAtIndex(i,NULL));
ClangASTType vbase_class_type (clang_type.GetVirtualBaseClassAtIndex(i,nullptr));
PrivateAutoCompleteMembers (frame,
partial_member_name,
@ -592,7 +592,7 @@ PrivateAutoCompleteMembers (StackFrame *frame,
{
std::string member_name;
ClangASTType member_clang_type = clang_type.GetFieldAtIndex (i, member_name, NULL, NULL, NULL);
ClangASTType member_clang_type = clang_type.GetFieldAtIndex (i, member_name, nullptr, nullptr, nullptr);
if (partial_member_name.empty() ||
member_name.find(partial_member_name) == 0)

4
lldb/source/Utility/ARM64_DWARF_Registers.cpp
View File

@ -28,7 +28,7 @@ arm64_dwarf::GetRegisterName (unsigned reg_num, bool altnernate_name)
default:
break;
}
return NULL;
return nullptr;
}
switch (reg_num)
@ -100,7 +100,7 @@ arm64_dwarf::GetRegisterName (unsigned reg_num, bool altnernate_name)
case v30: return "v30";
case v31: return "v31";
}
return 0;
return nullptr;
}
bool

2
lldb/source/Utility/ARM_DWARF_Registers.cpp
View File

@ -202,7 +202,7 @@ GetARMDWARFRegisterName (unsigned reg_num)
case dwarf_q14: return "q14";
case dwarf_q15: return "q15";
}
return 0;
return nullptr;
}
bool

6
lldb/source/Utility/PseudoTerminal.cpp
View File

@ -155,7 +155,7 @@ PseudoTerminal::OpenSlave (int oflag, char *error_str, size_t error_len)
// Open the master side of a pseudo terminal
const char *slave_name = GetSlaveName (error_str, error_len);
if (slave_name == NULL)
if (slave_name == nullptr)
return false;
m_slave_fd = ::open (slave_name, oflag);
@ -193,11 +193,11 @@ PseudoTerminal::GetSlaveName (char *error_str, size_t error_len) const
{
if (error_str)
::snprintf (error_str, error_len, "%s", "master file descriptor is invalid");
return NULL;
return nullptr;
}
const char *slave_name = ::ptsname (m_master_fd);
if (error_str && slave_name == NULL)
if (error_str && slave_name == nullptr)
::strerror_r (errno, error_str, error_len);
return slave_name;

8
lldb/source/Utility/StringExtractor.cpp
View File

@ -155,7 +155,7 @@ StringExtractor::GetU32 (uint32_t fail_value, int base)
{
if (m_index < m_packet.size())
{
char *end = NULL;
char *end = nullptr;
const char *start = m_packet.c_str();
const char *cstr = start + m_index;
uint32_t result = ::strtoul (cstr, &end, base);
@ -174,7 +174,7 @@ StringExtractor::GetS32 (int32_t fail_value, int base)
{
if (m_index < m_packet.size())
{
char *end = NULL;
char *end = nullptr;
const char *start = m_packet.c_str();
const char *cstr = start + m_index;
int32_t result = ::strtol (cstr, &end, base);
@ -194,7 +194,7 @@ StringExtractor::GetU64 (uint64_t fail_value, int base)
{
if (m_index < m_packet.size())
{
char *end = NULL;
char *end = nullptr;
const char *start = m_packet.c_str();
const char *cstr = start + m_index;
uint64_t result = ::strtoull (cstr, &end, base);
@ -213,7 +213,7 @@ StringExtractor::GetS64 (int64_t fail_value, int base)
{
if (m_index < m_packet.size())
{
char *end = NULL;
char *end = nullptr;
const char *start = m_packet.c_str();
const char *cstr = start + m_index;
int64_t result = ::strtoll (cstr, &end, base);

2
lldb/source/Utility/StringExtractor.h
View File

@ -137,7 +137,7 @@ public:
{
if (m_index < m_packet.size())
return m_packet.c_str() + m_index;
return NULL;
return nullptr;
}
protected:

2
lldb/source/Utility/TimeSpecTimeout.h
View File

@ -76,7 +76,7 @@ public:
GetTimeSpecPtr () const
{
if (m_infinite)
return NULL;
return nullptr;
return &m_timespec;
}