diff options
Diffstat (limited to 'source/Expression/ClangExpressionDeclMap.cpp')
| -rw-r--r-- | source/Expression/ClangExpressionDeclMap.cpp | 866 |
1 files changed, 419 insertions, 447 deletions
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp index 198fde93386e..43c8a5fb1bcb 100644 --- a/source/Expression/ClangExpressionDeclMap.cpp +++ b/source/Expression/ClangExpressionDeclMap.cpp @@ -8,11 +8,6 @@ //===----------------------------------------------------------------------===// #include "lldb/Expression/ClangExpressionDeclMap.h" - -// C Includes -// C++ Includes -// Other libraries and framework includes -// Project includes #include "clang/AST/ASTContext.h" #include "clang/AST/DeclarationName.h" #include "clang/AST/Decl.h" @@ -68,21 +63,21 @@ ClangExpressionDeclMap::~ClangExpressionDeclMap() { // Note: The model is now that the parser's AST context and all associated // data does not vanish until the expression has been executed. This means - // that valuable lookup data (like namespaces) doesn't vanish, but - + // that valuable lookup data (like namespaces) doesn't vanish, but + DidParse(); DisableStructVars(); } -bool +bool ClangExpressionDeclMap::WillParse(ExecutionContext &exe_ctx, Materializer *materializer) { ClangASTMetrics::ClearLocalCounters(); - + EnableParserVars(); m_parser_vars->m_exe_ctx = exe_ctx; - + Target *target = exe_ctx.GetTargetPtr(); if (exe_ctx.GetFramePtr()) m_parser_vars->m_sym_ctx = exe_ctx.GetFramePtr()->GetSymbolContext(lldb::eSymbolContextEverything); @@ -98,18 +93,18 @@ ClangExpressionDeclMap::WillParse(ExecutionContext &exe_ctx, m_parser_vars->m_sym_ctx.Clear(true); m_parser_vars->m_sym_ctx.target_sp = exe_ctx.GetTargetSP(); } - + if (target) { m_parser_vars->m_persistent_vars = &target->GetPersistentVariables(); - + if (!target->GetScratchClangASTContext()) return false; } - + m_parser_vars->m_target_info = GetTargetInfo(); m_parser_vars->m_materializer = materializer; - + return true; } @@ -120,7 +115,7 @@ ClangExpressionDeclMap::DidParse() if (log) ClangASTMetrics::DumpCounters(log); - + if (m_parser_vars.get()) { for (size_t entity_index = 0, num_entities = m_found_entities.GetSize(); @@ -131,7 +126,7 @@ ClangExpressionDeclMap::DidParse() if (var_sp) var_sp->DisableParserVars(GetParserID()); } - + for (size_t pvar_index = 0, num_pvars = m_parser_vars->m_persistent_vars->GetSize(); pvar_index < num_pvars; ++pvar_index) @@ -140,20 +135,20 @@ ClangExpressionDeclMap::DidParse() if (pvar_sp) pvar_sp->DisableParserVars(GetParserID()); } - + DisableParserVars(); } } // Interface for IRForTarget -ClangExpressionDeclMap::TargetInfo +ClangExpressionDeclMap::TargetInfo ClangExpressionDeclMap::GetTargetInfo() { assert (m_parser_vars.get()); - + TargetInfo ret; - + ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Process *process = exe_ctx.GetProcessPtr(); @@ -162,7 +157,7 @@ ClangExpressionDeclMap::GetTargetInfo() ret.byte_order = process->GetByteOrder(); ret.address_byte_size = process->GetAddressByteSize(); } - else + else { Target *target = exe_ctx.GetTargetPtr(); if (target) @@ -175,61 +170,61 @@ ClangExpressionDeclMap::GetTargetInfo() return ret; } -bool -ClangExpressionDeclMap::AddPersistentVariable +bool +ClangExpressionDeclMap::AddPersistentVariable ( - const NamedDecl *decl, - const ConstString &name, + const NamedDecl *decl, + const ConstString &name, TypeFromParser parser_type, bool is_result, bool is_lvalue ) { assert (m_parser_vars.get()); - + if (m_parser_vars->m_materializer && is_result) { Error err; - + ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); if (target == NULL) return false; - + ASTContext *context(target->GetScratchClangASTContext()->getASTContext()); - + TypeFromUser user_type(m_ast_importer->DeportType(context, parser_type.GetASTContext(), parser_type.GetOpaqueQualType()), context); - + uint32_t offset = m_parser_vars->m_materializer->AddResultVariable(user_type, is_lvalue, m_keep_result_in_memory, err); - + ClangExpressionVariableSP var_sp = m_found_entities.CreateVariable(exe_ctx.GetBestExecutionContextScope(), name, user_type, m_parser_vars->m_target_info.byte_order, m_parser_vars->m_target_info.address_byte_size); - + if (!var_sp) return false; - + var_sp->EnableParserVars(GetParserID()); - + ClangExpressionVariable::ParserVars *parser_vars = var_sp->GetParserVars(GetParserID()); parser_vars->m_named_decl = decl; parser_vars->m_parser_type = parser_type; - + var_sp->EnableJITVars(GetParserID()); - + ClangExpressionVariable::JITVars *jit_vars = var_sp->GetJITVars(GetParserID()); - + jit_vars->m_offset = offset; - + return true; } - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); @@ -237,38 +232,38 @@ ClangExpressionDeclMap::AddPersistentVariable return false; ASTContext *context(target->GetScratchClangASTContext()->getASTContext()); - - TypeFromUser user_type(m_ast_importer->DeportType(context, + + TypeFromUser user_type(m_ast_importer->DeportType(context, parser_type.GetASTContext(), parser_type.GetOpaqueQualType()), context); - + if (!user_type.GetOpaqueQualType()) { if (log) log->Printf("Persistent variable's type wasn't copied successfully"); return false; } - + if (!m_parser_vars->m_target_info.IsValid()) return false; - + ClangExpressionVariableSP var_sp = m_parser_vars->m_persistent_vars->CreatePersistentVariable (exe_ctx.GetBestExecutionContextScope (), name, user_type, m_parser_vars->m_target_info.byte_order, m_parser_vars->m_target_info.address_byte_size); - + if (!var_sp) return false; - + var_sp->m_frozen_sp->SetHasCompleteType(); - + if (is_result) var_sp->m_flags |= ClangExpressionVariable::EVNeedsFreezeDry; else var_sp->m_flags |= ClangExpressionVariable::EVKeepInTarget; // explicitly-declared persistent variables should persist - + if (is_lvalue) { var_sp->m_flags |= ClangExpressionVariable::EVIsProgramReference; @@ -278,88 +273,87 @@ ClangExpressionDeclMap::AddPersistentVariable var_sp->m_flags |= ClangExpressionVariable::EVIsLLDBAllocated; var_sp->m_flags |= ClangExpressionVariable::EVNeedsAllocation; } - + if (m_keep_result_in_memory) { var_sp->m_flags |= ClangExpressionVariable::EVKeepInTarget; } - + if (log) log->Printf("Created persistent variable with flags 0x%hx", var_sp->m_flags); - + var_sp->EnableParserVars(GetParserID()); - + ClangExpressionVariable::ParserVars *parser_vars = var_sp->GetParserVars(GetParserID()); - + parser_vars->m_named_decl = decl; parser_vars->m_parser_type = parser_type; - + return true; } -bool -ClangExpressionDeclMap::AddValueToStruct +bool +ClangExpressionDeclMap::AddValueToStruct ( const NamedDecl *decl, const ConstString &name, llvm::Value *value, size_t size, - off_t alignment + lldb::offset_t alignment ) { assert (m_struct_vars.get()); assert (m_parser_vars.get()); - + bool is_persistent_variable = false; - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + m_struct_vars->m_struct_laid_out = false; - + if (m_struct_members.GetVariable(decl, GetParserID())) return true; - + ClangExpressionVariableSP var_sp (m_found_entities.GetVariable(decl, GetParserID())); - + if (!var_sp) { var_sp = m_parser_vars->m_persistent_vars->GetVariable(decl, GetParserID()); is_persistent_variable = true; } - + if (!var_sp) return false; - + if (log) log->Printf("Adding value for (NamedDecl*)%p [%s - %s] to the structure", - decl, - name.GetCString(), + static_cast<const void*>(decl), name.GetCString(), var_sp->GetName().GetCString()); - + // We know entity->m_parser_vars is valid because we used a parser variable // to find it - + ClangExpressionVariable::ParserVars *parser_vars = var_sp->GetParserVars(GetParserID()); parser_vars->m_llvm_value = value; - + if (ClangExpressionVariable::JITVars *jit_vars = var_sp->GetJITVars(GetParserID())) { // We already laid this out; do not touch - + if (log) log->Printf("Already placed at 0x%llx", (unsigned long long)jit_vars->m_offset); } - + var_sp->EnableJITVars(GetParserID()); - + ClangExpressionVariable::JITVars *jit_vars = var_sp->GetJITVars(GetParserID()); jit_vars->m_alignment = alignment; jit_vars->m_size = size; - + m_struct_members.AddVariable(var_sp); - + if (m_parser_vars->m_materializer) { uint32_t offset = 0; @@ -379,16 +373,16 @@ ClangExpressionDeclMap::AddValueToStruct else if (parser_vars->m_lldb_var) offset = m_parser_vars->m_materializer->AddVariable(parser_vars->m_lldb_var, err); } - + if (!err.Success()) return false; - + if (log) log->Printf("Placed at 0x%llx", (unsigned long long)offset); - + jit_vars->m_offset = offset; // TODO DoStructLayout() should not change this. } - + return true; } @@ -396,81 +390,81 @@ bool ClangExpressionDeclMap::DoStructLayout () { assert (m_struct_vars.get()); - + if (m_struct_vars->m_struct_laid_out) return true; - + if (!m_parser_vars->m_materializer) return false; - + m_struct_vars->m_struct_alignment = m_parser_vars->m_materializer->GetStructAlignment(); m_struct_vars->m_struct_size = m_parser_vars->m_materializer->GetStructByteSize(); m_struct_vars->m_struct_laid_out = true; return true; } -bool ClangExpressionDeclMap::GetStructInfo +bool ClangExpressionDeclMap::GetStructInfo ( uint32_t &num_elements, size_t &size, - off_t &alignment + lldb::offset_t &alignment ) { assert (m_struct_vars.get()); - + if (!m_struct_vars->m_struct_laid_out) return false; - + num_elements = m_struct_members.GetSize(); size = m_struct_vars->m_struct_size; alignment = m_struct_vars->m_struct_alignment; - + return true; } -bool -ClangExpressionDeclMap::GetStructElement +bool +ClangExpressionDeclMap::GetStructElement ( const NamedDecl *&decl, llvm::Value *&value, - off_t &offset, + lldb::offset_t &offset, ConstString &name, uint32_t index ) { assert (m_struct_vars.get()); - + if (!m_struct_vars->m_struct_laid_out) return false; - + if (index >= m_struct_members.GetSize()) return false; - + ClangExpressionVariableSP member_sp(m_struct_members.GetVariableAtIndex(index)); - + if (!member_sp) return false; - + ClangExpressionVariable::ParserVars *parser_vars = member_sp->GetParserVars(GetParserID()); ClangExpressionVariable::JITVars *jit_vars = member_sp->GetJITVars(GetParserID()); - + if (!parser_vars || !jit_vars || !member_sp->GetValueObject()) return false; - + decl = parser_vars->m_named_decl; value = parser_vars->m_llvm_value; offset = jit_vars->m_offset; name = member_sp->GetName(); - + return true; } bool -ClangExpressionDeclMap::GetFunctionInfo +ClangExpressionDeclMap::GetFunctionInfo ( - const NamedDecl *decl, + const NamedDecl *decl, uint64_t &ptr ) { @@ -478,14 +472,14 @@ ClangExpressionDeclMap::GetFunctionInfo if (!entity_sp) return false; - + // We know m_parser_vars is valid since we searched for the variable by // its NamedDecl - + ClangExpressionVariable::ParserVars *parser_vars = entity_sp->GetParserVars(GetParserID()); ptr = parser_vars->m_lldb_value.GetScalar().ULongLong(); - + return true; } @@ -500,7 +494,7 @@ FindCodeSymbolInContext SymbolContextList temp_sc_list; if (sym_ctx.module_sp) sym_ctx.module_sp->FindSymbolsWithNameAndType(name, eSymbolTypeAny, temp_sc_list); - + if (!sc_list.GetSize() && sym_ctx.target_sp) sym_ctx.target_sp->GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, temp_sc_list); @@ -527,14 +521,14 @@ FindCodeSymbolInContext } bool -ClangExpressionDeclMap::GetFunctionAddress +ClangExpressionDeclMap::GetFunctionAddress ( const ConstString &name, uint64_t &func_addr ) { assert (m_parser_vars.get()); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); ExecutionContext &exe_ctx = m_parser_vars->m_exe_ctx; Target *target = exe_ctx.GetTargetPtr(); @@ -545,25 +539,25 @@ ClangExpressionDeclMap::GetFunctionAddress return false; SymbolContextList sc_list; - + FindCodeSymbolInContext(name, m_parser_vars->m_sym_ctx, sc_list); uint32_t sc_list_size = sc_list.GetSize(); if (sc_list_size == 0) { - // We occasionally get debug information in which a const function is reported + // We occasionally get debug information in which a const function is reported // as non-const, so the mangled name is wrong. This is a hack to compensate. - + if (!strncmp(name.GetCString(), "_ZN", 3) && strncmp(name.GetCString(), "_ZNK", 4)) { std::string fixed_scratch("_ZNK"); fixed_scratch.append(name.GetCString() + 3); ConstString fixed_name(fixed_scratch.c_str()); - + if (log) log->Printf("Failed to find symbols given non-const name %s; trying %s", name.GetCString(), fixed_name.GetCString()); - + FindCodeSymbolInContext(fixed_name, m_parser_vars->m_sym_ctx, sc_list); sc_list_size = sc_list.GetSize(); } @@ -574,37 +568,25 @@ ClangExpressionDeclMap::GetFunctionAddress SymbolContext sym_ctx; sc_list.GetContextAtIndex(i, sym_ctx); - const Address *func_so_addr = NULL; - bool is_indirect_function = false; + lldb::addr_t callable_load_addr = LLDB_INVALID_ADDRESS; + if (sym_ctx.function) - func_so_addr = &sym_ctx.function->GetAddressRange().GetBaseAddress(); - else if (sym_ctx.symbol) { - if (sym_ctx.symbol->GetType() == eSymbolTypeReExported) - { - Symbol *reexported_symbol = sym_ctx.symbol->ResolveReExportedSymbol(*target); - if (reexported_symbol) - { - func_so_addr = &reexported_symbol->GetAddress(); - is_indirect_function = reexported_symbol->IsIndirect(); - } - } - else + const Address func_so_addr = sym_ctx.function->GetAddressRange().GetBaseAddress(); + if (func_so_addr.IsValid()) { - func_so_addr = &sym_ctx.symbol->GetAddress(); - is_indirect_function = sym_ctx.symbol->IsIndirect(); + callable_load_addr = func_so_addr.GetCallableLoadAddress(target, false); } } + else if (sym_ctx.symbol) + { + callable_load_addr = sym_ctx.symbol->ResolveCallableAddress(*target); + } - if (func_so_addr && func_so_addr->IsValid()) + if (callable_load_addr != LLDB_INVALID_ADDRESS) { - lldb::addr_t load_addr = func_so_addr->GetCallableLoadAddress (target, is_indirect_function); - - if (load_addr != LLDB_INVALID_ADDRESS) - { - func_addr = load_addr; - return true; - } + func_addr = callable_load_addr; + return true; } } return false; @@ -618,12 +600,12 @@ ClangExpressionDeclMap::GetSymbolAddress (Target &target, lldb_private::Module *module) { SymbolContextList sc_list; - + if (module) module->FindSymbolsWithNameAndType(name, symbol_type, sc_list); else target.GetImages().FindSymbolsWithNameAndType(name, symbol_type, sc_list); - + const uint32_t num_matches = sc_list.GetSize(); addr_t symbol_load_addr = LLDB_INVALID_ADDRESS; @@ -631,12 +613,12 @@ ClangExpressionDeclMap::GetSymbolAddress (Target &target, { SymbolContext sym_ctx; sc_list.GetContextAtIndex(i, sym_ctx); - + const Address *sym_address = &sym_ctx.symbol->GetAddress(); - + if (!sym_address || !sym_address->IsValid()) continue; - + if (sym_address) { switch (sym_ctx.symbol->GetType()) @@ -702,17 +684,17 @@ ClangExpressionDeclMap::GetSymbolAddress (Target &target, } } } - + if (symbol_load_addr == LLDB_INVALID_ADDRESS && process) { ObjCLanguageRuntime *runtime = process->GetObjCLanguageRuntime(); - + if (runtime) { symbol_load_addr = runtime->LookupRuntimeSymbol(name); } } - + return symbol_load_addr; } @@ -720,10 +702,10 @@ addr_t ClangExpressionDeclMap::GetSymbolAddress (const ConstString &name, lldb::SymbolType symbol_type) { assert (m_parser_vars.get()); - + if (!m_parser_vars->m_exe_ctx.GetTargetPtr()) return false; - + return GetSymbolAddress(m_parser_vars->m_exe_ctx.GetTargetRef(), m_parser_vars->m_exe_ctx.GetProcessPtr(), name, symbol_type); } @@ -733,12 +715,12 @@ ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target, lldb_private::Module *module) { SymbolContextList sc_list; - + if (module) module->FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list); else target.GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list); - + const uint32_t matches = sc_list.GetSize(); for (uint32_t i=0; i<matches; ++i) { @@ -748,7 +730,7 @@ ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target, { const Symbol *symbol = sym_ctx.symbol; const Address *sym_address = &symbol->GetAddress(); - + if (sym_address && sym_address->IsValid()) { switch (symbol->GetType()) @@ -790,7 +772,7 @@ ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target, } } break; - + case eSymbolTypeCode: // We already lookup functions elsewhere case eSymbolTypeVariable: case eSymbolTypeLocal: @@ -818,7 +800,7 @@ ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target, } } } - + return NULL; } @@ -833,12 +815,12 @@ ClangExpressionDeclMap::FindGlobalVariable ) { VariableList vars; - + if (module && namespace_decl) module->FindGlobalVariables (name, namespace_decl, true, -1, vars); else target.GetImages().FindGlobalVariables(name, true, -1, vars); - + if (vars.GetSize()) { if (type) @@ -846,7 +828,7 @@ ClangExpressionDeclMap::FindGlobalVariable for (size_t i = 0; i < vars.GetSize(); ++i) { VariableSP var_sp = vars.GetVariableAtIndex(i); - + if (ClangASTContext::AreTypesSame(*type, var_sp->GetType()->GetClangFullType())) return var_sp; } @@ -856,7 +838,7 @@ ClangExpressionDeclMap::FindGlobalVariable return vars.GetVariableAtIndex(0); } } - + return VariableSP(); } @@ -866,23 +848,23 @@ void ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context) { assert (m_ast_context); - + ClangASTMetrics::RegisterVisibleQuery(); - + const ConstString name(context.m_decl_name.getAsString().c_str()); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + if (GetImportInProgress()) { if (log && log->GetVerbose()) log->Printf("Ignoring a query during an import"); return; } - + static unsigned int invocation_id = 0; unsigned int current_id = invocation_id++; - + if (log) { if (!context.m_decl_context) @@ -892,20 +874,19 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context) else log->Printf("ClangExpressionDeclMap::FindExternalVisibleDecls[%u] for '%s' in a '%s'", current_id, name.GetCString(), context.m_decl_context->getDeclKindName()); } - + if (const NamespaceDecl *namespace_context = dyn_cast<NamespaceDecl>(context.m_decl_context)) { ClangASTImporter::NamespaceMapSP namespace_map = m_ast_importer->GetNamespaceMap(namespace_context); - + if (log && log->GetVerbose()) - log->Printf(" CEDM::FEVD[%u] Inspecting (NamespaceMap*)%p (%d entries)", - current_id, - namespace_map.get(), + log->Printf(" CEDM::FEVD[%u] Inspecting (NamespaceMap*)%p (%d entries)", + current_id, static_cast<void*>(namespace_map.get()), (int)namespace_map->size()); - + if (!namespace_map) return; - + for (ClangASTImporter::NamespaceMap::iterator i = namespace_map->begin(), e = namespace_map->end(); i != e; ++i) @@ -915,7 +896,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context) current_id, i->second.GetNamespaceDecl()->getNameAsString().c_str(), i->first->GetFileSpec().GetFilename().GetCString()); - + FindExternalVisibleDecls(context, i->first, i->second, @@ -925,65 +906,65 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context) else if (isa<TranslationUnitDecl>(context.m_decl_context)) { ClangNamespaceDecl namespace_decl; - + if (log) log->Printf(" CEDM::FEVD[%u] Searching the root namespace", current_id); - + FindExternalVisibleDecls(context, lldb::ModuleSP(), namespace_decl, current_id); } - + if (!context.m_found.variable) ClangASTSource::FindExternalVisibleDecls(context); } -void -ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, +void +ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, lldb::ModuleSP module_sp, ClangNamespaceDecl &namespace_decl, unsigned int current_id) { assert (m_ast_context); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + SymbolContextList sc_list; - + const ConstString name(context.m_decl_name.getAsString().c_str()); - + const char *name_unique_cstr = name.GetCString(); - + if (name_unique_cstr == NULL) return; - + static ConstString id_name("id"); static ConstString Class_name("Class"); - + if (name == id_name || name == Class_name) return; - - // Only look for functions by name out in our symbols if the function + + // Only look for functions by name out in our symbols if the function // doesn't start with our phony prefix of '$' Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); StackFrame *frame = m_parser_vars->m_exe_ctx.GetFramePtr(); if (name_unique_cstr[0] == '$' && !namespace_decl) { static ConstString g_lldb_class_name ("$__lldb_class"); - + if (name == g_lldb_class_name) { // Clang is looking for the type of "this" - + if (frame == NULL) return; - + SymbolContext sym_ctx = frame->GetSymbolContext(lldb::eSymbolContextFunction); - + if (!sym_ctx.function) return; - + // Get the block that defines the function Block *function_block = sym_ctx.GetFunctionBlock(); @@ -991,59 +972,59 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, return; clang::DeclContext *decl_context = function_block->GetClangDeclContext(); - + if (!decl_context) return; - + clang::CXXMethodDecl *method_decl = llvm::dyn_cast<clang::CXXMethodDecl>(decl_context); - + if (method_decl) { clang::CXXRecordDecl *class_decl = method_decl->getParent(); - + QualType class_qual_type(class_decl->getTypeForDecl(), 0); - + TypeFromUser class_user_type (class_qual_type.getAsOpaquePtr(), &class_decl->getASTContext()); - + if (log) { ASTDumper ast_dumper(class_qual_type); log->Printf(" CEDM::FEVD[%u] Adding type for $__lldb_class: %s", current_id, ast_dumper.GetCString()); } - + TypeFromParser class_type = CopyClassType(class_user_type, current_id); - + if (!class_type.IsValid()) return; - + TypeSourceInfo *type_source_info = m_ast_context->getTrivialTypeSourceInfo(QualType::getFromOpaquePtr(class_type.GetOpaqueQualType())); - + if (!type_source_info) return; - + TypedefDecl *typedef_decl = TypedefDecl::Create(*m_ast_context, m_ast_context->getTranslationUnitDecl(), SourceLocation(), SourceLocation(), context.m_decl_name.getAsIdentifierInfo(), type_source_info); - - + + if (!typedef_decl) return; - + context.AddNamedDecl(typedef_decl); - + if (method_decl->isInstance()) { // self is a pointer to the object - + QualType class_pointer_type = method_decl->getASTContext().getPointerType(class_qual_type); - + TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(), &method_decl->getASTContext()); - + m_struct_vars->m_object_pointer_type = self_user_type; } } @@ -1055,22 +1036,22 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, // scope and use its type. // FIXME: This code is formally correct, but clang doesn't currently emit DW_AT_object_pointer // for C++ so it hasn't actually been tested. - + VariableList *vars = frame->GetVariableList(false); - + lldb::VariableSP this_var = vars->FindVariable(ConstString("this")); - + if (this_var && this_var->IsInScope(frame) && this_var->LocationIsValidForFrame (frame)) { Type *this_type = this_var->GetType(); - + if (!this_type) return; - + ClangASTType pointee_type = this_type->GetClangForwardType().GetPointeeType(); - + if (pointee_type.IsValid()) { if (log) @@ -1078,89 +1059,89 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, ASTDumper ast_dumper(this_type->GetClangFullType()); log->Printf(" FEVD[%u] Adding type for $__lldb_objc_class: %s", current_id, ast_dumper.GetCString()); } - + TypeFromUser class_user_type(pointee_type); AddOneType(context, class_user_type, current_id); - - + + TypeFromUser this_user_type(this_type->GetClangFullType()); m_struct_vars->m_object_pointer_type = this_user_type; return; } } } - + return; } - + static ConstString g_lldb_objc_class_name ("$__lldb_objc_class"); if (name == g_lldb_objc_class_name) { // Clang is looking for the type of "*self" - + if (!frame) return; - + SymbolContext sym_ctx = frame->GetSymbolContext(lldb::eSymbolContextFunction); - + if (!sym_ctx.function) return; - + // Get the block that defines the function Block *function_block = sym_ctx.GetFunctionBlock(); - + if (!function_block) return; - + clang::DeclContext *decl_context = function_block->GetClangDeclContext(); - + if (!decl_context) return; - + clang::ObjCMethodDecl *method_decl = llvm::dyn_cast<clang::ObjCMethodDecl>(decl_context); - + if (method_decl) { ObjCInterfaceDecl* self_interface = method_decl->getClassInterface(); - + if (!self_interface) return; - + const clang::Type *interface_type = self_interface->getTypeForDecl(); - + if (!interface_type) return; // This is unlikely, but we have seen crashes where this occurred - + TypeFromUser class_user_type(QualType(interface_type, 0).getAsOpaquePtr(), &method_decl->getASTContext()); - + if (log) { ASTDumper ast_dumper(interface_type); log->Printf(" FEVD[%u] Adding type for $__lldb_objc_class: %s", current_id, ast_dumper.GetCString()); } - + AddOneType(context, class_user_type, current_id); - + if (method_decl->isInstanceMethod()) { // self is a pointer to the object - + QualType class_pointer_type = method_decl->getASTContext().getObjCObjectPointerType(QualType(interface_type, 0)); - + TypeFromUser self_user_type(class_pointer_type.getAsOpaquePtr(), &method_decl->getASTContext()); - + m_struct_vars->m_object_pointer_type = self_user_type; } else { // self is a Class pointer QualType class_type = method_decl->getASTContext().getObjCClassType(); - + TypeFromUser self_user_type(class_type.getAsOpaquePtr(), &method_decl->getASTContext()); - + m_struct_vars->m_object_pointer_type = self_user_type; } @@ -1172,22 +1153,22 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, // claims to have an object pointer (through DW_AT_object_pointer?) but is not formally a // method of the class. In that case, just look up the "self" variable in the the current // scope and use its type. - + VariableList *vars = frame->GetVariableList(false); - + lldb::VariableSP self_var = vars->FindVariable(ConstString("self")); - + if (self_var && - self_var->IsInScope(frame) && + self_var->IsInScope(frame) && self_var->LocationIsValidForFrame (frame)) { Type *self_type = self_var->GetType(); - + if (!self_type) return; - + ClangASTType self_clang_type = self_type->GetClangFullType(); - + if (self_clang_type.IsObjCClassType()) { return; @@ -1198,19 +1179,19 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, if (!self_clang_type) return; - + if (log) { ASTDumper ast_dumper(self_type->GetClangFullType()); log->Printf(" FEVD[%u] Adding type for $__lldb_objc_class: %s", current_id, ast_dumper.GetCString()); } - + TypeFromUser class_user_type (self_clang_type); - + AddOneType(context, class_user_type, current_id); - + TypeFromUser self_user_type(self_type->GetClangFullType()); - + m_struct_vars->m_object_pointer_type = self_user_type; return; } @@ -1219,66 +1200,66 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, return; } - + // any other $__lldb names should be weeded out now if (!::strncmp(name_unique_cstr, "$__lldb", sizeof("$__lldb") - 1)) return; - + do { if (!target) break; - + ClangASTContext *scratch_clang_ast_context = target->GetScratchClangASTContext(); - + if (!scratch_clang_ast_context) break; - + ASTContext *scratch_ast_context = scratch_clang_ast_context->getASTContext(); - + if (!scratch_ast_context) break; - + TypeDecl *ptype_type_decl = m_parser_vars->m_persistent_vars->GetPersistentType(name); - + if (!ptype_type_decl) break; - + Decl *parser_ptype_decl = m_ast_importer->CopyDecl(m_ast_context, scratch_ast_context, ptype_type_decl); - + if (!parser_ptype_decl) break; - + TypeDecl *parser_ptype_type_decl = dyn_cast<TypeDecl>(parser_ptype_decl); - + if (!parser_ptype_type_decl) break; - + if (log) log->Printf(" CEDM::FEVD[%u] Found persistent type %s", current_id, name.GetCString()); - + context.AddNamedDecl(parser_ptype_type_decl); } while (0); - + ClangExpressionVariableSP pvar_sp(m_parser_vars->m_persistent_vars->GetVariable(name)); - + if (pvar_sp) { AddOneVariable(context, pvar_sp, current_id); return; } - + const char *reg_name(&name.GetCString()[1]); - + if (m_parser_vars->m_exe_ctx.GetRegisterContext()) { const RegisterInfo *reg_info(m_parser_vars->m_exe_ctx.GetRegisterContext()->GetRegisterInfoByName(reg_name)); - + if (reg_info) { if (log) log->Printf(" CEDM::FEVD[%u] Found register %s", current_id, reg_info->name); - + AddOneRegister(context, reg_info, current_id); } } @@ -1288,11 +1269,11 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, ValueObjectSP valobj; VariableSP var; Error err; - + if (frame && !namespace_decl) { - valobj = frame->GetValueForVariableExpressionPath(name_unique_cstr, - eNoDynamicValues, + valobj = frame->GetValueForVariableExpressionPath(name_unique_cstr, + eNoDynamicValues, StackFrame::eExpressionPathOptionCheckPtrVsMember || StackFrame::eExpressionPathOptionsAllowDirectIVarAccess || StackFrame::eExpressionPathOptionsNoFragileObjcIvar || @@ -1300,7 +1281,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, StackFrame::eExpressionPathOptionsNoSyntheticArrayRange, var, err); - + // If we found a variable in scope, no need to pull up function names if (err.Success() && var) { @@ -1309,7 +1290,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, return; } } - + if (target) { var = FindGlobalVariable (*target, @@ -1317,7 +1298,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, name, &namespace_decl, NULL); - + if (var) { valobj = ValueObjectVariable::Create(target, var); @@ -1326,19 +1307,19 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, return; } } - + if (!context.m_found.variable) { const bool include_inlines = false; const bool append = false; - + if (namespace_decl && module_sp) { const bool include_symbols = false; module_sp->FindFunctions(name, &namespace_decl, - eFunctionNameTypeBase, + eFunctionNameTypeBase, include_symbols, include_inlines, append, @@ -1347,63 +1328,63 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, else if (target && !namespace_decl) { const bool include_symbols = true; - + // TODO Fix FindFunctions so that it doesn't return // instance methods for eFunctionNameTypeBase. - + target->GetImages().FindFunctions(name, eFunctionNameTypeFull, include_symbols, include_inlines, - append, + append, sc_list); } - + if (sc_list.GetSize()) { Symbol *extern_symbol = NULL; Symbol *non_extern_symbol = NULL; - + for (uint32_t index = 0, num_indices = sc_list.GetSize(); index < num_indices; ++index) { SymbolContext sym_ctx; sc_list.GetContextAtIndex(index, sym_ctx); - + if (sym_ctx.function) { clang::DeclContext *decl_ctx = sym_ctx.function->GetClangDeclContext(); - + if (!decl_ctx) continue; - + // Filter out class/instance methods. if (dyn_cast<clang::ObjCMethodDecl>(decl_ctx)) continue; if (dyn_cast<clang::CXXMethodDecl>(decl_ctx)) continue; - + AddOneFunction(context, sym_ctx.function, NULL, current_id); context.m_found.function_with_type_info = true; context.m_found.function = true; } else if (sym_ctx.symbol) { - if (sym_ctx.symbol->GetType() == eSymbolTypeReExported) + if (sym_ctx.symbol->GetType() == eSymbolTypeReExported && target) { sym_ctx.symbol = sym_ctx.symbol->ResolveReExportedSymbol(*target); if (sym_ctx.symbol == NULL) continue; } - + if (sym_ctx.symbol->IsExternal()) extern_symbol = sym_ctx.symbol; else non_extern_symbol = sym_ctx.symbol; } } - + if (!context.m_found.function_with_type_info) { if (extern_symbol) @@ -1418,14 +1399,14 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, } } } - + if (target && !context.m_found.variable && !namespace_decl) { - // We couldn't find a non-symbol variable for this. Now we'll hunt for a generic + // We couldn't find a non-symbol variable for this. Now we'll hunt for a generic // data symbol, and -- if it is found -- treat it as a variable. - + const Symbol *data_symbol = FindGlobalDataSymbol(*target, name); - + if (data_symbol) { std::string warning("got name from symbols: "); @@ -1440,43 +1421,43 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context, } } -static clang_type_t -MaybePromoteToBlockPointerType -( - ASTContext *ast_context, - clang_type_t candidate_type -) -{ - if (!candidate_type) - return candidate_type; - - QualType candidate_qual_type = QualType::getFromOpaquePtr(candidate_type); - - const PointerType *candidate_pointer_type = dyn_cast<PointerType>(candidate_qual_type); - - if (!candidate_pointer_type) - return candidate_type; - - QualType pointee_qual_type = candidate_pointer_type->getPointeeType(); - - const RecordType *pointee_record_type = dyn_cast<RecordType>(pointee_qual_type); - - if (!pointee_record_type) - return candidate_type; - - RecordDecl *pointee_record_decl = pointee_record_type->getDecl(); - - if (!pointee_record_decl->isRecord()) - return candidate_type; - - if (!pointee_record_decl->getName().startswith(llvm::StringRef("__block_literal_"))) - return candidate_type; - - QualType generic_function_type = ast_context->getFunctionNoProtoType(ast_context->UnknownAnyTy); - QualType block_pointer_type = ast_context->getBlockPointerType(generic_function_type); - - return block_pointer_type.getAsOpaquePtr(); -} +//static clang_type_t +//MaybePromoteToBlockPointerType +//( +// ASTContext *ast_context, +// clang_type_t candidate_type +//) +//{ +// if (!candidate_type) +// return candidate_type; +// +// QualType candidate_qual_type = QualType::getFromOpaquePtr(candidate_type); +// +// const PointerType *candidate_pointer_type = dyn_cast<PointerType>(candidate_qual_type); +// +// if (!candidate_pointer_type) +// return candidate_type; +// +// QualType pointee_qual_type = candidate_pointer_type->getPointeeType(); +// +// const RecordType *pointee_record_type = dyn_cast<RecordType>(pointee_qual_type); +// +// if (!pointee_record_type) +// return candidate_type; +// +// RecordDecl *pointee_record_decl = pointee_record_type->getDecl(); +// +// if (!pointee_record_decl->isRecord()) +// return candidate_type; +// +// if (!pointee_record_decl->getName().startswith(llvm::StringRef("__block_literal_"))) +// return candidate_type; +// +// QualType generic_function_type = ast_context->getFunctionNoProtoType(ast_context->UnknownAnyTy); +// QualType block_pointer_type = ast_context->getBlockPointerType(generic_function_type); +// +// return block_pointer_type.getAsOpaquePtr(); +//} bool ClangExpressionDeclMap::GetVariableValue (VariableSP &var, @@ -1485,25 +1466,25 @@ ClangExpressionDeclMap::GetVariableValue (VariableSP &var, TypeFromParser *parser_type) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + Type *var_type = var->GetType(); - - if (!var_type) + + if (!var_type) { if (log) log->PutCString("Skipped a definition because it has no type"); return false; } - + ClangASTType var_clang_type = var_type->GetClangFullType(); - + if (!var_clang_type) { if (log) log->PutCString("Skipped a definition because it has no Clang type"); return false; } - + ASTContext *ast = var_type->GetClangASTContext().getASTContext(); if (!ast) @@ -1513,25 +1494,16 @@ ClangExpressionDeclMap::GetVariableValue (VariableSP &var, return false; } //var_clang_type = MaybePromoteToBlockPointerType (ast, var_clang_type); - + DWARFExpression &var_location_expr = var->LocationExpression(); - - lldb::addr_t loclist_base_load_addr = LLDB_INVALID_ADDRESS; - - Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); - if (var_location_expr.IsLocationList()) - { - SymbolContext var_sc; - var->CalculateSymbolContext (&var_sc); - loclist_base_load_addr = var_sc.function->GetAddressRange().GetBaseAddress().GetLoadAddress (target); - } + Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); Error err; - + if (var->GetLocationIsConstantValueData()) { DataExtractor const_value_extractor; - + if (var_location_expr.GetExpressionData(const_value_extractor)) { var_location = Value(const_value_extractor.GetDataStart(), const_value_extractor.GetByteSize()); @@ -1544,45 +1516,45 @@ ClangExpressionDeclMap::GetVariableValue (VariableSP &var, return false; } } - + ClangASTType type_to_use = GuardedCopyType(var_clang_type); - + if (!type_to_use) { if (log) log->Printf("Couldn't copy a variable's type into the parser's AST context"); - + return false; } - + if (parser_type) *parser_type = TypeFromParser(type_to_use); - + if (var_location.GetContextType() == Value::eContextTypeInvalid) var_location.SetClangType(type_to_use); - + if (var_location.GetValueType() == Value::eValueTypeFileAddress) { SymbolContext var_sc; var->CalculateSymbolContext(&var_sc); - + if (!var_sc.module_sp) return false; Address so_addr(var_location.GetScalar().ULongLong(), var_sc.module_sp->GetSectionList()); - + lldb::addr_t load_addr = so_addr.GetLoadAddress(target); - + if (load_addr != LLDB_INVALID_ADDRESS) { var_location.GetScalar() = load_addr; var_location.SetValueType(Value::eValueTypeLoadAddress); } } - + if (user_type) *user_type = TypeFromUser(var_clang_type); - + return true; } @@ -1590,21 +1562,21 @@ void ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP var, ValueObjectSP valobj, unsigned int current_id) { assert (m_parser_vars.get()); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + TypeFromUser ut; TypeFromParser pt; Value var_location; - + if (!GetVariableValue (var, var_location, &ut, &pt)) return; - + clang::QualType parser_opaque_type = QualType::getFromOpaquePtr(pt.GetOpaqueQualType()); - + if (parser_opaque_type.isNull()) return; - + if (const clang::Type *parser_type = parser_opaque_type.getTypePtr()) { if (const TagType *tag_type = dyn_cast<TagType>(parser_type)) @@ -1612,8 +1584,8 @@ ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP v if (const ObjCObjectPointerType *objc_object_ptr_type = dyn_cast<ObjCObjectPointerType>(parser_type)) CompleteType(objc_object_ptr_type->getInterfaceDecl()); } - - + + bool is_reference = pt.IsReferenceType(); NamedDecl *var_decl = NULL; @@ -1621,11 +1593,11 @@ ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP v var_decl = context.AddVarDecl(pt); else var_decl = context.AddVarDecl(pt.GetLValueReferenceType()); - + std::string decl_name(context.m_decl_name.getAsString()); ConstString entity_name(decl_name.c_str()); ClangExpressionVariableSP entity(m_found_entities.CreateVariable (valobj)); - + assert (entity.get()); entity->EnableParserVars(GetParserID()); ClangExpressionVariable::ParserVars *parser_vars = entity->GetParserVars(GetParserID()); @@ -1634,45 +1606,45 @@ ClangExpressionDeclMap::AddOneVariable (NameSearchContext &context, VariableSP v parser_vars->m_llvm_value = NULL; parser_vars->m_lldb_value = var_location; parser_vars->m_lldb_var = var; - + if (is_reference) entity->m_flags |= ClangExpressionVariable::EVTypeIsReference; - + if (log) { ASTDumper orig_dumper(ut.GetOpaqueQualType()); - ASTDumper ast_dumper(var_decl); + ASTDumper ast_dumper(var_decl); log->Printf(" CEDM::FEVD[%u] Found variable %s, returned %s (original %s)", current_id, decl_name.c_str(), ast_dumper.GetCString(), orig_dumper.GetCString()); } } void ClangExpressionDeclMap::AddOneVariable(NameSearchContext &context, - ClangExpressionVariableSP &pvar_sp, + ClangExpressionVariableSP &pvar_sp, unsigned int current_id) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + TypeFromUser user_type (pvar_sp->GetTypeFromUser()); - + TypeFromParser parser_type (GuardedCopyType(user_type)); - + if (!parser_type.GetOpaqueQualType()) { if (log) log->Printf(" CEDM::FEVD[%u] Couldn't import type for pvar %s", current_id, pvar_sp->GetName().GetCString()); return; } - + NamedDecl *var_decl = context.AddVarDecl(parser_type.GetLValueReferenceType()); - + pvar_sp->EnableParserVars(GetParserID()); ClangExpressionVariable::ParserVars *parser_vars = pvar_sp->GetParserVars(GetParserID()); parser_vars->m_parser_type = parser_type; parser_vars->m_named_decl = var_decl; parser_vars->m_llvm_value = NULL; parser_vars->m_lldb_value.Clear(); - + if (log) { ASTDumper ast_dumper(var_decl); @@ -1681,59 +1653,59 @@ ClangExpressionDeclMap::AddOneVariable(NameSearchContext &context, } void -ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context, +ClangExpressionDeclMap::AddOneGenericVariable(NameSearchContext &context, const Symbol &symbol, unsigned int current_id) { assert(m_parser_vars.get()); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); if (target == NULL) return; ASTContext *scratch_ast_context = target->GetScratchClangASTContext()->getASTContext(); - + TypeFromUser user_type (ClangASTContext::GetBasicType(scratch_ast_context, eBasicTypeVoid).GetPointerType().GetLValueReferenceType()); TypeFromParser parser_type (ClangASTContext::GetBasicType(m_ast_context, eBasicTypeVoid).GetPointerType().GetLValueReferenceType()); NamedDecl *var_decl = context.AddVarDecl(parser_type); - + std::string decl_name(context.m_decl_name.getAsString()); ConstString entity_name(decl_name.c_str()); ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx.GetBestExecutionContextScope (), - entity_name, + entity_name, user_type, m_parser_vars->m_target_info.byte_order, m_parser_vars->m_target_info.address_byte_size)); assert (entity.get()); - + entity->EnableParserVars(GetParserID()); ClangExpressionVariable::ParserVars *parser_vars = entity->GetParserVars(GetParserID()); const Address &symbol_address = symbol.GetAddress(); lldb::addr_t symbol_load_addr = symbol_address.GetLoadAddress(target); - + //parser_vars->m_lldb_value.SetContext(Value::eContextTypeClangType, user_type.GetOpaqueQualType()); parser_vars->m_lldb_value.SetClangType(user_type); parser_vars->m_lldb_value.GetScalar() = symbol_load_addr; parser_vars->m_lldb_value.SetValueType(Value::eValueTypeLoadAddress); - + parser_vars->m_parser_type = parser_type; parser_vars->m_named_decl = var_decl; parser_vars->m_llvm_value = NULL; parser_vars->m_lldb_sym = &symbol; - + if (log) { ASTDumper ast_dumper(var_decl); - + log->Printf(" CEDM::FEVD[%u] Found variable %s, returned %s", current_id, decl_name.c_str(), ast_dumper.GetCString()); } } -bool +bool ClangExpressionDeclMap::ResolveUnknownTypes() { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); @@ -1746,82 +1718,82 @@ ClangExpressionDeclMap::ResolveUnknownTypes() ++index) { ClangExpressionVariableSP entity = m_found_entities.GetVariableAtIndex(index); - + ClangExpressionVariable::ParserVars *parser_vars = entity->GetParserVars(GetParserID()); - + if (entity->m_flags & ClangExpressionVariable::EVUnknownType) { const NamedDecl *named_decl = parser_vars->m_named_decl; const VarDecl *var_decl = dyn_cast<VarDecl>(named_decl); - + if (!var_decl) { if (log) log->Printf("Entity of unknown type does not have a VarDecl"); return false; } - + if (log) { ASTDumper ast_dumper(const_cast<VarDecl*>(var_decl)); log->Printf("Variable of unknown type now has Decl %s", ast_dumper.GetCString()); } - + QualType var_type = var_decl->getType(); TypeFromParser parser_type(var_type.getAsOpaquePtr(), &var_decl->getASTContext()); - + lldb::clang_type_t copied_type = m_ast_importer->CopyType(scratch_ast_context, &var_decl->getASTContext(), var_type.getAsOpaquePtr()); - + if (!copied_type) - { + { if (log) log->Printf("ClangExpressionDeclMap::ResolveUnknownType - Couldn't import the type for a variable"); - + return (bool) lldb::ClangExpressionVariableSP(); } - + TypeFromUser user_type(copied_type, scratch_ast_context); - + // parser_vars->m_lldb_value.SetContext(Value::eContextTypeClangType, user_type.GetOpaqueQualType()); parser_vars->m_lldb_value.SetClangType(user_type); parser_vars->m_parser_type = parser_type; - + entity->SetClangType(user_type); - + entity->m_flags &= ~(ClangExpressionVariable::EVUnknownType); } } - + return true; } void ClangExpressionDeclMap::AddOneRegister (NameSearchContext &context, - const RegisterInfo *reg_info, + const RegisterInfo *reg_info, unsigned int current_id) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + ClangASTType clang_type = ClangASTContext::GetBuiltinTypeForEncodingAndBitSize (m_ast_context, reg_info->encoding, reg_info->byte_size * 8); - + if (!clang_type) { if (log) log->Printf(" Tried to add a type for %s, but couldn't get one", context.m_decl_name.getAsString().c_str()); return; } - + TypeFromParser parser_clang_type (clang_type); - + NamedDecl *var_decl = context.AddVarDecl(parser_clang_type); - + ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx.GetBestExecutionContextScope(), m_parser_vars->m_target_info.byte_order, m_parser_vars->m_target_info.address_byte_size)); assert (entity.get()); - + std::string decl_name(context.m_decl_name.getAsString()); entity->SetName (ConstString (decl_name.c_str())); entity->SetRegisterInfo (reg_info); @@ -1832,7 +1804,7 @@ ClangExpressionDeclMap::AddOneRegister (NameSearchContext &context, parser_vars->m_llvm_value = NULL; parser_vars->m_lldb_value.Clear(); entity->m_flags |= ClangExpressionVariable::EVBareRegister; - + if (log) { ASTDumper ast_dumper(var_decl); @@ -1847,9 +1819,9 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, unsigned int current_id) { assert (m_parser_vars.get()); - + Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + NamedDecl *function_decl = NULL; const Address *fun_address = NULL; ClangASTType function_clang_type; @@ -1859,30 +1831,30 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, if (function) { Type *function_type = function->GetType(); - + if (!function_type) { if (log) log->PutCString(" Skipped a function because it has no type"); return; } - + function_clang_type = function_type->GetClangFullType(); - + if (!function_clang_type) { if (log) log->PutCString(" Skipped a function because it has no Clang type"); return; } - + fun_address = &function->GetAddressRange().GetBaseAddress(); - + ClangASTType copied_function_type = GuardedCopyType(function_clang_type); if (copied_function_type) { function_decl = context.AddFunDecl(copied_function_type); - + if (!function_decl) { if (log) @@ -1891,7 +1863,7 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, function_type->GetName().GetCString(), function_type->GetID()); } - + return; } } @@ -1904,7 +1876,7 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, function_type->GetName().GetCString(), function_type->GetID()); } - + return; } } @@ -1920,11 +1892,11 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, log->PutCString(" AddOneFunction called with no function and no symbol"); return; } - + Target *target = m_parser_vars->m_exe_ctx.GetTargetPtr(); lldb::addr_t load_addr = fun_address->GetCallableLoadAddress(target, is_indirect_function); - + ClangExpressionVariableSP entity(m_found_entities.CreateVariable (m_parser_vars->m_exe_ctx.GetBestExecutionContextScope (), m_parser_vars->m_target_info.byte_order, m_parser_vars->m_target_info.address_byte_size)); @@ -1936,7 +1908,7 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, entity->EnableParserVars(GetParserID()); ClangExpressionVariable::ParserVars *parser_vars = entity->GetParserVars(GetParserID()); - + if (load_addr != LLDB_INVALID_ADDRESS) { parser_vars->m_lldb_value.SetValueType(Value::eValueTypeLoadAddress); @@ -1945,25 +1917,25 @@ ClangExpressionDeclMap::AddOneFunction (NameSearchContext &context, else { // We have to try finding a file address. - + lldb::addr_t file_addr = fun_address->GetFileAddress(); - + parser_vars->m_lldb_value.SetValueType(Value::eValueTypeFileAddress); parser_vars->m_lldb_value.GetScalar() = file_addr; } - + parser_vars->m_named_decl = function_decl; parser_vars->m_llvm_value = NULL; - + if (log) { ASTDumper ast_dumper(function_decl); - + StreamString ss; - + fun_address->Dump(&ss, m_parser_vars->m_exe_ctx.GetBestExecutionContextScope(), Address::DumpStyleResolvedDescription); - + log->Printf(" CEDM::FEVD[%u] Found %s function %s (description %s), returned %s", current_id, (function ? "specific" : "generic"), @@ -1978,14 +1950,14 @@ ClangExpressionDeclMap::CopyClassType(TypeFromUser &ut, unsigned int current_id) { ClangASTType copied_clang_type = GuardedCopyType(ut); - + if (!copied_clang_type) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); - + if (log) log->Printf("ClangExpressionDeclMap::CopyClassType - Couldn't import the type"); - + return TypeFromParser(); } @@ -1993,21 +1965,21 @@ ClangExpressionDeclMap::CopyClassType(TypeFromUser &ut, { ClangASTType void_clang_type = ClangASTContext::GetBasicType(m_ast_context, eBasicTypeVoid); ClangASTType void_ptr_clang_type = void_clang_type.GetPointerType(); - + ClangASTType method_type = ClangASTContext::CreateFunctionType (m_ast_context, void_clang_type, &void_ptr_clang_type, 1, false, copied_clang_type.GetTypeQualifiers()); - + const bool is_virtual = false; const bool is_static = false; const bool is_inline = false; const bool is_explicit = false; const bool is_attr_used = true; const bool is_artificial = false; - + copied_clang_type.AddMethodToCXXRecordType ("$__lldb_expr", method_type, lldb::eAccessPublic, @@ -2018,26 +1990,26 @@ ClangExpressionDeclMap::CopyClassType(TypeFromUser &ut, is_attr_used, is_artificial); } - + return TypeFromParser(copied_clang_type); } -void -ClangExpressionDeclMap::AddOneType(NameSearchContext &context, +void +ClangExpressionDeclMap::AddOneType(NameSearchContext &context, TypeFromUser &ut, unsigned int current_id) { ClangASTType copied_clang_type = GuardedCopyType(ut); - + if (!copied_clang_type) { Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS)); if (log) log->Printf("ClangExpressionDeclMap::AddOneType - Couldn't import the type"); - + return; } - + context.AddTypeDecl(copied_clang_type); } |