src/cpu/x86/vm/stubGenerator_x86_64.cpp

*** 380,390 ****
      }
  #endif
  
      // restore regs belonging to calling function
  #ifdef _WIN64
!     for (int i = 15; i >= 6; i--) {
        __ movdqu(as_XMMRegister(i), xmm_save(i));
      }
  #endif
      __ movptr(r15, r15_save);
      __ movptr(r14, r14_save);
--- 380,395 ----
      }
  #endif
  
      // restore regs belonging to calling function
  #ifdef _WIN64
!     int xmm_ub = 15;
!     if (UseAVX > 2) {
!       xmm_ub = 31;
!     }
!     // emit the restores for xmm regs
!     for (int i = 6; i <= xmm_ub; i++) {
        __ movdqu(as_XMMRegister(i), xmm_save(i));
      }
  #endif
      __ movptr(r15, r15_save);
      __ movptr(r14, r14_save);