Add 'final' to some static variables.
This should mostly be a no-op (or a small optimization, in the case of
public fields) and is intended to make it easier to spot the remaining
non-final static fields.
Change-Id: I698b151c343f83e21303d752b8b59e020dc58728
Bug: 240771846
diff --git a/src/main/java/com/android/tools/r8/dex/code/DexCompareHelper.java b/src/main/java/com/android/tools/r8/dex/code/DexCompareHelper.java
index 93c2501..6af977e 100644
--- a/src/main/java/com/android/tools/r8/dex/code/DexCompareHelper.java
+++ b/src/main/java/com/android/tools/r8/dex/code/DexCompareHelper.java
@@ -11,7 +11,7 @@
static final int DEX_ITEM_CONST_STRING_COMPARE_ID;
static final int DEX_RECORD_FIELD_VALUES_COMPARE_ID;
- private static int HIGHEST_DEX_OPCODE = 0xFF;
+ private static final int HIGHEST_DEX_OPCODE = 0xFF;
static {
int lastId = HIGHEST_DEX_OPCODE;
diff --git a/src/main/java/com/android/tools/r8/graph/FieldAccessInfoImpl.java b/src/main/java/com/android/tools/r8/graph/FieldAccessInfoImpl.java
index e5d9dfe..47b1c27 100644
--- a/src/main/java/com/android/tools/r8/graph/FieldAccessInfoImpl.java
+++ b/src/main/java/com/android/tools/r8/graph/FieldAccessInfoImpl.java
@@ -25,12 +25,12 @@
public static final FieldAccessInfoImpl MISSING_FIELD_ACCESS_INFO = new FieldAccessInfoImpl(null);
- public static int FLAG_IS_READ_FROM_ANNOTATION = 1 << 0;
- public static int FLAG_IS_READ_FROM_METHOD_HANDLE = 1 << 1;
- public static int FLAG_IS_WRITTEN_FROM_METHOD_HANDLE = 1 << 2;
- public static int FLAG_HAS_REFLECTIVE_READ = 1 << 3;
- public static int FLAG_HAS_REFLECTIVE_WRITE = 1 << 4;
- public static int FLAG_IS_READ_FROM_RECORD_INVOKE_DYNAMIC = 1 << 5;
+ public static final int FLAG_IS_READ_FROM_ANNOTATION = 1 << 0;
+ public static final int FLAG_IS_READ_FROM_METHOD_HANDLE = 1 << 1;
+ public static final int FLAG_IS_WRITTEN_FROM_METHOD_HANDLE = 1 << 2;
+ public static final int FLAG_HAS_REFLECTIVE_READ = 1 << 3;
+ public static final int FLAG_HAS_REFLECTIVE_WRITE = 1 << 4;
+ public static final int FLAG_IS_READ_FROM_RECORD_INVOKE_DYNAMIC = 1 << 5;
// A direct reference to the definition of the field.
private DexField field;
diff --git a/src/main/java/com/android/tools/r8/ir/optimize/info/DefaultMethodOptimizationInfo.java b/src/main/java/com/android/tools/r8/ir/optimize/info/DefaultMethodOptimizationInfo.java
index f518d5e..8b7bd6b 100644
--- a/src/main/java/com/android/tools/r8/ir/optimize/info/DefaultMethodOptimizationInfo.java
+++ b/src/main/java/com/android/tools/r8/ir/optimize/info/DefaultMethodOptimizationInfo.java
@@ -28,16 +28,16 @@
public static final DefaultMethodOptimizationInfo DEFAULT_INSTANCE =
new DefaultMethodOptimizationInfo();
- static Set<DexType> UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT = ImmutableSet.of();
- static int UNKNOWN_RETURNED_ARGUMENT = -1;
- static boolean UNKNOWN_NEVER_RETURNS_NORMALLY = false;
- static AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE = UnknownValue.getInstance();
- static boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT = false;
- static boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS = false;
- static boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS = true;
- static boolean UNKNOWN_RETURN_VALUE_ONLY_DEPENDS_ON_ARGUMENTS = false;
- static BitSet NO_NULL_PARAMETER_OR_THROW_FACTS = null;
- static BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS = null;
+ static final Set<DexType> UNKNOWN_INITIALIZED_CLASSES_ON_NORMAL_EXIT = ImmutableSet.of();
+ static final int UNKNOWN_RETURNED_ARGUMENT = -1;
+ static final boolean UNKNOWN_NEVER_RETURNS_NORMALLY = false;
+ static final AbstractValue UNKNOWN_ABSTRACT_RETURN_VALUE = UnknownValue.getInstance();
+ static final boolean UNKNOWN_TRIGGERS_CLASS_INIT_BEFORE_ANY_SIDE_EFFECT = false;
+ static final boolean UNKNOWN_INITIALIZER_ENABLING_JAVA_ASSERTIONS = false;
+ static final boolean UNKNOWN_MAY_HAVE_SIDE_EFFECTS = true;
+ static final boolean UNKNOWN_RETURN_VALUE_ONLY_DEPENDS_ON_ARGUMENTS = false;
+ static final BitSet NO_NULL_PARAMETER_OR_THROW_FACTS = null;
+ static final BitSet NO_NULL_PARAMETER_ON_NORMAL_EXITS_FACTS = null;
protected DefaultMethodOptimizationInfo() {}
diff --git a/src/main/java/com/android/tools/r8/naming/ProguardMapSupplier.java b/src/main/java/com/android/tools/r8/naming/ProguardMapSupplier.java
index c3fc071..1d92c11 100644
--- a/src/main/java/com/android/tools/r8/naming/ProguardMapSupplier.java
+++ b/src/main/java/com/android/tools/r8/naming/ProguardMapSupplier.java
@@ -17,7 +17,7 @@
public class ProguardMapSupplier {
- public static int PG_MAP_ID_LENGTH = 7;
+ public static final int PG_MAP_ID_LENGTH = 7;
// Hash of the Proguard map (excluding the header up to and including the hash marker).
public static class ProguardMapId {
diff --git a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
index ca51281..86cdb5a 100644
--- a/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
+++ b/src/main/java/com/android/tools/r8/shaking/Enqueuer.java
@@ -1624,9 +1624,9 @@
static class FieldAccessMetadata {
- private static int DEFERRED_MASK = 1;
- private static int FROM_METHOD_HANDLE_MASK = 2;
- private static int FROM_RECORD_METHOD_HANDLE_MASK = 4;
+ private static final int DEFERRED_MASK = 1;
+ private static final int FROM_METHOD_HANDLE_MASK = 2;
+ private static final int FROM_RECORD_METHOD_HANDLE_MASK = 4;
static FieldAccessMetadata DEFAULT = new FieldAccessMetadata(0);
static FieldAccessMetadata FROM_METHOD_HANDLE =
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 7286734..39b359c 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2064,7 +2064,7 @@
}
}
- public static int NO_LIMIT = -1;
+ public static final int NO_LIMIT = -1;
public ArgumentPropagatorEventConsumer argumentPropagatorEventConsumer =
ArgumentPropagatorEventConsumer.emptyConsumer();
