diff options
| -rw-r--r-- | include/llvm/Constants.h | 6 | ||||
| -rw-r--r-- | lib/CodeGen/ShadowStackGC.cpp | 5 | ||||
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 6 | ||||
| -rw-r--r-- | tools/bugpoint/ExtractFunction.cpp | 4 |
4 files changed, 11 insertions, 10 deletions
diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h index 86d14912a4..90cf55daac 100644 --- a/include/llvm/Constants.h +++ b/include/llvm/Constants.h @@ -415,11 +415,11 @@ public: // ConstantStruct accessors static Constant* get(const StructType* T, const std::vector<Constant*>& V); static Constant* get(LLVMContext &Context, - const std::vector<Constant*>& V, bool Packed = false); + const std::vector<Constant*>& V, bool Packed); static Constant* get(LLVMContext &Context, Constant* const *Vals, unsigned NumVals, - bool Packed = false); - + bool Packed); + /// Transparently provide more efficient getOperand methods. DECLARE_TRANSPARENT_OPERAND_ACCESSORS(Constant); diff --git a/lib/CodeGen/ShadowStackGC.cpp b/lib/CodeGen/ShadowStackGC.cpp index 18c49363fe..541ab9a417 100644 --- a/lib/CodeGen/ShadowStackGC.cpp +++ b/lib/CodeGen/ShadowStackGC.cpp @@ -207,12 +207,13 @@ Constant *ShadowStackGC::GetFrameMap(Function &F) { }; Constant *DescriptorElts[] = { - ConstantStruct::get(F.getContext(), BaseElts, 2), + ConstantStruct::get(F.getContext(), BaseElts, 2, false), ConstantArray::get(ArrayType::get(VoidPtr, NumMeta), Metadata.begin(), NumMeta) }; - Constant *FrameMap = ConstantStruct::get(F.getContext(), DescriptorElts, 2); + Constant *FrameMap = ConstantStruct::get(F.getContext(), DescriptorElts, 2, + false); std::string TypeName("gc_map."); TypeName += utostr(NumMeta); diff --git a/lib/Transforms/IPO/GlobalOpt.cpp b/lib/Transforms/IPO/GlobalOpt.cpp index 950a23956f..8edd79ccef 100644 --- a/lib/Transforms/IPO/GlobalOpt.cpp +++ b/lib/Transforms/IPO/GlobalOpt.cpp @@ -2393,14 +2393,14 @@ static GlobalVariable *InstallGlobalCtors(GlobalVariable *GCL, CSVals[1] = Constant::getNullValue(PFTy); CSVals[0] = ConstantInt::get(Type::getInt32Ty(Context), 2147483647); } - CAList.push_back(ConstantStruct::get(Context, CSVals)); + CAList.push_back(ConstantStruct::get(Context, CSVals, false)); } // Create the array initializer. const Type *StructTy = - cast<ArrayType>(GCL->getType()->getElementType())->getElementType(); + cast<ArrayType>(GCL->getType()->getElementType())->getElementType(); Constant *CA = ConstantArray::get(ArrayType::get(StructTy, - CAList.size()), CAList); + CAList.size()), CAList); // If we didn't change the number of elements, don't create a new GV. if (CA->getType() == GCL->getInitializer()->getType()) { diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index df9277c10f..918d6a6a2a 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -189,8 +189,8 @@ static Constant *GetTorInit(std::vector<std::pair<Function*, int> > &TorList) { Elts.push_back(ConstantInt::get( Type::getInt32Ty(TorList[i].first->getContext()), TorList[i].second)); Elts.push_back(TorList[i].first); - ArrayElts.push_back(ConstantStruct::get( - TorList[i].first->getContext(), Elts)); + ArrayElts.push_back(ConstantStruct::get(TorList[i].first->getContext(), + Elts, false)); } return ConstantArray::get(ArrayType::get(ArrayElts[0]->getType(), ArrayElts.size()), |