*** old/src/share/vm/runtime/interfaceSupport.hpp	Tue Feb  2 10:45:47 2016
--- new/src/share/vm/runtime/interfaceSupport.hpp	Tue Feb  2 10:45:47 2016

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 415,424 ****
--- 415,432 ----
    TRACE_CALL(result_type, header)                                    \
    debug_only(NoHandleMark __hm;)                                     \
    os::verify_stack_alignment();                                      \
    /* begin of body */
  
+ #define VM_ENTRY_BASE_FROM_LEAF(result_type, header, thread)         \
+   TRACE_CALL(result_type, header)                                    \
+   debug_only(ResetNoHandleMark __rnhm;)                              \
+   HandleMarkCleaner __hm(thread);                                    \
+   Thread* THREAD = thread;                                           \
+   os::verify_stack_alignment();                                      \
+   /* begin of body */
+ 
  
  // ENTRY routines may lock, GC and throw exceptions
  
  #define VM_ENTRY_BASE(result_type, header, thread)                   \
    TRACE_CALL(result_type, header)                                    \

*** 582,589 ****
--- 590,605 ----
    result_type JNICALL header {                                       \
      VM_Exit::block_if_vm_exited();                                   \
      VM_LEAF_BASE(result_type, header)
  
  
+ #define JVM_ENTRY_FROM_LEAF(env, result_type, header)                \
+   { {                                                                \
+     JavaThread* thread=JavaThread::thread_from_jni_environment(env); \
+     ThreadInVMfromNative __tiv(thread);                              \
+     debug_only(VMNativeEntryWrapper __vew;)                          \
+     VM_ENTRY_BASE_FROM_LEAF(result_type, header, thread)
+ 
+ 
  #define JVM_END } }
  
  #endif // SHARE_VM_RUNTIME_INTERFACESUPPORT_HPP