From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 4 Aug 2014 18:28:36 +0000 (+0000)
Subject: Merging r214369:
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31c3814ef301549599411769eec7a2a73ece112b;p=clang

Merging r214369:
------------------------------------------------------------------------
r214369 | rsmith | 2014-07-30 17:22:56 -0700 (Wed, 30 Jul 2014) | 2 lines

Rename this test so that it actually runs, and fix it so that it passes.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_35@214743 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/SemaCXX/atomic-type.cxx b/test/SemaCXX/atomic-type.cpp
similarity index 91%
rename from test/SemaCXX/atomic-type.cxx
rename to test/SemaCXX/atomic-type.cpp
index 947bb3c5f4..f522d92f39 100644
--- a/test/SemaCXX/atomic-type.cxx
+++ b/test/SemaCXX/atomic-type.cpp
@@ -48,7 +48,7 @@ typedef _Atomic int(A::*mem_ptr_to_atomic_int);
 
 typedef _Atomic(int)&atomic_int_ref;
 typedef _Atomic int &atomic_int_ref;
-typedef _Atomic atomic_int_ref atomic_int_ref; // ok, qualifiers on references ignored in this case.
+typedef _Atomic atomic_int_ref atomic_int_ref; // expected-warning {{'_Atomic' qualifier on reference type 'atomic_int_ref' (aka '_Atomic(int) &') has no effect}}
 
 typedef int &_Atomic atomic_reference_to_int; // expected-error {{'_Atomic' qualifier may not be applied to a reference}}
 typedef _Atomic(int &) atomic_reference_to_int; // expected-error {{_Atomic cannot be applied to reference type 'int &'}}