comparison src/share/vm/c1/c1_LIRAssembler.cpp @ 3243:208b6c560ff4

Merge
author vladidan
date Thu, 14 Apr 2011 11:02:05 -0400
parents 6c97c830fb6f
children 5857923e563c b346f13112d8
comparison
equal deleted inserted replaced
3242:c737922fd8bb 3243:208b6c560ff4
1 /* 1 /*
2 * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
834 #endif 834 #endif
835 } else { 835 } else {
836 _masm->verify_stack_oop(r->reg2stack() * VMRegImpl::stack_slot_size); 836 _masm->verify_stack_oop(r->reg2stack() * VMRegImpl::stack_slot_size);
837 } 837 }
838 } 838 }
839 check_codespace();
840 CHECK_BAILOUT();
841
839 s.next(); 842 s.next();
840 } 843 }
841 VerifyOops = v; 844 VerifyOops = v;
842 } 845 }
843 #endif 846 #endif