From bb835ac64d80b19e086dadcbac52654723a6b938 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Tue, 15 Nov 2016 19:15:57 +0000 Subject: [PATCH] [CUDA] Mark __libcpp_{isnan,isinf,isfinite} as constexpr. Summary: This makes these functions available on host and device, which is necessary to compile for the device. Reviewers: hfinkel, EricWF Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D25403 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@287012 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/cmath | 12 ++++---- .../numerics/c.math/constexpr-fns.pass.cpp | 29 +++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) create mode 100644 test/libcxx/numerics/c.math/constexpr-fns.pass.cpp diff --git a/include/cmath b/include/cmath index 725515ea4..724935623 100644 --- a/include/cmath +++ b/include/cmath @@ -554,7 +554,7 @@ hypot(_A1 __lcpp_x, _A2 __lcpp_y, _A3 __lcpp_z) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT { #if __has_builtin(__builtin_isnan) @@ -566,7 +566,7 @@ __libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT { return isnan(__lcpp_x); @@ -574,7 +574,7 @@ __libcpp_isnan(_A1 __lcpp_x) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT { #if __has_builtin(__builtin_isinf) @@ -586,7 +586,7 @@ __libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT { return isinf(__lcpp_x); @@ -594,7 +594,7 @@ __libcpp_isinf(_A1 __lcpp_x) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT { #if __has_builtin(__builtin_isfinite) @@ -606,7 +606,7 @@ __libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT template _LIBCPP_ALWAYS_INLINE -typename enable_if::value, bool>::type +_LIBCPP_CONSTEXPR typename enable_if::value, bool>::type __libcpp_isfinite(_A1 __lcpp_x) _NOEXCEPT { return isfinite(__lcpp_x); diff --git a/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp b/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp new file mode 100644 index 000000000..92b91036a --- /dev/null +++ b/test/libcxx/numerics/c.math/constexpr-fns.pass.cpp @@ -0,0 +1,29 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// Check that the overloads of std::__libcpp_{isnan,isinf,isfinite} that take +// floating-point values are evaluatable from constexpr contexts. +// +// These functions need to be constexpr in order to be called from CUDA, see +// https://reviews.llvm.org/D25403. They don't actually need to be +// constexpr-evaluatable, but that's what we check here, since we can't check +// true constexpr-ness. +// +// UNSUPPORTED: c++98, c++03 + +#include + +constexpr bool a = std::__libcpp_isnan(0.); +constexpr bool b = std::__libcpp_isinf(0.0); +constexpr bool c = std::__libcpp_isfinite(0.0); + +int main() +{ + return 0; +}