6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-06-26 10:29:57 +00:00
Code Issues Projects Releases Wiki Activity

DataLayout: Be more verbose when diagnosing problems in pointer specs

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@223903 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Majnemer 2014-12-10 01:38:28 +00:00
parent 0178ab55a5
commit bf13927f3b
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/IR/DataLayout.cpp
View File

@ -197,8 +197,8 @@ void DataLayout::reset(StringRef Desc) {
static std::pair<StringRef, StringRef> split(StringRef Str, char Separator) {
assert(!Str.empty() && "parse error, string can't be empty here");
std::pair<StringRef, StringRef> Split = Str.split(Separator);
assert((!Split.second.empty() || Split.first == Str) &&
"a trailing separator is not allowed");
if (Split.second.empty() && Split.first != Str)
report_fatal_error("Trailing separator in datalayout string");
return Split;
}
@ -213,7 +213,8 @@ static unsigned getInt(StringRef R) {
/// Convert bits into bytes. Assert if not a byte width multiple.
static unsigned inBytes(unsigned Bits) {
assert(Bits % 8 == 0 && "number of bits must be a byte width multiple");
if (Bits % 8)
report_fatal_error("number of bits must be a byte width multiple");
return Bits / 8;
}
@ -251,10 +252,16 @@ void DataLayout::parseSpecifier(StringRef Desc) {
report_fatal_error("Invalid address space, must be a 24bit integer");
// Size.
if (Rest.empty())
report_fatal_error(
"Missing size specification for pointer in datalayout string");
Split = split(Rest, ':');
unsigned PointerMemSize = inBytes(getInt(Tok));
// ABI alignment.
if (Rest.empty())
report_fatal_error(
"Missing alignment specification for pointer in datalayout string");
Split = split(Rest, ':');
unsigned PointerABIAlign = inBytes(getInt(Tok));

3
test/Assembler/invalid-datalayout6.ll Normal file
View File

@ -0,0 +1,3 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s
target datalayout = "a:"
; CHECK: Trailing separator in datalayout string

3
test/Assembler/invalid-datalayout7.ll Normal file
View File

@ -0,0 +1,3 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s
target datalayout = "p:52"
; CHECK: number of bits must be a byte width multiple

3
test/Assembler/invalid-datalayout8.ll Normal file
View File

@ -0,0 +1,3 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s
target datalayout = "e-p"
; CHECK: Missing size specification for pointer in datalayout string

3
test/Assembler/invalid-datalayout9.ll Normal file
View File

@ -0,0 +1,3 @@
; RUN: not llvm-as < %s 2>&1 | FileCheck %s
target datalayout = "e-p:64"
; CHECK: Missing alignment specification for pointer in datalayout string