--- old/src/cpu/x86/vm/vtableStubs_x86_64.cpp	2015-10-14 13:53:43.040643378 +0200
+++ new/src/cpu/x86/vm/vtableStubs_x86_64.cpp	2015-10-14 13:53:42.892646956 +0200
@@ -222,11 +222,13 @@
 int VtableStub::pd_code_size_limit(bool is_vtable_stub) {
   if (is_vtable_stub) {
     // Vtable stub size
-    return (DebugVtables ? 512 : 24) + (CountCompiledCalls ? 13 : 0) +
+    return (ShenandoahVerifyReadsToFromSpace ? 512 : 0) +
+           (DebugVtables ? 512 : 24) + (CountCompiledCalls ? 13 : 0) +
            (UseCompressedClassPointers ?  MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
   } else {
     // Itable stub size
-    return (DebugVtables ? 512 : 74) + (CountCompiledCalls ? 13 : 0) +
+    return (ShenandoahVerifyReadsToFromSpace ? 512 : 0) +
+           (DebugVtables ? 512 : 74) + (CountCompiledCalls ? 13 : 0) +
            (UseCompressedClassPointers ?  MacroAssembler::instr_size_for_decode_klass_not_null() : 0);
   }
   // In order to tune these parameters, run the JVM with VM options