Author: davide
Date: Tue Mar 27 12:40:50 2018
New Revision: 328658
URL: http://llvm.org/viewvc/llvm-project?rev=328658&view=rev
Log:
Use the DWARF linkage name when importing C++ methods.
When importing C++ methods into clang AST nodes from the DWARF symbol
table, preserve the DW_AT_linkage_name and use it as the linker
("asm") name for the symbol.
Concretely, this enables `expression` to call into names that use the
GNU `abi_tag` extension, and enables lldb to call into code using
std::string or std::list from recent versions of libstdc++. See
https://bugs.llvm.org/show_bug.cgi?id=35310 . It also seems broadly
more robust than relying on the DWARF->clang->codegen pipeline to
roundtrip properly, but I'm not immediately aware of any other cases
in which it makes a difference.
Patch by Nelson Elhage!
Differential Revision: https://reviews.llvm.org/D40283
Added:
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp
Modified:
lldb/trunk/include/lldb/Symbol/ClangASTContext.h
lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
lldb/trunk/source/Symbol/ClangASTContext.cpp
Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=328658&r1=328657&r2=328658&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Tue Mar 27 12:40:50 2018
@@ -824,6 +824,7 @@ public:
clang::CXXMethodDecl *
AddMethodToCXXRecordType(lldb::opaque_compiler_type_t type, const char *name,
+ const char *mangled_name,
const CompilerType &method_type,
lldb::AccessType access, bool is_virtual,
bool is_static, bool is_inline, bool is_explicit,
Added:
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile?rev=328658&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile
Tue Mar 27 12:40:50 2018
@@ -0,0 +1,5 @@
+LEVEL = ../../make
+
+CXX_SOURCES := main.cpp
+
+include $(LEVEL)/Makefile.rules
Added:
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py?rev=328658&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py
Tue Mar 27 12:40:50 2018
@@ -0,0 +1,39 @@
+from __future__ import print_function
+
+import lldb
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+class ExprBug35310(TestBase):
+
+ mydir = TestBase.compute_mydir(__file__)
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+
+ self.main_source = "main.cpp"
+ self.main_source_spec = lldb.SBFileSpec(self.main_source)
+
+ def test_issue35310(self):
+ """Test invoking functions with non-standard linkage names.
+
+ The GNU abi_tag extension used by libstdc++ is a common source
+ of these, but they could originate from other reasons as well.
+ """
+ self.build()
+
+ (target, process, thread, bkpt) =
lldbutil.run_to_source_breakpoint(self,
+ '// Break here',
self.main_source_spec)
+ frame = thread.GetFrameAtIndex(0)
+
+ value = frame.EvaluateExpression("a.test_abi_tag()")
+ self.assertTrue(value.IsValid())
+ self.assertTrue(value.GetError().Success())
+ self.assertEqual(value.GetValueAsSigned(0), 1)
+
+ value = frame.EvaluateExpression("a.test_asm_name()")
+ self.assertTrue(value.IsValid())
+ self.assertTrue(value.GetError().Success())
+ self.assertEqual(value.GetValueAsSigned(0), 2)
Added:
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp?rev=328658&view=auto
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp
(added)
+++
lldb/trunk/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp
Tue Mar 27 12:40:50 2018
@@ -0,0 +1,19 @@
+#include <stdio.h>
+
+class A {
+public:
+ int __attribute__((abi_tag("cxx11"))) test_abi_tag() {
+ return 1;
+ }
+ int test_asm_name() asm("A_test_asm") {
+ return 2;
+ }
+};
+
+int main(int argc, char **argv) {
+ A a;
+ // Break here
+ a.test_abi_tag();
+ a.test_asm_name();
+ return 0;
+}
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=328658&r1=328657&r2=328658&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
(original)
+++ lldb/trunk/source/Plugins/ExpressionParser/Clang/ClangExpressionDeclMap.cpp
Tue Mar 27 12:40:50 2018
@@ -2166,7 +2166,7 @@ void ClangExpressionDeclMap::AddThisType
CXXMethodDecl *method_decl =
ClangASTContext::GetASTContext(m_ast_context)
->AddMethodToCXXRecordType(
- copied_clang_type.GetOpaqueQualType(), "$__lldb_expr",
+ copied_clang_type.GetOpaqueQualType(), "$__lldb_expr", NULL,
method_type, lldb::eAccessPublic, is_virtual, is_static,
is_inline, is_explicit, is_attr_used, is_artificial);
Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp?rev=328658&r1=328657&r2=328658&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp
(original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/DWARFASTParserClang.cpp Tue Mar
27 12:40:50 2018
@@ -276,6 +276,7 @@ TypeSP DWARFASTParserClang::ParseTypeFro
bool is_forward_declaration = false;
DWARFAttributes attributes;
const char *type_name_cstr = NULL;
+ const char *mangled_name_cstr = NULL;
ConstString type_name_const_str;
Type::ResolveState resolve_state = Type::eResolveStateUnresolved;
uint64_t byte_size = 0;
@@ -1231,9 +1232,8 @@ TypeSP DWARFASTParserClang::ParseTypeFro
case DW_AT_linkage_name:
case DW_AT_MIPS_linkage_name:
- break; // mangled =
- // form_value.AsCString(&dwarf->get_debug_str_data());
- // break;
+ mangled_name_cstr = form_value.AsCString();
+ break;
case DW_AT_type:
type_die_form = form_value;
break;
@@ -1594,9 +1594,10 @@ TypeSP DWARFASTParserClang::ParseTypeFro
clang::CXXMethodDecl *cxx_method_decl =
m_ast.AddMethodToCXXRecordType(
class_opaque_type.GetOpaqueQualType(),
- type_name_cstr, clang_type, accessibility,
- is_virtual, is_static, is_inline,
is_explicit,
- is_attr_used, is_artificial);
+ type_name_cstr, mangled_name_cstr,
clang_type,
+ accessibility, is_virtual, is_static,
+ is_inline, is_explicit, is_attr_used,
+ is_artificial);
type_handled = cxx_method_decl != NULL;
Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=328658&r1=328657&r2=328658&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Tue Mar 27 12:40:50 2018
@@ -7889,7 +7889,7 @@ clang::VarDecl *ClangASTContext::AddVari
}
clang::CXXMethodDecl *ClangASTContext::AddMethodToCXXRecordType(
- lldb::opaque_compiler_type_t type, const char *name,
+ lldb::opaque_compiler_type_t type, const char *name, const char
*mangled_name,
const CompilerType &method_clang_type, lldb::AccessType access,
bool is_virtual, bool is_static, bool is_inline, bool is_explicit,
bool is_attr_used, bool is_artificial) {
@@ -8009,6 +8009,11 @@ clang::CXXMethodDecl *ClangASTContext::A
if (is_attr_used)
cxx_method_decl->addAttr(clang::UsedAttr::CreateImplicit(*getASTContext()));
+ if (mangled_name != NULL) {
+ cxx_method_decl->addAttr(
+ clang::AsmLabelAttr::CreateImplicit(*getASTContext(), mangled_name));
+ }
+
// Populate the method decl with parameter decls
llvm::SmallVector<clang::ParmVarDecl *, 12> params;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
