[llvm-commits] [llvm] r134888 - in /llvm/trunk: include/llvm/ include/llvm/Support/ lib/AsmParser/ lib/Bitcode/Reader/ lib/CodeGen/ lib/Target/Blackfin/ lib/Target/MBlaze/ lib/Transforms/IPO/ lib/Transforms/InstCombine/ lib/Transforms/Instrumenta
Bill Wendling
wendling at apple.com
Tue Jul 12 00:17:26 PDT 2011
No worries. llvm-gcc doesn't get a lot of attention these days. :-) Thanks for looking into it!
-bw
On Jul 11, 2011, at 11:29 PM, Jay Foad wrote:
> Thanks. I'll look into it today. Sorry for the breakage.
>
> Jay.
>
> On 12 July 2011 02:18, Bill Wendling <wendling at apple.com> wrote:
>> Hi Jay,
>>
>> I had to revert this and your related patches. It was causing llvm-gcc to fail to compile on Darwin (possibly other machines). It was an assert:
>>
>> Assertion failed: (castIsValid(op, S, Ty) && "Invalid cast!"), function Create, file ...
>>
>> -bw
>>
>> On Jul 11, 2011, at 12:56 AM, Jay Foad wrote:
>>
>>> Author: foad
>>> Date: Mon Jul 11 02:56:41 2011
>>> New Revision: 134888
>>>
>>> URL: http://llvm.org/viewvc/llvm-project?rev=134888&view=rev
>>> Log:
>>> De-constify Types in FunctionType::get().
>>>
>>> Modified:
>>> llvm/trunk/include/llvm/DerivedTypes.h
>>> llvm/trunk/include/llvm/Intrinsics.h
>>> llvm/trunk/include/llvm/Support/TypeBuilder.h
>>> llvm/trunk/lib/AsmParser/LLParser.cpp
>>> llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>> llvm/trunk/lib/CodeGen/DwarfEHPrepare.cpp
>>> llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
>>> llvm/trunk/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp
>>> llvm/trunk/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp
>>> llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
>>> llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>>> llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
>>> llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
>>> llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp
>>> llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp
>>> llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
>>> llvm/trunk/lib/Transforms/Scalar/ObjCARC.cpp
>>> llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
>>> llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp
>>> llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
>>> llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
>>> llvm/trunk/lib/VMCore/Core.cpp
>>> llvm/trunk/lib/VMCore/Function.cpp
>>> llvm/trunk/lib/VMCore/IRBuilder.cpp
>>> llvm/trunk/lib/VMCore/Module.cpp
>>> llvm/trunk/lib/VMCore/Type.cpp
>>> llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp
>>> llvm/trunk/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
>>> llvm/trunk/unittests/ExecutionEngine/JIT/JITTest.cpp
>>> llvm/trunk/unittests/Support/TypeBuilderTest.cpp
>>> llvm/trunk/unittests/VMCore/PassManagerTest.cpp
>>>
>>> Modified: llvm/trunk/include/llvm/DerivedTypes.h
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DerivedTypes.h?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/DerivedTypes.h (original)
>>> +++ llvm/trunk/include/llvm/DerivedTypes.h Mon Jul 11 02:56:41 2011
>>> @@ -103,8 +103,6 @@
>>> /// a FunctionType.
>>> ///
>>> static FunctionType *get(const Type *Result,
>>> - ArrayRef<const Type*> Params, bool isVarArg);
>>> - static FunctionType *get(const Type *Result,
>>> ArrayRef<Type*> Params, bool isVarArg);
>>>
>>> /// FunctionType::get - Create a FunctionType taking no parameters.
>>>
>>> Modified: llvm/trunk/include/llvm/Intrinsics.h
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Intrinsics.h?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Intrinsics.h (original)
>>> +++ llvm/trunk/include/llvm/Intrinsics.h Mon Jul 11 02:56:41 2011
>>> @@ -44,12 +44,12 @@
>>>
>>> /// Intrinsic::getName(ID) - Return the LLVM name for an intrinsic, such as
>>> /// "llvm.ppc.altivec.lvx".
>>> - std::string getName(ID id, const Type **Tys = 0, unsigned numTys = 0);
>>> + std::string getName(ID id, Type **Tys = 0, unsigned numTys = 0);
>>>
>>> /// Intrinsic::getType(ID) - Return the function type for an intrinsic.
>>> ///
>>> const FunctionType *getType(LLVMContext &Context, ID id,
>>> - const Type **Tys = 0, unsigned numTys = 0);
>>> + Type **Tys = 0, unsigned numTys = 0);
>>>
>>> /// Intrinsic::isOverloaded(ID) - Returns true if the intrinsic can be
>>> /// overloaded.
>>> @@ -67,7 +67,7 @@
>>> /// overloaded intrinsic, Tys should point to an array of numTys pointers to
>>> /// Type, and must provide exactly one type for each overloaded type in the
>>> /// intrinsic.
>>> - Function *getDeclaration(Module *M, ID id, const Type **Tys = 0,
>>> + Function *getDeclaration(Module *M, ID id, Type **Tys = 0,
>>> unsigned numTys = 0);
>>>
>>> /// Map a GCC builtin name to an intrinsic ID.
>>>
>>> Modified: llvm/trunk/include/llvm/Support/TypeBuilder.h
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/TypeBuilder.h?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/include/llvm/Support/TypeBuilder.h (original)
>>> +++ llvm/trunk/include/llvm/Support/TypeBuilder.h Mon Jul 11 02:56:41 2011
>>> @@ -51,7 +51,7 @@
>>> /// namespace llvm {
>>> /// template<bool xcompile> class TypeBuilder<MyType, xcompile> {
>>> /// public:
>>> -/// static const StructType *get(LLVMContext &Context) {
>>> +/// static StructType *get(LLVMContext &Context) {
>>> /// // If you cache this result, be sure to cache it separately
>>> /// // for each LLVMContext.
>>> /// return StructType::get(
>>> @@ -104,7 +104,7 @@
>>> // Pointers
>>> template<typename T, bool cross> class TypeBuilder<T*, cross> {
>>> public:
>>> - static const PointerType *get(LLVMContext &Context) {
>>> + static PointerType *get(LLVMContext &Context) {
>>> return PointerType::getUnqual(TypeBuilder<T,cross>::get(Context));
>>> }
>>> };
>>> @@ -115,14 +115,14 @@
>>> // Arrays
>>> template<typename T, size_t N, bool cross> class TypeBuilder<T[N], cross> {
>>> public:
>>> - static const ArrayType *get(LLVMContext &Context) {
>>> + static ArrayType *get(LLVMContext &Context) {
>>> return ArrayType::get(TypeBuilder<T, cross>::get(Context), N);
>>> }
>>> };
>>> /// LLVM uses an array of length 0 to represent an unknown-length array.
>>> template<typename T, bool cross> class TypeBuilder<T[], cross> {
>>> public:
>>> - static const ArrayType *get(LLVMContext &Context) {
>>> + static ArrayType *get(LLVMContext &Context) {
>>> return ArrayType::get(TypeBuilder<T, cross>::get(Context), 0);
>>> }
>>> };
>>> @@ -152,7 +152,7 @@
>>> #define DEFINE_INTEGRAL_TYPEBUILDER(T) \
>>> template<> class TypeBuilder<T, false> { \
>>> public: \
>>> - static const IntegerType *get(LLVMContext &Context) { \
>>> + static IntegerType *get(LLVMContext &Context) { \
>>> return IntegerType::get(Context, sizeof(T) * CHAR_BIT); \
>>> } \
>>> }; \
>>> @@ -181,14 +181,14 @@
>>> template<uint32_t num_bits, bool cross>
>>> class TypeBuilder<types::i<num_bits>, cross> {
>>> public:
>>> - static const IntegerType *get(LLVMContext &C) {
>>> + static IntegerType *get(LLVMContext &C) {
>>> return IntegerType::get(C, num_bits);
>>> }
>>> };
>>>
>>> template<> class TypeBuilder<float, false> {
>>> public:
>>> - static const Type *get(LLVMContext& C) {
>>> + static Type *get(LLVMContext& C) {
>>> return Type::getFloatTy(C);
>>> }
>>> };
>>> @@ -196,7 +196,7 @@
>>>
>>> template<> class TypeBuilder<double, false> {
>>> public:
>>> - static const Type *get(LLVMContext& C) {
>>> + static Type *get(LLVMContext& C) {
>>> return Type::getDoubleTy(C);
>>> }
>>> };
>>> @@ -204,32 +204,32 @@
>>>
>>> template<bool cross> class TypeBuilder<types::ieee_float, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getFloatTy(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getFloatTy(C); }
>>> };
>>> template<bool cross> class TypeBuilder<types::ieee_double, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getDoubleTy(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getDoubleTy(C); }
>>> };
>>> template<bool cross> class TypeBuilder<types::x86_fp80, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getX86_FP80Ty(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getX86_FP80Ty(C); }
>>> };
>>> template<bool cross> class TypeBuilder<types::fp128, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getFP128Ty(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getFP128Ty(C); }
>>> };
>>> template<bool cross> class TypeBuilder<types::ppc_fp128, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getPPC_FP128Ty(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getPPC_FP128Ty(C); }
>>> };
>>> template<bool cross> class TypeBuilder<types::x86_mmx, cross> {
>>> public:
>>> - static const Type *get(LLVMContext& C) { return Type::getX86_MMXTy(C); }
>>> + static Type *get(LLVMContext& C) { return Type::getX86_MMXTy(C); }
>>> };
>>>
>>> template<bool cross> class TypeBuilder<void, cross> {
>>> public:
>>> - static const Type *get(LLVMContext &C) {
>>> + static Type *get(LLVMContext &C) {
>>> return Type::getVoidTy(C);
>>> }
>>> };
>>> @@ -247,14 +247,14 @@
>>>
>>> template<typename R, bool cross> class TypeBuilder<R(), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> + static FunctionType *get(LLVMContext &Context) {
>>> return FunctionType::get(TypeBuilder<R, cross>::get(Context), false);
>>> }
>>> };
>>> template<typename R, typename A1, bool cross> class TypeBuilder<R(A1), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(1);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> return FunctionType::get(TypeBuilder<R, cross>::get(Context),
>>> @@ -264,8 +264,8 @@
>>> template<typename R, typename A1, typename A2, bool cross>
>>> class TypeBuilder<R(A1, A2), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(2);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -276,8 +276,8 @@
>>> template<typename R, typename A1, typename A2, typename A3, bool cross>
>>> class TypeBuilder<R(A1, A2, A3), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(3);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -291,8 +291,8 @@
>>> bool cross>
>>> class TypeBuilder<R(A1, A2, A3, A4), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(4);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -307,8 +307,8 @@
>>> typename A5, bool cross>
>>> class TypeBuilder<R(A1, A2, A3, A4, A5), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(5);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -322,15 +322,15 @@
>>>
>>> template<typename R, bool cross> class TypeBuilder<R(...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> + static FunctionType *get(LLVMContext &Context) {
>>> return FunctionType::get(TypeBuilder<R, cross>::get(Context), true);
>>> }
>>> };
>>> template<typename R, typename A1, bool cross>
>>> class TypeBuilder<R(A1, ...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(1);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> return FunctionType::get(TypeBuilder<R, cross>::get(Context), params, true);
>>> @@ -339,8 +339,8 @@
>>> template<typename R, typename A1, typename A2, bool cross>
>>> class TypeBuilder<R(A1, A2, ...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(2);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -351,8 +351,8 @@
>>> template<typename R, typename A1, typename A2, typename A3, bool cross>
>>> class TypeBuilder<R(A1, A2, A3, ...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(3);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -366,8 +366,8 @@
>>> bool cross>
>>> class TypeBuilder<R(A1, A2, A3, A4, ...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(4);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>> @@ -382,8 +382,8 @@
>>> typename A5, bool cross>
>>> class TypeBuilder<R(A1, A2, A3, A4, A5, ...), cross> {
>>> public:
>>> - static const FunctionType *get(LLVMContext &Context) {
>>> - std::vector<const Type*> params;
>>> + static FunctionType *get(LLVMContext &Context) {
>>> + std::vector<Type*> params;
>>> params.reserve(5);
>>> params.push_back(TypeBuilder<A1, cross>::get(Context));
>>> params.push_back(TypeBuilder<A2, cross>::get(Context));
>>>
>>> Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
>>> +++ llvm/trunk/lib/AsmParser/LLParser.cpp Mon Jul 11 02:56:41 2011
>>> @@ -1442,7 +1442,7 @@
>>> "argument attributes invalid in function type");
>>> }
>>>
>>> - SmallVector<const Type*, 16> ArgListTy;
>>> + SmallVector<Type*, 16> ArgListTy;
>>> for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
>>> ArgListTy.push_back(ArgList[i].Ty);
>>>
>>> @@ -2655,7 +2655,7 @@
>>>
>>> // Okay, if we got here, the function is syntactically valid. Convert types
>>> // and do semantic checks.
>>> - std::vector<const Type*> ParamTypeList;
>>> + std::vector<Type*> ParamTypeList;
>>> SmallVector<AttributeWithIndex, 8> Attrs;
>>>
>>> if (RetAttrs != Attribute::None)
>>> @@ -3171,7 +3171,7 @@
>>> if (!(PFTy = dyn_cast<PointerType>(RetType)) ||
>>> !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>>> // Pull out the types of all of the arguments...
>>> - std::vector<const Type*> ParamTypes;
>>> + std::vector<Type*> ParamTypes;
>>> for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
>>> ParamTypes.push_back(ArgList[i].V->getType());
>>>
>>> @@ -3508,7 +3508,7 @@
>>> if (!(PFTy = dyn_cast<PointerType>(RetType)) ||
>>> !(Ty = dyn_cast<FunctionType>(PFTy->getElementType()))) {
>>> // Pull out the types of all of the arguments...
>>> - std::vector<const Type*> ParamTypes;
>>> + std::vector<Type*> ParamTypes;
>>> for (unsigned i = 0, e = ArgList.size(); i != e; ++i)
>>> ParamTypes.push_back(ArgList[i].V->getType());
>>>
>>>
>>> Modified: llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp (original)
>>> +++ llvm/trunk/lib/Bitcode/Reader/BitcodeReader.cpp Mon Jul 11 02:56:41 2011
>>> @@ -582,7 +582,7 @@
>>> // FUNCTION: [vararg, attrid, retty, paramty x N]
>>> if (Record.size() < 3)
>>> return Error("Invalid FUNCTION type record");
>>> - std::vector<const Type*> ArgTys;
>>> + std::vector<Type*> ArgTys;
>>> for (unsigned i = 3, e = Record.size(); i != e; ++i) {
>>> if (Type *T = getTypeByID(Record[i]))
>>> ArgTys.push_back(T);
>>> @@ -838,7 +838,7 @@
>>> // FUNCTION: [vararg, attrid, retty, paramty x N]
>>> if (Record.size() < 3)
>>> return Error("Invalid FUNCTION type record");
>>> - std::vector<const Type*> ArgTys;
>>> + std::vector<Type*> ArgTys;
>>> for (unsigned i = 3, e = Record.size(); i != e; ++i) {
>>> if (Type *Elt = getTypeByIDOrNull(Record[i]))
>>> ArgTys.push_back(Elt);
>>>
>>> Modified: llvm/trunk/lib/CodeGen/DwarfEHPrepare.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/DwarfEHPrepare.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/CodeGen/DwarfEHPrepare.cpp (original)
>>> +++ llvm/trunk/lib/CodeGen/DwarfEHPrepare.cpp Mon Jul 11 02:56:41 2011
>>> @@ -497,10 +497,8 @@
>>> // Find the rewind function if we didn't already.
>>> if (!RewindFunction) {
>>> LLVMContext &Ctx = ResumeInsts[0]->getContext();
>>> - std::vector<const Type*>
>>> - Params(1, Type::getInt8PtrTy(Ctx));
>>> FunctionType *FTy = FunctionType::get(Type::getVoidTy(Ctx),
>>> - Params, false);
>>> + Type::getInt8PtrTy(Ctx), false);
>>> const char *RewindName = TLI->getLibcallName(RTLIB::UNWIND_RESUME);
>>> RewindFunction = F->getParent()->getOrInsertFunction(RewindName, FTy);
>>> }
>>>
>>> Modified: llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp (original)
>>> +++ llvm/trunk/lib/CodeGen/IntrinsicLowering.cpp Mon Jul 11 02:56:41 2011
>>> @@ -29,7 +29,7 @@
>>> ArgIt ArgBegin, ArgIt ArgEnd,
>>> const Type *RetTy) {
>>> // Insert a correctly-typed definition now.
>>> - std::vector<const Type *> ParamTys;
>>> + std::vector<Type *> ParamTys;
>>> for (ArgIt I = ArgBegin; I != ArgEnd; ++I)
>>> ParamTys.push_back(I->getType());
>>> M.getOrInsertFunction(Name, FunctionType::get(RetTy, ParamTys, false));
>>> @@ -69,7 +69,7 @@
>>> // program already contains a function with this name.
>>> Module *M = CI->getParent()->getParent()->getParent();
>>> // Get or insert the definition now.
>>> - std::vector<const Type *> ParamTys;
>>> + std::vector<Type *> ParamTys;
>>> for (ArgIt I = ArgBegin; I != ArgEnd; ++I)
>>> ParamTys.push_back((*I)->getType());
>>> Constant* FCache = M->getOrInsertFunction(NewFn,
>>> @@ -553,12 +553,12 @@
>>> !CI->getType()->isIntegerTy())
>>> return false;
>>>
>>> - const IntegerType *Ty = dyn_cast<IntegerType>(CI->getType());
>>> + IntegerType *Ty = dyn_cast<IntegerType>(CI->getType());
>>> if (!Ty)
>>> return false;
>>>
>>> // Okay, we can do this xform, do so now.
>>> - const Type *Tys[] = { Ty };
>>> + Type *Tys[] = { Ty };
>>> Module *M = CI->getParent()->getParent()->getParent();
>>> Constant *Int = Intrinsic::getDeclaration(M, Intrinsic::bswap, Tys, 1);
>>>
>>>
>>> Modified: llvm/trunk/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp (original)
>>> +++ llvm/trunk/lib/Target/Blackfin/BlackfinIntrinsicInfo.cpp Mon Jul 11 02:56:41 2011
>>> @@ -83,7 +83,7 @@
>>>
>>> static const FunctionType *getType(LLVMContext &Context, unsigned id) {
>>> const Type *ResultTy = NULL;
>>> - std::vector<const Type*> ArgTys;
>>> + std::vector<Type*> ArgTys;
>>> bool IsVarArg = false;
>>>
>>> #define GET_INTRINSIC_GENERATOR
>>>
>>> Modified: llvm/trunk/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp (original)
>>> +++ llvm/trunk/lib/Target/MBlaze/MBlazeIntrinsicInfo.cpp Mon Jul 11 02:56:41 2011
>>> @@ -92,7 +92,7 @@
>>>
>>> static const FunctionType *getType(LLVMContext &Context, unsigned id) {
>>> const Type *ResultTy = NULL;
>>> - std::vector<const Type*> ArgTys;
>>> + std::vector<Type*> ArgTys;
>>> bool IsVarArg = false;
>>>
>>> #define GET_INTRINSIC_GENERATOR
>>>
>>> Modified: llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/IPO/ArgumentPromotion.cpp Mon Jul 11 02:56:41 2011
>>> @@ -493,7 +493,7 @@
>>> // Start by computing a new prototype for the function, which is the same as
>>> // the old function, but has modified arguments.
>>> const FunctionType *FTy = F->getFunctionType();
>>> - std::vector<const Type*> Params;
>>> + std::vector<Type*> Params;
>>>
>>> typedef std::set<IndicesVector> ScalarizeTable;
>>>
>>>
>>> Modified: llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/IPO/DeadArgumentElimination.cpp Mon Jul 11 02:56:41 2011
>>> @@ -208,7 +208,7 @@
>>> // the old function, but doesn't have isVarArg set.
>>> const FunctionType *FTy = Fn.getFunctionType();
>>>
>>> - std::vector<const Type*> Params(FTy->param_begin(), FTy->param_end());
>>> + std::vector<Type*> Params(FTy->param_begin(), FTy->param_end());
>>> FunctionType *NFTy = FunctionType::get(FTy->getReturnType(),
>>> Params, false);
>>> unsigned NumArgs = Params.size();
>>> @@ -647,7 +647,7 @@
>>> // Start by computing a new prototype for the function, which is the same as
>>> // the old function, but has fewer arguments and a different return type.
>>> const FunctionType *FTy = F->getFunctionType();
>>> - std::vector<const Type*> Params;
>>> + std::vector<Type*> Params;
>>>
>>> // Set up to build a new list of parameter attributes.
>>> SmallVector<AttributeWithIndex, 8> AttributesVec;
>>>
>>> Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineAndOrXor.cpp Mon Jul 11 02:56:41 2011
>>> @@ -1400,7 +1400,7 @@
>>> /// MatchBSwap - Given an OR instruction, check to see if this is a bswap idiom.
>>> /// If so, insert the new bswap intrinsic and return it.
>>> Instruction *InstCombiner::MatchBSwap(BinaryOperator &I) {
>>> - const IntegerType *ITy = dyn_cast<IntegerType>(I.getType());
>>> + IntegerType *ITy = dyn_cast<IntegerType>(I.getType());
>>> if (!ITy || ITy->getBitWidth() % 16 ||
>>> // ByteMask only allows up to 32-byte values.
>>> ITy->getBitWidth() > 32*8)
>>> @@ -1424,7 +1424,7 @@
>>> for (unsigned i = 1, e = ByteValues.size(); i != e; ++i)
>>> if (ByteValues[i] != V)
>>> return 0;
>>> - const Type *Tys[] = { ITy };
>>> + Type *Tys[] = { ITy };
>>> Module *M = I.getParent()->getParent()->getParent();
>>> Function *F = Intrinsic::getDeclaration(M, Intrinsic::bswap, Tys, 1);
>>> return CallInst::Create(F, V);
>>>
>>> Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp Mon Jul 11 02:56:41 2011
>>> @@ -217,9 +217,9 @@
>>> if (GVSrc->isConstant()) {
>>> Module *M = CI.getParent()->getParent()->getParent();
>>> Intrinsic::ID MemCpyID = Intrinsic::memcpy;
>>> - const Type *Tys[3] = { CI.getArgOperand(0)->getType(),
>>> - CI.getArgOperand(1)->getType(),
>>> - CI.getArgOperand(2)->getType() };
>>> + Type *Tys[3] = { CI.getArgOperand(0)->getType(),
>>> + CI.getArgOperand(1)->getType(),
>>> + CI.getArgOperand(2)->getType() };
>>> CI.setCalledFunction(Intrinsic::getDeclaration(M, MemCpyID, Tys, 3));
>>> Changed = true;
>>> }
>>> @@ -1187,7 +1187,7 @@
>>> const AttrListPtr &NestAttrs = NestF->getAttributes();
>>> if (!NestAttrs.isEmpty()) {
>>> unsigned NestIdx = 1;
>>> - const Type *NestTy = 0;
>>> + Type *NestTy = 0;
>>> Attributes NestAttr = Attribute::None;
>>>
>>> // Look for a parameter marked with the 'nest' attribute.
>>> @@ -1249,7 +1249,7 @@
>>> // Handle this by synthesizing a new function type, equal to FTy
>>> // with the chain parameter inserted.
>>>
>>> - std::vector<const Type*> NewTypes;
>>> + std::vector<Type*> NewTypes;
>>> NewTypes.reserve(FTy->getNumParams()+1);
>>>
>>> // Insert the chain's type into the list of parameter types, which may
>>>
>>> Modified: llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCompares.cpp Mon Jul 11 02:56:41 2011
>>> @@ -1683,7 +1683,7 @@
>>> // result and the overflow bit.
>>> Module *M = I.getParent()->getParent()->getParent();
>>>
>>> - const Type *NewType = IntegerType::get(OrigAdd->getContext(), NewWidth);
>>> + Type *NewType = IntegerType::get(OrigAdd->getContext(), NewWidth);
>>> Value *F = Intrinsic::getDeclaration(M, Intrinsic::sadd_with_overflow,
>>> &NewType, 1);
>>>
>>> @@ -1725,7 +1725,7 @@
>>> Builder->SetInsertPoint(OrigAdd);
>>>
>>> Module *M = I.getParent()->getParent()->getParent();
>>> - const Type *Ty = LHS->getType();
>>> + Type *Ty = LHS->getType();
>>> Value *F = Intrinsic::getDeclaration(M, Intrinsic::uadd_with_overflow, &Ty,1);
>>> CallInst *Call = Builder->CreateCall2(F, LHS, RHS, "uadd");
>>> Value *Add = Builder->CreateExtractValue(Call, 0);
>>>
>>> Modified: llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Instrumentation/GCOVProfiling.cpp Mon Jul 11 02:56:41 2011
>>> @@ -572,14 +572,13 @@
>>> }
>>>
>>> Constant *GCOVProfiler::getStartFileFunc() {
>>> - const Type *Args[] = { Type::getInt8PtrTy(*Ctx) };
>>> const FunctionType *FTy = FunctionType::get(Type::getVoidTy(*Ctx),
>>> - Args, false);
>>> + Type::getInt8PtrTy(*Ctx), false);
>>> return M->getOrInsertFunction("llvm_gcda_start_file", FTy);
>>> }
>>>
>>> Constant *GCOVProfiler::getIncrementIndirectCounterFunc() {
>>> - const Type *Args[] = {
>>> + Type *Args[] = {
>>> Type::getInt32PtrTy(*Ctx), // uint32_t *predecessor
>>> Type::getInt64PtrTy(*Ctx)->getPointerTo(), // uint64_t **state_table_row
>>> };
>>> @@ -589,7 +588,7 @@
>>> }
>>>
>>> Constant *GCOVProfiler::getEmitFunctionFunc() {
>>> - const Type *Args[2] = {
>>> + Type *Args[2] = {
>>> Type::getInt32Ty(*Ctx), // uint32_t ident
>>> Type::getInt8PtrTy(*Ctx), // const char *function_name
>>> };
>>> @@ -599,7 +598,7 @@
>>> }
>>>
>>> Constant *GCOVProfiler::getEmitArcsFunc() {
>>> - const Type *Args[] = {
>>> + Type *Args[] = {
>>> Type::getInt32Ty(*Ctx), // uint32_t num_counters
>>> Type::getInt64PtrTy(*Ctx), // uint64_t *counters
>>> };
>>>
>>> Modified: llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Scalar/MemCpyOptimizer.cpp Mon Jul 11 02:56:41 2011
>>> @@ -840,9 +840,9 @@
>>>
>>> // If not, then we know we can transform this.
>>> Module *Mod = M->getParent()->getParent()->getParent();
>>> - const Type *ArgTys[3] = { M->getRawDest()->getType(),
>>> - M->getRawSource()->getType(),
>>> - M->getLength()->getType() };
>>> + Type *ArgTys[3] = { M->getRawDest()->getType(),
>>> + M->getRawSource()->getType(),
>>> + M->getLength()->getType() };
>>> M->setCalledFunction(Intrinsic::getDeclaration(Mod, Intrinsic::memcpy,
>>> ArgTys, 3));
>>>
>>>
>>> Modified: llvm/trunk/lib/Transforms/Scalar/ObjCARC.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/ObjCARC.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Scalar/ObjCARC.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Scalar/ObjCARC.cpp Mon Jul 11 02:56:41 2011
>>> @@ -1498,8 +1498,8 @@
>>> Constant *ObjCARCOpt::getRetainRVCallee(Module *M) {
>>> if (!RetainRVCallee) {
>>> LLVMContext &C = M->getContext();
>>> - const Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> - std::vector<const Type *> Params;
>>> + Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> + std::vector<Type *> Params;
>>> Params.push_back(I8X);
>>> const FunctionType *FTy =
>>> FunctionType::get(I8X, Params, /*isVarArg=*/false);
>>> @@ -1515,8 +1515,8 @@
>>> Constant *ObjCARCOpt::getAutoreleaseRVCallee(Module *M) {
>>> if (!AutoreleaseRVCallee) {
>>> LLVMContext &C = M->getContext();
>>> - const Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> - std::vector<const Type *> Params;
>>> + Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> + std::vector<Type *> Params;
>>> Params.push_back(I8X);
>>> const FunctionType *FTy =
>>> FunctionType::get(I8X, Params, /*isVarArg=*/false);
>>> @@ -1532,7 +1532,7 @@
>>> Constant *ObjCARCOpt::getReleaseCallee(Module *M) {
>>> if (!ReleaseCallee) {
>>> LLVMContext &C = M->getContext();
>>> - std::vector<const Type *> Params;
>>> + std::vector<Type *> Params;
>>> Params.push_back(PointerType::getUnqual(Type::getInt8Ty(C)));
>>> AttrListPtr Attributes;
>>> Attributes.addAttr(~0u, Attribute::NoUnwind);
>>> @@ -1548,7 +1548,7 @@
>>> Constant *ObjCARCOpt::getRetainCallee(Module *M) {
>>> if (!RetainCallee) {
>>> LLVMContext &C = M->getContext();
>>> - std::vector<const Type *> Params;
>>> + std::vector<Type *> Params;
>>> Params.push_back(PointerType::getUnqual(Type::getInt8Ty(C)));
>>> AttrListPtr Attributes;
>>> Attributes.addAttr(~0u, Attribute::NoUnwind);
>>> @@ -1564,7 +1564,7 @@
>>> Constant *ObjCARCOpt::getAutoreleaseCallee(Module *M) {
>>> if (!AutoreleaseCallee) {
>>> LLVMContext &C = M->getContext();
>>> - std::vector<const Type *> Params;
>>> + std::vector<Type *> Params;
>>> Params.push_back(PointerType::getUnqual(Type::getInt8Ty(C)));
>>> AttrListPtr Attributes;
>>> Attributes.addAttr(~0u, Attribute::NoUnwind);
>>> @@ -3269,9 +3269,9 @@
>>> Constant *ObjCARCContract::getStoreStrongCallee(Module *M) {
>>> if (!StoreStrongCallee) {
>>> LLVMContext &C = M->getContext();
>>> - const Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> - const Type *I8XX = PointerType::getUnqual(I8X);
>>> - std::vector<const Type *> Params;
>>> + Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> + Type *I8XX = PointerType::getUnqual(I8X);
>>> + std::vector<Type *> Params;
>>> Params.push_back(I8XX);
>>> Params.push_back(I8X);
>>>
>>> @@ -3291,8 +3291,8 @@
>>> Constant *ObjCARCContract::getRetainAutoreleaseCallee(Module *M) {
>>> if (!RetainAutoreleaseCallee) {
>>> LLVMContext &C = M->getContext();
>>> - const Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> - std::vector<const Type *> Params;
>>> + Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> + std::vector<Type *> Params;
>>> Params.push_back(I8X);
>>> const FunctionType *FTy =
>>> FunctionType::get(I8X, Params, /*isVarArg=*/false);
>>> @@ -3307,8 +3307,8 @@
>>> Constant *ObjCARCContract::getRetainAutoreleaseRVCallee(Module *M) {
>>> if (!RetainAutoreleaseRVCallee) {
>>> LLVMContext &C = M->getContext();
>>> - const Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> - std::vector<const Type *> Params;
>>> + Type *I8X = PointerType::getUnqual(Type::getInt8Ty(C));
>>> + std::vector<Type *> Params;
>>> Params.push_back(I8X);
>>> const FunctionType *FTy =
>>> FunctionType::get(I8X, Params, /*isVarArg=*/false);
>>>
>>> Modified: llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Scalar/SimplifyLibCalls.cpp Mon Jul 11 02:56:41 2011
>>> @@ -992,7 +992,7 @@
>>> }
>>>
>>> // ffs(x) -> x != 0 ? (i32)llvm.cttz(x)+1 : 0
>>> - const Type *ArgType = Op->getType();
>>> + Type *ArgType = Op->getType();
>>> Value *F = Intrinsic::getDeclaration(Callee->getParent(),
>>> Intrinsic::cttz, &ArgType, 1);
>>> Value *V = B.CreateCall(F, Op, "cttz");
>>>
>>> Modified: llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Utils/CloneFunction.cpp Mon Jul 11 02:56:41 2011
>>> @@ -140,7 +140,7 @@
>>> Function *llvm::CloneFunction(const Function *F, ValueToValueMapTy &VMap,
>>> bool ModuleLevelChanges,
>>> ClonedCodeInfo *CodeInfo) {
>>> - std::vector<const Type*> ArgTypes;
>>> + std::vector<Type*> ArgTypes;
>>>
>>> // The user might be deleting arguments to the function by specifying them in
>>> // the VMap. If so, we need to not add the arguments to the arg ty vector
>>>
>>> Modified: llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Utils/CodeExtractor.cpp Mon Jul 11 02:56:41 2011
>>> @@ -258,7 +258,7 @@
>>> default: RetTy = Type::getInt16Ty(header->getContext()); break;
>>> }
>>>
>>> - std::vector<const Type*> paramTy;
>>> + std::vector<Type*> paramTy;
>>>
>>> // Add the types of the input values to the function's argument list
>>> for (Values::const_iterator i = inputs.begin(),
>>> @@ -279,7 +279,7 @@
>>> }
>>>
>>> DEBUG(dbgs() << "Function type: " << *RetTy << " f(");
>>> - for (std::vector<const Type*>::iterator i = paramTy.begin(),
>>> + for (std::vector<Type*>::iterator i = paramTy.begin(),
>>> e = paramTy.end(); i != e; ++i)
>>> DEBUG(dbgs() << **i << ", ");
>>> DEBUG(dbgs() << ")\n");
>>>
>>> Modified: llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp (original)
>>> +++ llvm/trunk/lib/Transforms/Utils/InlineFunction.cpp Mon Jul 11 02:56:41 2011
>>> @@ -663,7 +663,7 @@
>>>
>>> LLVMContext &Context = Arg->getContext();
>>>
>>> - const Type *VoidPtrTy = Type::getInt8PtrTy(Context);
>>> + Type *VoidPtrTy = Type::getInt8PtrTy(Context);
>>>
>>> // Create the alloca. If we have TargetData, use nice alignment.
>>> unsigned Align = 1;
>>> @@ -680,7 +680,7 @@
>>> Value *NewAlloca = new AllocaInst(AggTy, 0, Align, Arg->getName(),
>>> &*Caller->begin()->begin());
>>> // Emit a memcpy.
>>> - const Type *Tys[3] = {VoidPtrTy, VoidPtrTy, Type::getInt64Ty(Context)};
>>> + Type *Tys[3] = {VoidPtrTy, VoidPtrTy, Type::getInt64Ty(Context)};
>>> Function *MemCpyFn = Intrinsic::getDeclaration(Caller->getParent(),
>>> Intrinsic::memcpy,
>>> Tys, 3);
>>>
>>> Modified: llvm/trunk/lib/VMCore/Core.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Core.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Core.cpp Mon Jul 11 02:56:41 2011
>>> @@ -260,7 +260,7 @@
>>> LLVMTypeRef LLVMFunctionType(LLVMTypeRef ReturnType,
>>> LLVMTypeRef *ParamTypes, unsigned ParamCount,
>>> LLVMBool IsVarArg) {
>>> - std::vector<const Type*> Tys;
>>> + std::vector<Type*> Tys;
>>> for (LLVMTypeRef *I = ParamTypes, *E = ParamTypes + ParamCount; I != E; ++I)
>>> Tys.push_back(unwrap(*I));
>>>
>>>
>>> Modified: llvm/trunk/lib/VMCore/Function.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Function.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Function.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Function.cpp Mon Jul 11 02:56:41 2011
>>> @@ -333,7 +333,7 @@
>>> return 0;
>>> }
>>>
>>> -std::string Intrinsic::getName(ID id, const Type **Tys, unsigned numTys) {
>>> +std::string Intrinsic::getName(ID id, Type **Tys, unsigned numTys) {
>>> assert(id < num_intrinsics && "Invalid intrinsic ID!");
>>> static const char * const Table[] = {
>>> "not_intrinsic",
>>> @@ -356,10 +356,10 @@
>>> }
>>>
>>> const FunctionType *Intrinsic::getType(LLVMContext &Context,
>>> - ID id, const Type **Tys,
>>> + ID id, Type **Tys,
>>> unsigned numTys) {
>>> const Type *ResultTy = NULL;
>>> - std::vector<const Type*> ArgTys;
>>> + std::vector<Type*> ArgTys;
>>> bool IsVarArg = false;
>>>
>>> #define GET_INTRINSIC_GENERATOR
>>> @@ -384,7 +384,7 @@
>>> #include "llvm/Intrinsics.gen"
>>> #undef GET_INTRINSIC_ATTRIBUTES
>>>
>>> -Function *Intrinsic::getDeclaration(Module *M, ID id, const Type **Tys,
>>> +Function *Intrinsic::getDeclaration(Module *M, ID id, Type **Tys,
>>> unsigned numTys) {
>>> // There can never be multiple globals with the same name of different types,
>>> // because intrinsics must be a specific type.
>>>
>>> Modified: llvm/trunk/lib/VMCore/IRBuilder.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/IRBuilder.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/IRBuilder.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/IRBuilder.cpp Mon Jul 11 02:56:41 2011
>>> @@ -65,7 +65,7 @@
>>> bool isVolatile, MDNode *TBAATag) {
>>> Ptr = getCastedInt8PtrValue(Ptr);
>>> Value *Ops[] = { Ptr, Val, Size, getInt32(Align), getInt1(isVolatile) };
>>> - const Type *Tys[] = { Ptr->getType(), Size->getType() };
>>> + Type *Tys[] = { Ptr->getType(), Size->getType() };
>>> Module *M = BB->getParent()->getParent();
>>> Value *TheFn = Intrinsic::getDeclaration(M, Intrinsic::memset, Tys, 2);
>>>
>>> @@ -85,7 +85,7 @@
>>> Src = getCastedInt8PtrValue(Src);
>>>
>>> Value *Ops[] = { Dst, Src, Size, getInt32(Align), getInt1(isVolatile) };
>>> - const Type *Tys[] = { Dst->getType(), Src->getType(), Size->getType() };
>>> + Type *Tys[] = { Dst->getType(), Src->getType(), Size->getType() };
>>> Module *M = BB->getParent()->getParent();
>>> Value *TheFn = Intrinsic::getDeclaration(M, Intrinsic::memcpy, Tys, 3);
>>>
>>> @@ -105,7 +105,7 @@
>>> Src = getCastedInt8PtrValue(Src);
>>>
>>> Value *Ops[] = { Dst, Src, Size, getInt32(Align), getInt1(isVolatile) };
>>> - const Type *Tys[] = { Dst->getType(), Src->getType(), Size->getType() };
>>> + Type *Tys[] = { Dst->getType(), Src->getType(), Size->getType() };
>>> Module *M = BB->getParent()->getParent();
>>> Value *TheFn = Intrinsic::getDeclaration(M, Intrinsic::memmove, Tys, 3);
>>>
>>>
>>> Modified: llvm/trunk/lib/VMCore/Module.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Module.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Module.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Module.cpp Mon Jul 11 02:56:41 2011
>>> @@ -216,8 +216,8 @@
>>> va_start(Args, RetTy);
>>>
>>> // Build the list of argument types...
>>> - std::vector<const Type*> ArgTys;
>>> - while (const Type *ArgTy = va_arg(Args, const Type*))
>>> + std::vector<Type*> ArgTys;
>>> + while (Type *ArgTy = va_arg(Args, Type*))
>>> ArgTys.push_back(ArgTy);
>>>
>>> va_end(Args);
>>> @@ -234,8 +234,8 @@
>>> va_start(Args, RetTy);
>>>
>>> // Build the list of argument types...
>>> - std::vector<const Type*> ArgTys;
>>> - while (const Type *ArgTy = va_arg(Args, const Type*))
>>> + std::vector<Type*> ArgTys;
>>> + while (Type *ArgTy = va_arg(Args, Type*))
>>> ArgTys.push_back(ArgTy);
>>>
>>> va_end(Args);
>>>
>>> Modified: llvm/trunk/lib/VMCore/Type.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Type.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/lib/VMCore/Type.cpp (original)
>>> +++ llvm/trunk/lib/VMCore/Type.cpp Mon Jul 11 02:56:41 2011
>>> @@ -325,13 +325,6 @@
>>> NumContainedTys = Params.size() + 1; // + 1 for result type
>>> }
>>>
>>> -// FIXME: Remove this version.
>>> -FunctionType *FunctionType::get(const Type *ReturnType,
>>> - ArrayRef<const Type*> Params, bool isVarArg) {
>>> - return get(ReturnType, ArrayRef<Type*>(const_cast<Type**>(Params.data()),
>>> - Params.size()), isVarArg);
>>> -}
>>> -
>>> // FunctionType::get - The factory function for the FunctionType class.
>>> FunctionType *FunctionType::get(const Type *ReturnType,
>>> ArrayRef<Type*> Params, bool isVarArg) {
>>> @@ -357,7 +350,7 @@
>>>
>>>
>>> FunctionType *FunctionType::get(const Type *Result, bool isVarArg) {
>>> - return get(Result, ArrayRef<const Type *>(), isVarArg);
>>> + return get(Result, ArrayRef<Type *>(), isVarArg);
>>> }
>>>
>>>
>>>
>>> Modified: llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp (original)
>>> +++ llvm/trunk/unittests/Analysis/ScalarEvolutionTest.cpp Mon Jul 11 02:56:41 2011
>>> @@ -23,7 +23,7 @@
>>> Module M("world", Context);
>>>
>>> const FunctionType *FTy = FunctionType::get(Type::getVoidTy(Context),
>>> - std::vector<const Type *>(), false);
>>> + std::vector<Type *>(), false);
>>> Function *F = cast<Function>(M.getOrInsertFunction("f", FTy));
>>> BasicBlock *BB = BasicBlock::Create(Context, "entry", F);
>>> ReturnInst::Create(Context, 0, BB);
>>>
>>> Modified: llvm/trunk/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp (original)
>>> +++ llvm/trunk/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp Mon Jul 11 02:56:41 2011
>>> @@ -21,7 +21,7 @@
>>> namespace {
>>>
>>> Function *makeFakeFunction() {
>>> - std::vector<const Type*> params;
>>> + std::vector<Type*> params;
>>> const FunctionType *FTy =
>>> FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false);
>>> return Function::Create(FTy, GlobalValue::ExternalLinkage);
>>>
>>> Modified: llvm/trunk/unittests/ExecutionEngine/JIT/JITTest.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/ExecutionEngine/JIT/JITTest.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/unittests/ExecutionEngine/JIT/JITTest.cpp (original)
>>> +++ llvm/trunk/unittests/ExecutionEngine/JIT/JITTest.cpp Mon Jul 11 02:56:41 2011
>>> @@ -37,7 +37,7 @@
>>> namespace {
>>>
>>> Function *makeReturnGlobal(std::string Name, GlobalVariable *G, Module *M) {
>>> - std::vector<const Type*> params;
>>> + std::vector<Type*> params;
>>> const FunctionType *FTy = FunctionType::get(G->getType()->getElementType(),
>>> params, false);
>>> Function *F = Function::Create(FTy, GlobalValue::ExternalLinkage, Name, M);
>>> @@ -322,7 +322,7 @@
>>>
>>> const FunctionType *Func1Ty =
>>> cast<FunctionType>(TypeBuilder<void(void), false>::get(Context));
>>> - std::vector<const Type*> arg_types;
>>> + std::vector<Type*> arg_types;
>>> arg_types.push_back(Type::getInt1Ty(Context));
>>> const FunctionType *FuncTy = FunctionType::get(
>>> Type::getVoidTy(Context), arg_types, false);
>>>
>>> Modified: llvm/trunk/unittests/Support/TypeBuilderTest.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/TypeBuilderTest.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/unittests/Support/TypeBuilderTest.cpp (original)
>>> +++ llvm/trunk/unittests/Support/TypeBuilderTest.cpp Mon Jul 11 02:56:41 2011
>>> @@ -120,7 +120,7 @@
>>> }
>>>
>>> TEST(TypeBuilderTest, Functions) {
>>> - std::vector<const Type*> params;
>>> + std::vector<Type*> params;
>>> EXPECT_EQ(FunctionType::get(Type::getVoidTy(getGlobalContext()), params, false),
>>> (TypeBuilder<void(), true>::get(getGlobalContext())));
>>> EXPECT_EQ(FunctionType::get(Type::getInt8Ty(getGlobalContext()), params, true),
>>>
>>> Modified: llvm/trunk/unittests/VMCore/PassManagerTest.cpp
>>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/VMCore/PassManagerTest.cpp?rev=134888&r1=134887&r2=134888&view=diff
>>> ==============================================================================
>>> --- llvm/trunk/unittests/VMCore/PassManagerTest.cpp (original)
>>> +++ llvm/trunk/unittests/VMCore/PassManagerTest.cpp Mon Jul 11 02:56:41 2011
>>> @@ -405,13 +405,13 @@
>>> mod->setTargetTriple("x86_64-unknown-linux-gnu");
>>>
>>> // Type Definitions
>>> - std::vector<const Type*>FuncTy_0_args;
>>> + std::vector<Type*>FuncTy_0_args;
>>> FunctionType* FuncTy_0 = FunctionType::get(
>>> /*Result=*/IntegerType::get(getGlobalContext(), 32),
>>> /*Params=*/FuncTy_0_args,
>>> /*isVarArg=*/false);
>>>
>>> - std::vector<const Type*>FuncTy_2_args;
>>> + std::vector<Type*>FuncTy_2_args;
>>> FuncTy_2_args.push_back(IntegerType::get(getGlobalContext(), 1));
>>> FunctionType* FuncTy_2 = FunctionType::get(
>>> /*Result=*/Type::getVoidTy(getGlobalContext()),
>>>
>>>
>>> _______________________________________________
>>> llvm-commits mailing list
>>> llvm-commits at cs.uiuc.edu
>>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>
>>
More information about the llvm-commits
mailing list