1.1 --- a/src/cpu/x86/vm/x86_64.ad Mon Jun 23 18:21:18 2008 -0700 1.2 +++ b/src/cpu/x86/vm/x86_64.ad Tue Jun 24 10:43:29 2008 -0700 1.3 @@ -7060,7 +7060,7 @@ 1.4 1.5 // Convert oop pointer into compressed form 1.6 instruct encodeHeapOop(rRegN dst, rRegP src, rFlagsReg cr) %{ 1.7 - predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() != TypePtr::NotNull); 1.8 + predicate(n->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull); 1.9 match(Set dst (EncodeP src)); 1.10 effect(KILL cr); 1.11 format %{ "encode_heap_oop $dst,$src" %} 1.12 @@ -7076,7 +7076,7 @@ 1.13 %} 1.14 1.15 instruct encodeHeapOop_not_null(rRegN dst, rRegP src, rFlagsReg cr) %{ 1.16 - predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() == TypePtr::NotNull); 1.17 + predicate(n->bottom_type()->make_ptr()->ptr() == TypePtr::NotNull); 1.18 match(Set dst (EncodeP src)); 1.19 effect(KILL cr); 1.20 format %{ "encode_heap_oop_not_null $dst,$src" %}