changeset 8874:da41f75db57a

Merge
author coleenp
date Thu, 20 Aug 2015 17:39:43 +0200
parents 91bd6ad35898 57bb83e8b536
children efc17f03e5d4
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/stubRoutines.cpp	Thu Aug 20 15:17:43 2015 +0200
+++ b/src/share/vm/runtime/stubRoutines.cpp	Thu Aug 20 17:39:43 2015 +0200
@@ -181,7 +181,7 @@
     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");
+    assert(code_size1 == 0 || buffer.insts_remaining() > 200, "increase code_size1");
   }
 }
 
@@ -274,7 +274,7 @@
     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");
+    assert(code_size2 == 0 || buffer.insts_remaining() > 200, "increase code_size2");
   }
 
 #ifdef ASSERT