--- old/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	2015-04-06 14:41:00.343734600 -0700
+++ new/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	2015-04-06 14:41:00.134713700 -0700
@@ -117,9 +117,9 @@
   int vect_words = 0;
 #ifdef COMPILER2
   if (save_vectors) {
-    assert(UseAVX > 0, "256bit vectors are supported only with AVX");
-    assert(MaxVectorSize == 32, "only 256bit vectors are supported now");
-    // Save upper half of YMM registes
+    assert(UseAVX > 0, "512bit vectors are supported only with EVEX");
+    assert(MaxVectorSize == 64, "only 512bit vectors are supported now");
+    // Save upper half of ZMM/YMM registers : TODO: add support for ZMM save
     vect_words = 8 * 16 / wordSize;
     additional_frame_words += vect_words;
   }
@@ -283,8 +283,9 @@
   int additional_frame_bytes = 0;
 #ifdef COMPILER2
   if (restore_vectors) {
-    assert(UseAVX > 0, "256bit vectors are supported only with AVX");
-    assert(MaxVectorSize == 32, "only 256bit vectors are supported now");
+    assert(UseAVX > 0, "512bit vectors are supported only with EVEX");
+    assert(MaxVectorSize == 64, "only 512bit vectors are supported now");
+    // TODO: add frame support for additional_frame_bytes = 256
     additional_frame_bytes = 128;
   }
 #else