diff options
Diffstat (limited to 'lldb/source/Plugins/Language')
| -rw-r--r-- | lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp | 6 | ||||
| -rw-r--r-- | lldb/source/Plugins/Language/ObjC/NSDictionary.cpp | 22 |
2 files changed, 14 insertions, 14 deletions
diff --git a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp index 4ef7be1c18e..376dce8fee0 100644 --- a/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp +++ b/lldb/source/Plugins/Language/CPlusPlus/CxxStringTypes.cpp @@ -109,12 +109,12 @@ lldb_private::formatters::WCharStringSummaryProvider (ValueObject& valobj, Strea return false; // Get a wchar_t basic type from the current type system - CompilerType wchar_clang_type = valobj.GetCompilerType().GetBasicTypeFromAST(lldb::eBasicTypeWChar); + CompilerType wchar_compiler_type = valobj.GetCompilerType().GetBasicTypeFromAST(lldb::eBasicTypeWChar); - if (!wchar_clang_type) + if (!wchar_compiler_type) return false; - const uint32_t wchar_size = wchar_clang_type.GetBitSize(nullptr); // Safe to pass NULL for exe_scope here + const uint32_t wchar_size = wchar_compiler_type.GetBitSize(nullptr); // Safe to pass NULL for exe_scope here StringPrinter::ReadStringAndDumpToStreamOptions options(valobj); options.SetLocation(data_addr); diff --git a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp index 4820c349fb7..26dba1e2fd6 100644 --- a/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp +++ b/lldb/source/Plugins/Language/ObjC/NSDictionary.cpp @@ -29,7 +29,7 @@ using namespace lldb_private::formatters; static CompilerType GetLLDBNSPairType (TargetSP target_sp) { - CompilerType clang_type; + CompilerType compiler_type; ClangASTContext *target_ast_context = target_sp->GetScratchClangASTContext(); @@ -37,23 +37,23 @@ GetLLDBNSPairType (TargetSP target_sp) { ConstString g___lldb_autogen_nspair("__lldb_autogen_nspair"); - clang_type = target_ast_context->GetTypeForIdentifier<clang::CXXRecordDecl>(g___lldb_autogen_nspair); + compiler_type = target_ast_context->GetTypeForIdentifier<clang::CXXRecordDecl>(g___lldb_autogen_nspair); - if (!clang_type) + if (!compiler_type) { - clang_type = target_ast_context->CreateRecordType(NULL, lldb::eAccessPublic, g___lldb_autogen_nspair.GetCString(), clang::TTK_Struct, lldb::eLanguageTypeC); + compiler_type = target_ast_context->CreateRecordType(NULL, lldb::eAccessPublic, g___lldb_autogen_nspair.GetCString(), clang::TTK_Struct, lldb::eLanguageTypeC); - if (clang_type) + if (compiler_type) { - ClangASTContext::StartTagDeclarationDefinition(clang_type); - CompilerType id_clang_type = target_ast_context->GetBasicType (eBasicTypeObjCID); - ClangASTContext::AddFieldToRecordType(clang_type, "key", id_clang_type, lldb::eAccessPublic, 0); - ClangASTContext::AddFieldToRecordType(clang_type, "value", id_clang_type, lldb::eAccessPublic, 0); - ClangASTContext::CompleteTagDeclarationDefinition(clang_type); + ClangASTContext::StartTagDeclarationDefinition(compiler_type); + CompilerType id_compiler_type = target_ast_context->GetBasicType (eBasicTypeObjCID); + ClangASTContext::AddFieldToRecordType(compiler_type, "key", id_compiler_type, lldb::eAccessPublic, 0); + ClangASTContext::AddFieldToRecordType(compiler_type, "value", id_compiler_type, lldb::eAccessPublic, 0); + ClangASTContext::CompleteTagDeclarationDefinition(compiler_type); } } } - return clang_type; + return compiler_type; } namespace lldb_private { |
