summaryrefslogtreecommitdiff
path: root/test/ProfileTestMultiDex/Second.java
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2019-02-22 10:11:21 +0000
committerVladimir Marko <vmarko@google.com>2019-02-22 10:21:32 +0000
commit9a8dcea0e97e610c5b8589e0093dbb7766a08694 (patch)
tree1abbd3a5846560991950e0ad1470b47834f274dd /test/ProfileTestMultiDex/Second.java
parent438cc2b34be2a5d114a50ba6cdef22f9045d863a (diff)
Fix oatdump .data.bimg.rel.ro for intrinsics.
The Integer.valueOf() intrinsic is using entries that point to the boot image live objects array data rather than a start of an Object. So, we need to check for such entries before we look at the type of the Object. Test: Additional test in oatdump_app_test Test: m test-art-host-gtest Bug: 71526895 Change-Id: I49ab3b416aa2b4912b9fd2043805e900ad76f0f2
Diffstat (limited to 'test/ProfileTestMultiDex/Second.java')
-rw-r--r--test/ProfileTestMultiDex/Second.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/test/ProfileTestMultiDex/Second.java b/test/ProfileTestMultiDex/Second.java
index 4b3c7a479b..9f5dc66742 100644
--- a/test/ProfileTestMultiDex/Second.java
+++ b/test/ProfileTestMultiDex/Second.java
@@ -30,3 +30,11 @@ class SubC extends Super {
int getValue() { return 24; }
}
+class TestIntrinsicOatdump {
+ Integer valueOf(int i) {
+ // ProfileTestMultiDex is used also for testing oatdump for apps.
+ // This is a regression test that oatdump can handle .data.bimg.rel.ro
+ // entries pointing to the middle of the "boot image live objects" array.
+ return Integer.valueOf(i);
+ }
+}