Merge pull request #7845 from devreal/stack-fixes

Fix unexpected optimizations detected by STACK

Author: awlauria

ompi/mca/hook/comm_method/hook_comm_method_fns.c

@@ -789,8 +789,7 @@ ompi_report_comm_methods(int called_from_location) // 1 = from init, 2 = from fi
                     if (majority_method_offhost == -1) {
                         majority_method_offhost = this_method;
                     }
-                    if (majority_method_offhost != -1 &&
-                        this_method != majority_method_offhost)
+                    if (this_method != majority_method_offhost)
                     {
                         uniformity_offhost = 0;
                     }

ompi/mca/osc/rdma/osc_rdma_accumulate.c

@@ -241,10 +241,8 @@ static inline int ompi_osc_rdma_gacc_contig (ompi_osc_rdma_sync_t *sync, const v
             return ompi_osc_rdma_put_contig (sync, peer, target_address, target_handle, ptr, len, request);
         }
 
-        if (request) {
-            /* nothing more to do for this request */
-            ompi_osc_rdma_request_complete (request, MPI_SUCCESS);
-        }
+        /* nothing more to do for this request */
+        ompi_osc_rdma_request_complete (request, MPI_SUCCESS);
 
         return OMPI_SUCCESS;
     }

ompi/mca/osc/ucx/osc_ucx_component.c

@@ -538,21 +538,16 @@ static int component_select(struct ompi_win_t *win, void **base, size_t size, in
 error:
     if (module->disp_units) free(module->disp_units);
     if (module->comm) ompi_comm_free(&module->comm);
-    /* We update the modules count and (if need) registering a callback right
-     * prior to memory allocation for the module.
-     * So we use it as an indirect sign here
-     */
-    if (module) {
-        free(module);
-        ompi_osc_ucx_unregister_progress();
-    }
+    free(module);
 
 error_nomem:
     if (env_initialized == true) {
         opal_common_ucx_wpool_finalize(mca_osc_ucx_component.wpool);
         OBJ_DESTRUCT(&mca_osc_ucx_component.requests);
         mca_osc_ucx_component.env_initialized = false;
     }
+
+    ompi_osc_ucx_unregister_progress();
     return ret;
 }
 

ompi/mca/topo/treematch/treematch/tm_malloc.c

@@ -210,12 +210,13 @@ void *tm_realloc(void *old_ptr, size_t size, char *file, int line){
 }
 
 void tm_free(void *ptr){
-  byte *original_ptr = ((byte *)ptr) - EXTRA_BYTE;
+  byte *original_ptr;
   size_t size;
 
   if(!ptr)
     return;
 
+  original_ptr = ((byte *)ptr) - EXTRA_BYTE;
   size = retreive_size(original_ptr);
 
   if((bcmp(original_ptr ,extra_data, EXTRA_BYTE)) && ((tm_get_verbose_level()>=ERROR))){