5 files changed, 9 insertions, 17 deletions
diff --git a/llvm/include/llvm/DebugInfo/PDB/DIA/DIAEnumFrameData.h b/llvm/include/llvm/DebugInfo/PDB/DIA/DIAEnumFrameData.h
index e17ba2ce59b..f3b02f07e64 100644
--- a/llvm/include/llvm/DebugInfo/PDB/DIA/DIAEnumFrameData.h
+++ b/llvm/include/llvm/DebugInfo/PDB/DIA/DIAEnumFrameData.h
@@ -17,12 +17,9 @@
 namespace llvm {
 namespace pdb {
 
-class DIASession;
-
 class DIAEnumFrameData : public IPDBEnumChildren<IPDBFrameData> {
 public:
-  explicit DIAEnumFrameData(const DIASession &PDBSession,
-                            CComPtr<IDiaEnumFrameData> DiaEnumerator);
+  explicit DIAEnumFrameData(CComPtr<IDiaEnumFrameData> DiaEnumerator);
 
   uint32_t getChildCount() const override;
   ChildTypePtr getChildAtIndex(uint32_t Index) const override;
@@ -30,7 +27,6 @@ public:
   void reset() override;
 
 private:
-  const DIASession &Session;
   CComPtr<IDiaEnumFrameData> Enumerator;
 };
 
diff --git a/llvm/include/llvm/DebugInfo/PDB/DIA/DIAFrameData.h b/llvm/include/llvm/DebugInfo/PDB/DIA/DIAFrameData.h
index 7564c3b7a5a..0ce6cfc9303 100644
--- a/llvm/include/llvm/DebugInfo/PDB/DIA/DIAFrameData.h
+++ b/llvm/include/llvm/DebugInfo/PDB/DIA/DIAFrameData.h
@@ -20,8 +20,7 @@ class DIASession;
 
 class DIAFrameData : public IPDBFrameData {
 public:
-  explicit DIAFrameData(const DIASession &PDBSession,
-                        CComPtr<IDiaFrameData> DiaFrameData);
+  explicit DIAFrameData(CComPtr<IDiaFrameData> DiaFrameData);
 
   uint32_t getAddressOffset() const override;
   uint32_t getAddressSection() const override;
@@ -31,7 +30,6 @@ public:
   uint64_t getVirtualAddress() const override;
 
 private:
-  const DIASession &Session;
   CComPtr<IDiaFrameData> FrameData;
 };
 
diff --git a/llvm/lib/DebugInfo/PDB/DIA/DIAEnumFrameData.cpp b/llvm/lib/DebugInfo/PDB/DIA/DIAEnumFrameData.cpp
index 77514483e04..f873f3525df 100644
--- a/llvm/lib/DebugInfo/PDB/DIA/DIAEnumFrameData.cpp
+++ b/llvm/lib/DebugInfo/PDB/DIA/DIAEnumFrameData.cpp
@@ -13,9 +13,8 @@
 
 using namespace llvm::pdb;
 
-DIAEnumFrameData::DIAEnumFrameData(const DIASession &PDBSession,
-                                   CComPtr<IDiaEnumFrameData> DiaEnumerator)
-    : Session(PDBSession), Enumerator(DiaEnumerator) {}
+DIAEnumFrameData::DIAEnumFrameData(CComPtr<IDiaEnumFrameData> DiaEnumerator)
+    : Enumerator(DiaEnumerator) {}
 
 uint32_t DIAEnumFrameData::getChildCount() const {
   LONG Count = 0;
@@ -28,7 +27,7 @@ DIAEnumFrameData::getChildAtIndex(uint32_t Index) const {
   if (S_OK != Enumerator->Item(Index, &Item))
     return nullptr;
 
-  return std::unique_ptr<IPDBFrameData>(new DIAFrameData(Session, Item));
+  return std::unique_ptr<IPDBFrameData>(new DIAFrameData(Item));
 }
 
 std::unique_ptr<IPDBFrameData> DIAEnumFrameData::getNext() {
@@ -37,7 +36,7 @@ std::unique_ptr<IPDBFrameData> DIAEnumFrameData::getNext() {
   if (S_OK != Enumerator->Next(1, &Item, &NumFetched))
     return nullptr;
 
-  return std::unique_ptr<IPDBFrameData>(new DIAFrameData(Session, Item));
+  return std::unique_ptr<IPDBFrameData>(new DIAFrameData(Item));
 }
 
 void DIAEnumFrameData::reset() { Enumerator->Reset(); }
diff --git a/llvm/lib/DebugInfo/PDB/DIA/DIAFrameData.cpp b/llvm/lib/DebugInfo/PDB/DIA/DIAFrameData.cpp
index b904a2ff60a..533cce7923c 100644
--- a/llvm/lib/DebugInfo/PDB/DIA/DIAFrameData.cpp
+++ b/llvm/lib/DebugInfo/PDB/DIA/DIAFrameData.cpp
@@ -13,9 +13,8 @@
 
 using namespace llvm::pdb;
 
-DIAFrameData::DIAFrameData(const DIASession &PDBSession,
-                           CComPtr<IDiaFrameData> DiaFrameData)
-    : Session(PDBSession), FrameData(DiaFrameData) {}
+DIAFrameData::DIAFrameData(CComPtr<IDiaFrameData> DiaFrameData)
+    : FrameData(DiaFrameData) {}
 
 template <typename ArgType>
 ArgType
diff --git a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
index b89ca9a858f..bd375e172ac 100644
--- a/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
+++ b/llvm/lib/DebugInfo/PDB/DIA/DIASession.cpp
@@ -428,5 +428,5 @@ DIASession::getFrameData() const {
   if (!FD)
     return nullptr;
 
-  return llvm::make_unique<DIAEnumFrameData>(*this, FD);
+  return llvm::make_unique<DIAEnumFrameData>(FD);
 }