Move ConstantStruct back to 2.5 API.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77266 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/DebugInfo.cpp b/lib/Analysis/DebugInfo.cpp
index 61c9a4a..47a561b 100644
--- a/lib/Analysis/DebugInfo.cpp
+++ b/lib/Analysis/DebugInfo.cpp
@@ -545,8 +545,7 @@
ConstantInt::get(Type::Int64Ty, Hi)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
// If we already have this range, just return the uniqued version.
DIDescriptor &Entry = SimpleConstantCache[Init];
@@ -587,8 +586,7 @@
ConstantInt::get(Type::Int32Ty, RunTimeVer)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.compile_unit.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -606,8 +604,7 @@
ConstantInt::get(Type::Int64Ty, Val)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.enumerator.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -640,8 +637,7 @@
ConstantInt::get(Type::Int32Ty, Encoding)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.basictype.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -676,8 +672,7 @@
getCastToEmpty(DerivedFrom)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.derivedtype.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -716,8 +711,7 @@
ConstantInt::get(Type::Int32Ty, RuntimeLang)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.composite.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -754,8 +748,7 @@
ConstantInt::get(Type::Int1Ty, isDefinition)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.subprogram.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -788,8 +781,7 @@
VMContext.getConstantExprBitCast(Val, EmptyStructPtr)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.global_variable.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -814,8 +806,7 @@
getCastToEmpty(Type)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.variable.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,
@@ -834,8 +825,7 @@
getCastToEmpty(Context)
};
- Constant *Init = VMContext.getConstantStruct(Elts,
- sizeof(Elts)/sizeof(Elts[0]));
+ Constant *Init = ConstantStruct::get(Elts, sizeof(Elts)/sizeof(Elts[0]));
M.addTypeName("llvm.dbg.block.type", Init->getType());
GlobalVariable *GV = new GlobalVariable(M, Init->getType(), true,