--- a/hotspot/src/share/vm/opto/runtime.cpp	Thu Jul 20 17:23:24 2017 -0700
+++ b/hotspot/src/share/vm/opto/runtime.cpp	Fri Jul 21 09:50:12 2017 +0200
@@ -43,6 +43,7 @@
 #include "interpreter/interpreter.hpp"
 #include "interpreter/linkResolver.hpp"
 #include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/objArrayKlass.hpp"
@@ -1287,9 +1288,11 @@
   // normal bytecode execution.
   thread->clear_exception_oop_and_pc();
 
-  if (log_is_enabled(Info, exceptions)) {
+  LogTarget(Info, exceptions) lt;
+  if (lt.is_enabled()) {
     ResourceMark rm;
-    trace_exception(Log(exceptions)::info_stream(), exception(), pc, "");
+    LogStream ls(lt);
+    trace_exception(&ls, exception(), pc, "");
   }
 
   // for AbortVMOnException flag