| commit | bae2bd569f2f948f595321f69f8e4b559de4e1ce | [log] [tgz] |
|---|---|---|
| author | Christoffer Adamsen <christofferqa@google.com> | Wed May 29 09:41:52 2024 +0200 |
| committer | Christoffer Adamsen <christofferqa@google.com> | Wed May 29 07:52:59 2024 +0000 |
| tree | 687b3b93a5c7d2253759916835668f73c9466d59 | |
| parent | 29b639d87b75479d72bd6380ab327841080e8d75 [diff] |
Update assertion in field propagation Change-Id: I608b5eccd9ac5c212b2ccdd08ef8e73b373cc34d
diff --git a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java index 72bee53..e750309 100644 --- a/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java +++ b/src/main/java/com/android/tools/r8/optimize/argumentpropagation/propagation/DefaultFieldValueJoiner.java
@@ -263,7 +263,8 @@ // injected subclasses if it is pinned. However, none of the fields are pinned, so we // should be allowed to reason about the field assignments in the program. assert fields.stream() - .noneMatch(field -> appView.getKeepInfo(field).isPinned(appView.options())); + .allMatch( + field -> appView.getKeepInfo(field).isValuePropagationAllowed(appView, field)); return false; } fields.forEach(liveDefaultValueConsumer);