*** old/src/cpu/sparc/vm/sparc.ad	Fri Jun 20 14:33:42 2008
--- new/src/cpu/sparc/vm/sparc.ad	Fri Jun 20 14:33:42 2008

*** 5953,5973 ****
--- 5953,5973 ----
    ins_pipe(fstoreD_mem_reg);
  %}
  
  // Convert oop pointer into compressed form
  instruct encodeHeapOop(iRegN dst, iRegP src) %{
!   predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() != TypePtr::NotNull);
!   predicate(n->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull);
    match(Set dst (EncodeP src));
    format %{ "encode_heap_oop $src, $dst" %}
    ins_encode %{
      __ encode_heap_oop($src$$Register, $dst$$Register);
    %}
    ins_pipe(ialu_reg);
  %}
  
  instruct encodeHeapOop_not_null(iRegN dst, iRegP src) %{
!   predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() == TypePtr::NotNull);
!   predicate(n->bottom_type()->make_ptr()->ptr() == TypePtr::NotNull);
    match(Set dst (EncodeP src));
    format %{ "encode_heap_oop_not_null $src, $dst" %}
    ins_encode %{
      __ encode_heap_oop_not_null($src$$Register, $dst$$Register);
    %}