commit 6f7c958469d9b5a44ca2472058961a13d437b7bf
author Jesse Wilson <jessewilson@google.com> Mon Oct 17 12:37:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 17 12:37:35 2011 -0700
tree 1d018952a9da21dc747b39b5248598e4a1cc6ac2
parent f8e012785ee61a3d2f43f74a249d66e1381bdb83
parent d81cdcc27ba1c0bc8a48d28b5d4f93006500e18c

Merge "Fix annotations test 004." into dalvik-dev

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index 281f685..174388a 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -378,6 +378,10 @@
 Class* Method::GetReturnType() const {
   DCHECK(GetDeclaringClass()->IsResolved() || GetDeclaringClass()->IsErroneous())
       << PrettyMethod(this);
+  Class* java_return_type = java_return_type_;
+  if (java_return_type != NULL) {
+      return java_return_type;
+  }
   // Short-cut
   Class* result = GetDexCacheResolvedTypes()->Get(GetReturnTypeIdx());
   if (result == NULL) {

test/004-annotations/expected.txt

diff --git a/test/004-annotations/expected.txt b/test/004-annotations/expected.txt
index 8f19c4c..eade6de 100644
--- a/test/004-annotations/expected.txt
+++ b/test/004-annotations/expected.txt
@@ -28,10 +28,10 @@
     @android.test.anno.AnnoSimpleMethod()
       interface android.test.anno.AnnoSimpleMethod
     method parameter annotations:
-  annotations on FIELD public static int android.test.anno.SimplyNoted.mOneFoo:
+  annotations on FIELD public int android.test.anno.SimplyNoted.mFoo:
     @android.test.anno.AnnoSimpleField()
       interface android.test.anno.AnnoSimpleField
-  annotations on FIELD public int android.test.anno.SimplyNoted.mFoo:
+  annotations on FIELD public static int android.test.anno.SimplyNoted.mOneFoo:
     @android.test.anno.AnnoSimpleField()
       interface android.test.anno.AnnoSimpleField