diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-09-19 20:30:26 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-09-19 20:30:26 +0000 |
| commit | c332fba8285e35a5a11463c34795af84f3960759 (patch) | |
| tree | 6f13654fe13746b91469913b6d1e9536c10a37e9 /lib | |
| parent | cea1438cf59c7cd3a632d61d78e68589315510d3 (diff) | |
| download | llvm-c332fba8285e35a5a11463c34795af84f3960759.tar.gz llvm-c332fba8285e35a5a11463c34795af84f3960759.tar.bz2 llvm-c332fba8285e35a5a11463c34795af84f3960759.tar.xz | |
Remove the default value for ConstantStruct::get's isPacked parameter and
update the code which was broken by this.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@82327 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/ShadowStackGC.cpp | 5 | ||||
| -rw-r--r-- | lib/Transforms/IPO/GlobalOpt.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
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()) { |