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

     1.1 --- a/src/share/vm/opto/output.cpp	Tue Sep 15 11:09:34 2009 -0700
     1.2 +++ b/src/share/vm/opto/output.cpp	Tue Sep 15 21:53:47 2009 -0700
     1.3 @@ -611,7 +611,7 @@
     1.4        assert(cik->is_instance_klass() ||
     1.5               cik->is_array_klass(), "Not supported allocation.");
     1.6        sv = new ObjectValue(spobj->_idx,
     1.7 -                           new ConstantOopWriteValue(cik->encoding()));
     1.8 +                           new ConstantOopWriteValue(cik->constant_encoding()));
     1.9        Compile::set_sv_for_object_node(objs, sv);
    1.10  
    1.11        uint first_ind = spobj->first_index();
    1.12 @@ -702,13 +702,13 @@
    1.13    case Type::AryPtr:
    1.14    case Type::InstPtr:
    1.15    case Type::KlassPtr:          // fall through
    1.16 -    array->append(new ConstantOopWriteValue(t->isa_oopptr()->const_oop()->encoding()));
    1.17 +    array->append(new ConstantOopWriteValue(t->isa_oopptr()->const_oop()->constant_encoding()));
    1.18      break;
    1.19    case Type::NarrowOop:
    1.20      if (t == TypeNarrowOop::NULL_PTR) {
    1.21        array->append(new ConstantOopWriteValue(NULL));
    1.22      } else {
    1.23 -      array->append(new ConstantOopWriteValue(t->make_ptr()->isa_oopptr()->const_oop()->encoding()));
    1.24 +      array->append(new ConstantOopWriteValue(t->make_ptr()->isa_oopptr()->const_oop()->constant_encoding()));
    1.25      }
    1.26      break;
    1.27    case Type::Int:
    1.28 @@ -871,7 +871,7 @@
    1.29            assert(cik->is_instance_klass() ||
    1.30                   cik->is_array_klass(), "Not supported allocation.");
    1.31            ObjectValue* sv = new ObjectValue(spobj->_idx,
    1.32 -                                new ConstantOopWriteValue(cik->encoding()));
    1.33 +                                new ConstantOopWriteValue(cik->constant_encoding()));
    1.34            Compile::set_sv_for_object_node(objs, sv);
    1.35  
    1.36            uint first_ind = spobj->first_index();
    1.37 @@ -890,7 +890,7 @@
    1.38          }
    1.39        } else {
    1.40          const TypePtr *tp = obj_node->bottom_type()->make_ptr();
    1.41 -        scval = new ConstantOopWriteValue(tp->is_instptr()->const_oop()->encoding());
    1.42 +        scval = new ConstantOopWriteValue(tp->is_instptr()->const_oop()->constant_encoding());
    1.43        }
    1.44  
    1.45        OptoReg::Name box_reg = BoxLockNode::stack_slot(box_node);