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

     1.1 --- a/src/share/vm/opto/memnode.cpp	Fri Sep 06 11:11:19 2013 -0700
     1.2 +++ b/src/share/vm/opto/memnode.cpp	Mon Aug 12 17:37:02 2013 +0200
     1.3 @@ -1971,7 +1971,7 @@
     1.4    assert(adr_type != NULL, "expecting TypeKlassPtr");
     1.5  #ifdef _LP64
     1.6    if (adr_type->is_ptr_to_narrowklass()) {
     1.7 -    assert(UseCompressedKlassPointers, "no compressed klasses");
     1.8 +    assert(UseCompressedClassPointers, "no compressed klasses");
     1.9      Node* load_klass = gvn.transform(new (C) LoadNKlassNode(ctl, mem, adr, at, tk->make_narrowklass()));
    1.10      return new (C) DecodeNKlassNode(load_klass, load_klass->bottom_type()->make_ptr());
    1.11    }
    1.12 @@ -2309,7 +2309,7 @@
    1.13        val = gvn.transform(new (C) EncodePNode(val, val->bottom_type()->make_narrowoop()));
    1.14        return new (C) StoreNNode(ctl, mem, adr, adr_type, val);
    1.15      } else if (adr->bottom_type()->is_ptr_to_narrowklass() ||
    1.16 -               (UseCompressedKlassPointers && val->bottom_type()->isa_klassptr() &&
    1.17 +               (UseCompressedClassPointers && val->bottom_type()->isa_klassptr() &&
    1.18                  adr->bottom_type()->isa_rawptr())) {
    1.19        val = gvn.transform(new (C) EncodePKlassNode(val, val->bottom_type()->make_narrowklass()));
    1.20        return new (C) StoreNKlassNode(ctl, mem, adr, adr_type, val);