diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-18 20:00:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-18 20:00:29 +0000 |
| commit | e9bcf0fa76cd9a96d36fe9e190bd2947e842fbf8 (patch) | |
| tree | 44f6b91098639c6ebc438b4ec998d0dc128cef9a /runtime/interpreter/interpreter_switch_impl.cc | |
| parent | 8f0776768712b2021aa8fb649b51017b9f0fc7a9 (diff) | |
| parent | f832284dd847ff077577bb5712225430bbbb3b67 (diff) | |
| download | android_art-e9bcf0fa76cd9a96d36fe9e190bd2947e842fbf8.tar.gz android_art-e9bcf0fa76cd9a96d36fe9e190bd2947e842fbf8.tar.bz2 android_art-e9bcf0fa76cd9a96d36fe9e190bd2947e842fbf8.zip | |
Merge "Delete ClassHelper and fix compaction bug in GetDirectInterface"
Diffstat (limited to 'runtime/interpreter/interpreter_switch_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_switch_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/interpreter/interpreter_switch_impl.cc b/runtime/interpreter/interpreter_switch_impl.cc index 859cfc47c9..c1d24f5a5f 100644 --- a/runtime/interpreter/interpreter_switch_impl.cc +++ b/runtime/interpreter/interpreter_switch_impl.cc @@ -258,8 +258,8 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem self->ThrowNewExceptionF(self->GetCurrentLocationForThrow(), "Ljava/lang/VirtualMachineError;", "Returning '%s' that is not instance of return type '%s'", - ClassHelper(obj_result->GetClass()).GetDescriptor(), - ClassHelper(return_type).GetDescriptor()); + obj_result->GetClass()->GetDescriptor().c_str(), + return_type->GetDescriptor().c_str()); HANDLE_PENDING_EXCEPTION(); } } @@ -528,7 +528,7 @@ JValue ExecuteSwitchImpl(Thread* self, MethodHelper& mh, const DexFile::CodeItem self->ThrowNewExceptionF(self->GetCurrentLocationForThrow(), "Ljava/lang/VirtualMachineError;", "Throwing '%s' that is not instance of Throwable", - ClassHelper(exception->GetClass()).GetDescriptor()); + exception->GetClass()->GetDescriptor().c_str()); } else { self->SetException(shadow_frame.GetCurrentLocationForThrow(), exception->AsThrowable()); } |