[llvm-commits] [llvm] r167886 - in /llvm/trunk: include/llvm/DIBuilder.h include/llvm/DebugInfo.h lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp lib/VMCore/DIBuilder.cpp test/CodeGen/X86/dbg-subrange.ll

[Eric Christopher]

Author: echristo
Date: Tue Nov 13 17:30:43 2012
New Revision: 167886

URL: http://llvm.org/viewvc/llvm-project?rev=167886&view=rev
Log:
Revert "Use the 'count' attribute instead of the 'upper_bound' attribute."
temporarily as it is breaking the gdb bots.

This reverts commit r167806/e7ff4c14b157746b3e0228d2dce9f70712d1c126.

Modified:
    llvm/trunk/include/llvm/DIBuilder.h
    llvm/trunk/include/llvm/DebugInfo.h
    llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
    llvm/trunk/lib/VMCore/DIBuilder.cpp
    llvm/trunk/test/CodeGen/X86/dbg-subrange.ll

Modified: llvm/trunk/include/llvm/DIBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DIBuilder.h?rev=167886&r1=167885&r2=167886&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DIBuilder.h (original)
+++ llvm/trunk/include/llvm/DIBuilder.h Tue Nov 13 17:30:43 2012
@@ -371,7 +371,7 @@
 
     /// 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.

Modified: llvm/trunk/include/llvm/DebugInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo.h?rev=167886&r1=167885&r2=167886&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo.h (original)
+++ llvm/trunk/include/llvm/DebugInfo.h Tue Nov 13 17:30:43 2012
@@ -143,7 +143,6 @@
 
     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.

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp?rev=167886&r1=167885&r2=167886&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp Tue Nov 13 17:30:43 2012
@@ -1252,7 +1252,6 @@
   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 @@
   }
   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);
 }
 

Modified: llvm/trunk/lib/VMCore/DIBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/DIBuilder.cpp?rev=167886&r1=167885&r2=167886&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/DIBuilder.cpp (original)
+++ llvm/trunk/lib/VMCore/DIBuilder.cpp Tue Nov 13 17:30:43 2012
@@ -741,13 +741,11 @@
 
 /// 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));

Modified: llvm/trunk/test/CodeGen/X86/dbg-subrange.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/dbg-subrange.ll?rev=167886&r1=167885&r2=167886&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/dbg-subrange.ll (original)
+++ llvm/trunk/test/CodeGen/X86/dbg-subrange.ll Tue Nov 13 17:30:43 2012
@@ -4,7 +4,7 @@
 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 @@
 !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}