commit 2dc1b0f51487e7f16c013074b618c2040f01f898
author David Majnemer <david.majnemer@gmail.com> Wed Dec 10 01:38:28 2014 +0000
committer David Majnemer <david.majnemer@gmail.com> Wed Dec 10 01:38:28 2014 +0000
tree d5f980d96b3788420a896629bd73e78953da6b02
parent 7c5da41c70041cd3a388454f71a6faaeaf77adce

DataLayout: Be more verbose when diagnosing problems in pointer specs

llvm-svn: 223903

llvm/lib/IR/DataLayout.cpp

diff --git a/llvm/lib/IR/DataLayout.cpp b/llvm/lib/IR/DataLayout.cpp
index 394986e..4e0c066 100644
--- a/llvm/lib/IR/DataLayout.cpp
+++ b/llvm/lib/IR/DataLayout.cpp
@@ -197,8 +197,8 @@
 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 @@
 
 /// 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 @@
         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));