From 690b2f7746ffd37ee507618a5bc17a5799671417 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Fri, 20 Feb 2015 22:12:19 +0000 Subject: Revert "Wrap clang module files in a Mach-O, ELF, or COFF container." This reverts commit r230067. Investigating another batch of problems found by the bots. llvm-svn: 230073 --- clang/lib/Serialization/GlobalModuleIndex.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'clang/lib/Serialization/GlobalModuleIndex.cpp') diff --git a/clang/lib/Serialization/GlobalModuleIndex.cpp b/clang/lib/Serialization/GlobalModuleIndex.cpp index 68a23ea870d..47913880454 100644 --- a/clang/lib/Serialization/GlobalModuleIndex.cpp +++ b/clang/lib/Serialization/GlobalModuleIndex.cpp @@ -15,7 +15,6 @@ #include "clang/Basic/FileManager.h" #include "clang/Lex/HeaderSearch.h" #include "clang/Serialization/ASTBitCodes.h" -#include "clang/Serialization/ASTReader.h" #include "clang/Serialization/GlobalModuleIndex.h" #include "clang/Serialization/Module.h" #include "llvm/ADT/DenseMap.h" @@ -502,8 +501,8 @@ bool GlobalModuleIndexBuilder::loadModuleFile(const FileEntry *File) { // Initialize the input stream llvm::BitstreamReader InStreamFile; - ASTReader::InitStreamFileWithModule((*Buffer)->getMemBufferRef(), - InStreamFile); + InStreamFile.init((const unsigned char *)(*Buffer)->getBufferStart(), + (const unsigned char *)(*Buffer)->getBufferEnd()); llvm::BitstreamCursor InStream(InStreamFile); // Sniff for the signature. -- cgit v1.2.3