--- old/hotspot/src/share/vm/classfile/javaClasses.inline.hpp	2015-11-13 07:09:21.000000000 -0800
+++ new/hotspot/src/share/vm/classfile/javaClasses.inline.hpp	2015-11-13 07:09:21.000000000 -0800
@@ -73,4 +73,68 @@
   return obj != NULL && is_subclass(obj->klass());
 }
 
+inline int BackTrace::merge_bci_and_version(int bci, int version) {
+  // only store u2 for version, checking for overflow.
+  if (version > USHRT_MAX || version < 0) version = USHRT_MAX;
+  assert((jushort)bci == bci, "bci should be short");
+  return build_int_from_shorts(version, bci);
+}
+
+inline int BackTrace::merge_mid_and_cpref(int mid, int cpref) {
+  // only store u2 for mid and cpref, checking for overflow.
+  assert((jushort)mid == mid, "mid should be short");
+  assert((jushort)cpref == cpref, "cpref should be short");
+  return build_int_from_shorts(cpref, mid);
+}
+
+inline int BackTrace::bci_at(unsigned int merged) {
+  return extract_high_short_from_int(merged);
+}
+
+inline int BackTrace::version_at(unsigned int merged) {
+  return extract_low_short_from_int(merged);
+}
+
+inline int BackTrace::mid_at(unsigned int merged) {
+  return extract_high_short_from_int(merged);
+}
+
+inline int BackTrace::cpref_at(unsigned int merged) {
+  return extract_low_short_from_int(merged);
+}
+
+inline int BackTrace::get_line_number(const methodHandle& method, int bci) {
+  int line_number = 0;
+  if (method->is_native()) {
+    // Negative value different from -1 below, enabling Java code in
+    // class java.lang.StackTraceElement to distinguish "native" from
+    // "no LineNumberTable".  JDK tests for -2.
+    line_number = -2;
+  } else {
+    // Returns -1 if no LineNumberTable, and otherwise actual line number
+    line_number = method->line_number_from_bci(bci);
+    if (line_number == -1 && ShowHiddenFrames) {
+      line_number = bci + 1000000;
+    }
+  }
+  return line_number;
+}
+
+/*
+ * Returns the source file name of a given InstanceKlass and version
+ */
+inline Symbol* BackTrace::get_source_file_name(InstanceKlass* holder, int version) {
+  // Find the specific ik version that contains this source_file_name_index
+  // via the previous versions list, but use the current version's
+  // constant pool to look it up.  The previous version's index has been
+  // merged for the current constant pool.
+  InstanceKlass* ik = holder->get_klass_version(version);
+  if (ik != NULL) {
+    return ik->source_file_name();
+  }
+  
+  // This version has been cleaned up.
+  return NULL;
+}
+
 #endif // SHARE_VM_CLASSFILE_JAVACLASSES_INLINE_HPP