From 9a8dcea0e97e610c5b8589e0093dbb7766a08694 Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Fri, 22 Feb 2019 10:11:21 +0000
Subject: 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
---
 test/ProfileTestMultiDex/Second.java | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'test/ProfileTestMultiDex/Second.java')

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);
+  }
+}
-- 
cgit v1.2.3