# HG changeset patch
# User kvn
# Date 1301988478 25200
# Node ID 03f2be00fa216cb73134b52c7812e30ab8eb85bf
# Parent  d7a3fed1c1c9934ad503e647ddf12c5961047429# Parent  fb37e3eabfd0ca895b75d39be9578f1e9a558ef2
Merge

diff -r d7a3fed1c1c9 -r 03f2be00fa21 src/share/vm/c1/c1_LIRAssembler.cpp
--- a/src/share/vm/c1/c1_LIRAssembler.cpp	Mon Apr 04 19:02:36 2011 -0700
+++ b/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;