src/share/vm/oops/instanceKlass.cpp

rev 13105 : imported patch 8181917-refactor-ul-logstream-alt1-callsite-changes

*** 40,49 ****
--- 40,50 ----
  #include "interpreter/oopMapCache.hpp"
  #include "interpreter/rewriter.hpp"
  #include "jvmtifiles/jvmti.h"
  #include "logging/log.hpp"
  #include "logging/logMessage.hpp"
+ #include "logging/logStream.hpp"
  #include "memory/heapInspection.hpp"
  #include "memory/iterator.inline.hpp"
  #include "memory/metadataFactory.hpp"
  #include "memory/metaspaceShared.hpp"
  #include "memory/oopFactory.hpp"
*** 1082,1097 ****
      return;
    }
  
    methodHandle h_method(THREAD, class_initializer());
    assert(!is_initialized(), "we cannot initialize twice");
!   if (log_is_enabled(Info, class, init)) {
      ResourceMark rm;
!     outputStream* log = Log(class, init)::info_stream();
!     log->print("%d Initializing ", call_class_initializer_counter++);
!     name()->print_value_on(log);
!     log->print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
    }
    if (h_method() != NULL) {
      JavaCallArguments args; // No arguments
      JavaValue result(T_VOID);
      JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args)
--- 1083,1099 ----
      return;
    }
  
    methodHandle h_method(THREAD, class_initializer());
    assert(!is_initialized(), "we cannot initialize twice");
!   LogTarget(Info, class, init) lt;
!   if (lt.is_enabled()) {
      ResourceMark rm;
!     LogStream ls(lt);
!     ls.print("%d Initializing ", call_class_initializer_counter++);
!     name()->print_value_on(&ls);
!     ls.print_cr("%s (" INTPTR_FORMAT ")", h_method() == NULL ? "(no method)" : "", p2i(this));
    }
    if (h_method() != NULL) {
      JavaCallArguments args; // No arguments
      JavaValue result(T_VOID);
      JavaCalls::call(&result, h_method, &args, CHECK); // Static call (no args)