comparison src/share/vm/opto/locknode.cpp @ 7206:d2f8c38e543d

Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents beebba0acc11
children 606acabe7b5c
comparison
equal deleted inserted replaced
7191:816b7e5bf2ed 7206:d2f8c38e543d
163 //------------------------------do_monitor_enter------------------------------- 163 //------------------------------do_monitor_enter-------------------------------
164 void Parse::do_monitor_enter() { 164 void Parse::do_monitor_enter() {
165 kill_dead_locals(); 165 kill_dead_locals();
166 166
167 // Null check; get casted pointer. 167 // Null check; get casted pointer.
168 Node *obj = do_null_check(peek(), T_OBJECT); 168 Node* obj = null_check(peek());
169 // Check for locking null object 169 // Check for locking null object
170 if (stopped()) return; 170 if (stopped()) return;
171 171
172 // the monitor object is not part of debug info expression stack 172 // the monitor object is not part of debug info expression stack
173 pop(); 173 pop();