commit 99f4668e1969a0a688044433803b3e7797391688
author Garret Rieger <grieger@google.com> Thu Sep 29 19:39:59 2022 +0000
committer Behdad Esfahbod <behdad@behdad.org> Fri Sep 30 10:58:50 2022 -0600
tree 20ea0546c32e2f7a1b59e3a700f457d991a43aa2
parent 8f1bf23cc9a8912c452f7571e2a3f35a192a8120

[repacker] use mutable copies of Coverage/ClassDef in MarkBasePos shrink operation.

Also make mutable copies (when needed) of the top level subtables during a split operation.

src/graph/graph.hh

diff --git a/src/graph/graph.hh b/src/graph/graph.hh
index e4a5d40..79c7e69 100644
--- a/src/graph/graph.hh
+++ b/src/graph/graph.hh
@@ -496,6 +496,12 @@
   }
 
   template <typename T, typename ...Ts>
+  vertex_and_table_t<T> as_mutable_table (unsigned parent, const void* offset, Ts... ds)
+  {
+    return as_table_from_index<T> (mutable_index_for_offset (parent, offset), std::forward<Ts>(ds)...);
+  }
+
+  template <typename T, typename ...Ts>
   vertex_and_table_t<T> as_table_from_index (unsigned index, Ts... ds)
   {
     if (index >= vertices_.length)
@@ -833,7 +839,20 @@
    * parent to the clone. The copy is a shallow copy, objects
    * linked from child are not duplicated.
    */
-  bool duplicate (unsigned parent_idx, unsigned child_idx)
+  unsigned duplicate_if_shared (unsigned parent_idx, unsigned child_idx)
+  {
+    unsigned new_idx = duplicate (parent_idx, child_idx);
+    if (new_idx == (unsigned) -1) return child_idx;
+    return new_idx;
+  }
+
+
+  /*
+   * Creates a copy of child and re-assigns the link from
+   * parent to the clone. The copy is a shallow copy, objects
+   * linked from child are not duplicated.
+   */
+  unsigned duplicate (unsigned parent_idx, unsigned child_idx)
   {
     update_parents ();
 
@@ -849,7 +868,7 @@
       // to child are from parent.
       DEBUG_MSG (SUBSET_REPACK, nullptr, "  Not duplicating %d => %d",
                  parent_idx, child_idx);
-      return false;
+      return -1;
     }
 
     DEBUG_MSG (SUBSET_REPACK, nullptr, "  Duplicating %d => %d",
@@ -869,7 +888,7 @@
       reassign_link (l, parent_idx, clone_idx);
     }
 
-    return true;
+    return clone_idx;
   }