src/share/vm/aot/aotCompiledMethod.cpp

rev 29186 : Review changes 2

*** 21,44 ****
   * questions.
   */
  
  #include "precompiled.hpp"
  
  #include "code/codeCache.hpp"
  #include "code/compiledIC.hpp"
  #include "code/nativeInst.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "jvmci/compilerRuntime.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  #include "oops/method.hpp"
- #include "aot/aotCompiledMethod.hpp"
- #include "aot/aotLoader.hpp"
- #include "aot/aotCodeHeap.hpp"
- #include "aot/compiledIC_aot.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/array.hpp"
  #include "utilities/xmlstream.hpp"
--- 21,43 ----
   * questions.
   */
  
  #include "precompiled.hpp"
  
+ #include "aot/aotCodeHeap.hpp"
+ #include "aot/aotLoader.hpp"
+ #include "aot/compiledIC_aot.hpp"
  #include "code/codeCache.hpp"
  #include "code/compiledIC.hpp"
  #include "code/nativeInst.hpp"
  #include "compiler/compilerOracle.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/gcLocker.hpp"
  #include "jvmci/compilerRuntime.hpp"
  #include "jvmci/jvmciRuntime.hpp"
  #include "oops/method.hpp"
  #include "runtime/java.hpp"
  #include "runtime/os.hpp"
  #include "runtime/sharedRuntime.hpp"
  #include "utilities/array.hpp"
  #include "utilities/xmlstream.hpp"
*** 398,408 ****
    if (db == NULL) {
      assert(dest == _call->plt_resolve_call(), "sanity");
    }
  }
  
! void PltNativeCallWrapper::set_to_interpreted(methodHandle method, CompiledICInfo& info) {
    assert(!info.to_aot(), "only for nmethod");
    CompiledPltStaticCall* csc = CompiledPltStaticCall::at(instruction_address());
    csc->set_to_interpreted(method, info.entry());
  }
  
--- 397,407 ----
    if (db == NULL) {
      assert(dest == _call->plt_resolve_call(), "sanity");
    }
  }
  
! void PltNativeCallWrapper::set_to_interpreted(const methodHandle& method, CompiledICInfo& info) {
    assert(!info.to_aot(), "only for nmethod");
    CompiledPltStaticCall* csc = CompiledPltStaticCall::at(instruction_address());
    csc->set_to_interpreted(method, info.entry());
  }