--- old/src/share/vm/runtime/heapMonitoring.cpp	2017-06-30 13:52:12.383459313 -0700
+++ new/src/share/vm/runtime/heapMonitoring.cpp	2017-06-30 13:52:12.283459673 -0700
@@ -45,7 +45,7 @@
   // freed.
   static void free_data(StackTraceData *data) {
     if (data->trace != NULL) {
-      FREE_C_HEAP_ARRAY(jvmtiCallFrame, data->trace->frames);
+      FREE_C_HEAP_ARRAY(jvmtiFrameInfo, data->trace->frames);
       FREE_C_HEAP_OBJ(data->trace);
     }
     delete data;
@@ -443,7 +443,7 @@
   *to = *src;
 
   to->frames =
-      NEW_C_HEAP_ARRAY(jvmtiCallFrame, MaxStackDepth, mtInternal);
+      NEW_C_HEAP_ARRAY(jvmtiFrameInfo, MaxStackDepth, mtInternal);
 
   if (to->frames == NULL) {
     return false;
@@ -451,7 +451,7 @@
 
   memcpy(to->frames,
          src->frames,
-         sizeof(jvmtiCallFrame) * MaxStackDepth);
+         sizeof(jvmtiFrameInfo) * MaxStackDepth);
   return true;
 }
 
@@ -564,7 +564,7 @@
 
   for (jint i = 0; i < trace_count; i++) {
     jvmtiStackTrace *current_trace = stack_traces + i;
-    FREE_C_HEAP_ARRAY(jvmtiCallFrame, current_trace->frames);
+    FREE_C_HEAP_ARRAY(jvmtiFrameInfo, current_trace->frames);
   }
 
   FREE_C_HEAP_ARRAY(jvmtiStackTrace, traces->stack_traces);
@@ -604,10 +604,6 @@
   if (_rnd == 0) {
     _rnd = 1;
   }
-  for (int i = 0; i < 20; i++) {
-    _rnd = next_random(_rnd);
-  }
-
   _enabled = true;
 }
 
@@ -677,8 +673,8 @@
       return;
     }
 
-    jvmtiCallFrame *frames =
-        NEW_C_HEAP_ARRAY(jvmtiCallFrame, MaxStackDepth, mtInternal);
+    jvmtiFrameInfo *frames =
+        NEW_C_HEAP_ARRAY(jvmtiFrameInfo, MaxStackDepth, mtInternal);
 
     if (frames == NULL) {
       FREE_C_HEAP_OBJ(trace);
@@ -686,7 +682,6 @@
     }
 
     trace->frames = frames;
-    trace->env_id = (JavaThread::current())->jni_environment();
     trace->thread_id = SharedRuntime::get_java_tid(thread);
     trace->size = byte_size;
     trace->frame_count = 0;
@@ -696,8 +691,8 @@
       int count = 0;
       while (!vfst.at_end() && count < MaxStackDepth) {
         Method* m = vfst.method();
-        frames[count].bci = vfst.bci();
-        frames[count].method_id = m->jmethod_id();
+        frames[count].location = vfst.bci();
+        frames[count].method = m->jmethod_id();
         count++;
 
         vfst.next();
@@ -712,7 +707,7 @@
     }
 
     // Failure!
-    FREE_C_HEAP_ARRAY(jvmtiCallFrame, trace->frames);
+    FREE_C_HEAP_ARRAY(jvmtiFrameInfo, trace->frames);
     FREE_C_HEAP_OBJ(trace);
     return;
   } else {