From aa3943bf63618dce1a74eda1a81bcee7ee9c73f5 Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Wed, 1 Jul 2009 22:33:26 +0000 Subject: [PATCH] --- Reverse-merging (from foreign repository) r74648 into '.': U include/llvm/LLVMContext.h U lib/VMCore/LLVMContext.cpp U lib/AsmParser/LLParser.cpp U lib/AsmParser/LLParser.h Temporarily reverting r74648. It was causing massive failures in release mode. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74653 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/LLVMContext.h | 182 +++++++++++++++++----------------- lib/AsmParser/LLParser.cpp | 7 +- lib/AsmParser/LLParser.h | 7 +- lib/VMCore/LLVMContext.cpp | 196 +++++++++++++++++-------------------- 4 files changed, 183 insertions(+), 209 deletions(-) diff --git a/include/llvm/LLVMContext.h b/include/llvm/LLVMContext.h index d338e0de676..f0c2200c7a3 100644 --- a/include/llvm/LLVMContext.h +++ b/include/llvm/LLVMContext.h @@ -54,151 +54,147 @@ public: ~LLVMContext(); // ConstantInt accessors - ConstantInt* getConstantIntTrue() const; - ConstantInt* getConstantIntFalse() const; + ConstantInt* getConstantIntTrue(); + ConstantInt* getConstantIntFalse(); ConstantInt* getConstantInt(const IntegerType* Ty, uint64_t V, - bool isSigned = false) const; - ConstantInt* getConstantIntSigned(const IntegerType* Ty, int64_t V) const; - ConstantInt* getConstantInt(const APInt& V) const; - Constant* getConstantInt(const Type* Ty, const APInt& V) const; - ConstantInt* getAllOnesConstantInt(const Type* Ty) const; + bool isSigned = false); + ConstantInt* getConstantIntSigned(const IntegerType* Ty, int64_t V); + ConstantInt* getConstantInt(const APInt& V); + Constant* getConstantInt(const Type* Ty, const APInt& V); + ConstantInt* getAllOnesConstantInt(const Type* Ty); // ConstantPointerNull accessors - ConstantPointerNull* getConstantPointerNull(const PointerType* T) const; + ConstantPointerNull* getConstantPointerNull(const PointerType* T); // ConstantStruct accessors Constant* getConstantStruct(const StructType* T, - const std::vector& V) const; + const std::vector& V); Constant* getConstantStruct(const std::vector& V, - bool Packed = false) const; + bool Packed = false); Constant* getConstantStruct(Constant* const *Vals, unsigned NumVals, - bool Packed = false) const; + bool Packed = false); // ConstantAggregateZero accessors - ConstantAggregateZero* getConstantAggregateZero(const Type* Ty) const; + ConstantAggregateZero* getConstantAggregateZero(const Type* Ty); // ConstantArray accessors Constant* getConstantArray(const ArrayType* T, - const std::vector& V) const; + const std::vector& V); Constant* getConstantArray(const ArrayType* T, Constant* const* Vals, - unsigned NumVals) const; + unsigned NumVals); Constant* getConstantArray(const std::string& Initializer, - bool AddNull = false) const; + bool AddNull = false); // ConstantExpr accessors - Constant* getConstantExpr(unsigned Opcode, Constant* C1, Constant* C2) const; - Constant* getConstantExprTrunc(Constant* C, const Type* Ty) const; - Constant* getConstantExprSExt(Constant* C, const Type* Ty) const; - Constant* getConstantExprZExt(Constant* C, const Type* Ty) const; - Constant* getConstantExprFPTrunc(Constant* C, const Type* Ty) const; - Constant* getConstantExprFPExtend(Constant* C, const Type* Ty) const; - Constant* getConstantExprUIToFP(Constant* C, const Type* Ty) const; - Constant* getConstantExprSIToFP(Constant* C, const Type* Ty) const; - Constant* getConstantExprFPToUI(Constant* C, const Type* Ty) const; - Constant* getConstantExprFPToSI(Constant* C, const Type* Ty) const; - Constant* getConstantExprPtrToInt(Constant* C, const Type* Ty) const; - Constant* getConstantExprIntToPtr(Constant* C, const Type* Ty) const; - Constant* getConstantExprBitCast(Constant* C, const Type* Ty) const; - Constant* getConstantExprCast(unsigned ops, Constant* C, - const Type* Ty) const; - Constant* getConstantExprZExtOrBitCast(Constant* C, const Type* Ty) const; - Constant* getConstantExprSExtOrBitCast(Constant* C, const Type* Ty) const; - Constant* getConstantExprTruncOrBitCast(Constant* C, const Type* Ty) const; - Constant* getConstantExprPointerCast(Constant* C, const Type* Ty) const; + Constant* getConstantExpr(unsigned Opcode, Constant* C1, Constant* C2); + Constant* getConstantExprTrunc(Constant* C, const Type* Ty); + Constant* getConstantExprSExt(Constant* C, const Type* Ty); + Constant* getConstantExprZExt(Constant* C, const Type* Ty); + Constant* getConstantExprFPTrunc(Constant* C, const Type* Ty); + Constant* getConstantExprFPExtend(Constant* C, const Type* Ty); + Constant* getConstantExprUIToFP(Constant* C, const Type* Ty); + Constant* getConstantExprSIToFP(Constant* C, const Type* Ty); + Constant* getConstantExprFPToUI(Constant* C, const Type* Ty); + Constant* getConstantExprFPToSI(Constant* C, const Type* Ty); + Constant* getConstantExprPtrToInt(Constant* C, const Type* Ty); + Constant* getConstantExprIntToPtr(Constant* C, const Type* Ty); + Constant* getConstantExprBitCast(Constant* C, const Type* Ty); + Constant* getConstantExprCast(unsigned ops, Constant* C, const Type* Ty); + Constant* getConstantExprZExtOrBitCast(Constant* C, const Type* Ty); + Constant* getConstantExprSExtOrBitCast(Constant* C, const Type* Ty); + Constant* getConstantExprTruncOrBitCast(Constant* C, const Type* Ty); + Constant* getConstantExprPointerCast(Constant* C, const Type* Ty); Constant* getConstantExprIntegerCast(Constant* C, const Type* Ty, - bool isSigned) const; - Constant* getConstantExprFPCast(Constant* C, const Type* Ty) const; - Constant* getConstantExprSelect(Constant* C, Constant* V1, - Constant* V2) const; - Constant* getConstantExprAlignOf(const Type* Ty) const; + bool isSigned); + Constant* getConstantExprFPCast(Constant* C, const Type* Ty); + Constant* getConstantExprSelect(Constant* C, Constant* V1, Constant* V2); + Constant* getConstantExprAlignOf(const Type* Ty); Constant* getConstantExprCompare(unsigned short pred, - Constant* C1, Constant* C2) const; - Constant* getConstantExprNeg(Constant* C) const; - Constant* getConstantExprFNeg(Constant* C) const; - Constant* getConstantExprNot(Constant* C) const; - Constant* getConstantExprAdd(Constant* C1, Constant* C2) const; - Constant* getConstantExprFAdd(Constant* C1, Constant* C2) const; - Constant* getConstantExprSub(Constant* C1, Constant* C2) const; - Constant* getConstantExprFSub(Constant* C1, Constant* C2) const; - Constant* getConstantExprMul(Constant* C1, Constant* C2) const; - Constant* getConstantExprFMul(Constant* C1, Constant* C2) const; - Constant* getConstantExprUDiv(Constant* C1, Constant* C2) const; - Constant* getConstantExprSDiv(Constant* C1, Constant* C2) const; - Constant* getConstantExprFDiv(Constant* C1, Constant* C2) const; - Constant* getConstantExprURem(Constant* C1, Constant* C2) const; - Constant* getConstantExprSRem(Constant* C1, Constant* C2) const; - Constant* getConstantExprFRem(Constant* C1, Constant* C2) const; - Constant* getConstantExprAnd(Constant* C1, Constant* C2) const; - Constant* getConstantExprOr(Constant* C1, Constant* C2) const; - Constant* getConstantExprXor(Constant* C1, Constant* C2) const; + Constant* C1, Constant* C2); + Constant* getConstantExprNeg(Constant* C); + Constant* getConstantExprFNeg(Constant* C); + Constant* getConstantExprNot(Constant* C); + Constant* getConstantExprAdd(Constant* C1, Constant* C2); + Constant* getConstantExprFAdd(Constant* C1, Constant* C2); + Constant* getConstantExprSub(Constant* C1, Constant* C2); + Constant* getConstantExprFSub(Constant* C1, Constant* C2); + Constant* getConstantExprMul(Constant* C1, Constant* C2); + Constant* getConstantExprFMul(Constant* C1, Constant* C2); + Constant* getConstantExprUDiv(Constant* C1, Constant* C2); + Constant* getConstantExprSDiv(Constant* C1, Constant* C2); + Constant* getConstantExprFDiv(Constant* C1, Constant* C2); + Constant* getConstantExprURem(Constant* C1, Constant* C2); + Constant* getConstantExprSRem(Constant* C1, Constant* C2); + Constant* getConstantExprFRem(Constant* C1, Constant* C2); + Constant* getConstantExprAnd(Constant* C1, Constant* C2); + Constant* getConstantExprOr(Constant* C1, Constant* C2); + Constant* getConstantExprXor(Constant* C1, Constant* C2); Constant* getConstantExprICmp(unsigned short pred, Constant* LHS, - Constant* RHS) const; + Constant* RHS); Constant* getConstantExprFCmp(unsigned short pred, Constant* LHS, - Constant* RHS) const; + Constant* RHS); Constant* getConstantExprVICmp(unsigned short pred, Constant* LHS, - Constant* RHS) const; + Constant* RHS); Constant* getConstantExprVFCmp(unsigned short pred, Constant* LHS, - Constant* RHS) const; - Constant* getConstantExprShl(Constant* C1, Constant* C2) const; - Constant* getConstantExprLShr(Constant* C1, Constant* C2) const; - Constant* getConstantExprAShr(Constant* C1, Constant* C2) const; + Constant* RHS); + Constant* getConstantExprShl(Constant* C1, Constant* C2); + Constant* getConstantExprLShr(Constant* C1, Constant* C2); + Constant* getConstantExprAShr(Constant* C1, Constant* C2); Constant* getConstantExprGetElementPtr(Constant* C, Constant* const* IdxList, - unsigned NumIdx) const; + unsigned NumIdx); Constant* getConstantExprGetElementPtr(Constant* C, Value* const* IdxList, - unsigned NumIdx) const; - Constant* getConstantExprExtractElement(Constant* Vec, Constant* Idx) const; + unsigned NumIdx); + Constant* getConstantExprExtractElement(Constant* Vec, Constant* Idx); Constant* getConstantExprInsertElement(Constant* Vec, Constant* Elt, - Constant* Idx) const; + Constant* Idx); Constant* getConstantExprShuffleVector(Constant* V1, Constant* V2, - Constant* Mask) const; + Constant* Mask); Constant* getConstantExprExtractValue(Constant* Agg, const unsigned* IdxList, - unsigned NumIdx) const; + unsigned NumIdx); Constant* getConstantExprInsertValue(Constant* Agg, Constant* Val, const unsigned* IdxList, - unsigned NumIdx) const; - Constant* getZeroValueForNegation(const Type* Ty) const; + unsigned NumIdx); + Constant* getZeroValueForNegation(const Type* Ty); // ConstantFP accessors - ConstantFP* getConstantFP(const APFloat& V) const; - Constant* getConstantFP(const Type* Ty, double V) const; - ConstantFP* getConstantFPNegativeZero(const Type* Ty) const; + ConstantFP* getConstantFP(const APFloat& V); + Constant* getConstantFP(const Type* Ty, double V); + ConstantFP* getConstantFPNegativeZero(const Type* Ty); // ConstantVector accessors Constant* getConstantVector(const VectorType* T, - const std::vector& V) const; - Constant* getConstantVector(const std::vector& V) const; - Constant* getConstantVector(Constant* const* Vals, unsigned NumVals) const; - ConstantVector* getConstantVectorAllOnes(const VectorType* Ty) const; + const std::vector& V); + Constant* getConstantVector(const std::vector& V); + Constant* getConstantVector(Constant* const* Vals, unsigned NumVals); + ConstantVector* getConstantVectorAllOnes(const VectorType* Ty); // FunctionType accessors FunctionType* getFunctionType(const Type* Result, const std::vector& Params, - bool isVarArg) const; + bool isVarArg); // IntegerType accessors - const IntegerType* getIntegerType(unsigned NumBits) const; + const IntegerType* getIntegerType(unsigned NumBits); // OpaqueType accessors - OpaqueType* getOpaqueType() const; + OpaqueType* getOpaqueType(); // StructType accessors StructType* getStructType(const std::vector& Params, - bool isPacked = false) const; + bool isPacked = false); // ArrayType accessors - ArrayType* getArrayType(const Type* ElementType, uint64_t NumElements) const; + ArrayType* getArrayType(const Type* ElementType, uint64_t NumElements); // PointerType accessors - PointerType* getPointerType(const Type* ElementType, - unsigned AddressSpace) const; - PointerType* getPointerTypeUnqualified(const Type* ElementType) const; + PointerType* getPointerType(const Type* ElementType, unsigned AddressSpace); + PointerType* getPointerTypeUnqualified(const Type* ElementType); // VectorType accessors - VectorType* getVectorType(const Type* ElementType, - unsigned NumElements) const; - VectorType* getVectorTypeInteger(const VectorType* VTy) const; - VectorType* getVectorTypeExtendedElement(const VectorType* VTy) const; - VectorType* getVectorTypeTruncatedElement(const VectorType* VTy) const; + VectorType* getVectorType(const Type* ElementType, unsigned NumElements); + VectorType* getVectorTypeInteger(const VectorType* VTy); + VectorType* getVectorTypeExtendedElement(const VectorType* VTy); + VectorType* getVectorTypeTruncatedElement(const VectorType* VTy); }; /// FOR BACKWARDS COMPATIBILITY - Returns a global context. diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index 011d1137975..4ab0f26f75d 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -18,7 +18,6 @@ #include "llvm/DerivedTypes.h" #include "llvm/InlineAsm.h" #include "llvm/Instructions.h" -#include "llvm/LLVMContext.h" #include "llvm/MDNode.h" #include "llvm/Module.h" #include "llvm/ValueSymbolTable.h" @@ -1654,11 +1653,11 @@ bool LLParser::ParseValID(ValID &ID) { ID.Kind = ValID::t_APFloat; break; case lltok::kw_true: - ID.ConstantVal = Context.getConstantIntTrue(); + ID.ConstantVal = ConstantInt::getTrue(); ID.Kind = ValID::t_Constant; break; case lltok::kw_false: - ID.ConstantVal = Context.getConstantIntFalse(); + ID.ConstantVal = ConstantInt::getFalse(); ID.Kind = ValID::t_Constant; break; case lltok::kw_null: ID.Kind = ValID::t_Null; break; @@ -2038,7 +2037,7 @@ bool LLParser::ConvertGlobalValIDToValue(const Type *Ty, ValID &ID, if (!isa(Ty)) return Error(ID.Loc, "integer constant must have integer type"); ID.APSIntVal.extOrTrunc(Ty->getPrimitiveSizeInBits()); - V = Context.getConstantInt(ID.APSIntVal); + V = ConstantInt::get(ID.APSIntVal); return false; case ValID::t_APFloat: if (!Ty->isFloatingPoint() || diff --git a/lib/AsmParser/LLParser.h b/lib/AsmParser/LLParser.h index 924c9293cb1..41c2ee75c60 100644 --- a/lib/AsmParser/LLParser.h +++ b/lib/AsmParser/LLParser.h @@ -15,7 +15,6 @@ #define LLVM_ASMPARSER_LLPARSER_H #include "LLLexer.h" -#include "llvm/Module.h" #include "llvm/Type.h" #include @@ -30,14 +29,13 @@ namespace llvm { class GlobalValue; class MDString; class MDNode; - class LLVMContext; struct ValID; class LLParser { public: typedef LLLexer::LocTy LocTy; private: - const LLVMContext& Context; + LLLexer Lex; Module *M; @@ -74,8 +72,7 @@ namespace llvm { std::map > ForwardRefValIDs; std::vector NumberedVals; public: - LLParser(MemoryBuffer *F, ParseError &Err, Module *m) : - Context(M->getContext()), Lex(F, Err), M(m) {} + LLParser(MemoryBuffer *F, ParseError &Err, Module *m) : Lex(F, Err), M(m) {} bool Run(); private: diff --git a/lib/VMCore/LLVMContext.cpp b/lib/VMCore/LLVMContext.cpp index 5e75d0b69c1..d29b758ea74 100644 --- a/lib/VMCore/LLVMContext.cpp +++ b/lib/VMCore/LLVMContext.cpp @@ -30,438 +30,420 @@ LLVMContext::LLVMContext() : pImpl(new LLVMContextImpl()) { } LLVMContext::~LLVMContext() { delete pImpl; } // ConstantInt accessors. -ConstantInt* LLVMContext::getConstantIntTrue() const { +ConstantInt* LLVMContext::getConstantIntTrue() { return ConstantInt::getTrue(); } -ConstantInt* LLVMContext::getConstantIntFalse() const { +ConstantInt* LLVMContext::getConstantIntFalse() { return ConstantInt::getFalse(); } ConstantInt* LLVMContext::getConstantInt(const IntegerType* Ty, uint64_t V, - bool isSigned) const { + bool isSigned) { return ConstantInt::get(Ty, V, isSigned); } ConstantInt* LLVMContext::getConstantIntSigned(const IntegerType* Ty, - int64_t V) const { + int64_t V) { return ConstantInt::getSigned(Ty, V); } -ConstantInt* LLVMContext::getConstantInt(const APInt& V) const { +ConstantInt* LLVMContext::getConstantInt(const APInt& V) { return ConstantInt::get(V); } -Constant* LLVMContext::getConstantInt(const Type* Ty, const APInt& V) const { +Constant* LLVMContext::getConstantInt(const Type* Ty, const APInt& V) { return ConstantInt::get(Ty, V); } -ConstantInt* LLVMContext::getAllOnesConstantInt(const Type* Ty) const { +ConstantInt* LLVMContext::getAllOnesConstantInt(const Type* Ty) { return ConstantInt::getAllOnesValue(Ty); } // ConstantPointerNull accessors. -ConstantPointerNull* -LLVMContext::getConstantPointerNull(const PointerType* T) const { +ConstantPointerNull* LLVMContext::getConstantPointerNull(const PointerType* T) { return ConstantPointerNull::get(T); } // ConstantStruct accessors. Constant* LLVMContext::getConstantStruct(const StructType* T, - const std::vector& V) const { + const std::vector& V) { return ConstantStruct::get(T, V); } Constant* LLVMContext::getConstantStruct(const std::vector& V, - bool Packed) const { + bool Packed) { return ConstantStruct::get(V, Packed); } Constant* LLVMContext::getConstantStruct(Constant* const *Vals, - unsigned NumVals, bool Packed) const { + unsigned NumVals, bool Packed) { return ConstantStruct::get(Vals, NumVals, Packed); } // ConstantAggregateZero accessors. -ConstantAggregateZero* -LLVMContext::getConstantAggregateZero(const Type* Ty) const { +ConstantAggregateZero* LLVMContext::getConstantAggregateZero(const Type* Ty) { return ConstantAggregateZero::get(Ty); } // ConstantArray accessors. Constant* LLVMContext::getConstantArray(const ArrayType* T, - const std::vector& V) const { + const std::vector& V) { return ConstantArray::get(T, V); } Constant* LLVMContext::getConstantArray(const ArrayType* T, Constant* const* Vals, - unsigned NumVals) const { + unsigned NumVals) { return ConstantArray::get(T, Vals, NumVals); } Constant* LLVMContext::getConstantArray(const std::string& Initializer, - bool AddNull) const { + bool AddNull) { return ConstantArray::get(Initializer, AddNull); } // ConstantExpr accessors. Constant* LLVMContext::getConstantExpr(unsigned Opcode, Constant* C1, - Constant* C2) const { + Constant* C2) { return ConstantExpr::get(Opcode, C1, C2); } -Constant* LLVMContext::getConstantExprTrunc(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprTrunc(Constant* C, const Type* Ty) { return ConstantExpr::getTrunc(C, Ty); } -Constant* LLVMContext::getConstantExprSExt(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprSExt(Constant* C, const Type* Ty) { return ConstantExpr::getSExt(C, Ty); } -Constant* LLVMContext::getConstantExprZExt(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprZExt(Constant* C, const Type* Ty) { return ConstantExpr::getZExt(C, Ty); } -Constant* -LLVMContext::getConstantExprFPTrunc(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprFPTrunc(Constant* C, const Type* Ty) { return ConstantExpr::getFPTrunc(C, Ty); } -Constant* -LLVMContext::getConstantExprFPExtend(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprFPExtend(Constant* C, const Type* Ty) { return ConstantExpr::getFPExtend(C, Ty); } -Constant* -LLVMContext::getConstantExprUIToFP(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprUIToFP(Constant* C, const Type* Ty) { return ConstantExpr::getUIToFP(C, Ty); } -Constant* -LLVMContext::getConstantExprSIToFP(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprSIToFP(Constant* C, const Type* Ty) { return ConstantExpr::getSIToFP(C, Ty); } -Constant* -LLVMContext::getConstantExprFPToUI(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprFPToUI(Constant* C, const Type* Ty) { return ConstantExpr::getFPToUI(C, Ty); } -Constant* -LLVMContext::getConstantExprFPToSI(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprFPToSI(Constant* C, const Type* Ty) { return ConstantExpr::getFPToSI(C, Ty); } -Constant* -LLVMContext::getConstantExprPtrToInt(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprPtrToInt(Constant* C, const Type* Ty) { return ConstantExpr::getPtrToInt(C, Ty); } -Constant* -LLVMContext::getConstantExprIntToPtr(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprIntToPtr(Constant* C, const Type* Ty) { return ConstantExpr::getIntToPtr(C, Ty); } -Constant* -LLVMContext::getConstantExprBitCast(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprBitCast(Constant* C, const Type* Ty) { return ConstantExpr::getBitCast(C, Ty); } Constant* LLVMContext::getConstantExprCast(unsigned ops, Constant* C, - const Type* Ty) const { + const Type* Ty) { return ConstantExpr::getCast(ops, C, Ty); } Constant* LLVMContext::getConstantExprZExtOrBitCast(Constant* C, - const Type* Ty) const { + const Type* Ty) { return ConstantExpr::getZExtOrBitCast(C, Ty); } Constant* LLVMContext::getConstantExprSExtOrBitCast(Constant* C, - const Type* Ty) const { + const Type* Ty) { return ConstantExpr::getSExtOrBitCast(C, Ty); } Constant* LLVMContext::getConstantExprTruncOrBitCast(Constant* C, - const Type* Ty) const { + const Type* Ty) { return ConstantExpr::getTruncOrBitCast(C, Ty); } -Constant* -LLVMContext::getConstantExprPointerCast(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprPointerCast(Constant* C, const Type* Ty) { return ConstantExpr::getPointerCast(C, Ty); } Constant* LLVMContext::getConstantExprIntegerCast(Constant* C, const Type* Ty, - bool isSigned) const { + bool isSigned) { return ConstantExpr::getIntegerCast(C, Ty, isSigned); } -Constant* -LLVMContext::getConstantExprFPCast(Constant* C, const Type* Ty) const { +Constant* LLVMContext::getConstantExprFPCast(Constant* C, const Type* Ty) { return ConstantExpr::getFPCast(C, Ty); } Constant* LLVMContext::getConstantExprSelect(Constant* C, Constant* V1, - Constant* V2) const { + Constant* V2) { return ConstantExpr::getSelect(C, V1, V2); } -Constant* LLVMContext::getConstantExprAlignOf(const Type* Ty) const { +Constant* LLVMContext::getConstantExprAlignOf(const Type* Ty) { return ConstantExpr::getAlignOf(Ty); } Constant* LLVMContext::getConstantExprCompare(unsigned short pred, - Constant* C1, Constant* C2) const { + Constant* C1, Constant* C2) { return ConstantExpr::getCompare(pred, C1, C2); } -Constant* LLVMContext::getConstantExprNeg(Constant* C) const { +Constant* LLVMContext::getConstantExprNeg(Constant* C) { return ConstantExpr::getNeg(C); } -Constant* LLVMContext::getConstantExprFNeg(Constant* C) const { +Constant* LLVMContext::getConstantExprFNeg(Constant* C) { return ConstantExpr::getFNeg(C); } -Constant* LLVMContext::getConstantExprNot(Constant* C) const { +Constant* LLVMContext::getConstantExprNot(Constant* C) { return ConstantExpr::getNot(C); } -Constant* LLVMContext::getConstantExprAdd(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprAdd(Constant* C1, Constant* C2) { return ConstantExpr::getAdd(C1, C2); } -Constant* LLVMContext::getConstantExprFAdd(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprFAdd(Constant* C1, Constant* C2) { return ConstantExpr::getFAdd(C1, C2); } -Constant* LLVMContext::getConstantExprSub(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprSub(Constant* C1, Constant* C2) { return ConstantExpr::getSub(C1, C2); } -Constant* LLVMContext::getConstantExprFSub(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprFSub(Constant* C1, Constant* C2) { return ConstantExpr::getFSub(C1, C2); } -Constant* LLVMContext::getConstantExprMul(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprMul(Constant* C1, Constant* C2) { return ConstantExpr::getMul(C1, C2); } -Constant* LLVMContext::getConstantExprFMul(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprFMul(Constant* C1, Constant* C2) { return ConstantExpr::getFMul(C1, C2); } -Constant* LLVMContext::getConstantExprUDiv(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprUDiv(Constant* C1, Constant* C2) { return ConstantExpr::getUDiv(C1, C2); } -Constant* LLVMContext::getConstantExprSDiv(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprSDiv(Constant* C1, Constant* C2) { return ConstantExpr::getSDiv(C1, C2); } -Constant* LLVMContext::getConstantExprFDiv(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprFDiv(Constant* C1, Constant* C2) { return ConstantExpr::getFDiv(C1, C2); } -Constant* LLVMContext::getConstantExprURem(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprURem(Constant* C1, Constant* C2) { return ConstantExpr::getURem(C1, C2); } -Constant* LLVMContext::getConstantExprSRem(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprSRem(Constant* C1, Constant* C2) { return ConstantExpr::getSRem(C1, C2); } -Constant* LLVMContext::getConstantExprFRem(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprFRem(Constant* C1, Constant* C2) { return ConstantExpr::getFRem(C1, C2); } -Constant* LLVMContext::getConstantExprAnd(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprAnd(Constant* C1, Constant* C2) { return ConstantExpr::getAnd(C1, C2); } -Constant* LLVMContext::getConstantExprOr(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprOr(Constant* C1, Constant* C2) { return ConstantExpr::getOr(C1, C2); } -Constant* LLVMContext::getConstantExprXor(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprXor(Constant* C1, Constant* C2) { return ConstantExpr::getXor(C1, C2); } Constant* LLVMContext::getConstantExprICmp(unsigned short pred, Constant* LHS, - Constant* RHS) const { + Constant* RHS) { return ConstantExpr::getICmp(pred, LHS, RHS); } Constant* LLVMContext::getConstantExprFCmp(unsigned short pred, Constant* LHS, - Constant* RHS) const { + Constant* RHS) { return ConstantExpr::getFCmp(pred, LHS, RHS); } Constant* LLVMContext::getConstantExprVICmp(unsigned short pred, Constant* LHS, - Constant* RHS) const { + Constant* RHS) { return ConstantExpr::getVICmp(pred, LHS, RHS); } Constant* LLVMContext::getConstantExprVFCmp(unsigned short pred, Constant* LHS, - Constant* RHS) const { + Constant* RHS) { return ConstantExpr::getVFCmp(pred, LHS, RHS); } -Constant* LLVMContext::getConstantExprShl(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprShl(Constant* C1, Constant* C2) { return ConstantExpr::getShl(C1, C2); } -Constant* LLVMContext::getConstantExprLShr(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprLShr(Constant* C1, Constant* C2) { return ConstantExpr::getLShr(C1, C2); } -Constant* LLVMContext::getConstantExprAShr(Constant* C1, Constant* C2) const { +Constant* LLVMContext::getConstantExprAShr(Constant* C1, Constant* C2) { return ConstantExpr::getAShr(C1, C2); } Constant* LLVMContext::getConstantExprGetElementPtr(Constant* C, Constant* const* IdxList, - unsigned NumIdx) const { + unsigned NumIdx) { return ConstantExpr::getGetElementPtr(C, IdxList, NumIdx); } Constant* LLVMContext::getConstantExprGetElementPtr(Constant* C, Value* const* IdxList, - unsigned NumIdx) const { + unsigned NumIdx) { return ConstantExpr::getGetElementPtr(C, IdxList, NumIdx); } Constant* LLVMContext::getConstantExprExtractElement(Constant* Vec, - Constant* Idx) const { + Constant* Idx) { return ConstantExpr::getExtractElement(Vec, Idx); } Constant* LLVMContext::getConstantExprInsertElement(Constant* Vec, Constant* Elt, - Constant* Idx) const { + Constant* Idx) { return ConstantExpr::getInsertElement(Vec, Elt, Idx); } Constant* LLVMContext::getConstantExprShuffleVector(Constant* V1, Constant* V2, - Constant* Mask) const { + Constant* Mask) { return ConstantExpr::getShuffleVector(V1, V2, Mask); } Constant* LLVMContext::getConstantExprExtractValue(Constant* Agg, const unsigned* IdxList, - unsigned NumIdx) const { + unsigned NumIdx) { return ConstantExpr::getExtractValue(Agg, IdxList, NumIdx); } Constant* LLVMContext::getConstantExprInsertValue(Constant* Agg, Constant* Val, const unsigned* IdxList, - unsigned NumIdx) const { + unsigned NumIdx) { return ConstantExpr::getInsertValue(Agg, Val, IdxList, NumIdx); } -Constant* LLVMContext::getZeroValueForNegation(const Type* Ty) const { +Constant* LLVMContext::getZeroValueForNegation(const Type* Ty) { return ConstantExpr::getZeroValueForNegationExpr(Ty); } // ConstantFP accessors. -ConstantFP* LLVMContext::getConstantFP(const APFloat& V) const { +ConstantFP* LLVMContext::getConstantFP(const APFloat& V) { return ConstantFP::get(V); } -Constant* LLVMContext::getConstantFP(const Type* Ty, double V) const { +Constant* LLVMContext::getConstantFP(const Type* Ty, double V) { return ConstantFP::get(Ty, V); } -ConstantFP* LLVMContext::getConstantFPNegativeZero(const Type* Ty) const { +ConstantFP* LLVMContext::getConstantFPNegativeZero(const Type* Ty) { return ConstantFP::getNegativeZero(Ty); } // ConstantVector accessors. Constant* LLVMContext::getConstantVector(const VectorType* T, - const std::vector& V) const { + const std::vector& V) { return ConstantVector::get(T, V); } -Constant* -LLVMContext::getConstantVector(const std::vector& V) const { +Constant* LLVMContext::getConstantVector(const std::vector& V) { return ConstantVector::get(V); } Constant* LLVMContext::getConstantVector(Constant* const* Vals, - unsigned NumVals) const { + unsigned NumVals) { return ConstantVector::get(Vals, NumVals); } -ConstantVector* -LLVMContext::getConstantVectorAllOnes(const VectorType* Ty) const { +ConstantVector* LLVMContext::getConstantVectorAllOnes(const VectorType* Ty) { return ConstantVector::getAllOnesValue(Ty); } // FunctionType accessors FunctionType* LLVMContext::getFunctionType(const Type* Result, const std::vector& Params, - bool isVarArg) const { + bool isVarArg) { return FunctionType::get(Result, Params, isVarArg); } // IntegerType accessors -const IntegerType* LLVMContext::getIntegerType(unsigned NumBits) const { +const IntegerType* LLVMContext::getIntegerType(unsigned NumBits) { return IntegerType::get(NumBits); } // OpaqueType accessors -OpaqueType* LLVMContext::getOpaqueType() const { +OpaqueType* LLVMContext::getOpaqueType() { return OpaqueType::get(); } // StructType accessors StructType* LLVMContext::getStructType(const std::vector& Params, - bool isPacked) const { + bool isPacked) { return StructType::get(Params, isPacked); } // ArrayType accessors ArrayType* LLVMContext::getArrayType(const Type* ElementType, - uint64_t NumElements) const { + uint64_t NumElements) { return ArrayType::get(ElementType, NumElements); } // PointerType accessors PointerType* LLVMContext::getPointerType(const Type* ElementType, - unsigned AddressSpace) const { + unsigned AddressSpace) { return PointerType::get(ElementType, AddressSpace); } -PointerType* -LLVMContext::getPointerTypeUnqualified(const Type* ElementType) const { +PointerType* LLVMContext::getPointerTypeUnqualified(const Type* ElementType) { return PointerType::getUnqual(ElementType); } // VectorType accessors VectorType* LLVMContext::getVectorType(const Type* ElementType, - unsigned NumElements) const { + unsigned NumElements) { return VectorType::get(ElementType, NumElements); } -VectorType* LLVMContext::getVectorTypeInteger(const VectorType* VTy) const { +VectorType* LLVMContext::getVectorTypeInteger(const VectorType* VTy) { return VectorType::getInteger(VTy); } -VectorType* -LLVMContext::getVectorTypeExtendedElement(const VectorType* VTy) const { +VectorType* LLVMContext::getVectorTypeExtendedElement(const VectorType* VTy) { return VectorType::getExtendedElementVectorType(VTy); } -VectorType* -LLVMContext::getVectorTypeTruncatedElement(const VectorType* VTy) const { +VectorType* LLVMContext::getVectorTypeTruncatedElement(const VectorType* VTy) { return VectorType::getTruncatedElementVectorType(VTy); }