Use JDK17-friendly base class in 683-clinit-inline-static-invoke
Bug: 239968561
Bug: 233029164
Test: art/tools/buildbot-build.sh --dist --host
Change-Id: Ic07c81a0dbce27eb438b60ad02ca7589e6777369
diff --git a/test/683-clinit-inline-static-invoke/src-multidex/MyModifier.java b/test/683-clinit-inline-static-invoke/src-multidex/MyCalendarUtils.java
similarity index 71%
rename from test/683-clinit-inline-static-invoke/src-multidex/MyModifier.java
rename to test/683-clinit-inline-static-invoke/src-multidex/MyCalendarUtils.java
index bc01940..fc79e32 100644
--- a/test/683-clinit-inline-static-invoke/src-multidex/MyModifier.java
+++ b/test/683-clinit-inline-static-invoke/src-multidex/MyCalendarUtils.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import java.lang.reflect.Modifier;
+import sun.util.calendar.CalendarUtils;
-public abstract class MyModifier extends Modifier {
- // Reference to MyModifier.classModifiers() shall resolve to
- // Modifier.classModifiers() which should be easily inlined.
+public abstract class MyCalendarUtils extends CalendarUtils {
+ // Reference to MyCalendarUtils.isJulianLeapYear() shall resolve to
+ // CalendarUtils.isJulianLeapYear() which should be easily inlined.
}
diff --git a/test/683-clinit-inline-static-invoke/src/Main.java b/test/683-clinit-inline-static-invoke/src/Main.java
index 6f15e27..d222539 100644
--- a/test/683-clinit-inline-static-invoke/src/Main.java
+++ b/test/683-clinit-inline-static-invoke/src/Main.java
@@ -26,6 +26,6 @@
// TypeId in the current DexFile, we erroneously provided the type index from the
// declaring DexFile and that caused a crash. This was fixed by changing the
// ClinitCheck entrypoint to take the Class reference from LoadClass.
- int placeholder = MyModifier.classModifiers();
+ boolean placeholder = MyCalendarUtils.isJulianLeapYear(-43);
}
}