Prefer linkage name to name for inline function frames.

Summary: Linkage name (DW_AT_linkage_name) contains more information than the identifier name (DW_AT_name).

Reviewed By: luciang

Differential Revision: D19657767

fbshipit-source-id: 87b2293e6f723ceb8b5202db0f3c569c37c6c7ea

folly/experimental/symbolizer/Dwarf.cpp

@@ -538,30 +538,35 @@ bool Dwarf::findLocation(
            inlineLocIter++, inlineFrameIter++) {
         inlineFrameIter->location.line = callerLine;
         callerLine = inlineLocIter->line;
+        folly::Optional<folly::StringPiece> linkageName;
         folly::Optional<folly::StringPiece> name;
         folly::Optional<uint64_t> file;
         forEachAttribute(
             cu, inlineLocIter->die, [&](const detail::Attribute& attr) {
               switch (attr.spec.name) {
+                case DW_AT_linkage_name:
+                  linkageName = boost::get<folly::StringPiece>(attr.attrValue);
+                  break;
                 case DW_AT_name:
-                  name = boost::get<StringPiece>(attr.attrValue);
+                  name = boost::get<folly::StringPiece>(attr.attrValue);
                   break;
                 case DW_AT_decl_file:
                   file = boost::get<uint64_t>(attr.attrValue);
                   break;
               }
-              return !file.has_value() || !name.has_value();
+              return !file || !name || !linkageName;
             });
-
-        if (!name.has_value() || !file.has_value()) {
+        if (!(name || linkageName) || !file) {
           break;
         }
 
         inlineFrameIter->found = true;
         inlineFrameIter->addr = address;
-        inlineFrameIter->name = name.value().data();
+        inlineFrameIter->name =
+            linkageName ? linkageName.value().data() : name.value().data();
         inlineFrameIter->location.hasFileAndLine = true;
-        inlineFrameIter->location.name = name.value();
+        inlineFrameIter->location.name =
+            linkageName ? linkageName.value() : name.value();
         inlineFrameIter->location.file = lineVM.getFullFileName(file.value());
       }
       locationInfo.line = callerLine;
@@ -656,7 +661,7 @@ detail::Die Dwarf::findDefinitionDie(
     return true;
   });
 
