--- old/src/share/vm/prims/jvmtiExport.cpp	2017-07-19 17:28:21.515788400 +0200
+++ new/src/share/vm/prims/jvmtiExport.cpp	2017-07-19 17:28:20.305560900 +0200
@@ -416,7 +416,7 @@
 
   if (HAS_PENDING_EXCEPTION) {
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;
@@ -444,7 +444,7 @@
 
   if (HAS_PENDING_EXCEPTION) {
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;
@@ -476,7 +476,7 @@
   if (HAS_PENDING_EXCEPTION) {
     Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;
@@ -511,7 +511,7 @@
   if (HAS_PENDING_EXCEPTION) {
     Symbol* ex_name = PENDING_EXCEPTION->klass()->name();
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;
@@ -543,7 +543,7 @@
 
   if (HAS_PENDING_EXCEPTION) {
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;
@@ -574,7 +574,7 @@
 
   if (HAS_PENDING_EXCEPTION) {
     LogTarget(Trace, jvmti) log;
-    LogStreamCHeap log_stream(log);
+    LogStream log_stream(log);
     java_lang_Throwable::print(PENDING_EXCEPTION, &log_stream);
     log_stream.cr();
     CLEAR_PENDING_EXCEPTION;