From: Jonathan Peyton <jonathan.l.peyton@intel.com>
Date: Wed, 30 Mar 2016 21:50:59 +0000 (+0000)
Subject: Fix bug when KMP_USE_ADAPTIVE_LOCKS is 0
X-Git-Tag: llvmorg-3.9.0-rc1~10462
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d46d979a9822239b1d30e8acb70726a69487be1;p=platform%2Fupstream%2Fllvm.git

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
---

diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp
index 205e5c9..3f9382f 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);