Author: xiaobai Date: Fri Jul 12 13:09:32 2019 New Revision: 365951 URL: http://llvm.org/viewvc/llvm-project?rev=365951&view=rev Log: [LanguageRuntime] Move CPPLanguageRuntime into a plugin
Summary: This seems better suited to be in a plugin. Reviewers: JDevlieghere, clayborg, jingham, compnerd, labath Subscribers: mgorny, lldb-commits Differential Revision: https://reviews.llvm.org/D64599 Added: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp - copied, changed from r365939, lldb/trunk/source/Target/CPPLanguageRuntime.cpp lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h - copied, changed from r365939, lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h Removed: lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h lldb/trunk/source/Target/CPPLanguageRuntime.cpp Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/CMakeLists.txt lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt lldb/trunk/source/Plugins/Language/CPlusPlus/LibCxx.cpp lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h lldb/trunk/source/Target/CMakeLists.txt Removed: lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h?rev=365950&view=auto ============================================================================== --- lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h (original) +++ lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h (removed) @@ -1,90 +0,0 @@ -//===-- CPPLanguageRuntime.h -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#ifndef liblldb_CPPLanguageRuntime_h_ -#define liblldb_CPPLanguageRuntime_h_ - -#include <vector> -#include "lldb/Core/PluginInterface.h" -#include "lldb/Target/LanguageRuntime.h" -#include "lldb/lldb-private.h" - -namespace lldb_private { - -class CPPLanguageRuntime : public LanguageRuntime { -public: - enum class LibCppStdFunctionCallableCase { - Lambda = 0, - CallableObject, - FreeOrMemberFunction, - Invalid - }; - - struct LibCppStdFunctionCallableInfo { - Symbol callable_symbol; - Address callable_address; - LineEntry callable_line_entry; - lldb::addr_t member__f_pointer_value = 0u; - LibCppStdFunctionCallableCase callable_case = - LibCppStdFunctionCallableCase::Invalid; - }; - - LibCppStdFunctionCallableInfo - FindLibCppStdFunctionCallableInfo(lldb::ValueObjectSP &valobj_sp); - - ~CPPLanguageRuntime() override; - - static char ID; - - bool isA(const void *ClassID) const override { - return ClassID == &ID || LanguageRuntime::isA(ClassID); - } - - static bool classof(const LanguageRuntime *runtime) { - return runtime->isA(&ID); - } - - lldb::LanguageType GetLanguageType() const override { - return lldb::eLanguageTypeC_plus_plus; - } - - static CPPLanguageRuntime *Get(Process &process) { - return llvm::cast_or_null<CPPLanguageRuntime>( - process.GetLanguageRuntime(lldb::eLanguageTypeC_plus_plus)); - } - - bool GetObjectDescription(Stream &str, ValueObject &object) override; - - bool GetObjectDescription(Stream &str, Value &value, - ExecutionContextScope *exe_scope) override; - - /// Obtain a ThreadPlan to get us into C++ constructs such as std::function. - /// - /// \param[in] thread - /// Curent thrad of execution. - /// - /// \param[in] stop_others - /// True if other threads should pause during execution. - /// - /// \return - /// A ThreadPlan Shared pointer - lldb::ThreadPlanSP GetStepThroughTrampolinePlan(Thread &thread, - bool stop_others) override; - - bool IsWhitelistedRuntimeValue(ConstString name) override; -protected: - // Classes that inherit from CPPLanguageRuntime can see and modify these - CPPLanguageRuntime(Process *process); - -private: - DISALLOW_COPY_AND_ASSIGN(CPPLanguageRuntime); -}; - -} // namespace lldb_private - -#endif // liblldb_CPPLanguageRuntime_h_ Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/ExpressionParser/Clang/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/ExpressionParser/Clang/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -44,6 +44,7 @@ add_lldb_library(lldbPluginExpressionPar lldbTarget lldbUtility lldbPluginCPlusPlusLanguage + lldbPluginCPPRuntime LINK_COMPONENTS Core ExecutionEngine Modified: lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp (original) +++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp Fri Jul 12 13:09:32 2019 @@ -32,7 +32,6 @@ #include "lldb/Symbol/TypeList.h" #include "lldb/Symbol/Variable.h" #include "lldb/Symbol/VariableList.h" -#include "lldb/Target/CPPLanguageRuntime.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/ObjCLanguageRuntime.h" #include "lldb/Target/Process.h" @@ -53,6 +52,7 @@ #include "clang/AST/RecursiveASTVisitor.h" #include "Plugins/Language/CPlusPlus/CPlusPlusLanguage.h" +#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" using namespace lldb; using namespace lldb_private; Modified: lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Language/CPlusPlus/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -28,6 +28,7 @@ add_lldb_library(lldbPluginCPlusPlusLang lldbTarget lldbUtility lldbPluginClangCommon + lldbPluginCPPRuntime LINK_COMPONENTS Support Modified: lldb/trunk/source/Plugins/Language/CPlusPlus/LibCxx.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Language/CPlusPlus/LibCxx.cpp?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Language/CPlusPlus/LibCxx.cpp (original) +++ lldb/trunk/source/Plugins/Language/CPlusPlus/LibCxx.cpp Fri Jul 12 13:09:32 2019 @@ -18,7 +18,6 @@ #include "lldb/DataFormatters/TypeSummary.h" #include "lldb/DataFormatters/VectorIterator.h" #include "lldb/Symbol/ClangASTContext.h" -#include "lldb/Target/CPPLanguageRuntime.h" #include "lldb/Target/ProcessStructReader.h" #include "lldb/Target/SectionLoadList.h" #include "lldb/Target/Target.h" @@ -27,6 +26,8 @@ #include "lldb/Utility/Status.h" #include "lldb/Utility/Stream.h" +#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" + using namespace lldb; using namespace lldb_private; using namespace lldb_private::formatters; Modified: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -1,2 +1,11 @@ +add_lldb_library(lldbPluginCPPRuntime PLUGIN + CPPLanguageRuntime.cpp + + LINK_LIBS + lldbCore + lldbSymbol + lldbTarget +) + add_subdirectory(ItaniumABI) #add_subdirectory(MicrosoftABI) Copied: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp (from r365939, lldb/trunk/source/Target/CPPLanguageRuntime.cpp) URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp?p2=lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp&p1=lldb/trunk/source/Target/CPPLanguageRuntime.cpp&r1=365939&r2=365951&rev=365951&view=diff ============================================================================== --- lldb/trunk/source/Target/CPPLanguageRuntime.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.cpp Fri Jul 12 13:09:32 2019 @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -#include "lldb/Target/CPPLanguageRuntime.h" -#include "lldb/Target/ObjCLanguageRuntime.h" - #include <string.h> #include <memory> +#include "CPPLanguageRuntime.h" + #include "llvm/ADT/StringRef.h" #include "lldb/Symbol/Block.h" Copied: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h (from r365939, lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h) URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h?p2=lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h&p1=lldb/trunk/include/lldb/Target/CPPLanguageRuntime.h&r1=365939&r2=365951&rev=365951&view=diff ============================================================================== (empty) Modified: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -7,4 +7,5 @@ add_lldb_library(lldbPluginCXXItaniumABI lldbInterpreter lldbSymbol lldbTarget + lldbPluginCPPRuntime ) Modified: lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h Fri Jul 12 13:09:32 2019 @@ -16,10 +16,11 @@ #include "lldb/Breakpoint/BreakpointResolver.h" #include "lldb/Core/Value.h" #include "lldb/Symbol/Type.h" -#include "lldb/Target/CPPLanguageRuntime.h" #include "lldb/Target/LanguageRuntime.h" #include "lldb/lldb-private.h" +#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" + namespace lldb_private { class ItaniumABILanguageRuntime : public lldb_private::CPPLanguageRuntime { Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp Fri Jul 12 13:09:32 2019 @@ -24,7 +24,6 @@ #include "lldb/Expression/FunctionCaller.h" #include "lldb/Symbol/ClangASTContext.h" #include "lldb/Symbol/ObjectFile.h" -#include "lldb/Target/CPPLanguageRuntime.h" #include "lldb/Target/ExecutionContext.h" #include "lldb/Target/Process.h" #include "lldb/Target/RegisterContext.h" @@ -39,6 +38,7 @@ #include "Plugins/Process/Utility/HistoryThread.h" #include "Plugins/Language/ObjC/NSString.h" +#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" #include <vector> Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -19,6 +19,7 @@ add_lldb_library(lldbPluginAppleObjCRunt lldbTarget lldbUtility lldbPluginExpressionParserClang + lldbPluginCPPRuntime LINK_COMPONENTS Support ) Modified: lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h (original) +++ lldb/trunk/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.h Fri Jul 12 13:09:32 2019 @@ -19,10 +19,11 @@ #include "llvm/ADT/StringRef.h" #include "lldb/Core/Module.h" #include "lldb/Expression/LLVMUserExpression.h" -#include "lldb/Target/CPPLanguageRuntime.h" #include "lldb/Target/LanguageRuntime.h" #include "lldb/lldb-private.h" +#include "Plugins/LanguageRuntime/CPlusPlus/CPPLanguageRuntime.h" + namespace lldb_private { namespace lldb_renderscript { Modified: lldb/trunk/source/Target/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/CMakeLists.txt?rev=365951&r1=365950&r2=365951&view=diff ============================================================================== --- lldb/trunk/source/Target/CMakeLists.txt (original) +++ lldb/trunk/source/Target/CMakeLists.txt Fri Jul 12 13:09:32 2019 @@ -1,6 +1,5 @@ add_lldb_library(lldbTarget ABI.cpp - CPPLanguageRuntime.cpp ExecutionContext.cpp JITLoader.cpp JITLoaderList.cpp Removed: lldb/trunk/source/Target/CPPLanguageRuntime.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/CPPLanguageRuntime.cpp?rev=365950&view=auto ============================================================================== --- lldb/trunk/source/Target/CPPLanguageRuntime.cpp (original) +++ lldb/trunk/source/Target/CPPLanguageRuntime.cpp (removed) @@ -1,354 +0,0 @@ -//===-- CPPLanguageRuntime.cpp -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// - -#include "lldb/Target/CPPLanguageRuntime.h" -#include "lldb/Target/ObjCLanguageRuntime.h" - -#include <string.h> - -#include <memory> - -#include "llvm/ADT/StringRef.h" - -#include "lldb/Symbol/Block.h" -#include "lldb/Symbol/Variable.h" -#include "lldb/Symbol/VariableList.h" - -#include "lldb/Core/PluginManager.h" -#include "lldb/Core/UniqueCStringMap.h" -#include "lldb/Symbol/ClangASTContext.h" -#include "lldb/Target/ABI.h" -#include "lldb/Target/ExecutionContext.h" -#include "lldb/Target/RegisterContext.h" -#include "lldb/Target/SectionLoadList.h" -#include "lldb/Target/StackFrame.h" -#include "lldb/Target/ThreadPlanRunToAddress.h" -#include "lldb/Target/ThreadPlanStepInRange.h" - -using namespace lldb; -using namespace lldb_private; - -static ConstString g_this = ConstString("this"); - -char CPPLanguageRuntime::ID = 0; - -// Destructor -CPPLanguageRuntime::~CPPLanguageRuntime() {} - -CPPLanguageRuntime::CPPLanguageRuntime(Process *process) - : LanguageRuntime(process) {} - -bool CPPLanguageRuntime::IsWhitelistedRuntimeValue(ConstString name) { - return name == g_this; -} - -bool CPPLanguageRuntime::GetObjectDescription(Stream &str, - ValueObject &object) { - // C++ has no generic way to do this. - return false; -} - -bool CPPLanguageRuntime::GetObjectDescription( - Stream &str, Value &value, ExecutionContextScope *exe_scope) { - // C++ has no generic way to do this. - return false; -} - -CPPLanguageRuntime::LibCppStdFunctionCallableInfo -CPPLanguageRuntime::FindLibCppStdFunctionCallableInfo( - lldb::ValueObjectSP &valobj_sp) { - LibCppStdFunctionCallableInfo optional_info; - - if (!valobj_sp) - return optional_info; - - // Member __f_ has type __base*, the contents of which will hold: - // 1) a vtable entry which may hold type information needed to discover the - // lambda being called - // 2) possibly hold a pointer to the callable object - // e.g. - // - // (lldb) frame var -R f_display - // (std::__1::function<void (int)>) f_display = { - // __buf_ = { - // ⦠- // } - // __f_ = 0x00007ffeefbffa00 - // } - // (lldb) memory read -fA 0x00007ffeefbffa00 - // 0x7ffeefbffa00: ... `vtable for std::__1::__function::__func<void (*) ... - // 0x7ffeefbffa08: ... `print_num(int) at std_function_cppreference_exam ... - // - // We will be handling five cases below, std::function is wrapping: - // - // 1) a lambda we know at compile time. We will obtain the name of the lambda - // from the first template pameter from __func's vtable. We will look up - // the lambda's operator()() and obtain the line table entry. - // 2) a lambda we know at runtime. A pointer to the lambdas __invoke method - // will be stored after the vtable. We will obtain the lambdas name from - // this entry and lookup operator()() and obtain the line table entry. - // 3) a callable object via operator()(). We will obtain the name of the - // object from the first template parameter from __func's vtable. We will - // look up the objectc operator()() and obtain the line table entry. - // 4) a member function. A pointer to the function will stored after the - // we will obtain the name from this pointer. - // 5) a free function. A pointer to the function will stored after the vtable - // we will obtain the name from this pointer. - ValueObjectSP member__f_( - valobj_sp->GetChildMemberWithName(ConstString("__f_"), true)); - - if (member__f_) { - ValueObjectSP sub_member__f_( - member__f_->GetChildMemberWithName(ConstString("__f_"), true)); - - if (sub_member__f_) - member__f_ = sub_member__f_; - } - - lldb::addr_t member__f_pointer_value = member__f_->GetValueAsUnsigned(0); - - optional_info.member__f_pointer_value = member__f_pointer_value; - - ExecutionContext exe_ctx(valobj_sp->GetExecutionContextRef()); - Process *process = exe_ctx.GetProcessPtr(); - - if (process == nullptr) - return optional_info; - - uint32_t address_size = process->GetAddressByteSize(); - Status status; - - // First item pointed to by __f_ should be the pointer to the vtable for - // a __base object. - lldb::addr_t vtable_address = - process->ReadPointerFromMemory(member__f_pointer_value, status); - - if (status.Fail()) - return optional_info; - - lldb::addr_t address_after_vtable = member__f_pointer_value + address_size; - // As commened above we may not have a function pointer but if we do we will - // need it. - lldb::addr_t possible_function_address = - process->ReadPointerFromMemory(address_after_vtable, status); - - if (status.Fail()) - return optional_info; - - Target &target = process->GetTarget(); - - if (target.GetSectionLoadList().IsEmpty()) - return optional_info; - - Address vtable_addr_resolved; - SymbolContext sc; - Symbol *symbol; - - if (!target.GetSectionLoadList().ResolveLoadAddress(vtable_address, - vtable_addr_resolved)) - return optional_info; - - target.GetImages().ResolveSymbolContextForAddress( - vtable_addr_resolved, eSymbolContextEverything, sc); - symbol = sc.symbol; - - if (symbol == nullptr) - return optional_info; - - llvm::StringRef vtable_name(symbol->GetName().GetCString()); - bool found_expected_start_string = - vtable_name.startswith("vtable for std::__1::__function::__func<"); - - if (!found_expected_start_string) - return optional_info; - - // Given case 1 or 3 we have a vtable name, we are want to extract the first - // template parameter - // - // ... __func<main::$_0, std::__1::allocator<main::$_0> ... - // ^^^^^^^^^ - // - // We do this by find the first < and , and extracting in between. - // - // This covers the case of the lambda known at compile time. - size_t first_open_angle_bracket = vtable_name.find('<') + 1; - size_t first_comma = vtable_name.find(','); - - llvm::StringRef first_template_parameter = - vtable_name.slice(first_open_angle_bracket, first_comma); - - Address function_address_resolved; - - // Setup for cases 2, 4 and 5 we have a pointer to a function after the - // vtable. We will use a process of elimination to drop through each case - // and obtain the data we need. - if (target.GetSectionLoadList().ResolveLoadAddress( - possible_function_address, function_address_resolved)) { - target.GetImages().ResolveSymbolContextForAddress( - function_address_resolved, eSymbolContextEverything, sc); - symbol = sc.symbol; - } - - auto get_name = [&first_template_parameter, &symbol]() { - // Given case 1: - // - // main::$_0 - // - // we want to append ::operator()() - if (first_template_parameter.contains("$_")) - return llvm::Regex::escape(first_template_parameter.str()) + - R"(::operator\(\)\(.*\))"; - - if (symbol != nullptr && - symbol->GetName().GetStringRef().contains("__invoke")) { - - llvm::StringRef symbol_name = symbol->GetName().GetStringRef(); - size_t pos2 = symbol_name.find_last_of(':'); - - // Given case 2: - // - // main::$_1::__invoke(...) - // - // We want to slice off __invoke(...) and append operator()() - std::string lambda_operator = - llvm::Regex::escape(symbol_name.slice(0, pos2 + 1).str()) + - R"(operator\(\)\(.*\))"; - - return lambda_operator; - } - - // Case 3 - return first_template_parameter.str() + R"(::operator\(\)\(.*\))"; - ; - }; - - std::string func_to_match = get_name(); - - SymbolContextList scl; - - target.GetImages().FindSymbolsMatchingRegExAndType( - RegularExpression{R"(^)" + func_to_match}, eSymbolTypeAny, scl, true); - - // Case 1,2 or 3 - if (scl.GetSize() >= 1) { - SymbolContext sc2 = scl[0]; - - AddressRange range; - sc2.GetAddressRange(eSymbolContextEverything, 0, false, range); - - Address address = range.GetBaseAddress(); - - Address addr; - if (target.ResolveLoadAddress(address.GetCallableLoadAddress(&target), - addr)) { - LineEntry line_entry; - addr.CalculateSymbolContextLineEntry(line_entry); - - if (first_template_parameter.contains("$_") || - (symbol != nullptr && - symbol->GetName().GetStringRef().contains("__invoke"))) { - // Case 1 and 2 - optional_info.callable_case = LibCppStdFunctionCallableCase::Lambda; - } else { - // Case 3 - optional_info.callable_case = - LibCppStdFunctionCallableCase::CallableObject; - } - - optional_info.callable_symbol = *symbol; - optional_info.callable_line_entry = line_entry; - optional_info.callable_address = addr; - return optional_info; - } - } - - // Case 4 or 5 - if (symbol && !symbol->GetName().GetStringRef().startswith("vtable for")) { - optional_info.callable_case = - LibCppStdFunctionCallableCase::FreeOrMemberFunction; - optional_info.callable_address = function_address_resolved; - optional_info.callable_symbol = *symbol; - - return optional_info; - } - - return optional_info; -} - -lldb::ThreadPlanSP -CPPLanguageRuntime::GetStepThroughTrampolinePlan(Thread &thread, - bool stop_others) { - ThreadPlanSP ret_plan_sp; - - lldb::addr_t curr_pc = thread.GetRegisterContext()->GetPC(); - - TargetSP target_sp(thread.CalculateTarget()); - - if (target_sp->GetSectionLoadList().IsEmpty()) - return ret_plan_sp; - - Address pc_addr_resolved; - SymbolContext sc; - Symbol *symbol; - - if (!target_sp->GetSectionLoadList().ResolveLoadAddress(curr_pc, - pc_addr_resolved)) - return ret_plan_sp; - - target_sp->GetImages().ResolveSymbolContextForAddress( - pc_addr_resolved, eSymbolContextEverything, sc); - symbol = sc.symbol; - - if (symbol == nullptr) - return ret_plan_sp; - - llvm::StringRef function_name(symbol->GetName().GetCString()); - - // Handling the case where we are attempting to step into std::function. - // The behavior will be that we will attempt to obtain the wrapped - // callable via FindLibCppStdFunctionCallableInfo() and if we find it we - // will return a ThreadPlanRunToAddress to the callable. Therefore we will - // step into the wrapped callable. - // - bool found_expected_start_string = - function_name.startswith("std::__1::function<"); - - if (!found_expected_start_string) - return ret_plan_sp; - - AddressRange range_of_curr_func; - sc.GetAddressRange(eSymbolContextEverything, 0, false, range_of_curr_func); - - StackFrameSP frame = thread.GetStackFrameAtIndex(0); - - if (frame) { - ValueObjectSP value_sp = frame->FindVariable(g_this); - - CPPLanguageRuntime::LibCppStdFunctionCallableInfo callable_info = - FindLibCppStdFunctionCallableInfo(value_sp); - - if (callable_info.callable_case != LibCppStdFunctionCallableCase::Invalid && - value_sp->GetValueIsValid()) { - // We found the std::function wrapped callable and we have its address. - // We now create a ThreadPlan to run to the callable. - ret_plan_sp = std::make_shared<ThreadPlanRunToAddress>( - thread, callable_info.callable_address, stop_others); - return ret_plan_sp; - } else { - // We are in std::function but we could not obtain the callable. - // We create a ThreadPlan to keep stepping through using the address range - // of the current function. - ret_plan_sp = std::make_shared<ThreadPlanStepInRange>( - thread, range_of_curr_func, sc, eOnlyThisThread, eLazyBoolYes, - eLazyBoolYes); - return ret_plan_sp; - } - } - - return ret_plan_sp; -} _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
