6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-07 14:33:15 +00:00
Code Issues Projects Releases Wiki Activity

IR: Allow 32-bits for lines in debug location

Browse Source 
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.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@228455 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith 2015-02-06 22:50:13 +00:00
parent 4752dabe97
commit 8713d99a25
5 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AsmParser/LLParser.cpp
View File

@ -2946,7 +2946,7 @@ struct MDUnsignedField : public MDFieldImpl<uint64_t> {
: ImplTy(Default), Max(Max) {} : ImplTy(Default), Max(Max) {}
}; };
struct LineField : public MDUnsignedField { struct LineField : public MDUnsignedField {
LineField() : MDUnsignedField(0, UINT32_MAX >> 8) {} LineField() : MDUnsignedField(0, UINT32_MAX) {}
}; };
struct ColumnField : public MDUnsignedField { struct ColumnField : public MDUnsignedField {
ColumnField() : MDUnsignedField(0, UINT16_MAX) {} ColumnField() : MDUnsignedField(0, UINT16_MAX) {}

10
lib/IR/DebugInfoMetadata.cpp
View File

@ -24,19 +24,12 @@ MDLocation::MDLocation(LLVMContext &C, StorageType Storage, unsigned Line,
"Expected a scope and optional inlined-at"); "Expected a scope and optional inlined-at");
// Set line and column. // Set line and column.
assert(Line < (1u << 24) && "Expected 24-bit line");
assert(Column < (1u << 16) && "Expected 16-bit column"); assert(Column < (1u << 16) && "Expected 16-bit column");
SubclassData32 = Line; SubclassData32 = Line;
SubclassData16 = Column; 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) { static void adjustColumn(unsigned &Column) {
// Set to unknown on overflow. We only have 16 bits to play with here. // Set to unknown on overflow. We only have 16 bits to play with here.
if (Column >= (1u << 16)) if (Column >= (1u << 16))
@ -47,8 +40,7 @@ MDLocation *MDLocation::getImpl(LLVMContext &Context, unsigned Line,
unsigned Column, Metadata *Scope, unsigned Column, Metadata *Scope,
Metadata *InlinedAt, StorageType Storage, Metadata *InlinedAt, StorageType Storage,
bool ShouldCreate) { bool ShouldCreate) {
// Fixup line/column. // Fixup column.
adjustLine(Line);
adjustColumn(Column); adjustColumn(Column);
if (Storage == Uniqued) { if (Storage == Uniqued) {

6
test/Assembler/invalid-mdlocation-overflow-line.ll
View File

@ -3,7 +3,7 @@
!0 = !{} !0 = !{}
; CHECK-NOT: error ; 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 ; CHECK: <stdin>:[[@LINE+1]]:24: error: value for 'line' too large, limit is 4294967295
!2 = !MDLocation(line: 16777216, scope: !0) !2 = !MDLocation(line: 4294967296, scope: !0)

4
test/Assembler/mdlocation.ll
View File

@ -19,5 +19,5 @@
!5 = !MDLocation(scope: !0) !5 = !MDLocation(scope: !0)
!6 = !MDLocation(scope: !0, column: 0, line: 0) !6 = !MDLocation(scope: !0, column: 0, line: 0)
; CHECK-NEXT: !4 = !MDLocation(line: 16777215, column: 65535, scope: !0) ; CHECK-NEXT: !4 = !MDLocation(line: 4294967295, column: 65535, scope: !0)
!7 = !MDLocation(line: 16777215, column: 65535, scope: !0) !7 = !MDLocation(line: 4294967295, column: 65535, scope: !0)

13
unittests/IR/MetadataTest.cpp
View File

@ -538,21 +538,20 @@ TEST_F(MDLocationTest, Overflow) {
EXPECT_EQ(2u, L->getLine()); EXPECT_EQ(2u, L->getLine());
EXPECT_EQ(7u, L->getColumn()); EXPECT_EQ(7u, L->getColumn());
} }
unsigned U24 = 1u << 24;
unsigned U16 = 1u << 16; unsigned U16 = 1u << 16;
{ {
MDLocation *L = MDLocation::get(Context, U24 - 1, U16 - 1, N); MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16 - 1, N);
EXPECT_EQ(U24 - 1, L->getLine()); EXPECT_EQ(UINT32_MAX, L->getLine());
EXPECT_EQ(U16 - 1, L->getColumn()); EXPECT_EQ(U16 - 1, L->getColumn());
} }
{ {
MDLocation *L = MDLocation::get(Context, U24, U16, N); MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16, N);
EXPECT_EQ(0u, L->getLine()); EXPECT_EQ(UINT32_MAX, L->getLine());
EXPECT_EQ(0u, L->getColumn()); EXPECT_EQ(0u, L->getColumn());
} }
{ {
MDLocation *L = MDLocation::get(Context, U24 + 1, U16 + 1, N); MDLocation *L = MDLocation::get(Context, UINT32_MAX, U16 + 1, N);
EXPECT_EQ(0u, L->getLine()); EXPECT_EQ(UINT32_MAX, L->getLine());
EXPECT_EQ(0u, L->getColumn()); EXPECT_EQ(0u, L->getColumn());
} }
} }