<div dir="ltr">It is incompatible to i686-linux. See <a href="http://bb.pgr.jp/builders/ninja-x64-msvc-RA-centos6/builds/30654">http://bb.pgr.jp/builders/ninja-x64-msvc-RA-centos6/builds/30654</a> (LLVM_BUILD_32_BITS=ON)</div><br><div class="gmail_quote"><div dir="ltr">On Fri, Oct 21, 2016 at 12:45 AM Benjamin Kramer via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br class="gmail_msg">
Date: Thu Oct 20 10:36:38 2016<br class="gmail_msg">
New Revision: 284736<br class="gmail_msg">
<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=284736&view=rev" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project?rev=284736&view=rev</a><br class="gmail_msg">
Log:<br class="gmail_msg">
[Support] Remove llvm::alignOf now that all uses are gone.<br class="gmail_msg">
<br class="gmail_msg">
Also clean up the legacy hacks for AlignedCharArray. I'm keeping<br class="gmail_msg">
LLVM_ALIGNAS alive for a bit longer because GCC 4.8.0 (which we still<br class="gmail_msg">
support apparently) shipped a buggy alignas(). All other supported<br class="gmail_msg">
compilers have a working alignas.<br class="gmail_msg">
<br class="gmail_msg">
Modified:<br class="gmail_msg">
llvm/trunk/include/llvm/Support/AlignOf.h<br class="gmail_msg">
llvm/trunk/include/llvm/Support/Compiler.h<br class="gmail_msg">
llvm/trunk/unittests/Support/AlignOfTest.cpp<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/Support/AlignOf.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AlignOf.h?rev=284736&r1=284735&r2=284736&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/AlignOf.h?rev=284736&r1=284735&r2=284736&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/Support/AlignOf.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/Support/AlignOf.h Thu Oct 20 10:36:38 2016<br class="gmail_msg">
@@ -7,8 +7,7 @@<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
//<br class="gmail_msg">
-// This file defines the AlignOf function that computes alignments for<br class="gmail_msg">
-// arbitrary types.<br class="gmail_msg">
+// This file defines the AlignedCharArray and AlignedCharArrayUnion classes.<br class="gmail_msg">
//<br class="gmail_msg">
//===----------------------------------------------------------------------===//<br class="gmail_msg">
<br class="gmail_msg">
@@ -17,204 +16,19 @@<br class="gmail_msg">
<br class="gmail_msg">
#include "llvm/Support/Compiler.h"<br class="gmail_msg">
#include <cstddef><br class="gmail_msg">
-#include <type_traits><br class="gmail_msg">
<br class="gmail_msg">
namespace llvm {<br class="gmail_msg">
<br class="gmail_msg">
-namespace detail {<br class="gmail_msg">
-<br class="gmail_msg">
-// For everything other than an abstract class we can calulate alignment by<br class="gmail_msg">
-// building a class with a single character and a member of the given type.<br class="gmail_msg">
-template <typename T, bool = std::is_abstract<T>::value><br class="gmail_msg">
-struct AlignmentCalcImpl {<br class="gmail_msg">
- char x;<br class="gmail_msg">
-#if defined(_MSC_VER)<br class="gmail_msg">
-// Disables "structure was padded due to __declspec(align())" warnings that are<br class="gmail_msg">
-// generated by any class using AlignOf<T> with a manually specified alignment.<br class="gmail_msg">
-// Although the warning is disabled in the LLVM project we need this pragma<br class="gmail_msg">
-// as AlignOf.h is a published support header that's available for use<br class="gmail_msg">
-// out-of-tree, and we would like that to compile cleanly at /W4.<br class="gmail_msg">
-#pragma warning(suppress : 4324)<br class="gmail_msg">
-#endif<br class="gmail_msg">
- T t;<br class="gmail_msg">
-private:<br class="gmail_msg">
- AlignmentCalcImpl() = delete;<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-// Abstract base class helper, this will have the minimal alignment and size<br class="gmail_msg">
-// for any abstract class. We don't even define its destructor because this<br class="gmail_msg">
-// type should never be used in a way that requires it.<br class="gmail_msg">
-struct AlignmentCalcImplBase {<br class="gmail_msg">
- virtual ~AlignmentCalcImplBase() = 0;<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-// When we have an abstract class type, specialize the alignment computation<br class="gmail_msg">
-// engine to create another abstract class that derives from both an empty<br class="gmail_msg">
-// abstract base class and the provided type. This has the same effect as the<br class="gmail_msg">
-// above except that it handles the fact that we can't actually create a member<br class="gmail_msg">
-// of type T.<br class="gmail_msg">
-template <typename T><br class="gmail_msg">
-struct AlignmentCalcImpl<T, true> : AlignmentCalcImplBase, T {<br class="gmail_msg">
- ~AlignmentCalcImpl() override = 0;<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-} // End detail namespace.<br class="gmail_msg">
-<br class="gmail_msg">
-/// AlignOf - A templated class that contains an enum value representing<br class="gmail_msg">
-/// the alignment of the template argument. For example,<br class="gmail_msg">
-/// AlignOf<int>::Alignment represents the alignment of type "int". The<br class="gmail_msg">
-/// alignment calculated is the minimum alignment, and not necessarily<br class="gmail_msg">
-/// the "desired" alignment returned by GCC's __alignof__ (for example). Note<br class="gmail_msg">
-/// that because the alignment is an enum value, it can be used as a<br class="gmail_msg">
-/// compile-time constant (e.g., for template instantiation).<br class="gmail_msg">
-template <typename T><br class="gmail_msg">
-struct AlignOf {<br class="gmail_msg">
-#ifndef _MSC_VER<br class="gmail_msg">
- // Avoid warnings from GCC like:<br class="gmail_msg">
- // comparison between 'enum llvm::AlignOf<X>::<anonymous>' and 'enum<br class="gmail_msg">
- // llvm::AlignOf<Y>::<anonymous>' [-Wenum-compare]<br class="gmail_msg">
- // by using constexpr instead of enum.<br class="gmail_msg">
- // (except on MSVC, since it doesn't support constexpr yet).<br class="gmail_msg">
- static constexpr unsigned Alignment = static_cast<unsigned int>(<br class="gmail_msg">
- sizeof(detail::AlignmentCalcImpl<T>) - sizeof(T));<br class="gmail_msg">
-#else<br class="gmail_msg">
- enum {<br class="gmail_msg">
- Alignment = static_cast<unsigned int>(<br class="gmail_msg">
- sizeof(::llvm::detail::AlignmentCalcImpl<T>) - sizeof(T))<br class="gmail_msg">
- };<br class="gmail_msg">
-#endif<br class="gmail_msg">
- enum { Alignment_GreaterEqual_2Bytes = Alignment >= 2 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_GreaterEqual_4Bytes = Alignment >= 4 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_GreaterEqual_8Bytes = Alignment >= 8 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_GreaterEqual_16Bytes = Alignment >= 16 ? 1 : 0 };<br class="gmail_msg">
-<br class="gmail_msg">
- enum { Alignment_LessEqual_2Bytes = Alignment <= 2 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_LessEqual_4Bytes = Alignment <= 4 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_LessEqual_8Bytes = Alignment <= 8 ? 1 : 0 };<br class="gmail_msg">
- enum { Alignment_LessEqual_16Bytes = Alignment <= 16 ? 1 : 0 };<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-#ifndef _MSC_VER<br class="gmail_msg">
-template <typename T> constexpr unsigned AlignOf<T>::Alignment;<br class="gmail_msg">
-#endif<br class="gmail_msg">
-<br class="gmail_msg">
-/// alignOf - A templated function that returns the minimum alignment of<br class="gmail_msg">
-/// of a type. This provides no extra functionality beyond the AlignOf<br class="gmail_msg">
-/// class besides some cosmetic cleanliness. Example usage:<br class="gmail_msg">
-/// alignOf<int>() returns the alignment of an int.<br class="gmail_msg">
-template <typename T><br class="gmail_msg">
-LLVM_CONSTEXPR inline unsigned alignOf() { return AlignOf<T>::Alignment; }<br class="gmail_msg">
-<br class="gmail_msg">
/// \struct AlignedCharArray<br class="gmail_msg">
/// \brief Helper for building an aligned character array type.<br class="gmail_msg">
///<br class="gmail_msg">
/// This template is used to explicitly build up a collection of aligned<br class="gmail_msg">
-/// character array types. We have to build these up using a macro and explicit<br class="gmail_msg">
-/// specialization to cope with old versions of MSVC and GCC where only an<br class="gmail_msg">
-/// integer literal can be used to specify an alignment constraint. Once built<br class="gmail_msg">
-/// up here, we can then begin to indirect between these using normal C++<br class="gmail_msg">
-/// template parameters.<br class="gmail_msg">
-<br class="gmail_msg">
-// MSVC requires special handling here.<br class="gmail_msg">
-#ifndef _MSC_VER<br class="gmail_msg">
-<br class="gmail_msg">
-#if __has_feature(cxx_alignas)<br class="gmail_msg">
+/// character array types.<br class="gmail_msg">
template<std::size_t Alignment, std::size_t Size><br class="gmail_msg">
struct AlignedCharArray {<br class="gmail_msg">
- alignas(Alignment) char buffer[Size];<br class="gmail_msg">
+ LLVM_ALIGNAS(Alignment) char buffer[Size];<br class="gmail_msg">
};<br class="gmail_msg">
<br class="gmail_msg">
-#elif defined(__GNUC__) || defined(__IBM_ATTRIBUTES)<br class="gmail_msg">
-/// \brief Create a type with an aligned char buffer.<br class="gmail_msg">
-template<std::size_t Alignment, std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray;<br class="gmail_msg">
-<br class="gmail_msg">
-#define LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(x) \<br class="gmail_msg">
- template<std::size_t Size> \<br class="gmail_msg">
- struct AlignedCharArray<x, Size> { \<br class="gmail_msg">
- __attribute__((aligned(x))) char buffer[Size]; \<br class="gmail_msg">
- };<br class="gmail_msg">
-<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(1)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(2)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(4)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(8)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(16)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(32)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(64)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(128)<br class="gmail_msg">
-<br class="gmail_msg">
-#undef LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT<br class="gmail_msg">
-<br class="gmail_msg">
-#else<br class="gmail_msg">
-# error No supported align as directive.<br class="gmail_msg">
-#endif<br class="gmail_msg">
-<br class="gmail_msg">
-#else // _MSC_VER<br class="gmail_msg">
-<br class="gmail_msg">
-/// \brief Create a type with an aligned char buffer.<br class="gmail_msg">
-template<std::size_t Alignment, std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray;<br class="gmail_msg">
-<br class="gmail_msg">
-// We provide special variations of this template for the most common<br class="gmail_msg">
-// alignments because __declspec(align(...)) doesn't actually work when it is<br class="gmail_msg">
-// a member of a by-value function argument in MSVC, even if the alignment<br class="gmail_msg">
-// request is something reasonably like 8-byte or 16-byte. Note that we can't<br class="gmail_msg">
-// even include the declspec with the union that forces the alignment because<br class="gmail_msg">
-// MSVC warns on the existence of the declspec despite the union member forcing<br class="gmail_msg">
-// proper alignment.<br class="gmail_msg">
-<br class="gmail_msg">
-template<std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray<1, Size> {<br class="gmail_msg">
- union {<br class="gmail_msg">
- char aligned;<br class="gmail_msg">
- char buffer[Size];<br class="gmail_msg">
- };<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-template<std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray<2, Size> {<br class="gmail_msg">
- union {<br class="gmail_msg">
- short aligned;<br class="gmail_msg">
- char buffer[Size];<br class="gmail_msg">
- };<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-template<std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray<4, Size> {<br class="gmail_msg">
- union {<br class="gmail_msg">
- int aligned;<br class="gmail_msg">
- char buffer[Size];<br class="gmail_msg">
- };<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-template<std::size_t Size><br class="gmail_msg">
-struct AlignedCharArray<8, Size> {<br class="gmail_msg">
- union {<br class="gmail_msg">
- double aligned;<br class="gmail_msg">
- char buffer[Size];<br class="gmail_msg">
- };<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-<br class="gmail_msg">
-// The rest of these are provided with a __declspec(align(...)) and we simply<br class="gmail_msg">
-// can't pass them by-value as function arguments on MSVC.<br class="gmail_msg">
-<br class="gmail_msg">
-#define LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(x) \<br class="gmail_msg">
- template<std::size_t Size> \<br class="gmail_msg">
- struct AlignedCharArray<x, Size> { \<br class="gmail_msg">
- __declspec(align(x)) char buffer[Size]; \<br class="gmail_msg">
- };<br class="gmail_msg">
-<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(16)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(32)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(64)<br class="gmail_msg">
-LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT(128)<br class="gmail_msg">
-<br class="gmail_msg">
-#undef LLVM_ALIGNEDCHARARRAY_TEMPLATE_ALIGNMENT<br class="gmail_msg">
-<br class="gmail_msg">
-#endif // _MSC_VER<br class="gmail_msg">
-<br class="gmail_msg">
namespace detail {<br class="gmail_msg">
template <typename T1,<br class="gmail_msg">
typename T2 = char, typename T3 = char, typename T4 = char,<br class="gmail_msg">
@@ -249,8 +63,8 @@ template <typename T1,<br class="gmail_msg">
typename T5 = char, typename T6 = char, typename T7 = char,<br class="gmail_msg">
typename T8 = char, typename T9 = char, typename T10 = char><br class="gmail_msg">
struct AlignedCharArrayUnion : llvm::AlignedCharArray<<br class="gmail_msg">
- AlignOf<llvm::detail::AlignerImpl<T1, T2, T3, T4, T5,<br class="gmail_msg">
- T6, T7, T8, T9, T10> >::Alignment,<br class="gmail_msg">
+ alignof(llvm::detail::AlignerImpl<T1, T2, T3, T4, T5,<br class="gmail_msg">
+ T6, T7, T8, T9, T10>),<br class="gmail_msg">
sizeof(::llvm::detail::SizerImpl<T1, T2, T3, T4, T5,<br class="gmail_msg">
T6, T7, T8, T9, T10>)> {<br class="gmail_msg">
};<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/include/llvm/Support/Compiler.h<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=284736&r1=284735&r2=284736&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Compiler.h?rev=284736&r1=284735&r2=284736&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/include/llvm/Support/Compiler.h (original)<br class="gmail_msg">
+++ llvm/trunk/include/llvm/Support/Compiler.h Thu Oct 20 10:36:38 2016<br class="gmail_msg">
@@ -325,15 +325,8 @@<br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
/// \macro LLVM_ALIGNAS<br class="gmail_msg">
-/// \brief Used to specify a minimum alignment for a structure or variable. The<br class="gmail_msg">
-/// alignment must be a constant integer. Use LLVM_PTR_SIZE to compute<br class="gmail_msg">
-/// alignments in terms of the size of a pointer.<br class="gmail_msg">
-///<br class="gmail_msg">
-/// Note that __declspec(align) has special quirks, it's not legal to pass a<br class="gmail_msg">
-/// structure with __declspec(align) as a formal parameter.<br class="gmail_msg">
-#ifdef _MSC_VER<br class="gmail_msg">
-# define LLVM_ALIGNAS(x) __declspec(align(x))<br class="gmail_msg">
-#elif __GNUC__ && !__has_feature(cxx_alignas) && !LLVM_GNUC_PREREQ(4, 8, 0)<br class="gmail_msg">
+/// \brief Used to specify a minimum alignment for a structure or variable.<br class="gmail_msg">
+#if __GNUC__ && !__has_feature(cxx_alignas) && !LLVM_GNUC_PREREQ(4, 8, 1)<br class="gmail_msg">
# define LLVM_ALIGNAS(x) __attribute__((aligned(x)))<br class="gmail_msg">
#else<br class="gmail_msg">
# define LLVM_ALIGNAS(x) alignas(x)<br class="gmail_msg">
<br class="gmail_msg">
Modified: llvm/trunk/unittests/Support/AlignOfTest.cpp<br class="gmail_msg">
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/AlignOfTest.cpp?rev=284736&r1=284735&r2=284736&view=diff" rel="noreferrer" class="gmail_msg" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/AlignOfTest.cpp?rev=284736&r1=284735&r2=284736&view=diff</a><br class="gmail_msg">
==============================================================================<br class="gmail_msg">
--- llvm/trunk/unittests/Support/AlignOfTest.cpp (original)<br class="gmail_msg">
+++ llvm/trunk/unittests/Support/AlignOfTest.cpp Thu Oct 20 10:36:38 2016<br class="gmail_msg">
@@ -89,140 +89,31 @@ V6::~V6() {}<br class="gmail_msg">
V7::~V7() {}<br class="gmail_msg">
V8::~V8() {}<br class="gmail_msg">
<br class="gmail_msg">
-struct Abstract1 {<br class="gmail_msg">
- virtual ~Abstract1() {}<br class="gmail_msg">
- virtual void method() = 0;<br class="gmail_msg">
-<br class="gmail_msg">
- char c;<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-struct Abstract2 : Abstract1 {<br class="gmail_msg">
- ~Abstract2() override = default;<br class="gmail_msg">
- double d;<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-struct Final final : Abstract2 {<br class="gmail_msg">
- void method() override {}<br class="gmail_msg">
-};<br class="gmail_msg">
-<br class="gmail_msg">
-// Ensure alignment is a compile-time constant.<br class="gmail_msg">
-char LLVM_ATTRIBUTE_UNUSED test_arr1<br class="gmail_msg">
- [AlignOf<char>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<short>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<int>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<long>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<long long>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<float>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<double>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<long double>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<void *>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<int *>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<double (*)(double)>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<double (S6::*)()>::Alignment > 0];<br class="gmail_msg">
-char LLVM_ATTRIBUTE_UNUSED test_arr2<br class="gmail_msg">
- [AlignOf<A1>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<A2>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<A4>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<A8>::Alignment > 0];<br class="gmail_msg">
-char LLVM_ATTRIBUTE_UNUSED test_arr3<br class="gmail_msg">
- [AlignOf<S1>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<S2>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<S3>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<S4>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<S5>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<S6>::Alignment > 0];<br class="gmail_msg">
-char LLVM_ATTRIBUTE_UNUSED test_arr4<br class="gmail_msg">
- [AlignOf<D1>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D2>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D3>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D4>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D5>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D6>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D7>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D8>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<D9>::Alignment > 0];<br class="gmail_msg">
-char LLVM_ATTRIBUTE_UNUSED test_arr5<br class="gmail_msg">
- [AlignOf<V1>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V2>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V3>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V4>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V5>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V6>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V7>::Alignment > 0]<br class="gmail_msg">
- [AlignOf<V8>::Alignment > 0];<br class="gmail_msg">
-<br class="gmail_msg">
-TEST(AlignOfTest, BasicAlignmentInvariants) {<br class="gmail_msg">
- EXPECT_LE(1u, alignOf<A1>());<br class="gmail_msg">
- EXPECT_LE(2u, alignOf<A2>());<br class="gmail_msg">
- EXPECT_LE(4u, alignOf<A4>());<br class="gmail_msg">
- EXPECT_LE(8u, alignOf<A8>());<br class="gmail_msg">
-<br class="gmail_msg">
- EXPECT_EQ(1u, alignOf<char>());<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<short>());<br class="gmail_msg">
- EXPECT_LE(alignOf<short>(), alignOf<int>());<br class="gmail_msg">
- EXPECT_LE(alignOf<int>(), alignOf<long>());<br class="gmail_msg">
- EXPECT_LE(alignOf<long>(), alignOf<long long>());<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<float>());<br class="gmail_msg">
- EXPECT_LE(alignOf<float>(), alignOf<double>());<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<long double>());<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<void *>());<br class="gmail_msg">
- EXPECT_EQ(alignOf<void *>(), alignOf<int *>());<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<S1>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<S2>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<S3>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<S4>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<S5>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<S6>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D1>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D2>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D3>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D4>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D5>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D6>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D7>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D8>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<D9>());<br class="gmail_msg">
- EXPECT_LE(alignOf<S1>(), alignOf<V1>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V2>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V3>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V4>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V5>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V6>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V7>());<br class="gmail_msg">
- EXPECT_LE(alignOf<V1>(), alignOf<V8>());<br class="gmail_msg">
-<br class="gmail_msg">
- EXPECT_LE(alignOf<char>(), alignOf<Abstract1>());<br class="gmail_msg">
- EXPECT_LE(alignOf<double>(), alignOf<Abstract2>());<br class="gmail_msg">
- EXPECT_LE(alignOf<Abstract2>(), alignOf<Final>());<br class="gmail_msg">
-}<br class="gmail_msg">
-<br class="gmail_msg">
TEST(AlignOfTest, BasicAlignedArray) {<br class="gmail_msg">
- EXPECT_LE(1u, alignOf<AlignedCharArrayUnion<A1> >());<br class="gmail_msg">
- EXPECT_LE(2u, alignOf<AlignedCharArrayUnion<A2> >());<br class="gmail_msg">
- EXPECT_LE(4u, alignOf<AlignedCharArrayUnion<A4> >());<br class="gmail_msg">
- EXPECT_LE(8u, alignOf<AlignedCharArrayUnion<A8> >());<br class="gmail_msg">
+ EXPECT_LE(1u, alignof(AlignedCharArrayUnion<A1>));<br class="gmail_msg">
+ EXPECT_LE(2u, alignof(AlignedCharArrayUnion<A2>));<br class="gmail_msg">
+ EXPECT_LE(4u, alignof(AlignedCharArrayUnion<A4>));<br class="gmail_msg">
+ EXPECT_LE(8u, alignof(AlignedCharArrayUnion<A8>));<br class="gmail_msg">
<br class="gmail_msg">
EXPECT_LE(1u, sizeof(AlignedCharArrayUnion<A1>));<br class="gmail_msg">
EXPECT_LE(2u, sizeof(AlignedCharArrayUnion<A2>));<br class="gmail_msg">
EXPECT_LE(4u, sizeof(AlignedCharArrayUnion<A4>));<br class="gmail_msg">
EXPECT_LE(8u, sizeof(AlignedCharArrayUnion<A8>));<br class="gmail_msg">
<br class="gmail_msg">
- EXPECT_EQ(1u, (alignOf<AlignedCharArrayUnion<A1> >()));<br class="gmail_msg">
- EXPECT_EQ(2u, (alignOf<AlignedCharArrayUnion<A1, A2> >()));<br class="gmail_msg">
- EXPECT_EQ(4u, (alignOf<AlignedCharArrayUnion<A1, A2, A4> >()));<br class="gmail_msg">
- EXPECT_EQ(8u, (alignOf<AlignedCharArrayUnion<A1, A2, A4, A8> >()));<br class="gmail_msg">
+ EXPECT_EQ(1u, (alignof(AlignedCharArrayUnion<A1>)));<br class="gmail_msg">
+ EXPECT_EQ(2u, (alignof(AlignedCharArrayUnion<A1, A2>)));<br class="gmail_msg">
+ EXPECT_EQ(4u, (alignof(AlignedCharArrayUnion<A1, A2, A4>)));<br class="gmail_msg">
+ EXPECT_EQ(8u, (alignof(AlignedCharArrayUnion<A1, A2, A4, A8>)));<br class="gmail_msg">
<br class="gmail_msg">
EXPECT_EQ(1u, sizeof(AlignedCharArrayUnion<A1>));<br class="gmail_msg">
EXPECT_EQ(2u, sizeof(AlignedCharArrayUnion<A1, A2>));<br class="gmail_msg">
EXPECT_EQ(4u, sizeof(AlignedCharArrayUnion<A1, A2, A4>));<br class="gmail_msg">
EXPECT_EQ(8u, sizeof(AlignedCharArrayUnion<A1, A2, A4, A8>));<br class="gmail_msg">
<br class="gmail_msg">
- EXPECT_EQ(1u, (alignOf<AlignedCharArrayUnion<A1[1]> >()));<br class="gmail_msg">
- EXPECT_EQ(2u, (alignOf<AlignedCharArrayUnion<A1[2], A2[1]> >()));<br class="gmail_msg">
- EXPECT_EQ(4u, (alignOf<AlignedCharArrayUnion<A1[42], A2[55],<br class="gmail_msg">
- A4[13]> >()));<br class="gmail_msg">
- EXPECT_EQ(8u, (alignOf<AlignedCharArrayUnion<A1[2], A2[1],<br class="gmail_msg">
- A4, A8> >()));<br class="gmail_msg">
+ EXPECT_EQ(1u, (alignof(AlignedCharArrayUnion<A1[1]>)));<br class="gmail_msg">
+ EXPECT_EQ(2u, (alignof(AlignedCharArrayUnion<A1[2], A2[1]>)));<br class="gmail_msg">
+ EXPECT_EQ(4u, (alignof(AlignedCharArrayUnion<A1[42], A2[55], A4[13]>)));<br class="gmail_msg">
+ EXPECT_EQ(8u, (alignof(AlignedCharArrayUnion<A1[2], A2[1], A4, A8>)));<br class="gmail_msg">
<br class="gmail_msg">
EXPECT_EQ(1u, sizeof(AlignedCharArrayUnion<A1[1]>));<br class="gmail_msg">
EXPECT_EQ(2u, sizeof(AlignedCharArrayUnion<A1[2], A2[1]>));<br class="gmail_msg">
@@ -233,49 +124,47 @@ TEST(AlignOfTest, BasicAlignedArray) {<br class="gmail_msg">
// For other tests we simply assert that the alignment of the union mathes<br class="gmail_msg">
// that of the fundamental type and hope that we have any weird type<br class="gmail_msg">
// productions that would trigger bugs.<br class="gmail_msg">
- EXPECT_EQ(alignOf<char>(), alignOf<AlignedCharArrayUnion<char> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<short>(), alignOf<AlignedCharArrayUnion<short> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<int>(), alignOf<AlignedCharArrayUnion<int> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<long>(), alignOf<AlignedCharArrayUnion<long> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<long long>(),<br class="gmail_msg">
- alignOf<AlignedCharArrayUnion<long long> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<float>(), alignOf<AlignedCharArrayUnion<float> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<double>(), alignOf<AlignedCharArrayUnion<double> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<long double>(),<br class="gmail_msg">
- alignOf<AlignedCharArrayUnion<long double> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<void *>(), alignOf<AlignedCharArrayUnion<void *> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<int *>(), alignOf<AlignedCharArrayUnion<int *> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<double (*)(double)>(),<br class="gmail_msg">
- alignOf<AlignedCharArrayUnion<double (*)(double)> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<double (S6::*)()>(),<br class="gmail_msg">
- alignOf<AlignedCharArrayUnion<double (S6::*)()> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S1>(), alignOf<AlignedCharArrayUnion<S1> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S2>(), alignOf<AlignedCharArrayUnion<S2> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S3>(), alignOf<AlignedCharArrayUnion<S3> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S4>(), alignOf<AlignedCharArrayUnion<S4> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S5>(), alignOf<AlignedCharArrayUnion<S5> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<S6>(), alignOf<AlignedCharArrayUnion<S6> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D1>(), alignOf<AlignedCharArrayUnion<D1> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D2>(), alignOf<AlignedCharArrayUnion<D2> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D3>(), alignOf<AlignedCharArrayUnion<D3> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D4>(), alignOf<AlignedCharArrayUnion<D4> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D5>(), alignOf<AlignedCharArrayUnion<D5> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D6>(), alignOf<AlignedCharArrayUnion<D6> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D7>(), alignOf<AlignedCharArrayUnion<D7> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D8>(), alignOf<AlignedCharArrayUnion<D8> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<D9>(), alignOf<AlignedCharArrayUnion<D9> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V1>(), alignOf<AlignedCharArrayUnion<V1> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V2>(), alignOf<AlignedCharArrayUnion<V2> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V3>(), alignOf<AlignedCharArrayUnion<V3> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V4>(), alignOf<AlignedCharArrayUnion<V4> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V5>(), alignOf<AlignedCharArrayUnion<V5> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V6>(), alignOf<AlignedCharArrayUnion<V6> >());<br class="gmail_msg">
- EXPECT_EQ(alignOf<V7>(), alignOf<AlignedCharArrayUnion<V7> >());<br class="gmail_msg">
+ EXPECT_EQ(alignof(char), alignof(AlignedCharArrayUnion<char>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(short), alignof(AlignedCharArrayUnion<short>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(int), alignof(AlignedCharArrayUnion<int>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(long), alignof(AlignedCharArrayUnion<long>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(long long), alignof(AlignedCharArrayUnion<long long>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(float), alignof(AlignedCharArrayUnion<float>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(double), alignof(AlignedCharArrayUnion<double>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(long double), alignof(AlignedCharArrayUnion<long double>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(void *), alignof(AlignedCharArrayUnion<void *>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(int *), alignof(AlignedCharArrayUnion<int *>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(double (*)(double)),<br class="gmail_msg">
+ alignof(AlignedCharArrayUnion<double (*)(double)>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(double (S6::*)()),<br class="gmail_msg">
+ alignof(AlignedCharArrayUnion<double (S6::*)()>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S1), alignof(AlignedCharArrayUnion<S1>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S2), alignof(AlignedCharArrayUnion<S2>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S3), alignof(AlignedCharArrayUnion<S3>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S4), alignof(AlignedCharArrayUnion<S4>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S5), alignof(AlignedCharArrayUnion<S5>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(S6), alignof(AlignedCharArrayUnion<S6>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D1), alignof(AlignedCharArrayUnion<D1>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D2), alignof(AlignedCharArrayUnion<D2>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D3), alignof(AlignedCharArrayUnion<D3>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D4), alignof(AlignedCharArrayUnion<D4>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D5), alignof(AlignedCharArrayUnion<D5>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D6), alignof(AlignedCharArrayUnion<D6>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D7), alignof(AlignedCharArrayUnion<D7>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D8), alignof(AlignedCharArrayUnion<D8>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(D9), alignof(AlignedCharArrayUnion<D9>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V1), alignof(AlignedCharArrayUnion<V1>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V2), alignof(AlignedCharArrayUnion<V2>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V3), alignof(AlignedCharArrayUnion<V3>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V4), alignof(AlignedCharArrayUnion<V4>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V5), alignof(AlignedCharArrayUnion<V5>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V6), alignof(AlignedCharArrayUnion<V6>));<br class="gmail_msg">
+ EXPECT_EQ(alignof(V7), alignof(AlignedCharArrayUnion<V7>));<br class="gmail_msg">
<br class="gmail_msg">
// Some versions of MSVC get this wrong somewhat disturbingly. The failure<br class="gmail_msg">
- // appears to be benign: alignOf<V8>() produces a preposterous value: 12<br class="gmail_msg">
+ // appears to be benign: alignof(V8) produces a preposterous value: 12<br class="gmail_msg">
#ifndef _MSC_VER<br class="gmail_msg">
- EXPECT_EQ(alignOf<V8>(), alignOf<AlignedCharArrayUnion<V8> >());<br class="gmail_msg">
+ EXPECT_EQ(alignof(V8), alignof(AlignedCharArrayUnion<V8>));<br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
EXPECT_EQ(sizeof(char), sizeof(AlignedCharArrayUnion<char>));<br class="gmail_msg">
@@ -343,11 +232,11 @@ TEST(AlignOfTest, BasicAlignedArray) {<br class="gmail_msg">
EXPECT_EQ(sizeof(V8), sizeof(AlignedCharArrayUnion<V8>));<br class="gmail_msg">
#endif<br class="gmail_msg">
<br class="gmail_msg">
- EXPECT_EQ(1u, (alignOf<AlignedCharArray<1, 1> >()));<br class="gmail_msg">
- EXPECT_EQ(2u, (alignOf<AlignedCharArray<2, 1> >()));<br class="gmail_msg">
- EXPECT_EQ(4u, (alignOf<AlignedCharArray<4, 1> >()));<br class="gmail_msg">
- EXPECT_EQ(8u, (alignOf<AlignedCharArray<8, 1> >()));<br class="gmail_msg">
- EXPECT_EQ(16u, (alignOf<AlignedCharArray<16, 1> >()));<br class="gmail_msg">
+ EXPECT_EQ(1u, (alignof(AlignedCharArray<1, 1>)));<br class="gmail_msg">
+ EXPECT_EQ(2u, (alignof(AlignedCharArray<2, 1>)));<br class="gmail_msg">
+ EXPECT_EQ(4u, (alignof(AlignedCharArray<4, 1>)));<br class="gmail_msg">
+ EXPECT_EQ(8u, (alignof(AlignedCharArray<8, 1>)));<br class="gmail_msg">
+ EXPECT_EQ(16u, (alignof(AlignedCharArray<16, 1>)));<br class="gmail_msg">
<br class="gmail_msg">
EXPECT_EQ(1u, sizeof(AlignedCharArray<1, 1>));<br class="gmail_msg">
EXPECT_EQ(7u, sizeof(AlignedCharArray<1, 7>));<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
_______________________________________________<br class="gmail_msg">
llvm-commits mailing list<br class="gmail_msg">
<a href="mailto:llvm-commits@lists.llvm.org" class="gmail_msg" target="_blank">llvm-commits@lists.llvm.org</a><br class="gmail_msg">
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" class="gmail_msg" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br class="gmail_msg">
</blockquote></div>