[llvm-branch-commits] [cfe-branch] r333569 - Merging r326173:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 30 11:06:17 2018
New Revision: 333569

URL: http://llvm.org/viewvc/llvm-project?rev=333569&view=rev
Log:
Merging r326173:

------------------------------------------------------------------------
r326173 | mstorsjo | 2018-02-26 22:27:06 -0800 (Mon, 26 Feb 2018) | 17 lines

[RecordLayout] Don't align to non-power-of-2 sizes when using -mms-bitfields

When targeting GNU/MinGW for i386, the size of the "long double" data
type is 12 bytes (while it is 8 bytes in MSVC). When building
with -mms-bitfields to have struct layouts match MSVC, data types
are laid out in a struct with alignment according to their size.
However, this doesn't make sense for the long double type, since
it doesn't match MSVC at all, and aligning to a non-power-of-2
size triggers other asserts later.

This matches what GCC does, aligning a long double to 4 bytes
in structs on i386 even when -mms-bitfields is specified.

This fixes asserts when using the max_align_t data type when
building for MinGW/i386 with the -mms-bitfields flag.

Differential Revision: https://reviews.llvm.org/D43734
------------------------------------------------------------------------

Modified:
    cfe/branches/release_60/lib/AST/RecordLayoutBuilder.cpp
    cfe/branches/release_60/test/CodeGen/mingw-long-double.c

Modified: cfe/branches/release_60/lib/AST/RecordLayoutBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/lib/AST/RecordLayoutBuilder.cpp?rev=333569&r1=333568&r2=333569&view=diff
==============================================================================
--- cfe/branches/release_60/lib/AST/RecordLayoutBuilder.cpp (original)
+++ cfe/branches/release_60/lib/AST/RecordLayoutBuilder.cpp Wed May 30 11:06:17 2018
@@ -1751,7 +1751,12 @@ void ItaniumRecordLayoutBuilder::LayoutF
       QualType T = Context.getBaseElementType(D->getType());
       if (const BuiltinType *BTy = T->getAs<BuiltinType>()) {
         CharUnits TypeSize = Context.getTypeSizeInChars(BTy);
-        if (TypeSize > FieldAlign)
+        assert(
+            (llvm::isPowerOf2_64(TypeSize.getQuantity()) ||
+             Context.getTargetInfo().getTriple().isWindowsGNUEnvironment()) &&
+            "Non PowerOf2 size outside of GNU mode");
+        if (TypeSize > FieldAlign &&
+            llvm::isPowerOf2_64(TypeSize.getQuantity()))
           FieldAlign = TypeSize;
       }
     }

Modified: cfe/branches/release_60/test/CodeGen/mingw-long-double.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_60/test/CodeGen/mingw-long-double.c?rev=333569&r1=333568&r2=333569&view=diff
==============================================================================
--- cfe/branches/release_60/test/CodeGen/mingw-long-double.c (original)
+++ cfe/branches/release_60/test/CodeGen/mingw-long-double.c Wed May 30 11:06:17 2018
@@ -1,5 +1,7 @@
 // RUN: %clang_cc1 -triple i686-windows-gnu -emit-llvm -o - %s \
 // RUN:    | FileCheck %s --check-prefix=GNU32
+// RUN: %clang_cc1 -triple i686-windows-gnu -emit-llvm -o - %s -mms-bitfields \
+// RUN:    | FileCheck %s --check-prefix=GNU32
 // RUN: %clang_cc1 -triple x86_64-windows-gnu -emit-llvm -o - %s \
 // RUN:    | FileCheck %s --check-prefix=GNU64
 // RUN: %clang_cc1 -triple x86_64-windows-msvc -emit-llvm -o - %s \