| commit | 5f21c65fe880cbc3b92b2a3b95766a030896a8a0 | [log] [tgz] |
|---|---|---|
| author | Rico Wind <ricow@google.com> | Fri Oct 14 09:54:02 2022 +0200 |
| committer | Rico Wind <ricow@google.com> | Fri Oct 14 09:54:02 2022 +0200 |
| tree | 57a4fbdbb3be6438555ee930699e4eadaf638d34 | |
| parent | 456b3c2cf7e94775d5cadeffad09ad8503b3cace [diff] |
Don't lookup method handle writes if we don't have access info The other usages of access info is already doing null checks Bug: 252930366 Change-Id: I373caa7c4bf3f7b514ece01e02aaa9c6d2727c36
diff --git a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldAssignmentTracker.java b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldAssignmentTracker.java index d05ea55..0db5825 100644 --- a/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldAssignmentTracker.java +++ b/src/main/java/com/android/tools/r8/ir/analysis/fieldaccess/FieldAssignmentTracker.java
@@ -131,7 +131,8 @@ field -> { FieldAccessInfo accessInfo = fieldAccessInfos.get(field.getReference()); KeepFieldInfo keepInfo = appView.getKeepInfo(field); - if (keepInfo.isPinned(appView.options()) || accessInfo.isWrittenFromMethodHandle()) { + if (keepInfo.isPinned(appView.options()) + || (accessInfo != null && accessInfo.isWrittenFromMethodHandle())) { fieldStates.put(field.getDefinition(), FieldState.unknown()); } });