diff options
author | Eric Christopher <echristo@gmail.com> | 2012-11-13 23:30:57 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2012-11-13 23:30:57 +0000 |
commit | 0c949efad533330eee234d613712510db7376e44 (patch) | |
tree | 852c90ffb6cc0358ce8a15d6612e40be5c19b174 /lib/CodeGen/CGDebugInfo.cpp | |
parent | 25f071eedf5d20faf9e1614d5ff5dc39b6de5041 (diff) |
Revert "Use the 'count' attribute instead of the 'upper_bound' attribute."
temporarily since it breaks the gdb bots.
This reverts commit r167807/30305bec25cac981c6d4a3b8be004401310a82a7.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@167887 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGDebugInfo.cpp')
-rw-r--r-- | lib/CodeGen/CGDebugInfo.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp index 3843889635..80fa09be74 100644 --- a/lib/CodeGen/CGDebugInfo.cpp +++ b/lib/CodeGen/CGDebugInfo.cpp @@ -1473,23 +1473,23 @@ llvm::DIType CGDebugInfo::CreateType(const ObjCInterfaceType *Ty, llvm::DIType CGDebugInfo::CreateType(const VectorType *Ty, llvm::DIFile Unit) { llvm::DIType ElementTy = getOrCreateType(Ty->getElementType(), Unit); - int64_t UpperBound = Ty->getNumElements(); + int64_t NumElems = Ty->getNumElements(); int64_t LowerBound = 0; - if (UpperBound == 0) + if (NumElems == 0) // If number of elements are not known then this is an unbounded array. // Use Low = 1, Hi = 0 to express such arrays. LowerBound = 1; else - --UpperBound; + --NumElems; - llvm::Value *Subscript = DBuilder.getOrCreateSubrange(LowerBound, UpperBound, - Ty->getNumElements()); + llvm::Value *Subscript = DBuilder.getOrCreateSubrange(LowerBound, NumElems); llvm::DIArray SubscriptArray = DBuilder.getOrCreateArray(Subscript); uint64_t Size = CGM.getContext().getTypeSize(Ty); uint64_t Align = CGM.getContext().getTypeAlign(Ty); - return DBuilder.createVectorType(Size, Align, ElementTy, SubscriptArray); + return + DBuilder.createVectorType(Size, Align, ElementTy, SubscriptArray); } llvm::DIType CGDebugInfo::CreateType(const ArrayType *Ty, @@ -1525,11 +1525,9 @@ llvm::DIType CGDebugInfo::CreateType(const ArrayType *Ty, while ((Ty = dyn_cast<ArrayType>(EltTy))) { int64_t UpperBound = 0; int64_t LowerBound = 0; - uint64_t Count = 0; if (const ConstantArrayType *CAT = dyn_cast<ConstantArrayType>(Ty)) { - Count = CAT->getSize().getZExtValue(); - if (Count) - UpperBound = Count - 1; + if (CAT->getSize().getZExtValue()) + UpperBound = CAT->getSize().getZExtValue() - 1; } else // This is an unbounded array. Use Low = 1, Hi = 0 to express such // arrays. @@ -1537,8 +1535,7 @@ llvm::DIType CGDebugInfo::CreateType(const ArrayType *Ty, // FIXME: Verify this is right for VLAs. Subscripts.push_back(DBuilder.getOrCreateSubrange(LowerBound, - UpperBound, - Count)); + UpperBound)); EltTy = Ty->getElementType(); } |