commit 9ca5363e3b7e7f330037fb21412c0199cf4fc53e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Oct 12 16:03:59 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 12 16:03:59 2017 +0000
tree 3d6b0a722cd79d7f5d7232b264fa6ef4358281f8
parent 6783118d2ad9d759f0617b1219a9e29a10a569f7
parent a682247fda8817be8c5ee70b3b3dbf5f3a76ad70

Merge "ART: Make FastJNI annotation checks slow-debug"

runtime/entrypoints/quick/quick_jni_entrypoints.cc

diff --git a/runtime/entrypoints/quick/quick_jni_entrypoints.cc b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
index 158c1d6..6bb67a3 100644
--- a/runtime/entrypoints/quick/quick_jni_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_jni_entrypoints.cc
@@ -16,6 +16,7 @@
 
 #include "art_method-inl.h"
 #include "base/casts.h"
+#include "base/logging.h"
 #include "entrypoints/entrypoint_utils-inl.h"
 #include "indirect_reference_table.h"
 #include "mirror/object-inl.h"
@@ -27,6 +28,8 @@
 static_assert(sizeof(IRTSegmentState) == sizeof(uint32_t), "IRTSegmentState size unexpected");
 static_assert(std::is_trivial<IRTSegmentState>::value, "IRTSegmentState not trivial");
 
+static bool kEnableAnnotationChecks = RegisterRuntimeDebugFlag(&kEnableAnnotationChecks);
+
 template <bool kDynamicFast>
 static inline void GoToRunnableFast(Thread* self) NO_THREAD_SAFETY_ANALYSIS;
 
@@ -53,7 +56,7 @@
   uint32_t saved_local_ref_cookie = bit_cast<uint32_t>(env->local_ref_cookie);
   env->local_ref_cookie = env->locals.GetSegmentState();
 
-  if (kIsDebugBuild) {
+  if (kIsDebugBuild && kEnableAnnotationChecks) {
     ArtMethod* native_method = *self->GetManagedStack()->GetTopQuickFrame();
     CHECK(native_method->IsAnnotatedWithFastNative()) << native_method->PrettyMethod();
   }
@@ -94,7 +97,7 @@
 // TODO: NO_THREAD_SAFETY_ANALYSIS due to different control paths depending on fast JNI.
 template <bool kDynamicFast>
 ALWAYS_INLINE static inline void GoToRunnableFast(Thread* self) NO_THREAD_SAFETY_ANALYSIS {
-  if (kIsDebugBuild) {
+  if (kIsDebugBuild && kEnableAnnotationChecks) {
     // Should only enter here if the method is !Fast JNI or @FastNative.
     ArtMethod* native_method = *self->GetManagedStack()->GetTopQuickFrame();