diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-28 18:12:55 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-28 18:36:32 -0700 |
| commit | ded66a01f81812e0129d17c3d08d5eda18433062 (patch) | |
| tree | 74a3f7bad1c020b0136d6c173633a361a479f5cb /runtime/reflection.cc | |
| parent | e0205d519dd417f749243b42b8711dfa313e5390 (diff) | |
| download | art-ded66a01f81812e0129d17c3d08d5eda18433062.zip art-ded66a01f81812e0129d17c3d08d5eda18433062.tar.gz art-ded66a01f81812e0129d17c3d08d5eda18433062.tar.bz2 | |
Move MethodHelper::GetReturnType to mirror::ArtMethod.
Also, fix missing handle in HasSameSignatureWithDifferentClassLoaders.
Change-Id: I9e1ffd09be950ecc8346fc3c485760d82d9ecab3
Diffstat (limited to 'runtime/reflection.cc')
| -rw-r--r-- | runtime/reflection.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/reflection.cc b/runtime/reflection.cc index b57e48f..228d200 100644 --- a/runtime/reflection.cc +++ b/runtime/reflection.cc @@ -632,8 +632,8 @@ jobject InvokeMethod(const ScopedObjectAccessAlreadyRunnable& soa, jobject javaM } // Box if necessary and return. - return soa.AddLocalReference<jobject>(BoxPrimitive(mh.GetReturnType()->GetPrimitiveType(), - result)); + return soa.AddLocalReference<jobject>( + BoxPrimitive(Primitive::GetType(mh.GetMethod()->GetReturnTypeDescriptor()[0]), result)); } bool VerifyObjectIsClass(mirror::Object* o, mirror::Class* c) { |