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

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

diff --git a/examples/ExceptionDemo/ExceptionDemo.cpp b/examples/ExceptionDemo/ExceptionDemo.cpp
index 6822152a5f5d981e2583f3810e02a836dfb6653f..317a326cb9f2abb44f9378a277224b27f220e325 100644 (file)
--- a/examples/ExceptionDemo/ExceptionDemo.cpp
+++ b/examples/ExceptionDemo/ExceptionDemo.cpp
@@ -1122,14 +1122,11 @@ static llvm::BasicBlock *createCatchBlock(llvm::LLVMContext &context,
 /// @param numExceptionsToCatch length of exceptionTypesToCatch array
 /// @param exceptionTypesToCatch array of type info types to "catch"
 /// @returns generated function
 /// @param numExceptionsToCatch length of exceptionTypesToCatch array
 /// @param exceptionTypesToCatch array of type info types to "catch"
 /// @returns generated function

-static
-llvm::Function *createCatchWrappedInvokeFunction(llvm::Module &module,
-                                             llvm::IRBuilder<> &builder,
-                                             llvm::FunctionPassManager &fpm,
-                                             llvm::Function &toInvoke,
-                                             std::string ourId,
-                                             unsigned numExceptionsToCatch,
-                                             unsigned exceptionTypesToCatch[]) {
+static llvm::Function *createCatchWrappedInvokeFunction(
+    llvm::Module &module, llvm::IRBuilder<> &builder,
+    llvm::legacy::FunctionPassManager &fpm, llvm::Function &toInvoke,
+    std::string ourId, unsigned numExceptionsToCatch,
+    unsigned exceptionTypesToCatch[]) {

 
   llvm::LLVMContext &context = module.getContext();
   llvm::Function *toPrint32Int = module.getFunction("print32Int");
 
   llvm::LLVMContext &context = module.getContext();
   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
 ///        if the above nativeThrowType matches generated function's arg.
 /// @returns generated function
 /// @param nativeThrowFunct function which will throw a foreign exception
 ///        if the above nativeThrowType matches generated function's arg.
 /// @returns generated function

-static
-llvm::Function *createThrowExceptionFunction(llvm::Module &module,
-                                             llvm::IRBuilder<> &builder,
-                                             llvm::FunctionPassManager &fpm,
-                                             std::string ourId,
-                                             int32_t nativeThrowType,
-                                             llvm::Function &nativeThrowFunct) {
+static llvm::Function *
+createThrowExceptionFunction(llvm::Module &module, llvm::IRBuilder<> &builder,
+                             llvm::legacy::FunctionPassManager &fpm,
+                             std::string ourId, int32_t nativeThrowType,
+                             llvm::Function &nativeThrowFunct) {

   llvm::LLVMContext &context = module.getContext();
   namedValues.clear();
   ArgTypes unwindArgTypes;
   llvm::LLVMContext &context = module.getContext();
   namedValues.clear();
   ArgTypes unwindArgTypes;


@@ -1508,10 +1503,10 @@ static void createStandardUtilityFunctions(unsigned numTypeInfos,
 /// @param nativeThrowFunctName name of external function which will throw
 ///        a foreign exception
 /// @returns outermost generated test function.
 /// @param nativeThrowFunctName name of external function which will throw
 ///        a foreign exception
 /// @returns outermost generated test function.

-llvm::Function *createUnwindExceptionTest(llvm::Module &module,
-                                          llvm::IRBuilder<> &builder,
-                                          llvm::FunctionPassManager &fpm,
-                                          std::string nativeThrowFunctName) {
+llvm::Function *
+createUnwindExceptionTest(llvm::Module &module, llvm::IRBuilder<> &builder,
+                          llvm::legacy::FunctionPassManager &fpm,
+                          std::string nativeThrowFunctName) {

   // Number of type infos to generate
   unsigned numTypeInfos = 6;
 
   // Number of type infos to generate
   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.
     // Start with registering info about how the
 
     // Set up the optimizer pipeline.
     // Start with registering info about how the

diff --git a/examples/Kaleidoscope/Chapter4/toy.cpp b/examples/Kaleidoscope/Chapter4/toy.cpp
index ae52db82db3f848e1cb2c74fc4d7ddccb3bb7a12..f70c836ddb188e795de7136fb2a001f07f1e3462 100644 (file)
--- a/examples/Kaleidoscope/Chapter4/toy.cpp
+++ b/examples/Kaleidoscope/Chapter4/toy.cpp
@@ -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
     // target lays out data structures.
 
     // Set up the optimizer pipeline.  Start with registering info about how the
     // target lays out data structures.

diff --git a/examples/Kaleidoscope/Chapter5/toy.cpp b/examples/Kaleidoscope/Chapter5/toy.cpp
index db3efdce3d16bbf870690dde7c1c86b927ad5b4e..728a2f5d4cfe03fdff1f1827a4c460364b4526e6 100644 (file)
--- a/examples/Kaleidoscope/Chapter5/toy.cpp
+++ b/examples/Kaleidoscope/Chapter5/toy.cpp
@@ -506,7 +506,7 @@ static PrototypeAST *ParseExtern() {
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, Value *> NamedValues;
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, Value *> NamedValues;

-static FunctionPassManager *TheFPM;
+static legacy::FunctionPassManager *TheFPM;

 
 Value *ErrorV(const char *Str) {
   Error(Str);
 
 Value *ErrorV(const char *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
   // target lays out data structures.
 
   // Set up the optimizer pipeline.  Start with registering info about how the
   // target lays out data structures.

diff --git a/examples/Kaleidoscope/Chapter6/toy.cpp b/examples/Kaleidoscope/Chapter6/toy.cpp
index c64120d7cea885200b69ef1c6d794b9a57a75735..8131aa1077b5769a61848475d501a25755a9e66d 100644 (file)
--- a/examples/Kaleidoscope/Chapter6/toy.cpp
+++ b/examples/Kaleidoscope/Chapter6/toy.cpp
@@ -594,7 +594,7 @@ static PrototypeAST *ParseExtern() {
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, Value *> NamedValues;
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, Value *> NamedValues;

-static FunctionPassManager *TheFPM;
+static legacy::FunctionPassManager *TheFPM;

 
 Value *ErrorV(const char *Str) {
   Error(Str);
 
 Value *ErrorV(const char *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
   // target lays out data structures.
 
   // Set up the optimizer pipeline.  Start with registering info about how the
   // target lays out data structures.

diff --git a/examples/Kaleidoscope/Chapter7/toy.cpp b/examples/Kaleidoscope/Chapter7/toy.cpp
index 07b53add3b708247821848b24794782e49386e5a..82f083ac6e1155e8e6aad1a1b5e02c301b873aa5 100644 (file)
--- a/examples/Kaleidoscope/Chapter7/toy.cpp
+++ b/examples/Kaleidoscope/Chapter7/toy.cpp
@@ -665,7 +665,7 @@ static PrototypeAST *ParseExtern() {
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, AllocaInst *> NamedValues;
 static Module *TheModule;
 static IRBuilder<> Builder(getGlobalContext());
 static std::map<std::string, AllocaInst *> NamedValues;

-static FunctionPassManager *TheFPM;
+static legacy::FunctionPassManager *TheFPM;

 
 Value *ErrorV(const char *Str) {
   Error(Str);
 
 Value *ErrorV(const char *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
   // target lays out data structures.
 
   // Set up the optimizer pipeline.  Start with registering info about how the
   // target lays out data structures.

diff --git a/examples/Kaleidoscope/Chapter8/toy.cpp b/examples/Kaleidoscope/Chapter8/toy.cpp
index 4cdadfba6a47b2099e064b438d52fc87e9642930..30d4669e19c16df844eeb6721a5c2192363a4b71 100644 (file)
--- a/examples/Kaleidoscope/Chapter8/toy.cpp
+++ b/examples/Kaleidoscope/Chapter8/toy.cpp
@@ -855,7 +855,7 @@ static DICompositeType CreateFunctionType(unsigned NumArgs, DIFile Unit) {
 
 static Module *TheModule;
 static std::map<std::string, AllocaInst *> NamedValues;
 
 static Module *TheModule;
 static std::map<std::string, AllocaInst *> NamedValues;

-static FunctionPassManager *TheFPM;
+static legacy::FunctionPassManager *TheFPM;

 
 Value *ErrorV(const char *Str) {
   Error(Str);
 
 Value *ErrorV(const char *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
   // target lays out data structures.
 
   // Set up the optimizer pipeline.  Start with registering info about how the
   // target lays out data structures.