From 612f31284e423904d3afa255ed20ac36f2a1e010 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Wed, 10 Dec 2014 02:36:41 +0000 Subject: [PATCH] DataLayout: Provide nicer diagnostics for malformed strings llvm-svn: 223911 --- llvm/lib/IR/DataLayout.cpp | 13 +++++++++++-- llvm/test/Assembler/invalid-datalayout10.ll | 3 +++ llvm/test/Assembler/invalid-datalayout11.ll | 3 +++ llvm/test/Assembler/invalid-datalayout12.ll | 3 +++ llvm/test/Assembler/invalid-datalayout13.ll | 3 +++ 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 llvm/test/Assembler/invalid-datalayout10.ll create mode 100644 llvm/test/Assembler/invalid-datalayout11.ll create mode 100644 llvm/test/Assembler/invalid-datalayout12.ll create mode 100644 llvm/test/Assembler/invalid-datalayout13.ll diff --git a/llvm/lib/IR/DataLayout.cpp b/llvm/lib/IR/DataLayout.cpp index 4e0c066..cde3937 100644 --- a/llvm/lib/IR/DataLayout.cpp +++ b/llvm/lib/IR/DataLayout.cpp @@ -199,6 +199,8 @@ static std::pair split(StringRef Str, char Separator) { std::pair Split = Str.split(Separator); if (Split.second.empty() && Split.first != Str) report_fatal_error("Trailing separator in datalayout string"); + if (!Split.second.empty() && Split.first.empty()) + report_fatal_error("Expected token before separator in datalayout string"); return Split; } @@ -297,6 +299,9 @@ void DataLayout::parseSpecifier(StringRef Desc) { "Sized aggregate specification in datalayout string"); // ABI alignment. + if (Rest.empty()) + report_fatal_error( + "Missing alignment specification in datalayout string"); Split = split(Rest, ':'); unsigned ABIAlign = inBytes(getInt(Tok)); @@ -328,8 +333,12 @@ void DataLayout::parseSpecifier(StringRef Desc) { break; } case 'm': - assert(Tok.empty()); - assert(Rest.size() == 1); + if (!Tok.empty()) + report_fatal_error("Unexpected trailing characters after mangling specifier in datalayout string"); + if (Rest.empty()) + report_fatal_error("Expected mangling specifier in datalayout string"); + if (Rest.size() > 1) + report_fatal_error("Unknown mangling specifier in datalayout string"); switch(Rest[0]) { default: report_fatal_error("Unknown mangling in datalayout string"); diff --git a/llvm/test/Assembler/invalid-datalayout10.ll b/llvm/test/Assembler/invalid-datalayout10.ll new file mode 100644 index 0000000..9f19688 --- /dev/null +++ b/llvm/test/Assembler/invalid-datalayout10.ll @@ -0,0 +1,3 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s +target datalayout = "m" +; CHECK: Expected mangling specifier in datalayout string diff --git a/llvm/test/Assembler/invalid-datalayout11.ll b/llvm/test/Assembler/invalid-datalayout11.ll new file mode 100644 index 0000000..f8fed8f --- /dev/null +++ b/llvm/test/Assembler/invalid-datalayout11.ll @@ -0,0 +1,3 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s +target datalayout = "m." +; CHECK: Unexpected trailing characters after mangling specifier in datalayout string diff --git a/llvm/test/Assembler/invalid-datalayout12.ll b/llvm/test/Assembler/invalid-datalayout12.ll new file mode 100644 index 0000000..d79c196 --- /dev/null +++ b/llvm/test/Assembler/invalid-datalayout12.ll @@ -0,0 +1,3 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s +target datalayout = "f" +; CHECK: Missing alignment specification in datalayout string diff --git a/llvm/test/Assembler/invalid-datalayout13.ll b/llvm/test/Assembler/invalid-datalayout13.ll new file mode 100644 index 0000000..5ac719d --- /dev/null +++ b/llvm/test/Assembler/invalid-datalayout13.ll @@ -0,0 +1,3 @@ +; RUN: not llvm-as < %s 2>&1 | FileCheck %s +target datalayout = ":32" +; CHECK: Expected token before separator in datalayout string -- 2.7.4