diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-21 17:43:44 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-06-09 12:46:32 -0700 |
| commit | bfd9a4378eacaf2dc2bbe05ad48c5164fc93c9fe (patch) | |
| tree | 3d3f667c8232a9c1bb6fe9daea0d364f9ae01d8c /runtime/common_throws.cc | |
| parent | 2e1ca953c7fb165da36cc26ea74d3045d7e272c8 (diff) | |
| download | android_art-bfd9a4378eacaf2dc2bbe05ad48c5164fc93c9fe.tar.gz android_art-bfd9a4378eacaf2dc2bbe05ad48c5164fc93c9fe.tar.bz2 android_art-bfd9a4378eacaf2dc2bbe05ad48c5164fc93c9fe.zip | |
Change MethodHelper to use a Handle.
Added ConstHandle to help prevent errors where you modify the value
stored in the handle of the caller. Also fixed compaction bugs
related to not knowing MethodHelper::GetReturnType can resolve types.
This bug was present in interpreter RETURN_OBJECT.
Bug: 13077697
Change-Id: I71f964d4d810ab4debda1a09bc968af8f3c874a3
Diffstat (limited to 'runtime/common_throws.cc')
| -rw-r--r-- | runtime/common_throws.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc index a3e3cfad7e..8de3068dca 100644 --- a/runtime/common_throws.cc +++ b/runtime/common_throws.cc @@ -363,7 +363,7 @@ void ThrowNullPointerExceptionForMethodAccess(const ThrowLocation& throw_locatio } void ThrowNullPointerExceptionFromDexPC(const ThrowLocation& throw_location) { - const DexFile::CodeItem* code = MethodHelper(throw_location.GetMethod()).GetCodeItem(); + const DexFile::CodeItem* code = throw_location.GetMethod()->GetCodeItem(); uint32_t throw_dex_pc = throw_location.GetDexPc(); CHECK_LT(throw_dex_pc, code->insns_size_in_code_units_); const Instruction* instr = Instruction::At(&code->insns_[throw_dex_pc]); |