--- old/src/share/vm/classfile/verifier.cpp	2017-06-18 08:17:30.158908200 +0200
+++ new/src/share/vm/classfile/verifier.cpp	2017-06-18 08:17:29.403836800 +0200
@@ -34,6 +34,7 @@
 #include "interpreter/bytecodes.hpp"
 #include "interpreter/bytecodeStream.hpp"
 #include "logging/log.hpp"
+#include "logging/logStream.hpp"
 #include "memory/oopFactory.hpp"
 #include "memory/resourceArea.hpp"
 #include "oops/instanceKlass.hpp"
@@ -49,7 +50,6 @@
 #include "runtime/thread.hpp"
 #include "services/threadService.hpp"
 #include "utilities/bytes.hpp"
-#include "logging/log.hpp"
 
 #define NOFAILOVER_MAJOR_VERSION                       51
 #define NONZERO_PADDING_BYTES_IN_SWITCH_MAJOR_VERSION  51
@@ -191,11 +191,15 @@
         klass, message_buffer, message_buffer_len, THREAD);
   }
 
-  if (log_is_enabled(Info, class, init)){
-    log_end_verification(Log(class, init)::info_stream(), klassName, exception_name, THREAD);
-  }
-  if (log_is_enabled(Info, verification)){
-    log_end_verification(Log(verification)::info_stream(), klassName, exception_name, THREAD);
+  LogTarget(Info, class, init) lt1;
+  if (lt1.is_enabled()) {
+    LogStream ls(lt1);
+    log_end_verification(&ls, klassName, exception_name, THREAD);
+  }
+  LogTarget(Info, verification) lt2;
+  if (lt2.is_enabled()) {
+    LogStream ls(lt2);
+    log_end_verification(&ls, klassName, exception_name, THREAD);
   }
 
   if (HAS_PENDING_EXCEPTION) {
@@ -662,9 +666,11 @@
   StackMapTable stackmap_table(&reader, &current_frame, max_locals, max_stack,
                                code_data, code_length, CHECK_VERIFY(this));
 
-  if (log_is_enabled(Info, verification)) {
+  LogTarget(Info, verification) lt;
+  if (lt.is_enabled()) {
     ResourceMark rm(THREAD);
-    stackmap_table.print_on(Log(verification)::info_stream());
+    LogStream ls(lt);
+    stackmap_table.print_on(&ls);
   }
 
   RawBytecodeStream bcs(m);
@@ -704,10 +710,12 @@
       VerificationType type, type2;
       VerificationType atype;
 
-      if (log_is_enabled(Info, verification)) {
+      LogTarget(Info, verification) lt;
+      if (lt.is_enabled()) {
         ResourceMark rm(THREAD);
-        current_frame.print_on(Log(verification)::info_stream());
-        log_info(verification)("offset = %d,  opcode = %s", bci, Bytecodes::name(opcode));
+        LogStream ls(lt);
+        current_frame.print_on(&ls);
+        lt.print("offset = %d,  opcode = %s", bci, Bytecodes::name(opcode));
       }
 
       // Make sure wide instruction is in correct format