Author: tnorthover Date: Mon Nov 2 13:32:23 2015 New Revision: 251821 URL: http://llvm.org/viewvc/llvm-project?rev=251821&view=rev Log: Fix va_arg on watchOS.
As in other contexts, alignments can go up to 16 bytes in a va_list. Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp cfe/trunk/test/CodeGen/armv7k-abi.c Modified: cfe/trunk/lib/CodeGen/TargetInfo.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/TargetInfo.cpp?rev=251821&r1=251820&r2=251821&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/TargetInfo.cpp (original) +++ cfe/trunk/lib/CodeGen/TargetInfo.cpp Mon Nov 2 13:32:23 2015 @@ -5301,6 +5301,10 @@ Address ARMABIInfo::EmitVAArg(CodeGenFun getABIKind() == ARMABIInfo::AAPCS) { TyAlignForABI = std::max(TyAlignForABI, CharUnits::fromQuantity(4)); TyAlignForABI = std::min(TyAlignForABI, CharUnits::fromQuantity(8)); + } else if (getABIKind() == ARMABIInfo::AAPCS16_VFP) { + // ARMv7k allows type alignment up to 16 bytes. + TyAlignForABI = std::max(TyAlignForABI, CharUnits::fromQuantity(4)); + TyAlignForABI = std::min(TyAlignForABI, CharUnits::fromQuantity(16)); } else { TyAlignForABI = CharUnits::fromQuantity(4); } Modified: cfe/trunk/test/CodeGen/armv7k-abi.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/armv7k-abi.c?rev=251821&r1=251820&r2=251821&view=diff ============================================================================== --- cfe/trunk/test/CodeGen/armv7k-abi.c (original) +++ cfe/trunk/test/CodeGen/armv7k-abi.c Mon Nov 2 13:32:23 2015 @@ -1,4 +1,6 @@ -// RUN: %clang_cc1 -triple thumbv7k-apple-watchos2.0 -target-abi aapcs16 %s -o - -emit-llvm | FileCheck %s +// RUN: %clang_cc1 -triple thumbv7k-apple-watchos2.0 -target-abi aapcs16 -target-cpu cortex-a7 %s -o - -emit-llvm | FileCheck %s + +#include <arm_neon.h> // Make sure 64 and 128 bit types are naturally aligned by the v7k ABI: @@ -80,9 +82,12 @@ typedef struct { // CHECK: define [2 x i32] @return_oddly_sized_struct() OddlySizedStruct return_oddly_sized_struct() {} -// CHECK: define double @test_va_arg(i8* %l) -// CHECK: load double, double* -double test_va_arg(__builtin_va_list l) { - return __builtin_va_arg(l, double); +// CHECK: define <4 x float> @test_va_arg_vec(i8* %l) +// CHECK: [[ALIGN_TMP:%.*]] = add i32 {{%.*}}, 15 +// CHECK: [[ALIGNED:%.*]] = and i32 [[ALIGN_TMP]], -16 +// CHECK: [[ALIGNED_I8:%.*]] = inttoptr i32 [[ALIGNED]] to i8* +// CHECK: [[ALIGNED_VEC:%.*]] = bitcast i8* [[ALIGNED_I8]] to <4 x float> +// CHECK: load <4 x float>, <4 x float>* [[ALIGNED_VEC]], align 16 +float32x4_t test_va_arg_vec(__builtin_va_list l) { + return __builtin_va_arg(l, float32x4_t); } - _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits