commit 4e270bc8cccf25fbbd716effa8f953f15d45824c
author Morten Krogh-Jespersen <mkroghj@google.com> Wed Jan 15 15:14:52 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Jan 15 14:43:27 2020 +0000
tree cdd65dd0103691c7c8aaf60cd7b7edc4b9685700
parent 35abaaa2f16cb78e0f0c2056145772a9c23011b5

Bail out if reading Dex sources in Cf line number remapping

Bug: 147009037
Change-Id: I953c6927c3a0b4c967bf44277d9d678d96bc6173

src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java

diff --git a/src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java b/src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java
index 7713857..2e34cd7 100644
--- a/src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java
+++ b/src/main/java/com/android/tools/r8/utils/CfLineToMethodMapper.java
@@ -42,6 +42,9 @@
         ArchiveResourceProvider provider = (ArchiveResourceProvider) resourceProvider;
         provider.accept(
             programResource -> {
+              if (programResource.getKind() != Kind.CF) {
+                return;
+              }
               try {
                 new ClassReader(StreamUtils.StreamToByteArrayClose(programResource.getByteStream()))
                     .accept(classVisitor, ClassReader.SKIP_FRAMES);