From: Eric Christopher Date: Tue, 13 Nov 2012 23:30:43 +0000 (+0000) Subject: Revert "Use the 'count' attribute instead of the 'upper_bound' attribute." X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=242343d1ab0d6b10221569fd2c504842a561f0e7;p=oota-llvm.git Revert "Use the 'count' attribute instead of the 'upper_bound' attribute." temporarily as it is breaking the gdb bots. This reverts commit r167806/e7ff4c14b157746b3e0228d2dce9f70712d1c126. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167886 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/DIBuilder.h b/include/llvm/DIBuilder.h index 9a3468272d6..2f078006808 100644 --- a/include/llvm/DIBuilder.h +++ b/include/llvm/DIBuilder.h @@ -371,7 +371,7 @@ namespace llvm { /// getOrCreateSubrange - Create a descriptor for a value range. This /// implicitly uniques the values returned. - DISubrange getOrCreateSubrange(int64_t Lo, int64_t Hi, uint64_t Count); + DISubrange getOrCreateSubrange(int64_t Lo, int64_t Hi); /// createGlobalVariable - Create a new descriptor for the specified global. /// @param Name Name of the variable. diff --git a/include/llvm/DebugInfo.h b/include/llvm/DebugInfo.h index d75579dcba9..dae03ad1009 100644 --- a/include/llvm/DebugInfo.h +++ b/include/llvm/DebugInfo.h @@ -143,7 +143,6 @@ namespace llvm { uint64_t getLo() const { return getUInt64Field(1); } uint64_t getHi() const { return getUInt64Field(2); } - uint64_t getCount() const { return getUInt64Field(3); } }; /// DIArray - This descriptor holds an array of descriptors. diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp index bcb002cdac3..2b07dda31ff 100644 --- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp +++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp @@ -1252,7 +1252,6 @@ void CompileUnit::constructSubrangeDIE(DIE &Buffer, DISubrange SR, addDIEEntry(DW_Subrange, dwarf::DW_AT_type, dwarf::DW_FORM_ref4, IndexTy); uint64_t L = SR.getLo(); uint64_t H = SR.getHi(); - uint64_t C = SR.getCount(); // The L value defines the lower bounds which is typically zero for C/C++. The // H value is the upper bounds. Values are 64 bit. H - L + 1 is the size @@ -1266,7 +1265,7 @@ void CompileUnit::constructSubrangeDIE(DIE &Buffer, DISubrange SR, } if (L) addUInt(DW_Subrange, dwarf::DW_AT_lower_bound, 0, L); - addUInt(DW_Subrange, dwarf::DW_AT_count, 0, C); + addUInt(DW_Subrange, dwarf::DW_AT_upper_bound, 0, H); Buffer.addChild(DW_Subrange); } diff --git a/lib/VMCore/DIBuilder.cpp b/lib/VMCore/DIBuilder.cpp index ed9c3b0a361..152b825523d 100644 --- a/lib/VMCore/DIBuilder.cpp +++ b/lib/VMCore/DIBuilder.cpp @@ -741,13 +741,11 @@ DIArray DIBuilder::getOrCreateArray(ArrayRef Elements) { /// getOrCreateSubrange - Create a descriptor for a value range. This /// implicitly uniques the values returned. -DISubrange DIBuilder::getOrCreateSubrange(int64_t Lo, int64_t Hi, - uint64_t Count) { +DISubrange DIBuilder::getOrCreateSubrange(int64_t Lo, int64_t Hi) { Value *Elts[] = { GetTagConstant(VMContext, dwarf::DW_TAG_subrange_type), ConstantInt::get(Type::getInt64Ty(VMContext), Lo), - ConstantInt::get(Type::getInt64Ty(VMContext), Hi), - ConstantInt::get(Type::getInt64Ty(VMContext), Count) + ConstantInt::get(Type::getInt64Ty(VMContext), Hi) }; return DISubrange(MDNode::get(VMContext, Elts)); diff --git a/test/CodeGen/X86/dbg-subrange.ll b/test/CodeGen/X86/dbg-subrange.ll index 127dedb2814..788910c7fe7 100644 --- a/test/CodeGen/X86/dbg-subrange.ll +++ b/test/CodeGen/X86/dbg-subrange.ll @@ -4,7 +4,7 @@ target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f3 target triple = "x86_64-apple-macosx10.7.2" @s = common global [4294967296 x i8] zeroinitializer, align 16 -;CHECK: .quad 4294967296 ## DW_AT_count +;CHECK: .long 4294967295 define void @bar() nounwind uwtable ssp { entry: @@ -31,7 +31,7 @@ entry: !14 = metadata !{i32 720897, null, metadata !"", null, i32 0, i64 34359738368, i64 8, i32 0, i32 0, metadata !15, metadata !16, i32 0, i32 0} ; [ DW_TAG_array_type ] !15 = metadata !{i32 720932, null, metadata !"char", null, i32 0, i64 8, i64 8, i64 0, i32 0, i32 6} ; [ DW_TAG_base_type ] !16 = metadata !{metadata !17} -!17 = metadata !{i32 720929, i64 0, i64 4294967295, i64 4294967296} ; [ DW_TAG_subrange_type ] +!17 = metadata !{i32 720929, i64 0, i64 4294967295} ; [ DW_TAG_subrange_type ] !18 = metadata !{i32 5, i32 3, metadata !19, null} !19 = metadata !{i32 720907, metadata !5, i32 4, i32 1, metadata !6, i32 0} ; [ DW_TAG_lexical_block ] !20 = metadata !{i32 6, i32 1, metadata !19, null}