diff -r e097aad8f3f8 -r f559541c0daa hotspot/src/share/vm/runtime/java.cpp
--- a/hotspot/src/share/vm/runtime/java.cpp	Thu Jul 20 17:23:24 2017 -0700
+++ b/hotspot/src/share/vm/runtime/java.cpp	Fri Jul 21 09:50:12 2017 +0200
@@ -37,6 +37,7 @@
 #include "jvmci/jvmciRuntime.hpp"
 #endif
 #include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "memory/universe.hpp"
@@ -481,9 +482,11 @@
   Log(gc, heap, exit) log;
   if (log.is_info()) {
     ResourceMark rm;
-    Universe::print_on(log.info_stream());
+    LogStream ls_info(log.info());
+    Universe::print_on(&ls_info);
     if (log.is_trace()) {
-      ClassLoaderDataGraph::dump_on(log.trace_stream());
+      LogStream ls_trace(log.trace());
+      ClassLoaderDataGraph::dump_on(&ls_trace);
     }
   }