commit 16ce0923698d9a2df8a93d3895d2e851d8ac6fbf
author Ian Rogers <irogers@google.com> Fri Jan 10 14:59:36 2014 -0800
committer Ian Rogers <irogers@google.com> Fri Jan 10 15:25:32 2014 -0800
tree fd2584e44bdf658b45fa480a833245238c6aa707
parent aa368a44da1807a04fd66f348f7f867ca30ce3cf

Make fast JNI part of pretty method output.

Change-Id: Ic4951a22d12e93d7f1e1af7ffbb08b4bb9b8f587

runtime/mirror/art_method.h

diff --git a/runtime/mirror/art_method.h b/runtime/mirror/art_method.h
index 963b4d5..95ca4c9 100644
--- a/runtime/mirror/art_method.h
+++ b/runtime/mirror/art_method.h
@@ -114,7 +114,8 @@
   }
 
   bool IsFastNative() const {
-    return (GetAccessFlags() & kAccFastNative) != 0;
+    uint32_t mask = kAccFastNative | kAccNative;
+    return (GetAccessFlags() & mask) == mask;
   }
 
   bool IsAbstract() const {

runtime/utils.cc

diff --git a/runtime/utils.cc b/runtime/utils.cc
index 950e3f9..2ad4c4a 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -358,13 +358,16 @@
 }
 
 std::string PrettyMethod(const mirror::ArtMethod* m, bool with_signature) {
-  if (m == NULL) {
+  if (m == nullptr) {
     return "null";
   }
   MethodHelper mh(m);
   std::string result(PrettyDescriptor(mh.GetDeclaringClassDescriptor()));
   result += '.';
   result += mh.GetName();
+  if (UNLIKELY(m->IsFastNative())) {
+    result += "!";
+  }
   if (with_signature) {
     const Signature signature = mh.GetSignature();
     std::string sig_as_string(signature.ToString());