Merge QP1A.190228.005

Change-Id: Idede0b80b07d19b5b26774caedf0f617ce22e840

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);
+  }
+}