[PATCH] D15656: Fix build error: OMPT_SUPPORT=true was not tested after locking changes were made

[Jonathan Peyton via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL256314: Fix build error: OMPT_SUPPORT=true was not tested after hinted lock changes (authored by jlpeyton).

Changed prior to commit:
  http://reviews.llvm.org/D15656?vs=43279&id=43499#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D15656

Files:
  openmp/trunk/runtime/src/kmp_csupport.c

Index: openmp/trunk/runtime/src/kmp_csupport.c
===================================================================
--- openmp/trunk/runtime/src/kmp_csupport.c
+++ openmp/trunk/runtime/src/kmp_csupport.c
@@ -2202,6 +2202,12 @@
     __kmp_itt_lock_acquired((kmp_user_lock_p)user_lock);
 #endif
 
+#if OMPT_SUPPORT && OMPT_TRACE
+    if (ompt_enabled) {
+        // missing support here: need to know whether acquired first or not
+    }
+#endif
+
 #else // KMP_USE_DYNAMIC_LOCK
     int acquire_status;
     kmp_user_lock_p lck;
@@ -2230,7 +2236,6 @@
 #if USE_ITT_BUILD
     __kmp_itt_lock_acquired( lck );
 #endif /* USE_ITT_BUILD */
-#endif // KMP_USE_DYNAMIC_LOCK
 
 #if OMPT_SUPPORT && OMPT_TRACE
     if (ompt_enabled) {
@@ -2243,6 +2248,8 @@
         }
     }
 #endif
+
+#endif // KMP_USE_DYNAMIC_LOCK
 }
 
 void


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D15656.43499.patch
Type: text/x-patch
Size: 817 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20151223/49d38369/attachment.bin>