From f5e225a756450d1dbe688d13e7d0a1f43d8fa5a9 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Fri, 6 Jul 2007 13:38:17 +0000 Subject: [PATCH] eliminate residual cruft related to recognizing bytecode files. bitcode files are the only LLVM format left. llvm-svn: 37945 --- include/llvm/Bitcode/Archive.h | 10 ++-------- include/llvm/System/Path.h | 9 --------- lib/Archive/Archive.cpp | 9 +-------- lib/Archive/ArchiveReader.cpp | 16 +++++----------- lib/Archive/ArchiveWriter.cpp | 9 ++------- lib/Linker/LinkItems.cpp | 6 +----- lib/Linker/Linker.cpp | 2 -- lib/System/Path.cpp | 16 ---------------- tools/llvm-ar/llvm-ar.cpp | 7 ++----- 9 files changed, 13 insertions(+), 71 deletions(-) diff --git a/include/llvm/Bitcode/Archive.h b/include/llvm/Bitcode/Archive.h index eee3922f046..70fc936e9db 100644 --- a/include/llvm/Bitcode/Archive.h +++ b/include/llvm/Bitcode/Archive.h @@ -51,8 +51,7 @@ class ArchiveMember { SVR4SymbolTableFlag = 2, ///< Member is a SVR4 symbol table BSD4SymbolTableFlag = 4, ///< Member is a BSD4 symbol table LLVMSymbolTableFlag = 8, ///< Member is an LLVM symbol table - BytecodeFlag = 16, ///< Member is uncompressed bytecode - CompressedBytecodeFlag = 32, ///< Member is compressed bytecode + BitcodeFlag = 16, ///< Member is uncompressed bytecode HasPathFlag = 64, ///< Member has a full or partial path HasLongFilenameFlag = 128, ///< Member uses the long filename syntax StringTableFlag = 256 ///< Member is an ar(1) format string table @@ -112,7 +111,6 @@ class ArchiveMember { /// This method determines if the member is a regular compressed file. Note /// that compressed bytecode files will yield "false" for this method. - /// @see isCompressedBytecode() /// @returns true iff the archive member is a compressed regular file. /// @brief Determine if the member is a compressed regular file. bool isCompressed() const { return flags&CompressedFlag; } @@ -135,11 +133,7 @@ class ArchiveMember { /// @returns true iff the archive member is an uncompressed bytecode file. /// @brief Determine if this member is a bytecode file. - bool isBytecode() const { return flags&BytecodeFlag; } - - /// @returns true iff the archive member is a compressed bytecode file. - /// @brief Determine if the member is a compressed bytecode file. - bool isCompressedBytecode() const { return flags&CompressedBytecodeFlag;} + bool isBitcode() const { return flags&BitcodeFlag; } /// @returns true iff the file name contains a path (directory) component. /// @brief Determine if the member has a path diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h index 537a5af5a39..e7aa45bbc21 100644 --- a/include/llvm/System/Path.h +++ b/include/llvm/System/Path.h @@ -306,13 +306,6 @@ namespace sys { /// @brief Determine if the path references an archive file. bool isArchive() const; - /// This function determines if the path name in the object references an - /// LLVM Bytecode file by looking at its magic number. - /// @returns true if the file starts with the magic number for LLVM - /// bytecode files. - /// @brief Determine if the path references a bytecode file. - bool isBytecodeFile() const; - /// This function determines if the path name in the object references an /// LLVM Bitcode file by looking at its magic number. /// @returns true if the file starts with the magic number for LLVM @@ -621,9 +614,7 @@ namespace sys { /// This enumeration delineates the kinds of files that LLVM knows about. enum LLVMFileType { Unknown_FileType = 0, ///< Unrecognized file - Bytecode_FileType, ///< Uncompressed bytecode file Bitcode_FileType, ///< Bitcode file - CompressedBytecode_FileType, ///< Compressed bytecode file Archive_FileType, ///< ar style archive file ELF_Relocatable_FileType, ///< ELF Relocatable object file ELF_Executable_FileType, ///< ELF Executable image diff --git a/lib/Archive/Archive.cpp b/lib/Archive/Archive.cpp index d0c64097a2a..b7e7106ae6f 100644 --- a/lib/Archive/Archive.cpp +++ b/lib/Archive/Archive.cpp @@ -126,15 +126,8 @@ bool ArchiveMember::replaceWith(const sys::Path& newFile, std::string* ErrMsg) { // Determine what kind of file it is switch (sys::IdentifyFileType(signature,4)) { - case sys::Bytecode_FileType: - flags |= BytecodeFlag; - break; - case sys::CompressedBytecode_FileType: - flags |= CompressedBytecodeFlag; - flags &= ~CompressedFlag; - break; default: - flags &= ~(BytecodeFlag|CompressedBytecodeFlag); + flags &= ~BitcodeFlag; break; } return false; diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index 93eaac18f6b..c8ffcd6863a 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 = diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp index d67937ea114..ee552013838 100644 --- a/lib/Archive/ArchiveWriter.cpp +++ b/lib/Archive/ArchiveWriter.cpp @@ -179,11 +179,7 @@ Archive::addFileBefore(const sys::Path& filePath, iterator where, mbr->path.getMagicNumber(magic,4); switch (sys::IdentifyFileType(magic.c_str(),4)) { case sys::Bitcode_FileType: - case sys::Bytecode_FileType: - flags |= ArchiveMember::BytecodeFlag; - break; - case sys::CompressedBytecode_FileType: - flags |= ArchiveMember::CompressedBytecodeFlag; + flags |= ArchiveMember::BitcodeFlag; break; default: break; @@ -223,8 +219,7 @@ Archive::writeMember( // Now that we have the data in memory, update the // symbol table if its a bitcode file. - if (CreateSymbolTable && - (member.isBytecode() || member.isCompressedBytecode())) { + if (CreateSymbolTable && member.isBitcode()) { std::vector symbols; std::string FullMemberName = archPath.toString() + "(" + member.getPath().toString() diff --git a/lib/Linker/LinkItems.cpp b/lib/Linker/LinkItems.cpp index e66fa5b6e6d..3cf1f6bd8cd 100644 --- a/lib/Linker/LinkItems.cpp +++ b/lib/Linker/LinkItems.cpp @@ -82,9 +82,7 @@ bool Linker::LinkInLibrary(const std::string& Lib, bool& is_native) { case sys::Unknown_FileType: return warning("Supposed library '" + Lib + "' isn't a library."); - case sys::Bytecode_FileType: case sys::Bitcode_FileType: - case sys::CompressedBytecode_FileType: // LLVM ".so" file. if (LinkInFile(Pathname, is_native)) return error("Cannot link file '" + Pathname.toString() + "'"); @@ -176,9 +174,7 @@ bool Linker::LinkInFile(const sys::Path &File, bool &is_native) { return error("Cannot link archive '" + File.toString() + "'"); break; - case sys::Bitcode_FileType: - case sys::Bytecode_FileType: - case sys::CompressedBytecode_FileType: { + case sys::Bitcode_FileType: { verbose("Linking bitcode file '" + File.toString() + "'"); std::auto_ptr M(LoadObject(File)); if (M.get() == 0) diff --git a/lib/Linker/Linker.cpp b/lib/Linker/Linker.cpp index 4604305b6d5..9f9a59d4d6e 100644 --- a/lib/Linker/Linker.cpp +++ b/lib/Linker/Linker.cpp @@ -142,8 +142,6 @@ static inline sys::Path IsLibrary(const std::string& Name, FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1])); if (FullPath.isDynamicLibrary()) // Native shared library? return FullPath; - if (FullPath.isBytecodeFile()) // .so file containing bytecode? - return FullPath; if (FullPath.isBitcodeFile()) // .so file containing bitcode? return FullPath; diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp index fcdc5ff22cf..caf5789d7ef 100644 --- a/lib/System/Path.cpp +++ b/lib/System/Path.cpp @@ -47,14 +47,6 @@ sys::IdentifyFileType(const char*magic, unsigned length) { if (magic[1] == 'C' && magic[2] == (char)0xC0 && magic[3] == (char)0xDE) return Bitcode_FileType; break; - case 'l': - if (magic[1] == 'l' && magic[2] == 'v') { - if (magic[3] == 'c') - return CompressedBytecode_FileType; - else if (magic[3] == 'm') - return Bytecode_FileType; - } - break; case '!': if (length >= 8) if (memcmp(magic,"!\n",8) == 0) @@ -164,14 +156,6 @@ std::string Path::GetDLLSuffix() { return LTDL_SHLIB_EXT; } -bool -Path::isBytecodeFile() const { - std::string actualMagic; - if (!getMagicNumber(actualMagic, 4)) - return false; - return actualMagic == "llvc" || actualMagic == "llvm"; -} - bool Path::isBitcodeFile() const { std::string actualMagic; diff --git a/tools/llvm-ar/llvm-ar.cpp b/tools/llvm-ar/llvm-ar.cpp index 2cd16e361e0..1d3ede6459d 100644 --- a/tools/llvm-ar/llvm-ar.cpp +++ b/tools/llvm-ar/llvm-ar.cpp @@ -356,8 +356,7 @@ bool doPrint(std::string* ErrMsg) { // Skip things that don't make sense to print if (I->isLLVMSymbolTable() || I->isSVR4SymbolTable() || - I->isBSD4SymbolTable() || (!DontSkipBitcode && - (I->isBytecode() || I->isCompressedBytecode()))) + I->isBSD4SymbolTable() || (!DontSkipBitcode && I->isBitcode())) continue; if (Verbose) @@ -406,10 +405,8 @@ doDisplayTable(std::string* ErrMsg) { if (Verbose) { // FIXME: Output should be this format: // Zrw-r--r-- 500/ 500 525 Nov 8 17:42 2004 Makefile - if (I->isBytecode()) + if (I->isBitcode()) std::cout << "b"; - else if (I->isCompressedBytecode()) - std::cout << "B"; else if (I->isCompressed()) std::cout << "Z"; else