hotspot/src/share/vm/runtime/init.cpp

*** 23,33 ****
   */
  
  #include "precompiled.hpp"
  #include "classfile/stringTable.hpp"
  #include "classfile/symbolTable.hpp"
- #include "code/codeCacheExtensions.hpp"
  #include "code/icBuffer.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "interpreter/bytecodes.hpp"
  #include "memory/universe.hpp"
  #include "prims/methodHandles.hpp"
--- 23,32 ----
*** 103,126 ****
    management_init();
    bytecodes_init();
    classLoader_init1();
    compilationPolicy_init();
    codeCache_init();
-   CodeCacheExtensions::initialize();
    VM_Version_init();
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::VMVersion);
    os_init_globals();
    stubRoutines_init1();
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::StubRoutines1);
    jint status = universe_init();  // dependent on codeCache_init and
                                    // stubRoutines_init1 and metaspace_init.
    if (status != JNI_OK)
      return status;
  
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Universe);
    interpreter_init();  // before any methods loaded
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::Interpreter);
    invocationCounter_init();  // before any methods loaded
    marksweep_init();
    accessFlags_init();
    templateTable_init();
    InterfaceSupport_init();
--- 102,120 ----
*** 146,156 ****
      return JNI_ERR;
    }
    javaClasses_init();   // must happen after vtable initialization
    stubRoutines_init2(); // note: StubRoutines need 2-phase init
    MethodHandles::generate_adapters();
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::StubRoutines2);
  
  #if INCLUDE_NMT
    // Solaris stack is walkable only after stubRoutines are set up.
    // On Other platforms, the stack is always walkable.
    NMT_stack_walkable = true;
--- 140,149 ----
*** 160,170 ****
    // have been set so dump the flags now.
    if (PrintFlagsFinal || PrintFlagsRanges) {
      CommandLineFlags::printFlags(tty, false, PrintFlagsRanges);
    }
  
-   CodeCacheExtensions::complete_step(CodeCacheExtensionsSteps::InitGlobals);
    return JNI_OK;
  }
  
  
  void exit_globals() {
--- 153,162 ----