Prefer DWARF section

Author: HaohaiWen

llvm/lib/DebugInfo/Symbolize/Symbolize.cpp

@@ -628,13 +628,20 @@ LLVMSymbolizer::getOrCreateModuleInfo(const std::string &ModuleName) {
   ObjectPair Objects = ObjectsOrErr.get();
 
   std::unique_ptr<DIContext> Context;
-  // If this is a COFF object containing PDB info, use a PDBContext to
-  // symbolize. Otherwise, use DWARF.
+  // If this is a COFF object containing PDB info and not containing DWARF
+  // section, use a PDBContext to symbolize. Otherwise, use DWARF.
   if (auto CoffObject = dyn_cast<COFFObjectFile>(Objects.first)) {
     const codeview::DebugInfo *DebugInfo;
     StringRef PDBFileName;
     auto EC = CoffObject->getDebugPDBInfo(DebugInfo, PDBFileName);
-    if (!EC && DebugInfo != nullptr && !PDBFileName.empty()) {
+    // Use DWARF if there're DWARF sections.
+    bool HasDwarf =
+        llvm::any_of(Objects.first->sections(), [](SectionRef Section) -> bool {
+          if (Expected<StringRef> SectionName = Section.getName())
+            return SectionName.get() == ".debug_info";
+          return false;
+        });
+    if (!EC && !HasDwarf && DebugInfo != nullptr && !PDBFileName.empty()) {
       using namespace pdb;
       std::unique_ptr<IPDBSession> Session;
 

llvm/test/tools/llvm-profgen/coff-profile.test

@@ -2,7 +2,34 @@
 ; RUN: FileCheck %s --input-file %t
 
 ; CHECK:      main:2914368:0
-; CHECK-NEXT:  0: 31124
+; CHECK-NEXT:  3.1: 0
+; CHECK-NEXT:  3.2: 0
+; CHECK-NEXT:  8: 0
+; CHECK-NEXT:  65501: 0
+; CHECK-NEXT:  1: ??$init@HG@MyNameSpace2@@YAXHPEAG@Z:0
+; CHECK-NEXT:   1: 0
+; CHECK-NEXT:   1.1: 0
+; CHECK-NEXT:   1.2: 0
+; CHECK-NEXT:   2: 0
+; CHECK-NEXT:   13: 0
+; CHECK-NEXT:   65514: 0
+; CHECK-NEXT:  4: ?work1@?$MyClass@GH@MyNameSpace1@@QEAAXQEAGH@Z:299952
+; CHECK-NEXT:   0: ?work@?$MyClass@GH@MyNameSpace1@@AEAAXQEAGHH@Z:299952
+; CHECK-NEXT:    1.1: 2913
+; CHECK-NEXT:    1.2: 2913
+; CHECK-NEXT:    2: 2912
+; CHECK-NEXT:    3: 2913
+; CHECK-NEXT:    65530: 0
+; CHECK-NEXT:  5: ?work2@?$MyClass@GH@MyNameSpace1@@QEAAXQEAGH@Z:2614416
+; CHECK-NEXT:   0: ?work@?$MyClass@GH@MyNameSpace1@@AEAAXQEAGHH@Z:2614416
+; CHECK-NEXT:    1.1: 31124
+; CHECK-NEXT:    1.2: 31124
+; CHECK-NEXT:    2: 31124
+; CHECK-NEXT:    3: 31124
+; CHECK-NEXT:    65530: 0
+; CHECK-NEXT:  7: ?print@MyNameSpace2@@YAXPEAGH@Z:0
+; CHECK-NEXT:   1: 0
+; CHECK-NEXT:   65508: 0
 
 ; Original code
 ; clang-cl.exe -O2 -gdwarf coff-profile.cpp -fuse-ld=lld -Xclang -fdebug-info-for-profiling -o coff-profile.exe /link /debug:dwarf