*** old/src/share/vm/classfile/javaClasses.hpp	Fri Oct 30 18:24:03 2015
--- new/src/share/vm/classfile/javaClasses.hpp	Fri Oct 30 18:24:02 2015

*** 494,517 ****
--- 494,516 ----
    // Trace constants
    enum {
      trace_methods_offset = 0,
      trace_bcis_offset    = 1,
      trace_mirrors_offset = 2,
!     trace_cprefs_offset  = 3,
!     trace_next_offset    = 4,
      trace_size           = 5,
!     trace_next_offset    = 3,
!     trace_size           = 4,
      trace_chunk_size     = 32
    };
  
    static int backtrace_offset;
    static int detailMessage_offset;
    static int cause_offset;
    static int stackTrace_offset;
    static int static_unassigned_stacktrace_offset;
  
    // Printing
!   static char* print_stack_element_to_buffer(Handle mirror, int method, int version, int bci, int cpref);
!   static char* print_stack_element_to_buffer(Handle mirror, const methodHandle& method, int version, int bci);
    // StackTrace (programmatic access, new since 1.4)
    static void clear_stacktrace(oop throwable);
    // No stack trace available
    static const char* no_stack_trace_message();
    // Stacktrace (post JDK 1.7.0 to allow immutability protocol to be followed)

*** 520,539 ****
--- 519,544 ----
  
   public:
    // Backtrace
    static oop backtrace(oop throwable);
    static void set_backtrace(oop throwable, oop value);
+ 
+   // RedefineClasses support
+   // Mark methods as that are referenced in stacktraces so they
+   // aren't deallocated if they are redefined.
+   static void mark_on_stack(oop throwable);
+ 
    // Needed by JVMTI to filter out this internal field.
    static int get_backtrace_offset() { return backtrace_offset;}
    static int get_detailMessage_offset() { return detailMessage_offset;}
    // Message
    static oop message(oop throwable);
    static oop message(Handle throwable);
    static void set_message(oop throwable, oop value);
    static Symbol* detail_message(oop throwable);
!   static void print_stack_element(outputStream *st, Handle mirror, int method,
-                                   int version, int bci, int cpref);
!   static void print_stack_element(outputStream *st, Handle mirror, const methodHandle& method,
!                                   int version, int bci);
    static void print_stack_element(outputStream *st, const methodHandle& method, int bci);
    static void print_stack_usage(Handle stream);
  
    // Allocate space for backtrace (created but stack trace not filled in)
    static void allocate_backtrace(Handle throwable, TRAPS);

*** 1344,1354 ****
--- 1349,1359 ----
    static void set_methodName(oop element, oop value);
    static void set_fileName(oop element, oop value);
    static void set_lineNumber(oop element, int value);
  
    // Create an instance of StackTraceElement
!   static oop create(Handle mirror, int method, int version, int bci, int cpref, TRAPS);
!   static oop create(Handle mirror, const methodHandle& method, int version, int bci, TRAPS);
    static oop create(const methodHandle& method, int bci, TRAPS);
  
    // Debugging
    friend class JavaClasses;
  };