core: fix the updating of total_memory in hwloc_topology_insert_group_object()

Objects might get merged, update the remaining one, not the original one.

If merged with another group, there's no need to save total_memory during the merge
because we'll recompute it in hwloc_topology_insert_group_object() anyway.

Fixes 577b327

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

hwloc/topology.c

@@ -646,7 +646,6 @@ hwloc_replace_linked_object(hwloc_obj_t old, hwloc_obj_t new)
   new->memory_first_child = old->memory_first_child;
   new->io_first_child = old->io_first_child;
   new->misc_first_child = old->misc_first_child;
-  new->total_memory = old->total_memory;
   /* copy new contents to old now that tree pointers are OK */
   memcpy(old, new, sizeof(*old));
   /* clear new to that we may free it */
@@ -2025,11 +2024,11 @@ hwloc_topology_insert_group_object(struct hwloc_topology *topology, hwloc_obj_t
     return NULL;
 
   /* Compute group total_memory. */
-  obj->total_memory = 0;
-  for_each_child(child, obj)
-    obj->total_memory += child->total_memory;
-  for_each_memory_child(child, obj)
-    obj->total_memory += child->total_memory;
+  res->total_memory = 0;
+  for_each_child(child, res)
+    res->total_memory += child->total_memory;
+  for_each_memory_child(child, res)
+    res->total_memory += child->total_memory;
 
   hwloc_propagate_symmetric_subtree(topology, topology->levels[0][0]);
   hwloc_set_group_depth(topology);