| commit | fedd6ab1aa14c20c2410ee56f48c7d39db6f3981 | [log] [tgz] |
|---|---|---|
| author | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Mar 28 10:27:40 2022 +0200 |
| committer | Christoffer Quist Adamsen <christofferqa@google.com> | Mon Mar 28 10:27:40 2022 +0200 |
| tree | 10fe106a4f8bce8e9d581ca8e86f8e73e8116fac | |
| parent | 9ac3dba96a4669a25086e262844d9b82d32ae99c [diff] |
Fix test failures from enum unboxing and signature removal Change-Id: I11ee85a9d4373b08aff1b548d769b081d9d7d782
diff --git a/src/main/java/com/android/tools/r8/shaking/KeepInfo.java b/src/main/java/com/android/tools/r8/shaking/KeepInfo.java index 5325d08..cdeda2b 100644 --- a/src/main/java/com/android/tools/r8/shaking/KeepInfo.java +++ b/src/main/java/com/android/tools/r8/shaking/KeepInfo.java
@@ -156,8 +156,9 @@ if (!configuration.isKeepAttributesSignatureEnabled()) { return true; } - return !(configuration.isForceProguardCompatibilityEnabled() - || !isShrinkingAllowed(configuration)); + return !configuration.isForceProguardCompatibilityEnabled() + && internalIsOptimizationAllowed() + && internalIsShrinkingAllowed(); } public boolean isEnclosingMethodAttributeRemovalAllowed(
diff --git a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java index db8a047..5ee7900 100644 --- a/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java +++ b/src/test/java/com/android/tools/r8/enumunboxing/NullValuedFieldEnumUnboxingTest.java
@@ -33,7 +33,7 @@ .addInnerClasses(NullValuedFieldEnumUnboxingTest.class) .addKeepMainRule(Main.class) .addKeepRules(enumKeepRules.getKeepRules()) - .addEnumUnboxingInspector(inspector -> inspector.assertUnboxed(MyEnum.class)) + .addEnumUnboxingInspector(inspector -> inspector.assertNotUnboxed(MyEnum.class)) .setMinApi(parameters.getApiLevel()) .compile() .run(parameters.getRuntime(), Main.class)