From 67fbfa377308b9839b63b9c8f656c2604dbaa174 Mon Sep 17 00:00:00 2001 From: Adrian Prantl Date: Sat, 21 Feb 2015 00:29:14 +0000 Subject: Revert "Wrap clang module files in a Mach-O, ELF, or COFF container." This reverts commit 230099. The Linux configure+make build variant still needs some work. llvm-svn: 230103 --- clang/lib/Serialization/ModuleManager.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'clang/lib/Serialization/ModuleManager.cpp') diff --git a/clang/lib/Serialization/ModuleManager.cpp b/clang/lib/Serialization/ModuleManager.cpp index 8f1473f3a3a..ac98ca0b872 100644 --- a/clang/lib/Serialization/ModuleManager.cpp +++ b/clang/lib/Serialization/ModuleManager.cpp @@ -13,7 +13,6 @@ //===----------------------------------------------------------------------===// #include "clang/Lex/HeaderSearch.h" #include "clang/Lex/ModuleMap.h" -#include "clang/Serialization/ASTReader.h" #include "clang/Serialization/GlobalModuleIndex.h" #include "clang/Serialization/ModuleManager.h" #include "llvm/Support/MemoryBuffer.h" @@ -136,10 +135,10 @@ ModuleManager::addModule(StringRef FileName, ModuleKind Type, New->Buffer = std::move(*Buf); } - - // Initialize the stream. - ASTReader::InitStreamFileWithModule(New->Buffer->getMemBufferRef(), - New->StreamFile); + + // Initialize the stream + New->StreamFile.init((const unsigned char *)New->Buffer->getBufferStart(), + (const unsigned char *)New->Buffer->getBufferEnd()); } if (ExpectedSignature) { -- cgit v1.2.3