--- a/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp	Wed Mar 01 14:51:12 2017 +0300
+++ b/hotspot/src/share/vm/jvmci/jvmciCompilerToVM.hpp	Mon Feb 27 17:36:36 2017 +0100
@@ -206,4 +206,14 @@
   inline void do_void()                     { }
 };
 
+class JNIHandleMark : public StackObj {
+  public:
+    JNIHandleMark() { push_jni_handle_block(); }
+    ~JNIHandleMark() { pop_jni_handle_block(); }
+
+  private:
+    static void push_jni_handle_block();
+    static void pop_jni_handle_block();
+};
+
 #endif // SHARE_VM_JVMCI_JVMCI_COMPILER_TO_VM_HPP