diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-12-05 10:57:13 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-12-05 13:11:12 -0800 |
| commit | a89d7ed6f091ac495cd43560ece6988776d14d61 (patch) | |
| tree | d416d6035e2061005e201d7d101890f81bed82a6 /runtime/class_linker.h | |
| parent | ab74d3eae37de79444edd1edd70400970d5e85ad (diff) | |
| download | art-a89d7ed6f091ac495cd43560ece6988776d14d61.zip art-a89d7ed6f091ac495cd43560ece6988776d14d61.tar.gz art-a89d7ed6f091ac495cd43560ece6988776d14d61.tar.bz2 | |
Add pointer size logic to InitFromImageInterpretOnly
Previously we didn't have this logic which broke dex2oat if passed
--runtime-option -Xint flag.
Also we now no longer call InitFromImageInterpretOnlyCallback if
we are the compiler.
Bug: 18631640
Change-Id: Ie84fceeb85cabeeec7a5fedefd73dd919cca8e5e
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 55332f8..132da67 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -476,6 +476,9 @@ class ClassLinker { SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); private: + static void InitFromImageInterpretOnlyCallback(mirror::Object* obj, void* arg) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + const OatFile::OatMethod FindOatMethodFor(mirror::ArtMethod* method, bool* found) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); |