mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-18 19:16:43 +00:00
Code Issues Projects Releases Wiki Activity

Guard init_priority attribute within libc++

Browse Source 
Not all platforms support priority attribute. I'm moving conditional definition of this attribute to `include/__config`.

Reviewed By: #libc, aaron.ballman

Differential Revision: https://reviews.llvm.org/D91565
This commit is contained in:
Zbigniew Sarbinowski 2020-11-20 14:46:21 -05:00 committed by Abhina Sreeskantharajan
parent 9211da4215
commit 2c7e24c4b6
6 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Basic/Attr.td
View File

@ -381,6 +381,9 @@ def TargetELF : TargetSpec {
let ObjectFormats = ["ELF"];
}
def TargetSupportsInitPriority : TargetSpec {
let CustomCode = [{ !Target.getTriple().isOSzOS() }];
}
// Attribute subject match rules that are used for #pragma clang attribute.
//
// A instance of AttrSubjectMatcherRule represents an individual match rule.
@ -2221,7 +2224,7 @@ def WorkGroupSizeHint : InheritableAttr {
let Documentation = [Undocumented];
}
def InitPriority : InheritableAttr {
def InitPriority : InheritableAttr, TargetSpecificAttr<TargetSupportsInitPriority> {
let Spellings = [GCC<"init_priority", /*AllowInC*/0>];
let Args = [UnsignedArgument<"Priority">];
let Subjects = SubjectList<[Var], ErrorDiag>;

2
clang/include/clang/Basic/AttrDocs.td
View File

@ -79,7 +79,7 @@ relative ordering of values is important. For example:
initialization being the opposite.
This attribute is only supported for C++ and Objective-C++ and is ignored in
other language modes.
other language modes. Currently, this attribute is not implemented on z/OS.
}];
}

22
clang/test/SemaCXX/init-priority-attr.cpp
View File

@ -1,5 +1,7 @@
// RUN: %clang_cc1 -fsyntax-only -verify %s
// RUN: %clang_cc1 -fsyntax-only -DSYSTEM -verify %s
// RUN: %clang_cc1 -triple=x86_64-unknown-unknown -fsyntax-only -verify %s
// RUN: %clang_cc1 -triple=x86_64-unknown-unknown -fsyntax-only -DSYSTEM -verify %s
// RUN: %clang_cc1 -triple=s390x-none-zos -fsyntax-only -verify=unknown %s
// RUN: %clang_cc1 -triple=s390x-none-zos -fsyntax-only -DSYSTEM -verify=unknown-system %s
#if defined(SYSTEM)
#5 "init-priority-attr.cpp" 3 // system header
@ -23,25 +25,35 @@ extern Two coo[];
extern Two koo[];
Two foo __attribute__((init_priority(101))) ( 5, 6 );
// unknown-system-no-diagnostics
// unknown-warning@-2 {{unknown attribute 'init_priority' ignored}}
Two goo __attribute__((init_priority(2,3))) ( 5, 6 ); // expected-error {{'init_priority' attribute takes one argument}}
// unknown-warning@-1 {{unknown attribute 'init_priority' ignored}}
Two coo[2] __attribute__((init_priority(100)));
#if !defined(SYSTEM)
// expected-error@-2 {{'init_priority' attribute requires integer constant between 101 and 65535 inclusive}}
// expected-error@-2 {{'init_priority' attribute requires integer constant between 101 and 65535 inclusive}}
// unknown-warning@-3 {{unknown attribute 'init_priority' ignored}}
#endif
Two boo[2] __attribute__((init_priority(65536)));
#if !defined(SYSTEM)
// expected-error@-2 {{'init_priority' attribute requires integer constant between 101 and 65535 inclusive}}
// expected-error@-2 {{'init_priority' attribute requires integer constant between 101 and 65535 inclusive}}
// unknown-warning@-3 {{unknown attribute 'init_priority' ignored}}
#endif
Two koo[4] __attribute__((init_priority(1.13))); // expected-error {{'init_priority' attribute requires an integer constant}}
// unknown-warning@-1 {{unknown attribute 'init_priority' ignored}}
Two func() __attribute__((init_priority(1001))); // expected-error {{'init_priority' attribute only applies to variables}}
// unknown-warning@-1 {{unknown attribute 'init_priority' ignored}}
int i __attribute__((init_priority(1001))); // expected-error {{can only use 'init_priority' attribute on file-scope definitions of objects of class type}}
// unknown-warning@-1 {{unknown attribute 'init_priority' ignored}}
int main() {
Two foo __attribute__((init_priority(1001))); // expected-error {{can only use 'init_priority' attribute on file-scope definitions of objects of class type}}
Two foo __attribute__((init_priority(1001))); // expected-error {{can only use 'init_priority' attribute on file-scope definitions of objects of class type}}
// unknown-warning@-1 {{unknown attribute 'init_priority' ignored}}
}

6
libcxx/include/__config
View File

@ -1421,6 +1421,12 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
#define _LIBCPP_HAS_NO_FGETPOS_FSETPOS
#endif
#if __has_attribute(init_priority)
# define _LIBCPP_INIT_PRIORITY_MAX __attribute__((init_priority(101)))
#else
# define _LIBCPP_INIT_PRIORITY_MAX
#endif
#endif // __cplusplus
#endif // _LIBCPP_CONFIG

10
libcxx/src/experimental/memory_resource.cpp
View File

@ -76,16 +76,6 @@ union ResourceInitHelper {
~ResourceInitHelper() {}
};
// Detect if the init_priority attribute is supported.
#if (defined(_LIBCPP_COMPILER_GCC) && defined(__APPLE__)) \
|| defined(_LIBCPP_COMPILER_MSVC)
// GCC on Apple doesn't support the init priority attribute,
// and MSVC doesn't support any GCC attributes.
# define _LIBCPP_INIT_PRIORITY_MAX
#else
# define _LIBCPP_INIT_PRIORITY_MAX __attribute__((init_priority(101)))
#endif
// When compiled in C++14 this initialization should be a constant expression.
// Only in C++11 is "init_priority" needed to ensure initialization order.
#if _LIBCPP_STD_VER > 11

2
libcxx/src/iostream.cpp
View File

@ -77,7 +77,7 @@ __asm__("?wclog@" _LIBCPP_ABI_NAMESPACE_STR "@std@@3V?$basic_ostream@_WU?$char_t
#endif
;
_LIBCPP_HIDDEN ios_base::Init __start_std_streams __attribute__((init_priority(101)));
_LIBCPP_HIDDEN ios_base::Init __start_std_streams _LIBCPP_INIT_PRIORITY_MAX;
// On Windows the TLS storage for locales needs to be initialized before we create
// the standard streams, otherwise it may not be alive during program termination