commit d81cdcc27ba1c0bc8a48d28b5d4f93006500e18c
author Jesse Wilson <jessewilson@google.com> Mon Oct 17 14:36:48 2011 -0400
committer Jesse Wilson <jessewilson@google.com> Mon Oct 17 14:37:45 2011 -0400
tree 0cc5bacf4d180f73ba04469c57a1f7b974378fa8
parent 7f14116b1daeb2d6c80ed93716f734d34865eae1

Fix annotations test 004.

We use the Java return type rather than looking the return type up
from the dex file because we don't have a dex file to look it up in.

The expected results were sorted statics first; now we're sorting
them non-statics first.

Change-Id: Id4ac52cdec9b472483ec055e47ca1bc3c6a2d885

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