src/hotspot/cpu/x86/templateInterpreterGenerator_x86.cpp

@@ -37,10 +37,11 @@
  #include "oops/arrayOop.hpp"
  #include "oops/methodCounters.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"
+ #include "oops/inlineKlass.hpp"
  #include "oops/resolvedIndyEntry.hpp"
  #include "oops/resolvedMethodEntry.hpp"
  #include "prims/jvmtiExport.hpp"
  #include "prims/jvmtiThreadState.hpp"
  #include "runtime/continuation.hpp"

@@ -63,11 +64,11 @@
  // fail with a guarantee ("not enough space for interpreter generation");
  // if too small.
  // Run with +PrintInterpreter to get the VM to print out the size.
  // Max size with JVMTI
  #ifdef AMD64
- int TemplateInterpreter::InterpreterCodeSize = JVMCI_ONLY(268) NOT_JVMCI(256) * 1024;
+ int TemplateInterpreter::InterpreterCodeSize = JVMCI_ONLY(280) NOT_JVMCI(268) * 1024;
  #else
  int TemplateInterpreter::InterpreterCodeSize = 224 * 1024;
  #endif // AMD64
  
  // Global Register Names

@@ -208,15 +209,19 @@
      __ MacroAssembler::verify_FPU(UseSSE >= 2 ? 0 : 1, "generate_return_entry_for in interpreter");
    }
  #endif // _LP64
  
    // Restore stack bottom in case i2c adjusted stack
-   __ movptr(rcx, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
-   __ lea(rsp, Address(rbp, rcx, Address::times_ptr));
+   __ movptr(rscratch1, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
+   __ lea(rsp, Address(rbp, rscratch1, Address::times_ptr));
    // and null it as marker that esp is now tos until next java call
    __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), NULL_WORD);
  
+   if (state == atos && InlineTypeReturnedAsFields) {
+     __ store_inline_type_fields_to_buf(NULL);
+   }
+ 
    __ restore_bcp();
    __ restore_locals();
  
    if (state == atos) {
      Register mdp = rbx;