[llvm-commits] [llvm] r134901 - /llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp

[Garrison Venn]

Author: gvenn
Date: Mon Jul 11 11:31:53 2011
New Revision: 134901

URL: http://llvm.org/viewvc/llvm-project?rev=134901&view=rev
Log:
Modified demo to work with non const Type parameters as is required by new
type system. However most of these modifications were due to IRBuilder
(IRBuilderBase), not having been modified to NOT return such const qualified
free types. If IRBuilder does not change, as can also be seen in its 
instruction creation methods, to use const free types, it may be useful to have
ExceptionDemo drop IRBuilder usage. Modifying builder.getInt32Ty() to
llvm::Type::getInt32Ty(builder.getContext()) is pretty ugly.


Modified:
    llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp

Modified: llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp?rev=134901&r1=134900&r2=134901&view=diff
==============================================================================
--- llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp (original)
+++ llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp Mon Jul 11 11:31:53 2011
@@ -190,7 +190,7 @@
 static llvm::ConstantInt *ourExceptionCaughtState;
 
 typedef std::vector<std::string> ArgNames;
-typedef std::vector<const llvm::Type*> ArgTypes;
+typedef std::vector<llvm::Type*> ArgTypes;
 
 //
 // Code Generation Utilities
@@ -987,7 +987,7 @@
                          ourExceptionNotThrownState);
   
   const llvm::PointerType *exceptionStorageType = 
-  builder.getInt8Ty()->getPointerTo();
+      builder.getInt8Ty()->getPointerTo();
   *exceptionStorage = 
   createEntryBlockAlloca(toAddTo,
                          "exceptionStorage",
@@ -1098,7 +1098,7 @@
   llvm::Function *toPrint32Int = module.getFunction("print32Int");
   
   ArgTypes argTypes;
-  argTypes.push_back(builder.getInt32Ty());
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
   
   ArgNames argNames;
   argNames.push_back("exceptTypeToThrow");
@@ -1376,7 +1376,7 @@
   llvm::LLVMContext &context = module.getContext();
   namedValues.clear();
   ArgTypes unwindArgTypes;
-  unwindArgTypes.push_back(builder.getInt32Ty());
+  unwindArgTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
   ArgNames unwindArgNames;
   unwindArgNames.push_back("exceptTypeToThrow");
   
@@ -1622,7 +1622,7 @@
 // End test functions
 //
 
-typedef llvm::ArrayRef<const llvm::Type*> TypeArray;
+typedef llvm::ArrayRef<llvm::Type*> TypeArray;
 
 /// This initialization routine creates type info globals and 
 /// adds external function declarations to module.
@@ -1650,8 +1650,7 @@
   
   // Create our type info type
   ourTypeInfoType = llvm::StructType::get(context, 
-                                          TypeArray(builder.getInt32Ty()));
-  
+                      TypeArray(llvm::Type::getInt32Ty(builder.getContext())));
   // Create OurException type
   ourExceptionType = llvm::StructType::get(context, 
                                            TypeArray(ourTypeInfoType));
@@ -1661,7 +1660,9 @@
   // Note: Declaring only a portion of the _Unwind_Exception struct.
   //       Does this cause problems?
   ourUnwindExceptionType =
-    llvm::StructType::get(context, TypeArray(builder.getInt64Ty()));
+    llvm::StructType::get(context, 
+                    TypeArray(llvm::Type::getInt64Ty(builder.getContext())));
+
   struct OurBaseException_t dummyException;
   
   // Calculate offset of OurException::unwindException member.
@@ -1726,7 +1727,7 @@
   const llvm::Type *retType = builder.getVoidTy();
   
   argTypes.clear();
-  argTypes.push_back(builder.getInt32Ty());
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
   argTypes.push_back(builder.getInt8Ty()->getPointerTo());
   
   argNames.clear();
@@ -1745,7 +1746,7 @@
   retType = builder.getVoidTy();
   
   argTypes.clear();
-  argTypes.push_back(builder.getInt64Ty());
+  argTypes.push_back(llvm::Type::getInt64Ty(builder.getContext()));
   argTypes.push_back(builder.getInt8Ty()->getPointerTo());
   
   argNames.clear();
@@ -1782,7 +1783,7 @@
   retType = builder.getVoidTy();
   
   argTypes.clear();
-  argTypes.push_back(builder.getInt32Ty());
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
   
   argNames.clear();
   
@@ -1818,7 +1819,7 @@
   retType = builder.getInt8Ty()->getPointerTo();
   
   argTypes.clear();
-  argTypes.push_back(builder.getInt32Ty());
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
   
   argNames.clear();
   
@@ -1876,9 +1877,9 @@
   retType = builder.getInt32Ty();
   
   argTypes.clear();
-  argTypes.push_back(builder.getInt32Ty());
-  argTypes.push_back(builder.getInt32Ty());
-  argTypes.push_back(builder.getInt64Ty());
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+  argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+  argTypes.push_back(llvm::Type::getInt64Ty(builder.getContext()));
   argTypes.push_back(builder.getInt8Ty()->getPointerTo());
   argTypes.push_back(builder.getInt8Ty()->getPointerTo());