From c81ec9b2de27d79ab248c5ebd84d4b3d8296166d Mon Sep 17 00:00:00 2001
From: Zachary Turner <zturner@google.com>
Date: Tue, 26 Apr 2016 16:57:53 +0000
Subject: [PATCH] Fix build broken due to order of initialization problem.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@267571 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/llvm/DebugInfo/PDB/Raw/PDBInfoStream.h | 6 ++++--
 lib/DebugInfo/PDB/Raw/PDBInfoStream.cpp        | 3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/llvm/DebugInfo/PDB/Raw/PDBInfoStream.h b/include/llvm/DebugInfo/PDB/Raw/PDBInfoStream.h
index c22d31dd162..ed914348d9f 100644
--- a/include/llvm/DebugInfo/PDB/Raw/PDBInfoStream.h
+++ b/include/llvm/DebugInfo/PDB/Raw/PDBInfoStream.h
@@ -22,7 +22,7 @@ namespace llvm {
 
 class PDBInfoStream {
 public:
-  PDBInfoStream(const PDBFile &File);
+  PDBInfoStream(PDBFile &File);
 
   std::error_code reload();
 
@@ -33,9 +33,11 @@ public:
 
   uint32_t getNamedStreamIndex(llvm::StringRef Name) const;
 
+  PDBFile &getFile() { return Pdb; }
+
 private:
+  PDBFile &Pdb;
   PDBStream Stream1;
-  const PDBFile &Pdb;
 
   // PDB file format version.  We only support VC70.  See the enumeration
   // `PdbRaw_ImplVer` for the other possible values.
diff --git a/lib/DebugInfo/PDB/Raw/PDBInfoStream.cpp b/lib/DebugInfo/PDB/Raw/PDBInfoStream.cpp
index 47d9b294ec0..76fa1952d7f 100644
--- a/lib/DebugInfo/PDB/Raw/PDBInfoStream.cpp
+++ b/lib/DebugInfo/PDB/Raw/PDBInfoStream.cpp
@@ -13,8 +13,7 @@
 
 using namespace llvm;
 
-PDBInfoStream::PDBInfoStream(const PDBFile &File)
-    : Pdb(File), Stream1(1, File) {}
+PDBInfoStream::PDBInfoStream(PDBFile &File) : Pdb(File), Stream1(1, File) {}
 
 std::error_code PDBInfoStream::reload() {
   Stream1.setOffset(0);