Author: Martin Storsjö Date: 2020-11-26T10:09:32+02:00 New Revision: 6b429668ded1aa7de4d586fc6dc8a469799b4d9c
URL: https://github.com/llvm/llvm-project/commit/6b429668ded1aa7de4d586fc6dc8a469799b4d9c DIFF: https://github.com/llvm/llvm-project/commit/6b429668ded1aa7de4d586fc6dc8a469799b4d9c.diff LOG: [OpenMP][OMPT] Fix building with OMPT disabled after 6d3b81664a4b79 Added: Modified: openmp/runtime/src/ompt-specific.h Removed: ################################################################################ diff --git a/openmp/runtime/src/ompt-specific.h b/openmp/runtime/src/ompt-specific.h index 49aa6451f603..18816e7337c1 100644 --- a/openmp/runtime/src/ompt-specific.h +++ b/openmp/runtime/src/ompt-specific.h @@ -109,6 +109,26 @@ inline void ompt_set_thread_state(kmp_info_t *thread, ompt_state_t state) { inline const char *ompt_get_runtime_version() { return &__kmp_version_lib_ver[KMP_VERSION_MAGIC_LEN]; } + +class OmptReturnAddressGuard { +private: + bool SetAddress{false}; + int Gtid; + +public: + OmptReturnAddressGuard(int Gtid, void *ReturnAddress) : Gtid(Gtid) { + if (ompt_enabled.enabled && Gtid >= 0 && __kmp_threads[Gtid] && + !__kmp_threads[Gtid]->th.ompt_thread_info.return_address) { + SetAddress = true; + __kmp_threads[Gtid]->th.ompt_thread_info.return_address = ReturnAddress; + } + } + ~OmptReturnAddressGuard() { + if (SetAddress) + __kmp_threads[Gtid]->th.ompt_thread_info.return_address = NULL; + } +}; + #endif // OMPT_SUPPORT // macros providing the OMPT callbacks for reduction clause @@ -135,23 +155,4 @@ inline const char *ompt_get_runtime_version() { #define OMPT_REDUCTION_END #endif // ! OMPT_SUPPORT && OMPT_OPTIONAL -class OmptReturnAddressGuard { -private: - bool SetAddress{false}; - int Gtid; - -public: - OmptReturnAddressGuard(int Gtid, void *ReturnAddress) : Gtid(Gtid) { - if (ompt_enabled.enabled && Gtid >= 0 && __kmp_threads[Gtid] && - !__kmp_threads[Gtid]->th.ompt_thread_info.return_address) { - SetAddress = true; - __kmp_threads[Gtid]->th.ompt_thread_info.return_address = ReturnAddress; - } - } - ~OmptReturnAddressGuard() { - if (SetAddress) - __kmp_threads[Gtid]->th.ompt_thread_info.return_address = NULL; - } -}; - #endif _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
