| commit | afaf430eed27354bc8427e5a77875b20fac75b7d | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Thu Jan 13 12:27:39 2022 +0100 |
| committer | Christoffer Adamsen <christofferqa@google.com> | Thu Jan 13 12:03:14 2022 +0000 |
| tree | 019d21d3dae4fd78459056608df6f62449725b09 | |
| parent | 5db1b1bd0879155976521f634aff77f890de1f52 [diff] |
Fix spurious warning from use of -identifiernamestring rule Bug: 214263216 Change-Id: Ic0749cb543617e7d216584f41ecaf7b27fc3d802
diff --git a/src/main/java/com/android/tools/r8/naming/IdentifierNameStringMarker.java b/src/main/java/com/android/tools/r8/naming/IdentifierNameStringMarker.java index ea756b5..dce1aee 100644 --- a/src/main/java/com/android/tools/r8/naming/IdentifierNameStringMarker.java +++ b/src/main/java/com/android/tools/r8/naming/IdentifierNameStringMarker.java
@@ -143,6 +143,9 @@ return iterator; } Value in = instruction.value(); + if (in.isDexItemBasedConstString()) { + return iterator; + } if (!in.isConstString()) { warnUndeterminedIdentifierIfNecessary(field, code.context(), instruction, null); return iterator;
diff --git a/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java b/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java index beaaa77..4041e32 100644 --- a/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java +++ b/src/test/java/com/android/tools/r8/naming/IdentifierNameStringReprocessingTest.java
@@ -43,9 +43,6 @@ .enableMemberValuePropagationAnnotations() .enableReprocessClassInitializerAnnotations() .setMinApi(parameters.getApiLevel()) - .allowDiagnosticWarningMessages() - // TODO(b/214263216): should not report spurious warning. - .compileWithExpectedDiagnostics(diagnostics -> diagnostics.assertWarningsCount(1)) .run(parameters.getRuntime(), Main.class) .apply( runResult -> {