diff options
| author | Alexander Monakov <amonakov@ispras.ru> | 2022-10-26 16:37:34 +0300 |
|---|---|---|
| committer | Alexander Monakov <amonakov@ispras.ru> | 2022-10-26 19:30:15 +0300 |
| commit | 82e629c26647313be406c41a01e6868cfad0f289 (patch) | |
| tree | ff0d62590400d9a5e5a13e378903882d06659c6a | |
| parent | a87819b8f1b890d36a3f05bd9de80be20e9525dd (diff) | |
| download | gcc-82e629c26647313be406c41a01e6868cfad0f289.zip gcc-82e629c26647313be406c41a01e6868cfad0f289.tar.gz gcc-82e629c26647313be406c41a01e6868cfad0f289.tar.bz2 | |
ipa-visibility: remove assert in TLS optimization [PR107353]
When upgrading TLS access model based on optimized symbol visibility
status, we attempted to assert that recomputing the model would not
weaken it. It turns out that C, C++, and Fortran front-ends all can
(unintentionally) assign a stronger model than what can be derived
from the declaration.
Let's act conservatively instead of asserting, at least as long as
such pre-existing issues remain.
gcc/ChangeLog:
PR other/107353
* ipa-visibility.cc (function_and_variable_visibility):
Conditionally upgrade TLS model instead of asserting.
| -rw-r--r-- | gcc/ipa-visibility.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/ipa-visibility.cc b/gcc/ipa-visibility.cc index 3ed2b7c..238f7eb 100644 --- a/gcc/ipa-visibility.cc +++ b/gcc/ipa-visibility.cc @@ -886,8 +886,12 @@ function_and_variable_visibility (bool whole_program) && vnode->ref_list.referring.length ()) { enum tls_model new_model = decl_default_tls_model (decl); - gcc_checking_assert (new_model >= decl_tls_model (decl)); - set_decl_tls_model (decl, new_model); + STATIC_ASSERT (TLS_MODEL_GLOBAL_DYNAMIC < TLS_MODEL_LOCAL_DYNAMIC); + STATIC_ASSERT (TLS_MODEL_INITIAL_EXEC < TLS_MODEL_LOCAL_EXEC); + /* We'd prefer to assert that recomputed model is not weaker than + what the front-end assigned, but cannot: see PR 107353. */ + if (new_model >= decl_tls_model (decl)) + set_decl_tls_model (decl, new_model); } } } |