From 925faf274c16eada7496f0c76cc50d1293328a70 Mon Sep 17 00:00:00 2001 From: JF Bastien Date: Sat, 26 May 2018 00:13:53 +0000 Subject: [PATCH] Fix GCC handling of ATOMIC_VAR_INIT r333325 from D47225 added warning checks, and the test was written to be C++11 correct by using ATOMIC_VAR_INIT (note that the committee fixed that recently...). It seems like GCC can't handle ATOMIC_VAR_INIT well because it generates 'type 'std::atomic' cannot be initialized with an initializer list' on bot libcxx-libcxxabi-x86_64-linux-ubuntu-cxx03. Drop the ATOMIC_VAR_INITs since they weren't required to test the diagnostics. llvm-svn: 333327 --- libcxx/test/libcxx/atomics/diagnose_nonnull.fail.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcxx/test/libcxx/atomics/diagnose_nonnull.fail.cpp b/libcxx/test/libcxx/atomics/diagnose_nonnull.fail.cpp index a1f6332acd01..98d299bf854d 100644 --- a/libcxx/test/libcxx/atomics/diagnose_nonnull.fail.cpp +++ b/libcxx/test/libcxx/atomics/diagnose_nonnull.fail.cpp @@ -17,8 +17,8 @@ #include int main() { - std::atomic ai = ATOMIC_VAR_INIT(0); - volatile std::atomic vai = ATOMIC_VAR_INIT(0); + std::atomic ai; + volatile std::atomic vai; int i = 42; atomic_is_lock_free((const volatile std::atomic*)0); // expected-error {{null passed to a callee that requires a non-null argument}}