| commit | 1bf2731480b09fa0eb8052a1439e9ef91d0f2ebb | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Dec 29 16:50:51 2020 +0100 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Tue Dec 29 16:50:51 2020 +0100 |
| tree | 2779b41989eaad510b65065468616bc67b9e4d64 | |
| parent | d1535c12cf4522191d15b6d288a3189b20f8e7f0 [diff] |
Account for abstract methods in createFieldAccessInfoCollectionModifier() Change-Id: Idec22d6d6a1c63b5fb8d1cb89a8e099d7f501301
diff --git a/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java b/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java index fd9fa86..495be54 100644 --- a/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java +++ b/src/main/java/com/android/tools/r8/horizontalclassmerging/HorizontalClassMerger.java
@@ -121,7 +121,7 @@ definition -> definition.getCode().isHorizontalClassMergingCode(), method -> builder.recordFieldWrittenInContext(group.getClassIdField(), method)); target.forEachProgramVirtualMethodMatching( - definition -> definition.getCode().isHorizontalClassMergingCode(), + definition -> definition.hasCode() && definition.getCode().isHorizontalClassMergingCode(), method -> builder.recordFieldReadInContext(group.getClassIdField(), method)); } return builder.build();