diff options
| author | 2018-05-22 15:33:48 +0100 | |
|---|---|---|
| committer | 2018-05-23 13:48:31 +0100 | |
| commit | 6ec2a1bf1cbecf17546df780dd0ad769042e1874 (patch) | |
| tree | 09f7430f020e04dc892ff2c2152bb773cd45c0dd /runtime/interpreter/interpreter.cc | |
| parent | 2d3065e6ca0bd707bc998b7d260bb8e8ec07cf87 (diff) | |
ObjPtr<>-ify UnstartedRuntime, fix 2 stale reference uses.
Test: Rely on TreeHugger.
Bug: 31113334
Change-Id: I35f76c3e3b94dfca18dbe67aba065a1270f4e5ee
Diffstat (limited to 'runtime/interpreter/interpreter.cc')
| -rw-r--r-- | runtime/interpreter/interpreter.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index f23304c391..048c6e4d66 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -31,6 +31,7 @@ #include "mterp/mterp.h" #include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" +#include "shadow_frame-inl.h" #include "stack.h" #include "thread-inl.h" #include "unstarted_runtime.h" @@ -419,7 +420,7 @@ void EnterInterpreterFromInvoke(Thread* self, size_t cur_reg = num_regs - num_ins; if (!method->IsStatic()) { CHECK(receiver != nullptr); - shadow_frame->SetVRegReference(cur_reg, receiver.Ptr()); + shadow_frame->SetVRegReference(cur_reg, receiver); ++cur_reg; } uint32_t shorty_len = 0; @@ -430,7 +431,7 @@ void EnterInterpreterFromInvoke(Thread* self, case 'L': { ObjPtr<mirror::Object> o = reinterpret_cast<StackReference<mirror::Object>*>(&args[arg_pos])->AsMirrorPtr(); - shadow_frame->SetVRegReference(cur_reg, o.Ptr()); + shadow_frame->SetVRegReference(cur_reg, o); break; } case 'J': case 'D': { |