diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-09-09 13:51:09 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-09-09 13:51:09 -0700 |
| commit | cd48f2d86197d4fe87cc88077bc4af5ba66e5295 (patch) | |
| tree | a678a9eafd72d80cb6d7581b99cc11bc9cf64911 /compiler/dex/quick/gen_invoke.cc | |
| parent | 5bc47ebe278af65e8e2a2d6b603ac94a020285f7 (diff) | |
| download | android_art-cd48f2d86197d4fe87cc88077bc4af5ba66e5295.tar.gz android_art-cd48f2d86197d4fe87cc88077bc4af5ba66e5295.tar.bz2 android_art-cd48f2d86197d4fe87cc88077bc4af5ba66e5295.zip | |
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
Diffstat (limited to 'compiler/dex/quick/gen_invoke.cc')
| -rwxr-xr-x | compiler/dex/quick/gen_invoke.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/dex/quick/gen_invoke.cc b/compiler/dex/quick/gen_invoke.cc index 78f5c733f9..8ce696ca15 100755 --- a/compiler/dex/quick/gen_invoke.cc +++ b/compiler/dex/quick/gen_invoke.cc @@ -1130,7 +1130,7 @@ RegLocation Mir2Lir::InlineTargetWide(CallInfo* info) { return res; } -bool Mir2Lir::GenInlinedReferenceGet(CallInfo* info) { +bool Mir2Lir::GenInlinedReferenceGetReferent(CallInfo* info) { if (cu_->instruction_set == kMips) { // TODO - add Mips implementation return false; |