diff options
| author | Ian Rogers <irogers@google.com> | 2014-08-14 11:34:07 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-08-14 11:47:39 -0700 |
| commit | 97b52f89e5e0b52a08d4b9a3953d0973a3cf5636 (patch) | |
| tree | 31cd309bfbb4e566fcecb1d951e5a5504a891a20 /runtime/class_linker.h | |
| parent | 3842ad76aaeb80e0bb6b02c5f7dc4674533ef872 (diff) | |
| download | art-97b52f89e5e0b52a08d4b9a3953d0973a3cf5636.tar.gz art-97b52f89e5e0b52a08d4b9a3953d0973a3cf5636.tar.bz2 art-97b52f89e5e0b52a08d4b9a3953d0973a3cf5636.zip | |
Make OatClass and OatMethod immutable once more.
OatClass and OatMethod are representation of disk data and we don't want the
runtime to mutate this.
Change-Id: Id5b8658fd544f5d6e1b9120af134d3644ff1a52c
Diffstat (limited to 'runtime/class_linker.h')
| -rw-r--r-- | runtime/class_linker.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/class_linker.h b/runtime/class_linker.h index 6fc0f0e2f2..d2c9b4070d 100644 --- a/runtime/class_linker.h +++ b/runtime/class_linker.h @@ -392,7 +392,7 @@ class ClassLinker { } private: - bool FindOatMethodFor(mirror::ArtMethod* method, OatFile::OatMethod* oat_method) + const OatFile::OatMethod FindOatMethodFor(mirror::ArtMethod* method, bool* found) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); OatFile& GetImageOatFile(gc::space::ImageSpace* space) @@ -461,9 +461,9 @@ class ClassLinker { void FixupStaticTrampolines(mirror::Class* klass) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - // Finds the associated oat class for a dex_file and descriptor. Returns whether the class - // was found, and sets the data in oat_class. - bool FindOatClass(const DexFile& dex_file, uint16_t class_def_idx, OatFile::OatClass* oat_class) + // Finds the associated oat class for a dex_file and descriptor. Returns an invalid OatClass on + // error and sets found to false. + OatFile::OatClass FindOatClass(const DexFile& dex_file, uint16_t class_def_idx, bool* found) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void RegisterDexFileLocked(const DexFile& dex_file, Handle<mirror::DexCache> dex_cache) |