Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/opto/locknode.cpp	Sat Jan 07 13:26:43 2012 -0800
     1.2 +++ b/src/share/vm/opto/locknode.cpp	Tue Jan 10 18:05:38 2012 -0800
     1.3 @@ -100,7 +100,7 @@
     1.4        AbstractLockNode* alock = n->as_AbstractLock();
     1.5        // Check lock's box since box could be referenced by Lock's debug info.
     1.6        if (alock->box_node() == this) {
     1.7 -        if (alock->obj_node() == obj) {
     1.8 +        if (alock->obj_node()->eqv_uncast(obj)) {
     1.9            if ((unique_lock != NULL) && alock->is_Lock()) {
    1.10              if (lock == NULL) {
    1.11                lock = alock->as_Lock();
    1.12 @@ -121,7 +121,7 @@
    1.13      Node* n = this->raw_out(i);
    1.14      if (n->is_FastLock()) {
    1.15        FastLockNode* flock = n->as_FastLock();
    1.16 -      assert((flock->box_node() == this) && (flock->obj_node() == obj),"");
    1.17 +      assert((flock->box_node() == this) && flock->obj_node()->eqv_uncast(obj),"");
    1.18      }
    1.19      if (n->is_SafePoint() && n->as_SafePoint()->jvms()) {
    1.20        SafePointNode* sfn = n->as_SafePoint();
    1.21 @@ -135,7 +135,7 @@
    1.22            Node* obj_node = sfn->monitor_obj(jvms, idx);
    1.23            Node* box_node = sfn->monitor_box(jvms, idx);
    1.24            if (box_node == this) {
    1.25 -            assert(obj_node == obj,"");
    1.26 +            assert(obj_node->eqv_uncast(obj),"");
    1.27            }
    1.28          }
    1.29        }