comparison src/share/vm/opto/memnode.cpp @ 12226:7944aba7ba41

8015107: NPG: Use consistent naming for metaspace concepts Reviewed-by: coleenp, mgerdin, hseigel
author ehelin
date Mon, 12 Aug 2013 17:37:02 +0200
parents 3aa636f2a743
children 884ed7a10f09
comparison
equal deleted inserted replaced
12186:313b724f8911 12226:7944aba7ba41
1969 // sanity check the alias category against the created node type 1969 // sanity check the alias category against the created node type
1970 const TypePtr *adr_type = adr->bottom_type()->isa_ptr(); 1970 const TypePtr *adr_type = adr->bottom_type()->isa_ptr();
1971 assert(adr_type != NULL, "expecting TypeKlassPtr"); 1971 assert(adr_type != NULL, "expecting TypeKlassPtr");
1972 #ifdef _LP64 1972 #ifdef _LP64
1973 if (adr_type->is_ptr_to_narrowklass()) { 1973 if (adr_type->is_ptr_to_narrowklass()) {
1974 assert(UseCompressedKlassPointers, "no compressed klasses"); 1974 assert(UseCompressedClassPointers, "no compressed klasses");
1975 Node* load_klass = gvn.transform(new (C) LoadNKlassNode(ctl, mem, adr, at, tk->make_narrowklass())); 1975 Node* load_klass = gvn.transform(new (C) LoadNKlassNode(ctl, mem, adr, at, tk->make_narrowklass()));
1976 return new (C) DecodeNKlassNode(load_klass, load_klass->bottom_type()->make_ptr()); 1976 return new (C) DecodeNKlassNode(load_klass, load_klass->bottom_type()->make_ptr());
1977 } 1977 }
1978 #endif 1978 #endif
1979 assert(!adr_type->is_ptr_to_narrowklass() && !adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop"); 1979 assert(!adr_type->is_ptr_to_narrowklass() && !adr_type->is_ptr_to_narrowoop(), "should have got back a narrow oop");
2307 #ifdef _LP64 2307 #ifdef _LP64
2308 if (adr->bottom_type()->is_ptr_to_narrowoop()) { 2308 if (adr->bottom_type()->is_ptr_to_narrowoop()) {
2309 val = gvn.transform(new (C) EncodePNode(val, val->bottom_type()->make_narrowoop())); 2309 val = gvn.transform(new (C) EncodePNode(val, val->bottom_type()->make_narrowoop()));
2310 return new (C) StoreNNode(ctl, mem, adr, adr_type, val); 2310 return new (C) StoreNNode(ctl, mem, adr, adr_type, val);
2311 } else if (adr->bottom_type()->is_ptr_to_narrowklass() || 2311 } else if (adr->bottom_type()->is_ptr_to_narrowklass() ||
2312 (UseCompressedKlassPointers && val->bottom_type()->isa_klassptr() && 2312 (UseCompressedClassPointers && val->bottom_type()->isa_klassptr() &&
2313 adr->bottom_type()->isa_rawptr())) { 2313 adr->bottom_type()->isa_rawptr())) {
2314 val = gvn.transform(new (C) EncodePKlassNode(val, val->bottom_type()->make_narrowklass())); 2314 val = gvn.transform(new (C) EncodePKlassNode(val, val->bottom_type()->make_narrowklass()));
2315 return new (C) StoreNKlassNode(ctl, mem, adr, adr_type, val); 2315 return new (C) StoreNKlassNode(ctl, mem, adr, adr_type, val);
2316 } 2316 }
2317 #endif 2317 #endif