Skip to content

Commit c2c7932

Browse files
resistorresistor
committed
Change ConstantArray to 2.5 API.
llvm-svn: 77347
1 parent 2706a55 commit c2c7932

24 files changed

+177
-221
lines changed

‎llvm/examples/BrainF/BrainF.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void BrainF::header(LLVMContext& C) {
125125
{
126126
//@aberrormsg = internal constant [%d x i8] c"\00"
127127
Constant *msg_0 =
128-
C.getConstantArray("Error: The head has left the tape.", true);
128+
ConstantArray::get("Error: The head has left the tape.", true);
129129

130130
GlobalVariable *aberrormsg = new GlobalVariable(
131131
*module,

‎llvm/include/llvm/Constants.h

+13-1
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,22 @@ class ConstantArray : public Constant {
327327
friend struct ConstantCreator<ConstantArray, ArrayType,
328328
std::vector<Constant*> >;
329329
ConstantArray(const ConstantArray &); // DO NOT IMPLEMENT
330-
friend class LLVMContextImpl;
331330
protected:
332331
ConstantArray(const ArrayType *T, const std::vector<Constant*> &Val);
333332
public:
333+
// ConstantArray accessors
334+
static Constant* get(const ArrayType* T, const std::vector<Constant*>& V);
335+
static Constant* get(const ArrayType* T, Constant* const* Vals,
336+
unsigned NumVals);
337+
338+
/// This method constructs a ConstantArray and initializes it with a text
339+
/// string. The default behavior (AddNull==true) causes a null terminator to
340+
/// be placed at the end of the array. This effectively increases the length
341+
/// of the array by one (you've been warned). However, in some situations
342+
/// this is not desired so if AddNull==false then the string is copied without
343+
/// null termination.
344+
static Constant* get(const StringRef &Initializer, bool AddNull = true);
345+
334346
/// Transparently provide more efficient getOperand methods.
335347
DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Constant);
336348

‎llvm/include/llvm/LLVMContext.h

+1-20
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ class LLVMContext {
5858
friend class ConstantInt;
5959
friend class ConstantFP;
6060
friend class ConstantStruct;
61+
friend class ConstantArray;
6162
public:
6263
LLVMContext();
6364
~LLVMContext();
@@ -82,21 +83,6 @@ class LLVMContext {
8283

8384
// ConstantAggregateZero accessors
8485
ConstantAggregateZero* getConstantAggregateZero(const Type* Ty);
85-
86-
// ConstantArray accessors
87-
Constant* getConstantArray(const ArrayType* T,
88-
const std::vector<Constant*>& V);
89-
Constant* getConstantArray(const ArrayType* T, Constant* const* Vals,
90-
unsigned NumVals);
91-
92-
/// This method constructs a ConstantArray and initializes it with a text
93-
/// string. The default behavior (AddNull==true) causes a null terminator to
94-
/// be placed at the end of the array. This effectively increases the length
95-
/// of the array by one (you've been warned). However, in some situations
96-
/// this is not desired so if AddNull==false then the string is copied without
97-
/// null termination.
98-
Constant* getConstantArray(const StringRef &Initializer,
99-
bool AddNull = true);
10086

10187
// ConstantExpr accessors
10288
Constant* getConstantExpr(unsigned Opcode, Constant* C1, Constant* C2);
@@ -225,12 +211,7 @@ class LLVMContext {
225211
void erase(MDString *M);
226212
void erase(MDNode *M);
227213
void erase(ConstantAggregateZero *Z);
228-
void erase(ConstantArray *Z);
229214
void erase(ConstantVector *V);
230-
231-
// RAUW helpers
232-
Constant *replaceUsesOfWithOnConstant(ConstantArray *CA,
233-
Value *From, Value *To, Use *U);
234215
};
235216

236217
/// FOR BACKWARDS COMPATIBILITY - Returns a global context.

‎llvm/include/llvm/Support/IRBuilder.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ template <bool preserveNames=true, typename T = ConstantFolder> class IRBuilder{
413413
return CreateConstGEP2_32(Ptr, 0, Idx, Name);
414414
}
415415
Value *CreateGlobalString(const char *Str = "", const char *Name = "") {
416-
Constant *StrConstant = Context.getConstantArray(Str, true);
416+
Constant *StrConstant = ConstantArray::get(Str, true);
417417
Module &M = *BB->getParent()->getParent();
418418
GlobalVariable *gv = new GlobalVariable(M,
419419
StrConstant->getType(),

‎llvm/lib/Analysis/DebugInfo.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,7 @@ Constant *DIFactory::GetStringConstant(const std::string &String) {
499499
return Slot = VMContext.getConstantPointerNull(DestTy);
500500

501501
// Construct string as an llvm constant.
502-
Constant *ConstStr = VMContext.getConstantArray(String);
502+
Constant *ConstStr = ConstantArray::get(String);
503503

504504
// Otherwise create and return a new string global.
505505
GlobalVariable *StrGV = new GlobalVariable(M, ConstStr->getType(), true,
@@ -521,7 +521,7 @@ DIArray DIFactory::GetOrCreateArray(DIDescriptor *Tys, unsigned NumTys) {
521521
for (unsigned i = 0; i != NumTys; ++i)
522522
Elts.push_back(getCastToEmpty(Tys[i]));
523523

524-
Constant *Init = VMContext.getConstantArray(VMContext.getArrayType(EmptyStructPtr,
524+
Constant *Init = ConstantArray::get(VMContext.getArrayType(EmptyStructPtr,
525525
Elts.size()),
526526
Elts.data(), Elts.size());
527527
// If we already have this array, just return the uniqued version.

‎llvm/lib/AsmParser/LLParser.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1811,13 +1811,13 @@ bool LLParser::ParseValID(ValID &ID) {
18111811
" is not of type '" +Elts[0]->getType()->getDescription());
18121812
}
18131813

1814-
ID.ConstantVal = Context.getConstantArray(ATy, Elts.data(), Elts.size());
1814+
ID.ConstantVal = ConstantArray::get(ATy, Elts.data(), Elts.size());
18151815
ID.Kind = ValID::t_Constant;
18161816
return false;
18171817
}
18181818
case lltok::kw_c: // c "foo"
18191819
Lex.Lex();
1820-
ID.ConstantVal = Context.getConstantArray(Lex.getStrVal(), false);
1820+
ID.ConstantVal = ConstantArray::get(Lex.getStrVal(), false);
18211821
if (ParseToken(lltok::StringConstant, "expected string")) return true;
18221822
ID.Kind = ValID::t_Constant;
18231823
return false;

‎llvm/lib/Bitcode/Reader/BitcodeReader.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void BitcodeReaderValueList::ResolveConstantForwardRefs() {
288288
// Make the new constant.
289289
Constant *NewC;
290290
if (ConstantArray *UserCA = dyn_cast<ConstantArray>(UserC)) {
291-
NewC = Context.getConstantArray(UserCA->getType(), &NewOps[0],
291+
NewC = ConstantArray::get(UserCA->getType(), &NewOps[0],
292292
NewOps.size());
293293
} else if (ConstantStruct *UserCS = dyn_cast<ConstantStruct>(UserC)) {
294294
NewC = ConstantStruct::get(&NewOps[0], NewOps.size(),
@@ -930,7 +930,7 @@ bool BitcodeReader::ParseConstants() {
930930
const Type *EltTy = ATy->getElementType();
931931
for (unsigned i = 0; i != Size; ++i)
932932
Elts.push_back(ValueList.getConstantFwdRef(Record[i], EltTy));
933-
V = Context.getConstantArray(ATy, Elts);
933+
V = ConstantArray::get(ATy, Elts);
934934
} else if (const VectorType *VTy = dyn_cast<VectorType>(CurTy)) {
935935
const Type *EltTy = VTy->getElementType();
936936
for (unsigned i = 0; i != Size; ++i)
@@ -952,7 +952,7 @@ bool BitcodeReader::ParseConstants() {
952952
std::vector<Constant*> Elts;
953953
for (unsigned i = 0; i != Size; ++i)
954954
Elts.push_back(ConstantInt::get(EltTy, Record[i]));
955-
V = Context.getConstantArray(ATy, Elts);
955+
V = ConstantArray::get(ATy, Elts);
956956
break;
957957
}
958958
case bitc::CST_CODE_CSTRING: { // CSTRING: [values]
@@ -967,7 +967,7 @@ bool BitcodeReader::ParseConstants() {
967967
for (unsigned i = 0; i != Size; ++i)
968968
Elts.push_back(ConstantInt::get(EltTy, Record[i]));
969969
Elts.push_back(Context.getNullValue(EltTy));
970-
V = Context.getConstantArray(ATy, Elts);
970+
V = ConstantArray::get(ATy, Elts);
971971
break;
972972
}
973973
case bitc::CST_CODE_CE_BINOP: { // CE_BINOP: [opcode, opval, opval]

‎llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5812,7 +5812,7 @@ SDValue DAGCombiner::SimplifySelectCC(DebugLoc DL, SDValue N0, SDValue N1,
58125812
const TargetData &TD = *TLI.getTargetData();
58135813

58145814
// Create a ConstantArray of the two constants.
5815-
Constant *CA = DAG.getContext()->getConstantArray(
5815+
Constant *CA = ConstantArray::get(
58165816
DAG.getContext()->getArrayType(FPTy, 2), Elts, 2);
58175817
SDValue CPIdx = DAG.getConstantPool(CA, TLI.getPointerTy(),
58185818
TD.getPrefTypeAlignment(FPTy));

‎llvm/lib/CodeGen/ShadowStackGC.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Constant *ShadowStackGC::GetFrameMap(Function &F) {
209209

210210
Constant *DescriptorElts[] = {
211211
ConstantStruct::get(BaseElts, 2),
212-
Context.getConstantArray(Context.getArrayType(VoidPtr, NumMeta),
212+
ConstantArray::get(Context.getArrayType(VoidPtr, NumMeta),
213213
Metadata.begin(), NumMeta)
214214
};
215215

‎llvm/lib/Linker/LinkModules.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ static Value *RemapOperand(const Value *In,
369369
Operands[i] =cast<Constant>(RemapOperand(CPA->getOperand(i), ValueMap,
370370
Context));
371371
Result =
372-
Context.getConstantArray(cast<ArrayType>(CPA->getType()), Operands);
372+
ConstantArray::get(cast<ArrayType>(CPA->getType()), Operands);
373373
} else if (const ConstantStruct *CPS = dyn_cast<ConstantStruct>(CPV)) {
374374
std::vector<Constant*> Operands(CPS->getNumOperands());
375375
for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i)
@@ -1186,7 +1186,7 @@ static bool LinkAppendingVars(Module *M,
11861186
for (unsigned i = 0, e = T2->getNumElements(); i != e; ++i)
11871187
Inits.push_back(CV);
11881188
}
1189-
NG->setInitializer(Context.getConstantArray(NewType, Inits));
1189+
NG->setInitializer(ConstantArray::get(NewType, Inits));
11901190
Inits.clear();
11911191

11921192
// Replace any uses of the two global variables with uses of the new

‎llvm/lib/Target/XCore/XCoreTargetObjectFile.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ XCoreTargetObjectFile::XCoreTargetObjectFile(bool isXS1A) {
2929
else
3030
ReadOnlySection = getOrCreateSection("\t.cp.rodata", false,
3131
SectionKind::ReadOnly);
32-
}
32+
}

‎llvm/lib/Transforms/IPO/ExtractGV.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ namespace {
110110
AUGs.push_back(Context.getConstantExprBitCast(*GI, SBP));
111111
}
112112
ArrayType *AT = Context.getArrayType(SBP, AUGs.size());
113-
Constant *Init = Context.getConstantArray(AT, AUGs);
113+
Constant *Init = ConstantArray::get(AT, AUGs);
114114
GlobalValue *gv = new GlobalVariable(M, AT, false,
115115
GlobalValue::AppendingLinkage,
116116
Init, "llvm.used");

‎llvm/lib/Transforms/IPO/GlobalOpt.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1968,7 +1968,7 @@ static GlobalVariable *InstallGlobalCtors(GlobalVariable *GCL,
19681968
// Create the array initializer.
19691969
const Type *StructTy =
19701970
cast<ArrayType>(GCL->getType()->getElementType())->getElementType();
1971-
Constant *CA = Context.getConstantArray(ArrayType::get(StructTy,
1971+
Constant *CA = ConstantArray::get(ArrayType::get(StructTy,
19721972
CAList.size()), CAList);
19731973

19741974
// If we didn't change the number of elements, don't create a new GV.
@@ -2094,7 +2094,7 @@ static Constant *EvaluateStoreInto(Constant *Init, Constant *Val,
20942094
assert(CI->getZExtValue() < ATy->getNumElements());
20952095
Elts[CI->getZExtValue()] =
20962096
EvaluateStoreInto(Elts[CI->getZExtValue()], Val, Addr, OpNo+1, Context);
2097-
return Context.getConstantArray(ATy, Elts);
2097+
return ConstantArray::get(ATy, Elts);
20982098
}
20992099
}
21002100

‎llvm/lib/Transforms/Scalar/SimplifyLibCalls.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1290,7 +1290,7 @@ struct VISIBILITY_HIDDEN PrintFOpt : public LibCallOptimization {
12901290
// Create a string literal with no \n on it. We expect the constant merge
12911291
// pass to be run after this pass, to merge duplicate strings.
12921292
FormatStr.erase(FormatStr.end()-1);
1293-
Constant *C = Context->getConstantArray(FormatStr, true);
1293+
Constant *C = ConstantArray::get(FormatStr, true);
12941294
C = new GlobalVariable(*Callee->getParent(), C->getType(), true,
12951295
GlobalVariable::InternalLinkage, C, "str");
12961296
EmitPutS(C, B);

‎llvm/lib/Transforms/Utils/LowerInvoke.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ void LowerInvoke::createAbortMessage(Module *M) {
183183
// The abort message for expensive EH support tells the user that the
184184
// program 'unwound' without an 'invoke' instruction.
185185
Constant *Msg =
186-
Context.getConstantArray("ERROR: Exception thrown, but not caught!\n");
186+
ConstantArray::get("ERROR: Exception thrown, but not caught!\n");
187187
AbortMessageLength = Msg->getNumOperands()-1; // don't include \0
188188

189189
GlobalVariable *MsgGV = new GlobalVariable(*M, Msg->getType(), true,
@@ -195,7 +195,7 @@ void LowerInvoke::createAbortMessage(Module *M) {
195195
// The abort message for cheap EH support tells the user that EH is not
196196
// enabled.
197197
Constant *Msg =
198-
Context.getConstantArray("Exception handler needed, but not enabled."
198+
ConstantArray::get("Exception handler needed, but not enabled."
199199
"Recompile program with -enable-correct-eh-support.\n");
200200
AbortMessageLength = Msg->getNumOperands()-1; // don't include \0
201201

‎llvm/lib/Transforms/Utils/ValueMapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Value *llvm::MapValue(const Value *V, ValueMapTy &VM, LLVMContext &Context) {
5656
Values.push_back(cast<Constant>(MV));
5757
for (++i; i != e; ++i)
5858
Values.push_back(cast<Constant>(MapValue(*i, VM, Context)));
59-
return VM[V] = Context.getConstantArray(CA->getType(), Values);
59+
return VM[V] = ConstantArray::get(CA->getType(), Values);
6060
}
6161
}
6262
return VM[V] = C;

‎llvm/lib/VMCore/ConstantFold.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ Constant *llvm::ConstantFoldInsertValueInstruction(LLVMContext &Context,
521521
if (isa<StructType>(AggTy))
522522
return ConstantStruct::get(Ops);
523523
else
524-
return Context.getConstantArray(cast<ArrayType>(AggTy), Ops);
524+
return ConstantArray::get(cast<ArrayType>(AggTy), Ops);
525525
}
526526
if (isa<ConstantAggregateZero>(Agg)) {
527527
// Insertion of constant into aggregate zero
@@ -550,7 +550,7 @@ Constant *llvm::ConstantFoldInsertValueInstruction(LLVMContext &Context,
550550
if (isa<StructType>(AggTy))
551551
return ConstantStruct::get(Ops);
552552
else
553-
return Context.getConstantArray(cast<ArrayType>(AggTy), Ops);
553+
return ConstantArray::get(cast<ArrayType>(AggTy), Ops);
554554
}
555555
if (isa<ConstantStruct>(Agg) || isa<ConstantArray>(Agg)) {
556556
// Insertion of constant into aggregate constant
@@ -567,7 +567,7 @@ Constant *llvm::ConstantFoldInsertValueInstruction(LLVMContext &Context,
567567
if (isa<StructType>(Agg->getType()))
568568
C = ConstantStruct::get(Ops);
569569
else
570-
C = Context.getConstantArray(cast<ArrayType>(Agg->getType()), Ops);
570+
C = ConstantArray::get(cast<ArrayType>(Agg->getType()), Ops);
571571
return C;
572572
}
573573

0 commit comments

Comments
 (0)