diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-29 17:38:42 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-29 17:38:42 +0000 |
| commit | 7d18094813401ee56d4d97c88595db82b29b60f4 (patch) | |
| tree | fb461f55ace71f247d069846725363af72ff3abe /clang/test/Parser/pragma-attribute.cpp | |
| parent | e9d85264ac4cdf505c7497612d3fe7630590c52f (diff) | |
| download | bcm5719-llvm-7d18094813401ee56d4d97c88595db82b29b60f4.tar.gz bcm5719-llvm-7d18094813401ee56d4d97c88595db82b29b60f4.zip | |
Revert "Revert "Support for groups of attributes in #pragma clang attribute""
This reverts commit r345487, which reverted r345486. I think the crashes were
caused by an OOM on the builder, trying again to confirm...
llvm-svn: 345517
Diffstat (limited to 'clang/test/Parser/pragma-attribute.cpp')
| -rw-r--r-- | clang/test/Parser/pragma-attribute.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/test/Parser/pragma-attribute.cpp b/clang/test/Parser/pragma-attribute.cpp index bf14319fc55..c4ae2056fb9 100644 --- a/clang/test/Parser/pragma-attribute.cpp +++ b/clang/test/Parser/pragma-attribute.cpp @@ -100,11 +100,12 @@ void function(); #pragma clang attribute push(__attribute__((annotate("test"))), apply_to = any( variable(unless(is_parameter)), variable(unless(is_parameter)) )) // expected-error {{duplicate attribute subject matcher 'variable(unless(is_parameter))'}} #pragma clang attribute push(__attribute__((annotate("test"))), apply_to = any( variable(unless(is_parameter)), variable(unless(is_parameter)), enum, variable(unless(is_parameter)) )) // expected-error 2 {{duplicate attribute subject matcher 'variable(unless(is_parameter))'}} -#pragma clang attribute // expected-error {{expected 'push' or 'pop' after '#pragma clang attribute'}} -#pragma clang attribute 42 // expected-error {{expected 'push' or 'pop' after '#pragma clang attribute'}} +#pragma clang attribute // expected-error {{expected 'push', 'pop', or '(' after '#pragma clang attribute'}} +#pragma clang attribute 42 // expected-error {{expected 'push', 'pop', or '(' after '#pragma clang attribute'}} #pragma clang attribute pushpop // expected-error {{unexpected argument 'pushpop' to '#pragma clang attribute'; expected 'push' or 'pop'}} -#pragma clang attribute push // expected-error {{expected '('}} +#pragma clang attribute push +#pragma clang attribute pop #pragma clang attribute push ( // expected-error {{expected an attribute after '('}} #pragma clang attribute push (__attribute__((annotate)) // expected-error {{expected ')'}} #pragma clang attribute push () // expected-error {{expected an attribute after '('}} |
