Author: void Date: Mon Aug 4 13:28:36 2014 New Revision: 214743 URL: http://llvm.org/viewvc/llvm-project?rev=214743&view=rev Log: 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. ------------------------------------------------------------------------ Added: cfe/branches/release_35/test/SemaCXX/atomic-type.cpp - copied unchanged from r214369, cfe/trunk/test/SemaCXX/atomic-type.cpp Removed: cfe/branches/release_35/test/SemaCXX/atomic-type.cxx Modified: cfe/branches/release_35/ (props changed) Propchange: cfe/branches/release_35/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 4 13:28:36 2014 @@ -1,4 +1,4 @@ /cfe/branches/type-system-rewrite:134693-134817 -/cfe/trunk:213609,213611,213613,213741,213840,213902,213912,213993,213998,214008,214050,214208,214471 +/cfe/trunk:213609,213611,213613,213741,213840,213902,213912,213993,213998,214008,214050,214208,214369,214390,214471 /cfe/trunk/test:170344 /cfe/trunk/test/SemaTemplate:126920 Removed: cfe/branches/release_35/test/SemaCXX/atomic-type.cxx URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/test/SemaCXX/atomic-type.cxx?rev=214742&view=auto ============================================================================== --- cfe/branches/release_35/test/SemaCXX/atomic-type.cxx (original) +++ cfe/branches/release_35/test/SemaCXX/atomic-type.cxx (removed) @@ -1,58 +0,0 @@ -// RUN: %clang_cc1 -verify -pedantic %s - -template<typename T> struct atomic { - _Atomic(T) value; - - void f() _Atomic; // expected-error {{expected ';' at end of declaration list}} -}; - -template<typename T> struct user { - struct inner { char n[sizeof(T)]; }; - atomic<inner> i; -}; - -user<int> u; - -// Test overloading behavior of atomics. -struct A { }; - -int &ovl1(_Atomic(int)); -int &ovl1(_Atomic int); // ok, redeclaration -long &ovl1(_Atomic(long)); -float &ovl1(_Atomic(float)); -double &ovl1(_Atomic(A const *const *)); -double &ovl1(A const *const *_Atomic); -short &ovl1(_Atomic(A **)); - -void test_overloading(int i, float f, _Atomic(int) ai, _Atomic(float) af, - long l, _Atomic(long) al, A const *const *acc, - A const ** ac, A **a) { - int& ir1 = ovl1(i); - int& ir2 = ovl1(ai); - long& lr1 = ovl1(l); - long& lr2 = ovl1(al); - float &fr1 = ovl1(f); - float &fr2 = ovl1(af); - double &dr1 = ovl1(acc); - double &dr2 = ovl1(ac); - short &sr1 = ovl1(a); -} - -typedef int (A::*fp)() _Atomic; // expected-error {{expected ';' after top level declarator}} expected-warning {{does not declare anything}} - -typedef _Atomic(int(A::*)) atomic_mem_ptr_to_int; -typedef int(A::*_Atomic atomic_mem_ptr_to_int); - -typedef _Atomic(int)(A::*mem_ptr_to_atomic_int); -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 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 &'}} - -struct S { - _Atomic union { int n; }; // expected-warning {{anonymous union cannot be '_Atomic'}} -}; _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits