Author: epilk Date: Wed Mar 13 11:30:59 2019 New Revision: 356075 URL: http://llvm.org/viewvc/llvm-project?rev=356075&view=rev Log: [Parse] Parse '#pragma clang attribute' as an external-declaration
Previously, we parsed it only in the top level, which excludes namespaces and extern "C" blocks. rdar://problem/48818890 Differential revision: https://reviews.llvm.org/D59282 Added: cfe/trunk/test/Parser/pragma-attribute-context.cpp Modified: cfe/trunk/lib/Parse/Parser.cpp Modified: cfe/trunk/lib/Parse/Parser.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=356075&r1=356074&r2=356075&view=diff ============================================================================== --- cfe/trunk/lib/Parse/Parser.cpp (original) +++ cfe/trunk/lib/Parse/Parser.cpp Wed Mar 13 11:30:59 2019 @@ -583,10 +583,6 @@ bool Parser::ParseTopLevelDecl(DeclGroup ConsumeAnnotationToken(); return false; - case tok::annot_pragma_attribute: - HandlePragmaAttribute(); - return false; - case tok::eof: // Late template parsing can begin. if (getLangOpts().DelayedTemplateParsing) @@ -698,6 +694,9 @@ Parser::ParseExternalDeclaration(ParsedA case tok::annot_pragma_dump: HandlePragmaDump(); return nullptr; + case tok::annot_pragma_attribute: + HandlePragmaAttribute(); + return nullptr; case tok::semi: // Either a C++11 empty-declaration or attribute-declaration. SingleDecl = Added: cfe/trunk/test/Parser/pragma-attribute-context.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/pragma-attribute-context.cpp?rev=356075&view=auto ============================================================================== --- cfe/trunk/test/Parser/pragma-attribute-context.cpp (added) +++ cfe/trunk/test/Parser/pragma-attribute-context.cpp Wed Mar 13 11:30:59 2019 @@ -0,0 +1,34 @@ +// RUN: %clang_cc1 -verify -std=c++11 %s +// RUN: %clang_cc1 -xobjective-c++ -verify -std=c++11 %s + +#define BEGIN_PRAGMA _Pragma("clang attribute push (__attribute__((availability(macos, introduced=1000))), apply_to=function)") +#define END_PRAGMA _Pragma("clang attribute pop") + +extern "C" { +BEGIN_PRAGMA +int f(); // expected-note{{'f' has been marked as being introduced in macOS 1000 here}} +END_PRAGMA +} + +namespace my_ns { +BEGIN_PRAGMA +int g(); // expected-note{{'g' has been marked as being introduced in macOS 1000 here}} +END_PRAGMA +namespace nested { +BEGIN_PRAGMA +int h(); // expected-note{{'h' has been marked as being introduced in macOS 1000 here}} +END_PRAGMA +} +} + +int a = f(); // expected-warning{{'f' is only available on macOS 1000 or newer}} expected-note{{annotate 'a'}} +int b = my_ns::g(); // expected-warning{{'g' is only available on macOS 1000 or newer}} expected-note{{annotate 'b'}} +int c = my_ns::nested::h(); // expected-warning{{'h' is only available on macOS 1000 or newer}} expected-note{{annotate 'c'}} + +struct InStruct { + // FIXME: This asserts in Objective-C++! + // FIXME: This is a horrible diagnostic! +#ifndef __OBJC__ + BEGIN_PRAGMA // expected-error {{expected member name or ';' after declaration specifiers}} +#endif +}; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits