[Openmp-commits] [openmp] r297480 - Fix assertion failure when 'proclist' is used without 'explicit' in KMP_AFFINITY

[Jonathan Peyton via Openmp-commits]

Author: jlpeyton
Date: Fri Mar 10 11:22:47 2017
New Revision: 297480

URL: http://llvm.org/viewvc/llvm-project?rev=297480&view=rev
Log:
Fix assertion failure when 'proclist' is used without 'explicit' in KMP_AFFINITY

This change fixes an assertion failure the in case KMP_AFFINITY is set with
'proclist' specified but without 'explicit'
e.g., KMP_AFFINITY=verbose,proclist=[0-31]

Patch by Olga Malysheva

Differential Revision: https://reviews.llvm.org/D30404

Modified:
    openmp/trunk/runtime/src/kmp_settings.cpp

Modified: openmp/trunk/runtime/src/kmp_settings.cpp
URL: http://llvm.org/viewvc/llvm-project/openmp/trunk/runtime/src/kmp_settings.cpp?rev=297480&r1=297479&r2=297480&view=diff
==============================================================================
--- openmp/trunk/runtime/src/kmp_settings.cpp (original)
+++ openmp/trunk/runtime/src/kmp_settings.cpp Fri Mar 10 11:22:47 2017
@@ -2240,9 +2240,12 @@ __kmp_parse_affinity_env( char const * n
     if ( proclist ) {
         if ( ! type ) {
             KMP_WARNING( AffProcListNoType, name );
-            __kmp_affinity_type = affinity_explicit;
+            *out_type = affinity_explicit;
+# if OMP_40_ENABLED
+            __kmp_nested_proc_bind.bind_types[0] = proc_bind_intel;
+# endif
         }
-        else if ( __kmp_affinity_type != affinity_explicit ) {
+        else if ( *out_type != affinity_explicit ) {
             KMP_WARNING( AffProcListNotExplicit, name );
             KMP_ASSERT( *out_proclist != NULL );
             KMP_INTERNAL_FREE( *out_proclist );