diff options
| -rw-r--r-- | test/683-clinit-inline-static-invoke/src-multidex/MyCalendarUtils.java (renamed from test/683-clinit-inline-static-invoke/src-multidex/MyModifier.java) | 8 | ||||
| -rw-r--r-- | test/683-clinit-inline-static-invoke/src/Main.java | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/683-clinit-inline-static-invoke/src-multidex/MyModifier.java b/test/683-clinit-inline-static-invoke/src-multidex/MyCalendarUtils.java index bc01940d40..fc79e327b4 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 6f15e2722b..d2225397b5 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 @@ public class Main { // 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); } } |