[Openmp-commits] [PATCH] D30404: Assertion failure when 'proclist' is used without 'explicit' in KMP_AFFINITY

[Jonathan Peyton via Phabricator via Openmp-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL297480: Fix assertion failure when 'proclist' is used without 'explicit' in KMP_AFFINITY (authored by jlpeyton).

Changed prior to commit:
  https://reviews.llvm.org/D30404?vs=89873&id=91367#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D30404

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


Index: openmp/trunk/runtime/src/kmp_settings.cpp
===================================================================
--- openmp/trunk/runtime/src/kmp_settings.cpp
+++ openmp/trunk/runtime/src/kmp_settings.cpp
@@ -2240,9 +2240,12 @@
     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 );


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30404.91367.patch
Type: text/x-patch
Size: 816 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20170310/48605399/attachment.bin>