Index: test/profile/Inputs/instrprof-merge-match.c =================================================================== --- test/profile/Inputs/instrprof-merge-match.c +++ test/profile/Inputs/instrprof-merge-match.c @@ -1,6 +1,7 @@ #include #include #include +#include "../profile_test.h" int __llvm_profile_runtime = 0; uint64_t __llvm_profile_get_size_for_buffer(void); @@ -20,7 +21,7 @@ int main(int argc, const char *argv[]) { const uint64_t MaxSize = 10000; - static char Buffer[MaxSize]; + static char ALIGNED(sizeof(uint64_t)) Buffer[MaxSize]; uint64_t Size = __llvm_profile_get_size_for_buffer(); if (Size > MaxSize) Index: test/profile/instrprof-merge.c =================================================================== --- test/profile/instrprof-merge.c +++ test/profile/instrprof-merge.c @@ -8,6 +8,7 @@ #include #include #include +#include "profile_test.h" int __llvm_profile_runtime = 0; uint64_t __llvm_profile_get_size_for_buffer(void); @@ -41,7 +42,7 @@ return 1; const uint64_t MaxSize = 10000; - static char Buffer[MaxSize]; + static ALIGNED(sizeof(uint64_t)) char Buffer[MaxSize]; uint64_t Size = __llvm_profile_get_size_for_buffer(); if (Size > MaxSize) Index: test/profile/profile_test.h =================================================================== --- /dev/null +++ test/profile/profile_test.h @@ -0,0 +1,20 @@ +//===-- profile_test.h.h ----------------------------------------*- C++ -*-===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// +// +// This file contains definitions for the profile tests. +//===----------------------------------------------------------------------===// +#ifndef PROFILE_TEST_H +#define PROFILE_TEST_H + +#if defined(_MSC_VER) +# define ALIGNED(x) __declspec(align(x)) +#else // _MSC_VER +# define ALIGNED(x) __attribute__((aligned(x))) +#endif + +#endif // PROFILE_TEST_H