Merge pull request #7421 from hjelmn/osc_rdma_fix_one_more_issue_with_nondebug_builds_because_assert_is_optd_out

hjelmn · web-flow · commit a0567b51bad6 · 2020-02-18T20:25:23.000-08:00
osc/rdma: fix bug in attach for non-debug builds
diff --git a/ompi/mca/osc/rdma/osc_rdma_dynamic.c b/ompi/mca/osc/rdma/osc_rdma_dynamic.c
@@ -261,8 +261,8 @@ int ompi_osc_rdma_attach (struct ompi_win_t *win, void *base, size_t len)
         rdma_region_handle->btl_handle = NULL;
     }
 
-    assert(OMPI_SUCCESS == ompi_osc_rdma_add_attachment (rdma_region_handle, (intptr_t) base, len));
-
+    ret = ompi_osc_rdma_add_attachment (rdma_region_handle, (intptr_t) base, len);
+    assert(OMPI_SUCCESS == ret);
     module->dynamic_handles[region_index] = rdma_region_handle;
 
 #if OPAL_ENABLE_DEBUG

Original file line number	Diff line number	Diff line change
`@@ -261,8 +261,8 @@ int ompi_osc_rdma_attach (struct ompi_win_t win, void base, size_t len)`
`261`	`261`	`rdma_region_handle->btl_handle = NULL;`
`262`	`262`	`}`
`263`	`263`
`264`		`- assert(OMPI_SUCCESS == ompi_osc_rdma_add_attachment (rdma_region_handle, (intptr_t) base, len));`
`265`		`-`
	`264`	`+ ret = ompi_osc_rdma_add_attachment (rdma_region_handle, (intptr_t) base, len);`
	`265`	`+ assert(OMPI_SUCCESS == ret);`
`266`	`266`	`module->dynamic_handles[region_index] = rdma_region_handle;`
`267`	`267`
`268`	`268`	`#if OPAL_ENABLE_DEBUG`