Skip non-code archive entries before opening ArchiveResourceProviderUtils.readArchive previously opened zipFile.getInputStream(entry) on every ZIP entry before checking whether the entry was a .dex or .class file matching the filter predicate, and used ByteStreams.toByteArray, which repeatedly reallocates buffers while inflating large DEX entries. Bug: b/474638399 Change-Id: Icabe86b7e9b3f79417a0587bdd113ca8a47062ed
diff --git a/src/main/java/com/android/tools/r8/utils/ArchiveResourceProviderUtils.java b/src/main/java/com/android/tools/r8/utils/ArchiveResourceProviderUtils.java index e9967a4..0f3a339 100644 --- a/src/main/java/com/android/tools/r8/utils/ArchiveResourceProviderUtils.java +++ b/src/main/java/com/android/tools/r8/utils/ArchiveResourceProviderUtils.java
@@ -68,19 +68,22 @@ Enumeration<? extends ZipEntry> entries = zipFile.entries(); while (entries.hasMoreElements()) { ZipEntry entry = entries.nextElement(); - try (InputStream stream = zipFile.getInputStream(entry)) { - String name = entry.getName(); - Origin entryOrigin = new ArchiveEntryOrigin(name, origin); - if (ZipUtils.isDexFile(name)) { - if (predicate.test(name, Kind.DEX)) { + String name = entry.getName(); + if (ZipUtils.isDexFile(name)) { + if (predicate.test(name, Kind.DEX)) { + Origin entryOrigin = new ArchiveEntryOrigin(name, origin); + try (InputStream stream = zipFile.getInputStream(entry)) { consumer.accept( programResourceFactory.create( entryOrigin, Kind.DEX, ByteStreams.toByteArray(stream), null)); seenDex.set(); } - } else if (ZipUtils.isClassFile(name)) { - if (predicate.test(name, Kind.CF)) { - String descriptor = DescriptorUtils.guessTypeDescriptor(name); + } + } else if (ZipUtils.isClassFile(name)) { + if (predicate.test(name, Kind.CF)) { + Origin entryOrigin = new ArchiveEntryOrigin(name, origin); + String descriptor = DescriptorUtils.guessTypeDescriptor(name); + try (InputStream stream = zipFile.getInputStream(entry)) { consumer.accept( programResourceFactory.create( entryOrigin,