--- old/src/hotspot/cpu/x86/c1_Defs_x86.hpp	2018-09-12 16:10:18.398974200 -0700
+++ new/src/hotspot/cpu/x86/c1_Defs_x86.hpp	2018-09-12 16:10:18.234974203 -0700
@@ -41,7 +41,7 @@
 enum {
   pd_nof_cpu_regs_frame_map = RegisterImpl::number_of_registers,       // number of registers used during code emission
   pd_nof_fpu_regs_frame_map = FloatRegisterImpl::number_of_registers,  // number of registers used during code emission
-  pd_nof_xmm_regs_frame_map = XMMRegisterImpl::number_of_registers,    // number of registers used during code emission
+  pd_nof_xmm_regs_frame_map = (XMMRegisterImpl::number_of_registers > 16) ? 16: (XMMRegisterImpl::number_of_registers),    // number of registers used during code emission
 
 #ifdef _LP64
   #define UNALLOCATED 4    // rsp, rbp, r15, r10