From 78a469d93fdc8dd4e29c2a578e27fee977f27624 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Fri, 9 Jul 2021 17:13:51 -0700 Subject: [PATCH] Removing constant eval tests as NVCC/NVRTC don't exhibit this problem --- .../broken_constant_eval.pass.cpp | 35 ------------------- .../utilities.general/nothing_to_do.pass.cpp | 13 ------- 2 files changed, 48 deletions(-) delete mode 100644 .upstream-tests/test/std/utilities/utilities.general/broken_constant_eval.pass.cpp delete mode 100644 .upstream-tests/test/std/utilities/utilities.general/nothing_to_do.pass.cpp diff --git a/.upstream-tests/test/std/utilities/utilities.general/broken_constant_eval.pass.cpp b/.upstream-tests/test/std/utilities/utilities.general/broken_constant_eval.pass.cpp deleted file mode 100644 index d88f12524c..0000000000 --- a/.upstream-tests/test/std/utilities/utilities.general/broken_constant_eval.pass.cpp +++ /dev/null @@ -1,35 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// 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 test serves as a canary for when this issue is fixed in NVCC -// -// UNSUPPORTED: windows, icc, pgi -// XFAIL: clang-9 && c++11 -// XFAIL: clang-10 && c++11 -// gcc 10.0 is expected to pass, but later versions do not. -// XFAIL: gcc-10 && c++11 - - -#if defined(__has_builtin) -#if __has_builtin(__builtin_is_constant_evaluated) -#define BUILTIN_CONSTANT_EVAL() __builtin_is_constant_evaluated() -#endif -#endif - -#ifndef BUILTIN_CONSTANT_EVAL -#define BUILTIN_CONSTANT_EVAL() true -#endif - -__device__ __host__ inline constexpr bool constant_eval() { - return BUILTIN_CONSTANT_EVAL(); -} - -int main(int, char**) { - static_assert(constant_eval(), ""); - return 0; -} diff --git a/.upstream-tests/test/std/utilities/utilities.general/nothing_to_do.pass.cpp b/.upstream-tests/test/std/utilities/utilities.general/nothing_to_do.pass.cpp deleted file mode 100644 index 1f764da05d..0000000000 --- a/.upstream-tests/test/std/utilities/utilities.general/nothing_to_do.pass.cpp +++ /dev/null @@ -1,13 +0,0 @@ -//===----------------------------------------------------------------------===// -// -// 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 -// -//===----------------------------------------------------------------------===// - -int main(int, char**) -{ - - return 0; -}