commit cd48f2d86197d4fe87cc88077bc4af5ba66e5295
author Mathieu Chartier <mathieuc@google.com> Tue Sep 09 13:51:09 2014 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Sep 09 13:51:09 2014 -0700
tree a678a9eafd72d80cb6d7581b99cc11bc9cf64911
parent 5bc47ebe278af65e8e2a2d6b603ac94a020285f7

Change Reference.get() intrinsic to Reference.getReferent().

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

Requires:
https://android-review.googlesource.com/#/c/107100/

Bug: 17429865
Change-Id: Ie91e70abf43cedf3c707c7bb8a5059e19d2a2577

compiler/dex/quick/dex_file_method_inliner.h

diff --git a/compiler/dex/quick/dex_file_method_inliner.h b/compiler/dex/quick/dex_file_method_inliner.h
index b875e2b..30a2d90 100644
--- a/compiler/dex/quick/dex_file_method_inliner.h
+++ b/compiler/dex/quick/dex_file_method_inliner.h
@@ -145,7 +145,7 @@
       kNameCacheFloor,
       kNameCacheRint,
       kNameCacheRound,
-      kNameCacheReferenceGet,
+      kNameCacheReferenceGetReferent,
       kNameCacheCharAt,
       kNameCacheCompareTo,
       kNameCacheIsEmpty,