6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-28 23:38:59 +00:00
Code Issues Projects Releases Wiki Activity

[PM] Update the examples to reflect the removal of the

Browse Source 
llvm/PassManager.h wrapper header and its using declarations. These now
directly use the legacy namespace.

I had updated the #include lines in my large commit but forgot that the
examples weren't being built and didn't update the code to use the
correct namespace. Sorry for the noise here.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229095 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chandler Carruth 2015-02-13 10:21:05 +00:00
parent 417c5c172c
commit 7ea33e53c7
6 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
examples/ExceptionDemo/ExceptionDemo.cpp
View File

@ -1122,14 +1122,11 @@ static llvm::BasicBlock *createCatchBlock(llvm::LLVMContext &context,
/// @param numExceptionsToCatch length of exceptionTypesToCatch array /// @param numExceptionsToCatch length of exceptionTypesToCatch array
/// @param exceptionTypesToCatch array of type info types to "catch" /// @param exceptionTypesToCatch array of type info types to "catch"
/// @returns generated function /// @returns generated function
static static llvm::Function *createCatchWrappedInvokeFunction(
llvm::Function *createCatchWrappedInvokeFunction(llvm::Module &module, llvm::Module &module, llvm::IRBuilder<> &builder,
llvm::IRBuilder<> &builder, llvm::legacy::FunctionPassManager &fpm, llvm::Function &toInvoke,
llvm::FunctionPassManager &fpm, std::string ourId, unsigned numExceptionsToCatch,
llvm::Function &toInvoke, unsigned exceptionTypesToCatch[]) {
std::string ourId,
unsigned numExceptionsToCatch,
unsigned exceptionTypesToCatch[]) {
llvm::LLVMContext &context = module.getContext(); llvm::LLVMContext &context = module.getContext();
llvm::Function *toPrint32Int = module.getFunction("print32Int"); llvm::Function *toPrint32Int = module.getFunction("print32Int");
@ -1389,13 +1386,11 @@ llvm::Function *createCatchWrappedInvokeFunction(llvm::Module &module,
/// @param nativeThrowFunct function which will throw a foreign exception /// @param nativeThrowFunct function which will throw a foreign exception
/// if the above nativeThrowType matches generated function's arg. /// if the above nativeThrowType matches generated function's arg.
/// @returns generated function /// @returns generated function
static static llvm::Function *
llvm::Function *createThrowExceptionFunction(llvm::Module &module, createThrowExceptionFunction(llvm::Module &module, llvm::IRBuilder<> &builder,
llvm::IRBuilder<> &builder, llvm::legacy::FunctionPassManager &fpm,
llvm::FunctionPassManager &fpm, std::string ourId, int32_t nativeThrowType,
std::string ourId, llvm::Function &nativeThrowFunct) {
int32_t nativeThrowType,
llvm::Function &nativeThrowFunct) {
llvm::LLVMContext &context = module.getContext(); llvm::LLVMContext &context = module.getContext();
namedValues.clear(); namedValues.clear();
ArgTypes unwindArgTypes; ArgTypes unwindArgTypes;
@ -1508,10 +1503,10 @@ static void createStandardUtilityFunctions(unsigned numTypeInfos,
/// @param nativeThrowFunctName name of external function which will throw /// @param nativeThrowFunctName name of external function which will throw
/// a foreign exception /// a foreign exception
/// @returns outermost generated test function. /// @returns outermost generated test function.
llvm::Function *createUnwindExceptionTest(llvm::Module &module, llvm::Function *
llvm::IRBuilder<> &builder, createUnwindExceptionTest(llvm::Module &module, llvm::IRBuilder<> &builder,
llvm::FunctionPassManager &fpm, llvm::legacy::FunctionPassManager &fpm,
std::string nativeThrowFunctName) { std::string nativeThrowFunctName) {
// Number of type infos to generate // Number of type infos to generate
unsigned numTypeInfos = 6; unsigned numTypeInfos = 6;
@ -1971,7 +1966,7 @@ int main(int argc, char *argv[]) {
llvm::ExecutionEngine *executionEngine = factory.create(); llvm::ExecutionEngine *executionEngine = factory.create();
{ {
llvm::FunctionPassManager fpm(module); llvm::legacy::FunctionPassManager fpm(module);
// Set up the optimizer pipeline. // Set up the optimizer pipeline.
// Start with registering info about how the // Start with registering info about how the

2
examples/Kaleidoscope/Chapter4/toy.cpp
View File

@ -556,7 +556,7 @@ void *MCJITHelper::getPointerToFunction(Function *F) {
} }
// Create a function pass manager for this engine // Create a function pass manager for this engine
FunctionPassManager *FPM = new FunctionPassManager(OpenModule); auto *FPM = new legacy::FunctionPassManager(OpenModule);
// Set up the optimizer pipeline. Start with registering info about how the // Set up the optimizer pipeline. Start with registering info about how the
// target lays out data structures. // target lays out data structures.

4
examples/Kaleidoscope/Chapter5/toy.cpp
View File

@ -506,7 +506,7 @@ static PrototypeAST *ParseExtern() {
static Module *TheModule; static Module *TheModule;
static IRBuilder<> Builder(getGlobalContext()); static IRBuilder<> Builder(getGlobalContext());
static std::map<std::string, Value *> NamedValues; static std::map<std::string, Value *> NamedValues;
static FunctionPassManager *TheFPM; static legacy::FunctionPassManager *TheFPM;
Value *ErrorV(const char *Str) { Value *ErrorV(const char *Str) {
Error(Str); Error(Str);
@ -908,7 +908,7 @@ int main() {
exit(1); exit(1);
} }
FunctionPassManager OurFPM(TheModule); legacy::FunctionPassManager OurFPM(TheModule);
// Set up the optimizer pipeline. Start with registering info about how the // Set up the optimizer pipeline. Start with registering info about how the
// target lays out data structures. // target lays out data structures.

4
examples/Kaleidoscope/Chapter6/toy.cpp
View File

@ -594,7 +594,7 @@ static PrototypeAST *ParseExtern() {
static Module *TheModule; static Module *TheModule;
static IRBuilder<> Builder(getGlobalContext()); static IRBuilder<> Builder(getGlobalContext());
static std::map<std::string, Value *> NamedValues; static std::map<std::string, Value *> NamedValues;
static FunctionPassManager *TheFPM; static legacy::FunctionPassManager *TheFPM;
Value *ErrorV(const char *Str) { Value *ErrorV(const char *Str) {
Error(Str); Error(Str);
@ -1029,7 +1029,7 @@ int main() {
exit(1); exit(1);
} }
FunctionPassManager OurFPM(TheModule); legacy::FunctionPassManager OurFPM(TheModule);
// Set up the optimizer pipeline. Start with registering info about how the // Set up the optimizer pipeline. Start with registering info about how the
// target lays out data structures. // target lays out data structures.

4
examples/Kaleidoscope/Chapter7/toy.cpp
View File

@ -665,7 +665,7 @@ static PrototypeAST *ParseExtern() {
static Module *TheModule; static Module *TheModule;
static IRBuilder<> Builder(getGlobalContext()); static IRBuilder<> Builder(getGlobalContext());
static std::map<std::string, AllocaInst *> NamedValues; static std::map<std::string, AllocaInst *> NamedValues;
static FunctionPassManager *TheFPM; static legacy::FunctionPassManager *TheFPM;
Value *ErrorV(const char *Str) { Value *ErrorV(const char *Str) {
Error(Str); Error(Str);
@ -1203,7 +1203,7 @@ int main() {
exit(1); exit(1);
} }
FunctionPassManager OurFPM(TheModule); legacy::FunctionPassManager OurFPM(TheModule);
// Set up the optimizer pipeline. Start with registering info about how the // Set up the optimizer pipeline. Start with registering info about how the
// target lays out data structures. // target lays out data structures.

4
examples/Kaleidoscope/Chapter8/toy.cpp
View File

@ -855,7 +855,7 @@ static DICompositeType CreateFunctionType(unsigned NumArgs, DIFile Unit) {
static Module *TheModule; static Module *TheModule;
static std::map<std::string, AllocaInst *> NamedValues; static std::map<std::string, AllocaInst *> NamedValues;
static FunctionPassManager *TheFPM; static legacy::FunctionPassManager *TheFPM;
Value *ErrorV(const char *Str) { Value *ErrorV(const char *Str) {
Error(Str); Error(Str);
@ -1454,7 +1454,7 @@ int main() {
exit(1); exit(1);
} }
FunctionPassManager OurFPM(TheModule); legacy::FunctionPassManager OurFPM(TheModule);
// Set up the optimizer pipeline. Start with registering info about how the // Set up the optimizer pipeline. Start with registering info about how the
// target lays out data structures. // target lays out data structures.