diff options
| author | Douglas Gregor <dgregor@apple.com> | 2013-05-02 23:15:45 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2013-05-02 23:15:45 +0000 |
| commit | 33ebfe36e59dbc75a5f7ae28d59381ad478f460b (patch) | |
| tree | a196bbabea5e86b50f46027143a9516c06202ce5 /clang/test | |
| parent | 076b7fc6084342c7c4c2e05b1775e001216a914c (diff) | |
| download | bcm5719-llvm-33ebfe36e59dbc75a5f7ae28d59381ad478f460b.tar.gz bcm5719-llvm-33ebfe36e59dbc75a5f7ae28d59381ad478f460b.zip | |
Revert r180970; it's causing breakage.
llvm-svn: 180972
Diffstat (limited to 'clang/test')
| -rw-r--r-- | clang/test/SemaObjC/format-arg-attribute.m | 2 | ||||
| -rw-r--r-- | clang/test/SemaTemplate/attributes.cpp | 22 |
2 files changed, 2 insertions, 22 deletions
diff --git a/clang/test/SemaObjC/format-arg-attribute.m b/clang/test/SemaObjC/format-arg-attribute.m index dede433f37a..6edb8fd99b3 100644 --- a/clang/test/SemaObjC/format-arg-attribute.m +++ b/clang/test/SemaObjC/format-arg-attribute.m @@ -14,7 +14,7 @@ union u1 { int i; } __attribute__((format_arg(1))); // expected-warning {{'form enum e1 { E1V0 } __attribute__((format_arg(1))); // expected-warning {{'format_arg' attribute only applies to functions}} extern NSString *ff3 (const NSString *) __attribute__((format_arg(3-2))); -extern NSString *ff4 (const NSString *) __attribute__((format_arg(foo))); // expected-error {{use of undeclared identifier 'foo'}} +extern NSString *ff4 (const NSString *) __attribute__((format_arg(foo))); // expected-error {{attribute takes one argument}} /* format_arg formats must take and return a string. */ extern NSString *fi0 (int) __attribute__((format_arg(1))); // expected-error {{format argument not a string type}} diff --git a/clang/test/SemaTemplate/attributes.cpp b/clang/test/SemaTemplate/attributes.cpp index 5a06a706aa8..495f4a7ad38 100644 --- a/clang/test/SemaTemplate/attributes.cpp +++ b/clang/test/SemaTemplate/attributes.cpp @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -std=gnu++11 -fsyntax-only -verify %s +// RUN: %clang_cc1 -fsyntax-only -verify %s namespace attribute_aligned { template<int N> @@ -18,26 +18,6 @@ namespace attribute_aligned { check_alignment<2>::t c2; check_alignment<3>::t c3; // expected-note 2 {{in instantiation}} check_alignment<4>::t c4; - - template<unsigned Size, unsigned Align> - class my_aligned_storage - { - __attribute__((align(Align))) char storage[Size]; - }; - - template<typename T> - class C { - public: - C() { - static_assert(sizeof(t) == sizeof(T), "my_aligned_storage size wrong"); - static_assert(alignof(t) == alignof(T), "my_aligned_storage align wrong"); // expected-warning{{'alignof' applied to an expression is a GNU extension}} - } - - private: - my_aligned_storage<sizeof(T), alignof(T)> t; - }; - - C<double> cd; } namespace PR9049 { |
