summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2016-06-13 21:33:30 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2016-06-13 21:33:30 +0000
commite1890e12f056622bb8c206e8b1c0e19cbb5ae7e6 (patch)
tree37fcd9110a48f9f781046b097d63b0ce5193b24f
parentc5304aa3c4b29e9fe7314dc73e9dc0f3652be202 (diff)
downloadbcm5719-llvm-e1890e12f056622bb8c206e8b1c0e19cbb5ae7e6.tar.gz
bcm5719-llvm-e1890e12f056622bb8c206e8b1c0e19cbb5ae7e6.zip
Bug fix for Bugzilla bug 26602: Remove function bodies with KMP_ASSERT(0)
Fix for bugzilla https://llvm.org/bugs/show_bug.cgi?id=26602. Removed functions body consisted of the only KMP_ASSERT(0) statement. Thus possible runtime crash converted to compile-time error, which looks preferable (faster possible error detection). TODO: consider C++11 static assert as an alternative, that could make the diagnostics better. Patch by Andrey Churbanov Differential Revision: http://reviews.llvm.org/D21304 llvm-svn: 272590
-rw-r--r--openmp/runtime/src/kmp_dispatch.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/openmp/runtime/src/kmp_dispatch.cpp b/openmp/runtime/src/kmp_dispatch.cpp
index 71c3a40fbb0..c99d51b09b7 100644
--- a/openmp/runtime/src/kmp_dispatch.cpp
+++ b/openmp/runtime/src/kmp_dispatch.cpp
@@ -190,7 +190,7 @@ struct dispatch_shared_info_template {
// test_then_add template (general template should NOT be used)
template< typename T >
static __forceinline T
-test_then_add( volatile T *p, T d ) { KMP_ASSERT(0); };
+test_then_add( volatile T *p, T d );
template<>
__forceinline kmp_int32
@@ -213,7 +213,7 @@ test_then_add< kmp_int64 >( volatile kmp_int64 *p, kmp_int64 d )
// test_then_inc_acq template (general template should NOT be used)
template< typename T >
static __forceinline T
-test_then_inc_acq( volatile T *p ) { KMP_ASSERT(0); };
+test_then_inc_acq( volatile T *p );
template<>
__forceinline kmp_int32
@@ -236,7 +236,7 @@ test_then_inc_acq< kmp_int64 >( volatile kmp_int64 *p )
// test_then_inc template (general template should NOT be used)
template< typename T >
static __forceinline T
-test_then_inc( volatile T *p ) { KMP_ASSERT(0); };
+test_then_inc( volatile T *p );
template<>
__forceinline kmp_int32
@@ -259,7 +259,7 @@ test_then_inc< kmp_int64 >( volatile kmp_int64 *p )
// compare_and_swap template (general template should NOT be used)
template< typename T >
static __forceinline kmp_int32
-compare_and_swap( volatile T *p, T c, T s ) { KMP_ASSERT(0); };
+compare_and_swap( volatile T *p, T c, T s );
template<>
__forceinline kmp_int32
OpenPOWER on IntegriCloud