[llvm] r230940 - Teach DataLayout that alignments on basic types must be powers of two.

[Owen Anderson]

Author: resistor
Date: Mon Mar  2 03:35:03 2015
New Revision: 230940

URL: http://llvm.org/viewvc/llvm-project?rev=230940&view=rev
Log:
Teach DataLayout that alignments on basic types must be powers of two.

Fixes assertion failures/crashes on bad datalayout specifications.

Added:
    llvm/trunk/test/Assembler/invalid-datalayout23.ll
    llvm/trunk/test/Assembler/invalid-datalayout24.ll
Modified:
    llvm/trunk/lib/IR/DataLayout.cpp

Modified: llvm/trunk/lib/IR/DataLayout.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/DataLayout.cpp?rev=230940&r1=230939&r2=230940&view=diff
==============================================================================
--- llvm/trunk/lib/IR/DataLayout.cpp (original)
+++ llvm/trunk/lib/IR/DataLayout.cpp Mon Mar  2 03:35:03 2015
@@ -405,6 +405,10 @@ DataLayout::setAlignment(AlignTypeEnum a
     report_fatal_error("Invalid ABI alignment, must be a 16bit integer");
   if (!isUInt<16>(pref_align))
     report_fatal_error("Invalid preferred alignment, must be a 16bit integer");
+  if (abi_align != 0 && !isPowerOf2_64(abi_align))
+    report_fatal_error("Invalid ABI alignment, must be a power of 2");
+  if (pref_align != 0 && !isPowerOf2_64(pref_align))
+    report_fatal_error("Invalid preferred alignment, must be a power of 2");
 
   if (pref_align < abi_align)
     report_fatal_error(

Added: llvm/trunk/test/Assembler/invalid-datalayout23.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-datalayout23.ll?rev=230940&view=auto
==============================================================================
--- llvm/trunk/test/Assembler/invalid-datalayout23.ll (added)
+++ llvm/trunk/test/Assembler/invalid-datalayout23.ll Mon Mar  2 03:35:03 2015
@@ -0,0 +1,6 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+target datalayout = "i32:24:32"
+
+; CHECK: Invalid ABI alignment, must be a power of 2
+

Added: llvm/trunk/test/Assembler/invalid-datalayout24.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/invalid-datalayout24.ll?rev=230940&view=auto
==============================================================================
--- llvm/trunk/test/Assembler/invalid-datalayout24.ll (added)
+++ llvm/trunk/test/Assembler/invalid-datalayout24.ll Mon Mar  2 03:35:03 2015
@@ -0,0 +1,6 @@
+; RUN: not llvm-as < %s 2>&1 | FileCheck %s
+
+target datalayout = "i32:32:24"
+
+; CHECK: Invalid preferred alignment, must be a power of 2
+