diff options
author | Chris Lattner <sabre@nondot.org> | 2007-02-07 23:48:32 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-02-07 23:48:32 +0000 |
commit | 7cf7c2b703e648cdf1184d406bd53a65050be212 (patch) | |
tree | ff053af208088c5ee74c60c83b5809f473edb223 | |
parent | c6d0b164295ff4400306b9077a8087584ba31224 (diff) | |
download | external_llvm-7cf7c2b703e648cdf1184d406bd53a65050be212.zip external_llvm-7cf7c2b703e648cdf1184d406bd53a65050be212.tar.gz external_llvm-7cf7c2b703e648cdf1184d406bd53a65050be212.tar.bz2 |
move an llvmc-specific function out of the bcreader into llvmc.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34021 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/llvm/Bytecode/Reader.h | 12 | ||||
-rw-r--r-- | lib/Bytecode/Reader/ReaderWrappers.cpp | 16 | ||||
-rw-r--r-- | tools/llvmc/CompilerDriver.cpp | 17 |
3 files changed, 17 insertions, 28 deletions
diff --git a/include/llvm/Bytecode/Reader.h b/include/llvm/Bytecode/Reader.h index f175745..e33e310 100644 --- a/include/llvm/Bytecode/Reader.h +++ b/include/llvm/Bytecode/Reader.h @@ -81,18 +81,6 @@ Module* ParseBytecodeBuffer( std::string *ErrMsg = 0 ///< Optional place to return an error message ); -/// This function will read only the necessary parts of a bytecode file in order -/// to determine the list of dependent libraries encoded within it. The \p -/// deplibs parameter will contain a vector of strings of the bytecode module's -/// dependent libraries. -/// @returns true on error, false otherwise -/// @brief Get the list of dependent libraries from a bytecode file. -bool GetBytecodeDependentLibraries( - const std::string &fileName, ///< File name to read bytecode from - Module::LibraryListType& deplibs, ///< List of dependent libraries extracted - BCDecompressor_t *BCDC = Compressor::decompressToNewBuffer, - std::string* ErrMsg = 0 ///< Optional error message holder -); /// This function will read only the necessary parts of a bytecode file in order /// to obtain a list of externally visible global symbols that the bytecode diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp index 07094f2..63b5fe9 100644 --- a/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -256,22 +256,6 @@ Module *llvm::ParseBytecodeFile(const std::string &Filename, } -bool llvm::GetBytecodeDependentLibraries(const std::string &fname, - Module::LibraryListType& deplibs, - BCDecompressor_t *BCDC, - std::string* ErrMsg) { - ModuleProvider* MP = getBytecodeModuleProvider(fname, BCDC, ErrMsg); - if (!MP) { - deplibs.clear(); - return true; - } - Module* M = MP->releaseModule(ErrMsg); - deplibs = M->getLibraries(); - delete M; - delete MP; - return false; -} - static void getSymbols(Module*M, std::vector<std::string>& symbols) { // Loop over global variables for (Module::global_iterator GI = M->global_begin(), GE=M->global_end(); GI != GE; ++GI) diff --git a/tools/llvmc/CompilerDriver.cpp b/tools/llvmc/CompilerDriver.cpp index 055a4f4..a076a46 100644 --- a/tools/llvmc/CompilerDriver.cpp +++ b/tools/llvmc/CompilerDriver.cpp @@ -62,6 +62,23 @@ void DumpConfigData(CompilerDriver::ConfigData* cd, const std::string& type ){ DumpAction(&cd->Linker); } +static bool GetBytecodeDependentLibraries(const std::string &fname, + Module::LibraryListType& deplibs, + BCDecompressor_t *BCDC, + std::string* ErrMsg) { + ModuleProvider* MP = getBytecodeModuleProvider(fname, BCDC, ErrMsg); + if (!MP) { + deplibs.clear(); + return true; + } + Module* M = MP->releaseModule(ErrMsg); + deplibs = M->getLibraries(); + delete M; + delete MP; + return false; +} + + class CompilerDriverImpl : public CompilerDriver { /// @name Constructors /// @{ |