move AnalyzeBytecodeFile out of ReaderWrappers.cpp into Analyzer.cpp. Now
lli doesn't link in Analyzer.cpp.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@34020 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Bytecode/Reader/Analyzer.cpp b/lib/Bytecode/Reader/Analyzer.cpp
index 8db5f77..68d0a92 100644
--- a/lib/Bytecode/Reader/Analyzer.cpp
+++ b/lib/Bytecode/Reader/Analyzer.cpp
@@ -534,7 +534,7 @@
}
};
-
+} // end anonymous namespace
/// @brief Utility for printing a titled unsigned value with
/// an aligned colon.
@@ -574,14 +574,10 @@
<< std::left << val << (nl ? "\n" : "");
}
-}
-
-namespace llvm {
-
/// This function prints the contents of rhe BytecodeAnalysis structure in
/// a human legible form.
/// @brief Print BytecodeAnalysis structure to an ostream
-void PrintBytecodeAnalysis(BytecodeAnalysis& bca, std::ostream& Out )
+void llvm::PrintBytecodeAnalysis(BytecodeAnalysis& bca, std::ostream& Out )
{
Out << "\nSummary Analysis Of " << bca.ModuleId << ": \n\n";
print(Out, "Bytecode Analysis Of Module", bca.ModuleId);
@@ -673,11 +669,17 @@
Out << bca.VerifyInfo;
}
-BytecodeHandler* createBytecodeAnalyzerHandler(BytecodeAnalysis& bca,
- std::ostream* output)
-{
- return new AnalyzerHandler(bca,output);
+// AnalyzeBytecodeFile - analyze one file
+Module* llvm::AnalyzeBytecodeFile(const std::string &Filename, ///< File to analyze
+ BytecodeAnalysis& bca, ///< Statistical output
+ BCDecompressor_t *BCDC,
+ std::string *ErrMsg, ///< Error output
+ std::ostream* output ///< Dump output
+ ) {
+ BytecodeHandler* AH = new AnalyzerHandler(bca, output);
+ ModuleProvider* MP = getBytecodeModuleProvider(Filename, BCDC, ErrMsg, AH);
+ if (!MP) return 0;
+ Module *M = MP->releaseModule(ErrMsg);
+ delete MP;
+ return M;
}
-
-}
-
diff --git a/lib/Bytecode/Reader/Reader.h b/lib/Bytecode/Reader/Reader.h
index 516a116..8acf6c0 100644
--- a/lib/Bytecode/Reader/Reader.h
+++ b/lib/Bytecode/Reader/Reader.h
@@ -18,8 +18,6 @@
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/GlobalValue.h"
-#include "llvm/Function.h"
#include "llvm/ModuleProvider.h"
#include "llvm/Bytecode/Analyzer.h"
#include "llvm/ADT/SmallVector.h"
@@ -455,12 +453,6 @@
/// @}
};
-/// @brief A function for creating a BytecodeAnalzer as a handler
-/// for the Bytecode reader.
-BytecodeHandler* createBytecodeAnalyzerHandler(BytecodeAnalysis& bca,
- std::ostream* output );
-
-
} // End llvm namespace
// vim: sw=2
diff --git a/lib/Bytecode/Reader/ReaderWrappers.cpp b/lib/Bytecode/Reader/ReaderWrappers.cpp
index 84fa836..07094f2 100644
--- a/lib/Bytecode/Reader/ReaderWrappers.cpp
+++ b/lib/Bytecode/Reader/ReaderWrappers.cpp
@@ -255,21 +255,6 @@
return M;
}
-// AnalyzeBytecodeFile - analyze one file
-Module* llvm::AnalyzeBytecodeFile(
- const std::string &Filename, ///< File to analyze
- BytecodeAnalysis& bca, ///< Statistical output
- BCDecompressor_t *BCDC,
- std::string *ErrMsg, ///< Error output
- std::ostream* output ///< Dump output
-) {
- BytecodeHandler* AH = createBytecodeAnalyzerHandler(bca,output);
- ModuleProvider* MP = getBytecodeModuleProvider(Filename, BCDC, ErrMsg, AH);
- if (!MP) return 0;
- Module *M = MP->releaseModule(ErrMsg);
- delete MP;
- return M;
-}
bool llvm::GetBytecodeDependentLibraries(const std::string &fname,
Module::LibraryListType& deplibs,