--- a/src/hotspot/share/interpreter/interpreterRuntime.cpp	Wed Aug 14 11:14:54 2019 +0100
+++ b/src/hotspot/share/interpreter/interpreterRuntime.cpp	Wed Aug 14 10:07:00 2019 -0400
@@ -1440,7 +1440,7 @@
         method->set_signature_handler(_handlers->at(handler_index));
       }
     } else {
-      CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
+      DEBUG_ONLY(Thread::current()->check_possible_safepoint());
       // use generic signature handler
       method->set_signature_handler(Interpreter::slow_signature_handler());
     }