Mercurial > hg > graal-compiler
diff src/share/vm/opto/locknode.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | beebba0acc11 |
children | 606acabe7b5c |
line wrap: on
line diff
--- a/src/share/vm/opto/locknode.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/share/vm/opto/locknode.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -165,7 +165,7 @@ kill_dead_locals(); // Null check; get casted pointer. - Node *obj = do_null_check(peek(), T_OBJECT); + Node* obj = null_check(peek()); // Check for locking null object if (stopped()) return;