From e75ca3d809ff17260efa320a949cb91ea2b3981e Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 6 Jul 2007 13:38:17 +0000 Subject: eliminate residual cruft related to recognizing bytecode files. bitcode files are the only LLVM format left. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37945 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Archive/ArchiveReader.cpp | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'lib/Archive/ArchiveReader.cpp') diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index 93eaac18f6..c8ffcd6863 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -207,16 +207,10 @@ Archive::parseMemberHeader(const char*& At, const char* End, std::string* error) // Determine if this is a bytecode file switch (sys::IdentifyFileType(At, 4)) { case sys::Bitcode_FileType: - case sys::Bytecode_FileType: - flags |= ArchiveMember::BytecodeFlag; - break; - case sys::CompressedBytecode_FileType: - flags |= ArchiveMember::CompressedBytecodeFlag; - flags &= ~ArchiveMember::CompressedFlag; + flags |= ArchiveMember::BitcodeFlag; break; default: - flags &= ~(ArchiveMember::BytecodeFlag| - ArchiveMember::CompressedBytecodeFlag); + flags &= ~ArchiveMember::BitcodeFlag; break; } @@ -349,7 +343,7 @@ bool Archive::getAllModules(std::vector& Modules, std::string* ErrMessage) { for (iterator I=begin(), E=end(); I != E; ++I) { - if (I->isBytecode() || I->isCompressedBytecode()) { + if (I->isBitcode()) { std::string FullMemberName = archPath.toString() + "(" + I->getPath().toString() + ")"; MemoryBuffer *Buffer = @@ -535,7 +529,7 @@ Archive::findModulesDefiningSymbols(std::set& symbols, return false; // If it contains symbols - if (mbr->isBytecode() || mbr->isCompressedBytecode()) { + if (mbr->isBitcode()) { // Get the symbols std::vector symbols; std::string FullMemberName = archPath.toString() + "(" + @@ -612,7 +606,7 @@ bool Archive::isBitcodeArchive() { // Scan the archive, trying to load a bitcode member. We only load one to // see if this works. for (iterator I = begin(), E = end(); I != E; ++I) { - if (!I->isBytecode() && !I->isCompressedBytecode()) + if (!I->isBitcode()) continue; std::string FullMemberName = -- cgit v1.2.3-18-g5258