diff options
| author | Sebastien Hertz <shertz@google.com> | 2014-11-26 22:11:27 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-12-04 10:20:24 +0100 |
| commit | 6963e44331258b131bcc0599b868ba15902d6d22 (patch) | |
| tree | 24ef16e739e99d3e9d980f2acde8dd301c236c37 /runtime/class_linker.h | |
| parent | 220526b05d4365a1820a694c98527eda2d3dc980 (diff) | |
| download | art-6963e44331258b131bcc0599b868ba15902d6d22.zip art-6963e44331258b131bcc0599b868ba15902d6d22.tar.gz art-6963e44331258b131bcc0599b868ba15902d6d22.tar.bz2 | |
JDWP: fix breakpoint for method in the image
When we set a breakpoint in a compiled method, we deoptimize it by
changing its entrypoint so it is executed with the interpreter.
However, methods in the image can be called with their direct code
pointer, ignoring the updated entrypoint. In that case, the method
is not executed with the interpreter and we miss the breakpoint.
This CL avoids that situation by forcing a full deoptimization so
everything runs with the interpreter. However, if the image has been
compiled in PIC mode, we keep using selective deoptimization because
direct code pointer is not used in this mode.
Bug: 17965285
Change-Id: Icaf8cbb7fe9ad01d36f7378c59d50d9ce42ae57f
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index b78d0b5..55332f8 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -471,6 +471,10 @@ class ClassLinker { LOCKS_EXCLUDED(Locks::classlinker_classes_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + // Returns true if the method can be called with its direct code pointer, false otherwise. + bool MayBeCalledWithDirectCodePointer(mirror::ArtMethod* m) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + private: const OatFile::OatMethod FindOatMethodFor(mirror::ArtMethod* method, bool* found) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |