1 files changed, 50 insertions, 1 deletions
diff --git a/lib/DebugInfo/PDB/PDBSymbolData.cpp b/lib/DebugInfo/PDB/PDBSymbolData.cpp
index 60026689c6f1..ae4a8038ccd7 100644
--- a/lib/DebugInfo/PDB/PDBSymbolData.cpp
+++ b/lib/DebugInfo/PDB/PDBSymbolData.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/PDB/PDBSymbolData.h"
-
+#include "llvm/DebugInfo/PDB/IPDBSectionContrib.h"
 #include "llvm/DebugInfo/PDB/IPDBSession.h"
 #include "llvm/DebugInfo/PDB/PDBSymDumper.h"
 
@@ -24,3 +24,52 @@ PDBSymbolData::PDBSymbolData(const IPDBSession &PDBSession,
 }
 
 void PDBSymbolData::dump(PDBSymDumper &Dumper) const { Dumper.dump(*this); }
+
+std::unique_ptr<IPDBEnumLineNumbers> PDBSymbolData::getLineNumbers() const {
+  auto Len = RawSymbol->getLength();
+  Len = Len ? Len : 1;
+  if (auto RVA = RawSymbol->getRelativeVirtualAddress())
+    return Session.findLineNumbersByRVA(RVA, Len);
+
+  if (auto Section = RawSymbol->getAddressSection())
+    return Session.findLineNumbersBySectOffset(
+        Section, RawSymbol->getAddressOffset(), Len);
+
+  return nullptr;
+}
+
+uint32_t PDBSymbolData::getCompilandId() const {
+  if (auto Lines = getLineNumbers()) {
+    if (auto FirstLine = Lines->getNext())
+      return FirstLine->getCompilandId();
+  }
+
+  uint32_t DataSection = RawSymbol->getAddressSection();
+  uint32_t DataOffset = RawSymbol->getAddressOffset();
+  if (DataSection == 0) {
+    if (auto RVA = RawSymbol->getRelativeVirtualAddress())
+      Session.addressForRVA(RVA, DataSection, DataOffset);
+  }
+
+  if (DataSection) {
+    if (auto SecContribs = Session.getSectionContribs()) {
+      while (auto Section = SecContribs->getNext()) {
+        if (Section->getAddressSection() == DataSection &&
+            Section->getAddressOffset() <= DataOffset &&
+            (Section->getAddressOffset() + Section->getLength()) > DataOffset)
+          return Section->getCompilandId();
+      }
+    }
+  } else {
+    auto LexParentId = RawSymbol->getLexicalParentId();
+    while (auto LexParent = Session.getSymbolById(LexParentId)) {
+      if (LexParent->getSymTag() == PDB_SymType::Exe)
+        break;
+      if (LexParent->getSymTag() == PDB_SymType::Compiland)
+        return LexParentId;
+      LexParentId = LexParent->getRawSymbol().getLexicalParentId();
+    }
+  }
+
+  return 0;
+}