diff options
| author | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2016-03-30 21:50:59 +0000 |
|---|---|---|
| committer | Jonathan Peyton <jonathan.l.peyton@intel.com> | 2016-03-30 21:50:59 +0000 |
| commit | 1d46d979a9822239b1d30e8acb70726a69487be1 (patch) | |
| tree | a452c8e3c50d56951683407533206c33127108d5 | |
| parent | 43d4144d0dd25a0b9ffe73ddb7c18c3f1804dd62 (diff) | |
| download | bcm5719-llvm-1d46d979a9822239b1d30e8acb70726a69487be1.tar.gz bcm5719-llvm-1d46d979a9822239b1d30e8acb70726a69487be1.zip | |
Fix bug when KMP_USE_ADAPTIVE_LOCKS is 0
#endif was one line too low. If KMP_USE_ADAPTIVE_LOCKS is 0,
then queuing locks would incorrectly use drdpa lock mechanism.
This is a fix for https://llvm.org/bugs/show_bug.cgi?id=26649
llvm-svn: 264934
| -rw-r--r-- | openmp/runtime/src/kmp_lock.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp index 205e5c98a3f..3f9382f0d8b 100644 --- a/openmp/runtime/src/kmp_lock.cpp +++ b/openmp/runtime/src/kmp_lock.cpp @@ -3468,8 +3468,8 @@ __kmp_get_user_lock_owner(kmp_user_lock_p lck, kmp_uint32 seq) case lockseq_nested_queuing: #if KMP_USE_ADAPTIVE_LOCKS case lockseq_adaptive: - return __kmp_get_queuing_lock_owner((kmp_queuing_lock_t *)lck); #endif + return __kmp_get_queuing_lock_owner((kmp_queuing_lock_t *)lck); case lockseq_drdpa: case lockseq_nested_drdpa: return __kmp_get_drdpa_lock_owner((kmp_drdpa_lock_t *)lck); |
