remove some confusion about MPI_T_BIND_NO_OBJECT

hppritcha · hppritcha · commit dbb5e031d454 · 2025-07-29T11:42:20.000-06:00
Signed-off-by: Howard Pritchard &lt;howardp@lanl.gov&gt;
diff --git a/ompi/mpi/tool/cvar_handle_alloc.c b/ompi/mpi/tool/cvar_handle_alloc.c
@@ -43,12 +43,7 @@ int MPI_T_cvar_handle_alloc (int cvar_index, void *obj_handle,
         return MPI_T_ERR_INVALID;
     }
 
-    /*
-     * we allow NULL since many existing tests (both ompi and mpich) pass NULL
-     * for this argument.
-     */
-
-    if ((NULL != obj_handle) && (MPI_T_BIND_NO_OBJECT != obj_handle)) {
+    if (NULL != obj_handle) {
         if (ompit_obj_invalid(obj_handle)) {
             return MPI_T_ERR_INVALID_HANDLE;
         }
diff --git a/ompi/mpi/tool/pvar_handle_alloc.c b/ompi/mpi/tool/pvar_handle_alloc.c
@@ -39,11 +39,7 @@ int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,
         return MPI_T_ERR_NOT_INITIALIZED;
     }
 
-    /*
-     * we allow NULL since many existing tests (both ompi and mpich) pass NULL
-     * for this argument.
-     */
-    if ((NULL != obj_handle) && (MPI_T_BIND_NO_OBJECT != obj_handle)) {
+    if (NULL != obj_handle) {
         if (ompit_obj_invalid(obj_handle)) {
             return MPI_T_ERR_INVALID_HANDLE;
         }

Original file line number	Diff line number	Diff line change
`@@ -43,12 +43,7 @@ int MPI_T_cvar_handle_alloc (int cvar_index, void *obj_handle,`
`43`	`43`	`return MPI_T_ERR_INVALID;`
`44`	`44`	`}`
`45`	`45`
`46`		`- /*`
`47`		`- * we allow NULL since many existing tests (both ompi and mpich) pass NULL`
`48`		`- * for this argument.`
`49`		`- */`
`50`		`-`
`51`		`- if ((NULL != obj_handle) && (MPI_T_BIND_NO_OBJECT != obj_handle)) {`
	`46`	`+ if (NULL != obj_handle) {`
`52`	`47`	`if (ompit_obj_invalid(obj_handle)) {`
`53`	`48`	`return MPI_T_ERR_INVALID_HANDLE;`
`54`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,11 +39,7 @@ int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index,`
`39`	`39`	`return MPI_T_ERR_NOT_INITIALIZED;`
`40`	`40`	`}`
`41`	`41`
`42`		`- /*`
`43`		`- * we allow NULL since many existing tests (both ompi and mpich) pass NULL`
`44`		`- * for this argument.`
`45`		`- */`
`46`		`- if ((NULL != obj_handle) && (MPI_T_BIND_NO_OBJECT != obj_handle)) {`
	`42`	`+ if (NULL != obj_handle) {`
`47`	`43`	`if (ompit_obj_invalid(obj_handle)) {`
`48`	`44`	`return MPI_T_ERR_INVALID_HANDLE;`
`49`	`45`	`}`