*** old/src/hotspot/share/jvmci/jvmciExceptions.hpp	Sat May  4 16:22:27 2019
--- new/src/hotspot/share/jvmci/jvmciExceptions.hpp	Sat May  4 16:22:26 2019

*** 30,41 ****
--- 30,41 ----
  // JVMCIEnv exception utility macros.  Analagous to the regular CHECK, TRAP and THREAD macros.
  
  #define JVMCIENV __jvmci_env__
  #define JVMCI_TRAPS  JVMCIEnv* JVMCIENV
  
! #define JNI_JVMCIENV(thread, env)                                     \
!   JVMCIEnv __stack_jvmci_env__(thread, env, __FILE__, __LINE__);      \
    JVMCIEnv* JVMCIENV = &__stack_jvmci_env__
  
  #define THREAD_JVMCIENV(thread)                               \
    JVMCIEnv __stack_jvmci_env__(thread, __FILE__, __LINE__);   \
    JVMCIEnv* JVMCIENV = &__stack_jvmci_env__