Add Reference.getReferent for reference intrinsic.

Reference intrinsic was incorrectly inlining PhantomReference.get().
We get around this by adding a layer of indirection. Reference.get()
now calls getReferent() which is intrinsified and inlined.

Bug: 17429865

(cherry picked from commit ee1ba6114921065ff4629cdaee207e2960dadd63)

Change-Id: I305686d76e0e03856a46b85955622939718c8d85

1 files changed, 13 insertions, 1 deletions

diff --git a/libart/src/main/java/java/lang/ref/Reference.java b/libart/src/main/java/java/lang/ref/Reference.java
index 31ea588fb..70967b5da 100644
--- a/libart/src/main/java/java/lang/ref/Reference.java
+++ b/libart/src/main/java/java/lang/ref/Reference.java
@@ -199,7 +199,19 @@ public abstract class Reference<T> {
      * @return the referent to which reference refers, or {@code null} if the
      *         object has been cleared.
      */
-    public native T get();
+    public T get() {
+        return getReferent();
+    }
+
+    /**
+     * Returns the referent of the reference object.
+     *
+     * @return the referent to which reference refers, or {@code null} if the
+     *         object has been cleared. Required since the compiler
+     *         intrisifies getReferent() since we can't intrinsify Reference.get()
+     *         due to incorrect devirtualization (and inlining) of PhantomReference.get().
+     */
+    private final native T getReferent();
 
     /**
      * Checks whether the reference object has been enqueued.