[llvm] r228455 - IR: Allow 32-bits for lines in debug location

[Duncan P. N. Exon Smith]

Author: dexonsmith
Date: Fri Feb  6 16:50:13 2015
New Revision: 228455

URL: http://llvm.org/viewvc/llvm-project?rev=228455&view=rev
Log:
IR: Allow 32-bits for lines in debug location

Remove unnecessary restriction of 24-bits for line numbers in
`MDLocation`.

The rest of the debug info schema (with the exception of local
variables) uses 32-bits for line numbers.  As I introduce the
specialized nodes, it makes sense to canonicalize on one size or the
other.

Modified:
    llvm/trunk/lib/AsmParser/LLParser.cpp
    llvm/trunk/lib/IR/DebugInfoMetadata.cpp
    llvm/trunk/test/Assembler/invalid-mdlocation-overflow-line.ll
    llvm/trunk/test/Assembler/mdlocation.ll
    llvm/trunk/unittests/IR/MetadataTest.cpp

Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=228455&r1=228454&r2=228455&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Fri Feb  6 16:50:13 2015
@@ -2946,7 +2946,7 @@ struct MDUnsignedField : public MDFieldI
       : ImplTy(Default), Max(Max) {}
 };
 struct LineField : public MDUnsignedField {
-  LineField() : MDUnsignedField(0, UINT32_MAX >> 8) {}
+  LineField() : MDUnsignedField(0, UINT32_MAX) {}
 };
 struct ColumnField : public MDUnsignedField {
   ColumnField() : MDUnsignedField(0, UINT16_MAX) {}

Modified: llvm/trunk/lib/IR/DebugInfoMetadata.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DebugInfoMetadata.cpp?rev=228455&r1=228454&r2=228455&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DebugInfoMetadata.cpp (original)
+++ llvm/trunk/lib/IR/DebugInfoMetadata.cpp Fri Feb  6 16:50:13 2015
@@ -24,19 +24,12 @@ MDLocation::MDLocation(LLVMContext &C, S
          "Expected a scope and optional inlined-at");
 
   // Set line and column.
-  assert(Line < (1u << 24) && "Expected 24-bit line");
   assert(Column < (1u << 16) && "Expected 16-bit column");
 
   SubclassData32 = Line;
   SubclassData16 = Column;
 }
 
-static void adjustLine(unsigned &Line) {
-  // Set to unknown on overflow.  Still use 24 bits for now.
-  if (Line >= (1u << 24))
-    Line = 0;
-}
-
 static void adjustColumn(unsigned &Column) {
   // Set to unknown on overflow.  We only have 16 bits to play with here.
   if (Column >= (1u << 16))
@@ -47,8 +40,7 @@ MDLocation *MDLocation::getImpl(LLVMCont
                                 unsigned Column, Metadata *Scope,
                                 Metadata *InlinedAt, StorageType Storage,
                                 bool ShouldCreate) {
-  // Fixup line/column.
-  adjustLine(Line);
+  // Fixup column.
   adjustColumn(Column);
 
   if (Storage == Uniqued) {

Modified: llvm/trunk/test/Assembler/invalid-mdlocation-overflow-line.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-mdlocation-overflow-line.ll?rev=228455&r1=228454&r2=228455&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/invalid-mdlocation-overflow-line.ll (original)
+++ llvm/trunk/test/Assembler/invalid-mdlocation-overflow-line.ll Fri Feb  6 16:50:13 2015
@@ -3,7 +3,7 @@
 !0 = !{}
 
 ; CHECK-NOT: error
-!1 = !MDLocation(line: 16777215, scope: !0)
+!1 = !MDLocation(line: 4294967295, scope: !0)
 
-; CHECK: <stdin>:[[@LINE+1]]:24: error: value for 'line' too large, limit is 16777215
-!2 = !MDLocation(line: 16777216, scope: !0)
+; CHECK: <stdin>:[[@LINE+1]]:24: error: value for 'line' too large, limit is 4294967295
+!2 = !MDLocation(line: 4294967296, scope: !0)

Modified: llvm/trunk/test/Assembler/mdlocation.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/mdlocation.ll?rev=228455&r1=228454&r2=228455&view=diff
==============================================================================
--- llvm/trunk/test/Assembler/mdlocation.ll (original)
+++ llvm/trunk/test/Assembler/mdlocation.ll Fri Feb  6 16:50:13 2015
@@ -19,5 +19,5 @@
 !5 = !MDLocation(scope: !0)
 !6 = !MDLocation(scope: !0, column: 0, line: 0)
 
-; CHECK-NEXT: !4 = !MDLocation(line: 16777215, column: 65535, scope: !0)
-!7 = !MDLocation(line: 16777215, column: 65535, scope: !0)
+; CHECK-NEXT: !4 = !MDLocation(line: 4294967295, column: 65535, scope: !0)
+!7 = !MDLocation(line: 4294967295, column: 65535, scope: !0)

Modified: llvm/trunk/unittests/IR/MetadataTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/IR/MetadataTest.cpp?rev=228455&r1=228454&r2=228455&view=diff
==============================================================================
--- llvm/trunk/unittests/IR/MetadataTest.cpp (original)
+++ llvm/trunk/unittests/IR/MetadataTest.cpp Fri Feb  6 16:50:13 2015
@@ -538,21 +538,20 @@ TEST_F(MDLocationTest, Overflow) {
     EXPECT_EQ(2u, L->getLine());
     EXPECT_EQ(7u, L->getColumn());
   }
-  unsigned U24 = 1u << 24;
   unsigned U16 = 1u << 16;
   {
-    MDLocation *L = MDLocation::get(Context, U24 - 1, U16 - 1, N);
-    EXPECT_EQ(U24 - 1, L->getLine());
+    MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16 - 1, N);
+    EXPECT_EQ(UINT32_MAX, L->getLine());
     EXPECT_EQ(U16 - 1, L->getColumn());
   }
   {
-    MDLocation *L = MDLocation::get(Context, U24, U16, N);
-    EXPECT_EQ(0u, L->getLine());
+    MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16, N);
+    EXPECT_EQ(UINT32_MAX, L->getLine());
     EXPECT_EQ(0u, L->getColumn());
   }
   {
-    MDLocation *L = MDLocation::get(Context, U24 + 1, U16 + 1, N);
-    EXPECT_EQ(0u, L->getLine());
+    MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16 + 1, N);
+    EXPECT_EQ(UINT32_MAX, L->getLine());
     EXPECT_EQ(0u, L->getColumn());
   }
 }