-  if (!offset.hasValue()) {
+  if (!offset) {
     return die;
   }
   return getDieAtOffset(cu, cu.offset + offset.value());

folly/experimental/symbolizer/test/SymbolizerTest.cpp

@@ -158,12 +158,15 @@ void verifyStackTrace(
     const FrameArray<100>& frames,
     const std::string& barName,
     size_t barLine) {
-  EXPECT_EQ("inlineFoo<100>", std::string(frames.frames[5].name));
+  EXPECT_EQ(
+      "void folly::symbolizer::test::(anonymous namespace)::inlineFoo<100ul>("
+      "folly::symbolizer::FrameArray<100ul>&)",
+      std::string(folly::demangle(frames.frames[5].name)));
   EXPECT_EQ(
       "folly/experimental/symbolizer/test/SymbolizerTest.cpp",
       std::string(frames.frames[5].location.file.toString()));
   EXPECT_EQ(kQsortCallLineNo, frames.frames[5].location.line);
-  EXPECT_EQ(barName, std::string(frames.frames[6].name));
+  EXPECT_EQ(barName, std::string(folly::demangle(frames.frames[6].name)));
   EXPECT_EQ(
       "folly/experimental/symbolizer/test/SymbolizerTest.cpp",
       std::string(frames.frames[6].location.file.toString()));
@@ -212,14 +215,13 @@ TEST(SymbolizerTest, InlineFunctionBasic) {
   // clang-format off
   // Expected full stack trace with @mode/dev. The last frame is missing in opt
   // mode.
-  //  Frame: _ZN5folly10symbolizer13getStackTraceEPmm
-  //  Frame: getStackTrace<100>
+  //  Frame: _ZN5folly10symbolizer13getStackTraceILm100EEEbRNS0_10FrameArrayIXT_EEE
   //  Frame: _ZN5folly10symbolizer4test10comparatorILm100EEEiPKvS4_
   //  Frame: msort_with_tmp.part.0
   //  Frame: __GI___qsort_r
-  //  Frame: inlineFoo<100>
-  //  Frame: inlineBar<100>
-  //  Frame: _ZN5folly10symbolizer4test43SymbolizerTest_InlineFunctionWithCache_Test8TestBodyEv
+  //  Frame: _ZN5folly10symbolizer4test12_GLOBAL__N_19inlineFooILm100EEEvRNS0_10FrameArrayIXT_EEE
+  //  Frame: _ZN5folly10symbolizer4test12_GLOBAL__N_19inlineBarILm100EEEvRNS0_10FrameArrayIXT_EEE
+  //  Frame: _ZN5folly10symbolizer4test39SymbolizerTest_InlineFunctionBasic_Test8TestBodyEv
   //  Frame: _ZN7testing8internal35HandleExceptionsInMethodIfSupportedINS_4TestEvEET0_PT_MS4_FS3_vEPKc
   //  Frame: _ZN7testing4Test3RunEv
   //  Frame: _ZN7testing8TestInfo3RunEv
@@ -228,7 +230,11 @@ TEST(SymbolizerTest, InlineFunctionBasic) {
   //  Frame: _ZN7testing8UnitTest3RunEv
   //  Frame: _Z13RUN_ALL_TESTSv
   // clang-format on
-  verifyStackTrace(frames, "inlineBar<100>", kFooCallByStandaloneBarLineNo);
+  verifyStackTrace(
+      frames,
+      "void folly::symbolizer::test::(anonymous namespace)::inlineBar<100ul>("
+      "folly::symbolizer::FrameArray<100ul>&)",
+      kFooCallByStandaloneBarLineNo);
 
   FrameArray<100> frames2;
   inlineBar<100>(frames2);
@@ -245,7 +251,11 @@ TEST(SymbolizerTest, InlineClassMemberFunction) {
   obj.inlineBar(frames);
   symbolizer.symbolize(frames);
 
-  verifyStackTrace(frames, "inlineBar", kFooCallByClassBarLineNo);
+  verifyStackTrace(
+      frames,
+      "folly::symbolizer::test::ClassWithInlineFunctions::inlineBar("
+      "folly::symbolizer::FrameArray<100ul>&) const",
+      kFooCallByClassBarLineNo);
 }
 
 TEST(SymbolizerTest, StaticInlineClassMemberFunction) {
@@ -255,7 +265,11 @@ TEST(SymbolizerTest, StaticInlineClassMemberFunction) {
   ClassWithInlineFunctions::staticInlineBar(frames);
   symbolizer.symbolize(frames);
 
-  verifyStackTrace(frames, "staticInlineBar", kFooCallByClassStaticBarLineNo);
+  verifyStackTrace(
+      frames,
+      "folly::symbolizer::test::ClassWithInlineFunctions::staticInlineBar("
+      "folly::symbolizer::FrameArray<100ul>&)",
+      kFooCallByClassStaticBarLineNo);
 }
 
 // No inline frames should be filled because of no extra frames.
@@ -280,7 +294,11 @@ TEST(SymbolizerTest, InlineFunctionWithCache) {
   inlineBar<100>(frames);
   symbolizer.symbolize(frames);
 
-  verifyStackTrace(frames, "inlineBar<100>", kFooCallByStandaloneBarLineNo);
+  verifyStackTrace(
+      frames,
+      "void folly::symbolizer::test::(anonymous namespace)::inlineBar<100ul>("
+      "folly::symbolizer::FrameArray<100ul>&)",
+      kFooCallByStandaloneBarLineNo);
 
   FrameArray<100> frames2;
   inlineBar<100>(frames2);