[llvm-commits] [llvm] r134985 - /llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp
Garrison Venn
gvenn.cfe.dev at gmail.com
Tue Jul 12 08:34:43 PDT 2011
Author: gvenn
Date: Tue Jul 12 10:34:42 2011
New Revision: 134985
URL: http://llvm.org/viewvc/llvm-project?rev=134985&view=rev
Log:
Reverted 134901 because of 134959. Did not use svn merge -r but rather:
1,$s/llvm::Type::getInt\(..\)Ty(builder.getContext())/builder.getInt\1Ty()/g
1,$s/builder.getInt\(..*\)Ty()->getPointerTo()/builder.getInt\1PtrTy()/g
vi sub commands (second one was not a reversion but requested by
Tobias Grosser.
Mod was tested, but other examples have failed to build as they are currently
being thrashed with the const qualifier removal change.
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=134985&r1=134984&r2=134985&view=diff
==============================================================================
--- llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp (original)
+++ llvm/trunk/examples/ExceptionDemo/ExceptionDemo.cpp Tue Jul 12 10:34:42 2011
@@ -895,7 +895,7 @@
llvm::Value *cast =
builder.CreatePointerCast(stringVar,
- builder.getInt8Ty()->getPointerTo());
+ builder.getInt8PtrTy());
builder.CreateCall(printFunct, cast);
}
@@ -939,7 +939,7 @@
llvm::Value *cast =
builder.CreateBitCast(stringVar,
- builder.getInt8Ty()->getPointerTo());
+ builder.getInt8PtrTy());
builder.CreateCall2(&printFunct, &toPrint, cast);
}
@@ -987,7 +987,7 @@
ourExceptionNotThrownState);
const llvm::PointerType *exceptionStorageType =
- builder.getInt8Ty()->getPointerTo();
+ builder.getInt8PtrTy();
*exceptionStorage =
createEntryBlockAlloca(toAddTo,
"exceptionStorage",
@@ -1098,7 +1098,7 @@
llvm::Function *toPrint32Int = module.getFunction("print32Int");
ArgTypes argTypes;
- argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+ argTypes.push_back(builder.getInt32Ty());
ArgNames argNames;
argNames.push_back("exceptTypeToThrow");
@@ -1239,7 +1239,7 @@
llvm::Function *personality = module.getFunction("ourPersonality");
llvm::Value *functPtr =
builder.CreatePointerCast(personality,
- builder.getInt8Ty()->getPointerTo());
+ builder.getInt8PtrTy());
args.clear();
args.push_back(unwindException);
@@ -1376,7 +1376,7 @@
llvm::LLVMContext &context = module.getContext();
namedValues.clear();
ArgTypes unwindArgTypes;
- unwindArgTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+ unwindArgTypes.push_back(builder.getInt32Ty());
ArgNames unwindArgNames;
unwindArgNames.push_back("exceptTypeToThrow");
@@ -1650,7 +1650,7 @@
// Create our type info type
ourTypeInfoType = llvm::StructType::get(context,
- TypeArray(llvm::Type::getInt32Ty(builder.getContext())));
+ TypeArray(builder.getInt32Ty()));
// Create OurException type
ourExceptionType = llvm::StructType::get(context,
TypeArray(ourTypeInfoType));
@@ -1661,7 +1661,7 @@
// Does this cause problems?
ourUnwindExceptionType =
llvm::StructType::get(context,
- TypeArray(llvm::Type::getInt64Ty(builder.getContext())));
+ TypeArray(builder.getInt64Ty()));
struct OurBaseException_t dummyException;
@@ -1727,8 +1727,8 @@
const llvm::Type *retType = builder.getVoidTy();
argTypes.clear();
- argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt32Ty());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1746,8 +1746,8 @@
retType = builder.getVoidTy();
argTypes.clear();
- argTypes.push_back(llvm::Type::getInt64Ty(builder.getContext()));
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt64Ty());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1765,7 +1765,7 @@
retType = builder.getVoidTy();
argTypes.clear();
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1783,7 +1783,7 @@
retType = builder.getVoidTy();
argTypes.clear();
- argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+ argTypes.push_back(builder.getInt32Ty());
argNames.clear();
@@ -1801,7 +1801,7 @@
retType = builder.getVoidTy();
argTypes.clear();
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1816,10 +1816,10 @@
// createOurException
- retType = builder.getInt8Ty()->getPointerTo();
+ retType = builder.getInt8PtrTy();
argTypes.clear();
- argTypes.push_back(llvm::Type::getInt32Ty(builder.getContext()));
+ argTypes.push_back(builder.getInt32Ty());
argNames.clear();
@@ -1837,7 +1837,7 @@
retType = builder.getInt32Ty();
argTypes.clear();
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1857,7 +1857,7 @@
retType = builder.getInt32Ty();
argTypes.clear();
- argTypes.push_back(builder.getInt8Ty()->getPointerTo());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
@@ -1877,11 +1877,11 @@
retType = builder.getInt32Ty();
argTypes.clear();
- 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());
+ argTypes.push_back(builder.getInt32Ty());
+ argTypes.push_back(builder.getInt32Ty());
+ argTypes.push_back(builder.getInt64Ty());
+ argTypes.push_back(builder.getInt8PtrTy());
+ argTypes.push_back(builder.getInt8PtrTy());
argNames.clear();
More information about the llvm-commits
mailing list