*** old/src/share/vm/runtime/stubRoutines.cpp	Fri Jun 19 15:52:00 2015
--- new/src/share/vm/runtime/stubRoutines.cpp	Fri Jun 19 15:52:00 2015

*** 172,181 ****
--- 172,184 ----
      if (_code1 == NULL) {
        vm_exit_out_of_memory(code_size1, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (1)");
      }
      CodeBuffer buffer(_code1);
      StubGenerator_generate(&buffer, false);
+     // When new stubs added we need to make sure there is some space left
+     // to catch situation when we should increase size again.
+     assert(buffer.insts_remaining() > 200, "increase code_size1");
    }
  }
  
  
  #ifdef ASSERT

*** 256,265 ****
--- 259,271 ----
      if (_code2 == NULL) {
        vm_exit_out_of_memory(code_size2, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (2)");
      }
      CodeBuffer buffer(_code2);
      StubGenerator_generate(&buffer, true);
+     // When new stubs added we need to make sure there is some space left
+     // to catch situation when we should increase size again.
+     assert(buffer.insts_remaining() > 200, "increase code_size2");
    }
  
  #ifdef ASSERT
  
  #define TEST_ARRAYCOPY(type)                                                    \