Adjust to LLVM API changes that went into r70157.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70158 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index c2d50ce..375fcdd 100644
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -41,15 +41,15 @@
   /// \brief Helper class that saves the current stream position and
   /// then restores it when destroyed.
   struct VISIBILITY_HIDDEN SavedStreamPosition {
-    explicit SavedStreamPosition(llvm::BitstreamReader &Stream)
-      : Stream(Stream), Offset(Stream.GetCurrentBitNo()) { }
+    explicit SavedStreamPosition(llvm::BitstreamCursor &Cursor)
+      : Cursor(Cursor), Offset(Cursor.GetCurrentBitNo()) { }
 
     ~SavedStreamPosition() {
-      Stream.JumpToBit(Offset);
+      Cursor.JumpToBit(Offset);
     }
 
   private:
-    llvm::BitstreamReader &Stream;
+    llvm::BitstreamCursor &Cursor;
     uint64_t Offset;
   };
 }
@@ -1974,8 +1974,9 @@
   }
 
   // Initialize the stream
-  Stream.init((const unsigned char *)Buffer->getBufferStart(), 
-              (const unsigned char *)Buffer->getBufferEnd());
+  StreamFile.init((const unsigned char *)Buffer->getBufferStart(), 
+                  (const unsigned char *)Buffer->getBufferEnd());
+  Stream.init(StreamFile);
 
   // Sniff for the signature.
   if (Stream.Read(8) != 'C' ||