commit d9d148f876ef05087e93299103249d8fcf06a500
author Stephan Herhut <herhut@google.com> Mon Oct 02 17:00:07 2017 +0200
committer Stephan Herhut <herhut@google.com> Mon Oct 02 17:00:07 2017 +0200
tree 3439c7de92e6c535dba6cc24d38b44dc1ab40c81
parent e2361ece56f846dd3b82bdfcf83f5d4187a28d8c

Commit dex file contents early to free up memory.

This saves a couple GB live heap when writing class-per-file in my extreme
test where we have 1000 classes with 65k string references each.

Bug:
Change-Id: I9e65cacbe7605e009ad9b11f2c2f848ce08f4000

src/main/java/com/android/tools/r8/dex/VirtualFile.java

diff --git a/src/main/java/com/android/tools/r8/dex/VirtualFile.java b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
index b80dbd4..eeb5023 100644
--- a/src/main/java/com/android/tools/r8/dex/VirtualFile.java
+++ b/src/main/java/com/android/tools/r8/dex/VirtualFile.java
@@ -245,6 +245,9 @@
           nameToFileMap.put(nameToFileMap.size(), file);
           file.addClass(clazz);
           files.put(clazz, file);
+          // Commit this early, so that we do not keep the transaction state around longer than
+          // needed and clear the underlying sets.
+          file.commitTransaction();
         } else {
           synthetics.add(clazz);
         }
@@ -253,9 +256,9 @@
         for (DexProgramClass inputType : synthetic.getSynthesizedFrom()) {
           VirtualFile file = files.get(inputType);
           file.addClass(synthetic);
+          file.commitTransaction();
         }
       }
-      files.values().forEach(file -> file.commitTransaction());
       return nameToFileMap;
     }
   }