# HG changeset patch
# User kvn
# Date 1301988478 25200
# Node ID e929be96e05bf1ec4e00569b45ff5b1de0d85878
# Parent  ec7b2f3b386c33759a14bab2b28daf6684009b25# Parent  4b84c6a49f7139039d546e541478366a4bd0e225
Merge

diff -r ec7b2f3b386c -r e929be96e05b hotspot/src/share/vm/c1/c1_LIRAssembler.cpp
--- a/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Apr 04 19:02:36 2011 -0700
+++ b/hotspot/src/share/vm/c1/c1_LIRAssembler.cpp	Tue Apr 05 00:27:58 2011 -0700
@@ -836,6 +836,9 @@
           _masm->verify_stack_oop(r->reg2stack() * VMRegImpl::stack_slot_size);
         }
       }
+      check_codespace();
+      CHECK_BAILOUT();
+
       s.next();
     }
     VerifyOops = v;