| commit | d66c2e59c37bc69a79ecf16803c638b5d67bd58b | [log] [tgz] |
|---|---|---|
| author | Clément Béra <clementbera@google.com> | Tue Oct 12 12:14:44 2021 +0000 |
| committer | Clément Béra <clementbera@google.com> | Tue Oct 12 12:15:28 2021 +0000 |
| tree | 823f4da030cdb597681d2cafc6d398df2957c8fa | |
| parent | 96a6a6f6894f9e2d3bb0a73ec3b500cb8d297b3a [diff] |
Simplify constant value Change-Id: I96489462ec56ccf6c52a130a651c67d61330275b
diff --git a/src/main/java/com/android/tools/r8/ir/analysis/proto/RawMessageInfoDecoder.java b/src/main/java/com/android/tools/r8/ir/analysis/proto/RawMessageInfoDecoder.java index c3ab146..eb22b19 100644 --- a/src/main/java/com/android/tools/r8/ir/analysis/proto/RawMessageInfoDecoder.java +++ b/src/main/java/com/android/tools/r8/ir/analysis/proto/RawMessageInfoDecoder.java
@@ -214,9 +214,7 @@ DexItemBasedConstString constString = definition.asDexItemBasedConstString(); DexReference reference = constString.getItem(); NameComputationInfo<?> nameComputationInfo = constString.getNameComputationInfo(); - if (reference.isDexField() - && nameComputationInfo.isFieldNameComputationInfo() - && nameComputationInfo.asFieldNameComputationInfo().isForFieldName()) { + if (reference.isDexField() && nameComputationInfo.isFieldNameComputationInfo()) { DexField field = reference.asDexField(); DexEncodedField encodedField = context.getHolder().lookupInstanceField(field); if (encodedField != null) {
diff --git a/src/main/java/com/android/tools/r8/naming/dexitembasedstring/FieldNameComputationInfo.java b/src/main/java/com/android/tools/r8/naming/dexitembasedstring/FieldNameComputationInfo.java index eeb70f3..f9f8cc0 100644 --- a/src/main/java/com/android/tools/r8/naming/dexitembasedstring/FieldNameComputationInfo.java +++ b/src/main/java/com/android/tools/r8/naming/dexitembasedstring/FieldNameComputationInfo.java
@@ -21,10 +21,6 @@ return FIELD_NAME_INSTANCE; } - public boolean isForFieldName() { - return true; - } - @Override public DexString internalComputeNameFor( DexField field, DexDefinitionSupplier definitions, NamingLens namingLens) {