From 766b793143fa863283498233e8962391da09b63a Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Mon, 15 Nov 2004 01:20:11 +0000 Subject: [PATCH] Changes necessary to enable linking of archives without LLVM symbol tables. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@17811 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Bytecode/Reader.h | 11 +++--- lib/Archive/ArchiveReader.cpp | 49 ++++++++++++++++++++++++-- lib/Archive/ArchiveWriter.cpp | 29 +++++++++------ lib/Bytecode/Archive/ArchiveReader.cpp | 49 ++++++++++++++++++++++++-- lib/Bytecode/Archive/ArchiveWriter.cpp | 29 +++++++++------ lib/Bytecode/Reader/ReaderWrappers.cpp | 15 ++++---- 6 files changed, 147 insertions(+), 35 deletions(-) diff --git a/include/llvm/Bytecode/Reader.h b/include/llvm/Bytecode/Reader.h index a059ca4e933..4c0366330bd 100644 --- a/include/llvm/Bytecode/Reader.h +++ b/include/llvm/Bytecode/Reader.h @@ -77,11 +77,14 @@ bool GetBytecodeSymbols(const sys::Path& fileName, /// bytecode module defines. This is used for archiving and linking when only /// the list of symbols the module defines is needed and the bytecode is /// already in memory. -/// @returns true on success, false if the bytecode can't be parsed +/// @returns the ModuleProvider on success, 0 if the bytecode can't be parsed /// @brief Get a bytecode file's externally visibile defined global symbols. -bool llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length, - const std::string& ModuleID, - std::vector& symbols); +ModuleProvider* llvm::GetBytecodeSymbols( + const unsigned char*Buffer, ///< The buffer to be parsed + unsigned Length, ///< The length of \p Buffer + const std::string& ModuleID, ///< An identifier for the module + std::vector& symbols ///< The symbols defined in the module +); } // End llvm namespace diff --git a/lib/Archive/ArchiveReader.cpp b/lib/Archive/ArchiveReader.cpp index ae1a9330789..794e1b271f3 100644 --- a/lib/Archive/ArchiveReader.cpp +++ b/lib/Archive/ArchiveReader.cpp @@ -391,13 +391,58 @@ Archive::findModuleDefiningSymbol(const std::string& symbol) { // ModuleProviders that define those symbols. void Archive::findModulesDefiningSymbols(const std::set& symbols, - std::set& modules) + std::set& result) { + assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive"); + if (symTab.empty()) { + // We don't have a symbol table, so we must build it now but lets also + // make sure that we populate the modules table as we do this to ensure + // that we don't load them twice when findModuleDefiningSymbol is called + // below. + + // Get a pointer to the first file + const char* At = ((const char*)base) + firstFileOffset; + const char* End = ((const char*)base) + mapfile->size(); + + while ( At < End) { + // Compute the offset to be put in the symbol table + unsigned offset = At - base - firstFileOffset; + + // Parse the file's header + ArchiveMember* mbr = parseMemberHeader(At, End); + + // If it contains symbols + if (mbr->isBytecode() || mbr->isCompressedBytecode()) { + // Get the symbols + std::vector symbols; + ModuleProvider* MP = GetBytecodeSymbols((const unsigned char*)At, + mbr->getSize(), mbr->getPath().get(),symbols); + + if (MP) { + // Insert the module's symbols into the symbol table + for (std::vector::iterator I = symbols.begin(), + E=symbols.end(); I != E; ++I ) { + symTab.insert(std::make_pair(*I,offset)); + } + // Insert the ModuleProvider and the ArchiveMember into the table of + // modules. + modules.insert(std::make_pair(offset,std::make_pair(MP,mbr))); + } else { + throw std::string("Can't parse bytecode member: ") + + mbr->getPath().get(); + } + } + } + } + + // At this point we have a valid symbol table (one way or another) so we + // just use it to quickly find the symbols requested. + for (std::set::const_iterator I=symbols.begin(), E=symbols.end(); I != E; ++I) { ModuleProvider* mp = findModuleDefiningSymbol(*I); if (mp) { - modules.insert(mp); + result.insert(mp); } } } diff --git a/lib/Archive/ArchiveWriter.cpp b/lib/Archive/ArchiveWriter.cpp index 727b2bfcdf4..fa4d9e64fde 100644 --- a/lib/Archive/ArchiveWriter.cpp +++ b/lib/Archive/ArchiveWriter.cpp @@ -197,19 +197,28 @@ Archive::writeMember( if (CreateSymbolTable && (member.isBytecode() || member.isCompressedBytecode())) { std::vector symbols; - GetBytecodeSymbols((const unsigned char*)data,fSize,member.getPath().get(), - symbols); - for (std::vector::iterator SI = symbols.begin(), - SE = symbols.end(); SI != SE; ++SI) { + ModuleProvider* MP = GetBytecodeSymbols( + (const unsigned char*)data,fSize,member.getPath().get(), symbols); - std::pair Res = - symTab.insert(std::make_pair(*SI,filepos)); + // If the bytecode parsed successfully + if ( MP ) { + for (std::vector::iterator SI = symbols.begin(), + SE = symbols.end(); SI != SE; ++SI) { - if (Res.second) { - symTabSize += SI->length() + - numVbrBytes(SI->length()) + - numVbrBytes(filepos); + std::pair Res = + symTab.insert(std::make_pair(*SI,filepos)); + + if (Res.second) { + symTabSize += SI->length() + + numVbrBytes(SI->length()) + + numVbrBytes(filepos); + } } + // We don't need this module any more. + delete MP; + } else { + throw std::string("Can't parse bytecode member: ") + + member.getPath().get(); } } diff --git a/lib/Bytecode/Archive/ArchiveReader.cpp b/lib/Bytecode/Archive/ArchiveReader.cpp index ae1a9330789..794e1b271f3 100644 --- a/lib/Bytecode/Archive/ArchiveReader.cpp +++ b/lib/Bytecode/Archive/ArchiveReader.cpp @@ -391,13 +391,58 @@ Archive::findModuleDefiningSymbol(const std::string& symbol) { // ModuleProviders that define those symbols. void Archive::findModulesDefiningSymbols(const std::set& symbols, - std::set& modules) + std::set& result) { + assert(mapfile && base && "Can't findModulesDefiningSymbols on new archive"); + if (symTab.empty()) { + // We don't have a symbol table, so we must build it now but lets also + // make sure that we populate the modules table as we do this to ensure + // that we don't load them twice when findModuleDefiningSymbol is called + // below. + + // Get a pointer to the first file + const char* At = ((const char*)base) + firstFileOffset; + const char* End = ((const char*)base) + mapfile->size(); + + while ( At < End) { + // Compute the offset to be put in the symbol table + unsigned offset = At - base - firstFileOffset; + + // Parse the file's header + ArchiveMember* mbr = parseMemberHeader(At, End); + + // If it contains symbols + if (mbr->isBytecode() || mbr->isCompressedBytecode()) { + // Get the symbols + std::vector symbols; + ModuleProvider* MP = GetBytecodeSymbols((const unsigned char*)At, + mbr->getSize(), mbr->getPath().get(),symbols); + + if (MP) { + // Insert the module's symbols into the symbol table + for (std::vector::iterator I = symbols.begin(), + E=symbols.end(); I != E; ++I ) { + symTab.insert(std::make_pair(*I,offset)); + } + // Insert the ModuleProvider and the ArchiveMember into the table of + // modules. + modules.insert(std::make_pair(offset,std::make_pair(MP,mbr))); + } else { + throw std::string("Can't parse bytecode member: ") + + mbr->getPath().get(); + } + } + } + } + + // At this point we have a valid symbol table (one way or another) so we + // just use it to quickly find the symbols requested. + for (std::set::const_iterator I=symbols.begin(), E=symbols.end(); I != E; ++I) { ModuleProvider* mp = findModuleDefiningSymbol(*I); if (mp) { - modules.insert(mp); + result.insert(mp); } } } diff --git a/lib/Bytecode/Archive/ArchiveWriter.cpp b/lib/Bytecode/Archive/ArchiveWriter.cpp index 727b2bfcdf4..fa4d9e64fde 100644 --- a/lib/Bytecode/Archive/ArchiveWriter.cpp +++ b/lib/Bytecode/Archive/ArchiveWriter.cpp @@ -197,19 +197,28 @@ Archive::writeMember( if (CreateSymbolTable && (member.isBytecode() || member.isCompressedBytecode())) { std::vector symbols; - GetBytecodeSymbols((const unsigned char*)data,fSize,member.getPath().get(), - symbols); - for (std::vector::iterator SI = symbols.begin(), - SE = symbols.end(); SI != SE; ++SI) { + ModuleProvider* MP = GetBytecodeSymbols( + (const unsigned char*)data,fSize,member.getPath().get(), symbols); - std::pair Res = - symTab.insert(std::make_pair(*SI,filepos)); + // If the bytecode parsed successfully + if ( MP ) { + for (std::vector::iterator SI = symbols.begin(), + SE = symbols.end(); SI != SE; ++SI) { - if (Res.second) { - symTabSize += SI->length() + - numVbrBytes(SI->length()) + - numVbrBytes(filepos); + std::pair Res = + symTab.insert(std::make_pair(*SI,filepos)); + + if (Res.second) { + symTabSize += SI->length() + + numVbrBytes(SI->length()) + + numVbrBytes(filepos); + } } + // We don't need this module any more. + delete MP; + } else { + throw std::string("Can't parse bytecode member: ") + + member.getPath().get(); } } diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index de2fd030e8b..7cdcf64de1e 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -391,26 +391,27 @@ bool llvm::GetBytecodeSymbols(const sys::Path& fName, } } -bool llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length, +ModuleProvider* +llvm::GetBytecodeSymbols(const unsigned char*Buffer, unsigned Length, const std::string& ModuleID, std::vector& symbols) { try { - std::auto_ptr - AMP(getBytecodeBufferModuleProvider(Buffer, Length, ModuleID)); + ModuleProvider* MP = + getBytecodeBufferModuleProvider(Buffer, Length, ModuleID); // Get the module from the provider - Module* M = AMP->releaseModule(); + Module* M = MP->materializeModule(); // Get the symbols getSymbols(M, symbols); // Done with the module - delete M; - return true; + return MP; } catch (...) { - return false; + // Fall through } + return 0; } // vim: sw=2 ai