maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

IR: Allow 16-bits for column info 

Raise the limit for column information from 8 bits to 16 bits.

llvm-svn: 226291
This commit is contained in:
Duncan P. N. Exon Smith 2015-01-16 17:33:08 +00:00
parent c9cddb0837
commit 2f5bb31302
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/AsmParser/LLParser.cpp
View File

@ -3002,7 +3002,7 @@ bool LLParser::ParseSpecializedMDNode(MDNode *&N, bool IsDistinct) {
/// ::= !MDLocation(line: 43, column: 8, scope: !5, inlinedAt: !6) /// ::= !MDLocation(line: 43, column: 8, scope: !5, inlinedAt: !6)
bool LLParser::ParseMDLocation(MDNode *&Result, bool IsDistinct) { bool LLParser::ParseMDLocation(MDNode *&Result, bool IsDistinct) {
MDUnsignedField<uint32_t> line(0, ~0u >> 8); MDUnsignedField<uint32_t> line(0, ~0u >> 8);
MDUnsignedField<uint32_t> column(0, ~0u >> 24); MDUnsignedField<uint32_t> column(0, ~0u >> 16);
MDField scope; MDField scope;
MDField inlinedAt; MDField inlinedAt;
if (ParseMDFieldsImpl([&]() -> bool { if (ParseMDFieldsImpl([&]() -> bool {

6
llvm/lib/IR/Metadata.cpp
View File

@ -653,7 +653,7 @@ MDLocation::MDLocation(LLVMContext &C, unsigned Line, unsigned Column,
// Set line and column. // Set line and column.
assert(Line < (1u << 24) && "Expected 24-bit line"); assert(Line < (1u << 24) && "Expected 24-bit line");
assert(Column < (1u << 8) && "Expected 8-bit column"); assert(Column < (1u << 16) && "Expected 16-bit column");
MDNodeSubclassData = Line; MDNodeSubclassData = Line;
SubclassData16 = Column; SubclassData16 = Column;
@ -676,8 +676,8 @@ static void adjustLine(unsigned &Line) {
} }
static void adjustColumn(unsigned &Column) { static void adjustColumn(unsigned &Column) {
// Set to unknown on overflow. Still use 8 bits for now. // Set to unknown on overflow. We only have 16 bits to play with here.
if (Column >= (1u << 8)) if (Column >= (1u << 16))
Column = 0; Column = 0;
} }

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

@ -3,7 +3,7 @@
!0 = !{} !0 = !{}
; CHECK-NOT: error ; CHECK-NOT: error
!1 = !MDLocation(column: 255, scope: !0) !1 = !MDLocation(column: 65535, scope: !0)
; CHECK: <stdin>:[[@LINE+1]]:26: error: value for 'column' too large, limit is 255 ; CHECK: <stdin>:[[@LINE+1]]:26: error: value for 'column' too large, limit is 65535
!2 = !MDLocation(column: 256, scope: !0) !2 = !MDLocation(column: 65536, scope: !0)

7
llvm/test/Assembler/mdlocation.ll
View File

@ -1,8 +1,8 @@
; RUN: llvm-as < %s | llvm-dis | FileCheck %s ; RUN: llvm-as < %s | llvm-dis | FileCheck %s
; RUN: verify-uselistorder %s ; RUN: verify-uselistorder %s
; CHECK: !named = !{!0, !1, !1, !2, !2, !3, !3} ; CHECK: !named = !{!0, !1, !1, !2, !2, !3, !3, !4}
!named = !{!0, !1, !2, !3, !4, !5, !6} !named = !{!0, !1, !2, !3, !4, !5, !6, !7}
; CHECK: !0 = !{} ; CHECK: !0 = !{}
!0 = !{} !0 = !{}
@ -18,3 +18,6 @@
; CHECK-NEXT: !3 = !MDLocation(line: 0, scope: !0) ; CHECK-NEXT: !3 = !MDLocation(line: 0, scope: !0)
!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)
!7 = !MDLocation(line: 16777215, column: 65535, scope: !0)

10
llvm/unittests/IR/MetadataTest.cpp
View File

@ -397,19 +397,19 @@ TEST_F(MDLocationTest, Overflow) {
EXPECT_EQ(7u, L->getColumn()); EXPECT_EQ(7u, L->getColumn());
} }
unsigned U24 = 1u << 24; unsigned U24 = 1u << 24;
unsigned U8 = 1u << 8; unsigned U16 = 1u << 16;
{ {
MDLocation *L = MDLocation::get(Context, U24 - 1, U8 - 1, N); MDLocation *L = MDLocation::get(Context, U24 - 1, U16 - 1, N);
EXPECT_EQ(U24 - 1, L->getLine()); EXPECT_EQ(U24 - 1, L->getLine());
EXPECT_EQ(U8 - 1, L->getColumn()); EXPECT_EQ(U16 - 1, L->getColumn());
} }
{ {
MDLocation *L = MDLocation::get(Context, U24, U8, N); MDLocation *L = MDLocation::get(Context, U24, U16, N);
EXPECT_EQ(0u, L->getLine()); EXPECT_EQ(0u, L->getLine());
EXPECT_EQ(0u, L->getColumn()); EXPECT_EQ(0u, L->getColumn());
} }
{ {
MDLocation *L = MDLocation::get(Context, U24 + 1, U8 + 1, N); MDLocation *L = MDLocation::get(Context, U24 + 1, U16 + 1, N);
EXPECT_EQ(0u, L->getLine()); EXPECT_EQ(0u, L->getLine());
EXPECT_EQ(0u, L->getColumn()); EXPECT_EQ(0u, L->getColumn());
} }