aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2013-05-02 23:15:45 +0000
committerDouglas Gregor <dgregor@apple.com>2013-05-02 23:15:45 +0000
commitfa5f03052bc39d9c8f2fa8b4002597a8219760a4 (patch)
tree959f9cebb4a939a426b72fd52f2aa66605c048fc /test
parent3796d1539a39b999fd50bed7aea726ef6f845e17 (diff)
Revert r180970; it's causing breakage.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@180972 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
-rw-r--r--test/SemaObjC/format-arg-attribute.m2
-rw-r--r--test/SemaTemplate/attributes.cpp22
2 files changed, 2 insertions, 22 deletions
diff --git a/test/SemaObjC/format-arg-attribute.m b/test/SemaObjC/format-arg-attribute.m
index dede433f37..6edb8fd99b 100644
--- a/test/SemaObjC/format-arg-attribute.m
+++ b/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/test/SemaTemplate/attributes.cpp b/test/SemaTemplate/attributes.cpp
index 5a06a706aa..495f4a7ad3 100644
--- a/test/SemaTemplate/attributes.cpp
+++ b/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 {