From 92a2e1bbb900cb0ba24ed2d441baebff0ce88988 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Sat, 27 Jul 2019 01:59:23 +0000 Subject: [PATCH] Revert "[ARM] Set default alignment to 64bits" This reverts commit r367119. This broke several bots: http://lab.llvm.org:8011/builders/clang-atom-d525-fedora-rel/builds/26891/steps/ninja%20check%201/logs/FAIL%3A%20Clang%3A%3Aexception-alignment.cpp http://green.lab.llvm.org/green/job/clang-stage1-cmake-RA-incremental/245/consoleFull llvm-svn: 367166 --- clang/lib/Basic/Targets/ARM.cpp | 3 +-- clang/test/CodeGen/ARM/exception-alignment.cpp | 19 ------------------- clang/test/SemaCXX/warn-overaligned-type-thrown.cpp | 3 +-- 3 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 clang/test/CodeGen/ARM/exception-alignment.cpp diff --git a/clang/lib/Basic/Targets/ARM.cpp b/clang/lib/Basic/Targets/ARM.cpp index 3ae2091..c6834b9 100644 --- a/clang/lib/Basic/Targets/ARM.cpp +++ b/clang/lib/Basic/Targets/ARM.cpp @@ -309,9 +309,8 @@ ARMTargetInfo::ARMTargetInfo(const llvm::Triple &Triple, setAtomic(); // Maximum alignment for ARM NEON data types should be 64-bits (AAPCS) - // as well the default alignment if (IsAAPCS && (Triple.getEnvironment() != llvm::Triple::Android)) - DefaultAlignForAttributeAligned = MaxVectorAlign = 64; + MaxVectorAlign = 64; // Do force alignment of members that follow zero length bitfields. If // the alignment of the zero-length bitfield is greater than the member diff --git a/clang/test/CodeGen/ARM/exception-alignment.cpp b/clang/test/CodeGen/ARM/exception-alignment.cpp deleted file mode 100644 index 24efbd8..0000000 --- a/clang/test/CodeGen/ARM/exception-alignment.cpp +++ /dev/null @@ -1,19 +0,0 @@ -// Bug: https://bugs.llvm.org/show_bug.cgi?id=42668 -// REQUIRES: arm-registered-target -// RUN: %clang --target=arm-arm-none-eabi -march=armv8-a -S -emit-llvm -Os -o - %s | FileCheck --check-prefixes=CHECK,A8 %s -// RUN: %clang --target=arm-linux-androideabi -march=armv8-a -S -emit-llvm -Os -o - %s | FileCheck --check-prefixes=CHECK,A16 %s -// CHECK: [[E:%[A-z0-9]+]] = tail call i8* @__cxa_allocate_exception -// CHECK-NEXT: [[BC:%[A-z0-9]+]] = bitcast i8* [[E]] to <2 x i64>* -// A8-NEXT: store <2 x i64> , <2 x i64>* [[BC]], align 8 -// A16-NEXT: store <2 x i64> , <2 x i64>* [[BC]], align 16 -#include - -int main(void) { - try { - throw vld1q_u64(((const uint64_t[2]){1, 2})); - } catch (uint64x2_t exc) { - return 0; - } - return 1; -} - diff --git a/clang/test/SemaCXX/warn-overaligned-type-thrown.cpp b/clang/test/SemaCXX/warn-overaligned-type-thrown.cpp index d746844..0801017 100644 --- a/clang/test/SemaCXX/warn-overaligned-type-thrown.cpp +++ b/clang/test/SemaCXX/warn-overaligned-type-thrown.cpp @@ -2,12 +2,11 @@ // RUN: %clang_cc1 -triple arm64-apple-ios10 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions -DUNDERALIGNED %s // RUN: %clang_cc1 -triple arm64-apple-tvos10 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions -DUNDERALIGNED %s // RUN: %clang_cc1 -triple arm64-apple-watchos4 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions -DUNDERALIGNED %s -// RUN: %clang_cc1 -triple arm-linux-gnueabi -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions -DUNDERALIGNED %s // RUN: %clang_cc1 -triple x86_64-apple-macosx10.14 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple arm64-apple-ios12 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple arm64-apple-tvos12 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple arm64-apple-watchos5 -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s -// RUN: %clang_cc1 -triple arm-linux-androideabi -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s +// RUN: %clang_cc1 -triple arm-linux-gnueabi -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple aarch64-linux-gnueabi -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple mipsel-linux-gnu -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s // RUN: %clang_cc1 -triple mips64el-linux-gnu -verify -fsyntax-only -std=c++11 -fcxx-exceptions -fexceptions %s -- 2.7.4