summaryrefslogtreecommitdiff
path: root/src/dex_file.h
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2012-09-18 08:57:04 -0700
committer Mathieu Chartier <mathieuc@google.com> 2012-09-21 17:32:56 -0700
commit66f19258f9728d4ffe026074d8fd429d639802fa (patch)
treefd94009774c6cbbb1528ea096e606133bd35f104 /src/dex_file.h
parenta5e1e3d153990845d80cb8d013157210f11a473c (diff)
Change dex cache to be java object instead of array, add pointer to dex file in dex cache.
Generic clean up to facilitate having GDB macros for Pretty* helper functions. Improved cleanliness of DexCache since having it as an object array was not the best solution. Fixed a bug in InOrderWalk caused by ResolveType sometimes allocating classes. Rename C++ Method to AbstractMethod and add two new classes Constructor, Method which both inherit from AbstractMethod. Rename done to have the C++ code be closer to the java code. Change-Id: I4995b4c5e47a3822192b08afa24a639d3b1f4da9
Diffstat (limited to 'src/dex_file.h')
-rw-r--r--src/dex_file.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dex_file.h b/src/dex_file.h
index 7d39945a10..d28e684571 100644
--- a/src/dex_file.h
+++ b/src/dex_file.h
@@ -775,7 +775,7 @@ class DexFile {
// Returns -2 for native methods (as expected in exception traces).
//
// This is used by runtime; therefore use art::Method not art::DexFile::Method.
- int32_t GetLineNumFromPC(const Method* method, uint32_t rel_pc) const
+ int32_t GetLineNumFromPC(const AbstractMethod* method, uint32_t rel_pc) const
SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
void DecodeDebugInfo(const CodeItem* code_item, bool is_static, uint32_t method_idx,