src/cpu/x86/vm/x86_64.ad

*** 7058,7068 ****
  %}
  
  
  // Convert oop pointer into compressed form
  instruct encodeHeapOop(rRegN dst, rRegP src, rFlagsReg cr) %{
!   predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() != TypePtr::NotNull);
    match(Set dst (EncodeP src));
    effect(KILL cr);
    format %{ "encode_heap_oop $dst,$src" %}
    ins_encode %{
      Register s = $src$$Register;
--- 7058,7068 ----
  %}
  
  
  // Convert oop pointer into compressed form
  instruct encodeHeapOop(rRegN dst, rRegP src, rFlagsReg cr) %{
!   predicate(n->bottom_type()->make_ptr()->ptr() != TypePtr::NotNull);
    match(Set dst (EncodeP src));
    effect(KILL cr);
    format %{ "encode_heap_oop $dst,$src" %}
    ins_encode %{
      Register s = $src$$Register;
*** 7074,7084 ****
    %}
    ins_pipe(ialu_reg_long);
  %}
  
  instruct encodeHeapOop_not_null(rRegN dst, rRegP src, rFlagsReg cr) %{
!   predicate(n->bottom_type()->is_narrowoop()->make_oopptr()->ptr() == TypePtr::NotNull);
    match(Set dst (EncodeP src));
    effect(KILL cr);
    format %{ "encode_heap_oop_not_null $dst,$src" %}
    ins_encode %{
      Register s = $src$$Register;
--- 7074,7084 ----
    %}
    ins_pipe(ialu_reg_long);
  %}
  
  instruct encodeHeapOop_not_null(rRegN dst, rRegP src, rFlagsReg cr) %{
!   predicate(n->bottom_type()->make_ptr()->ptr() == TypePtr::NotNull);
    match(Set dst (EncodeP src));
    effect(KILL cr);
    format %{ "encode_heap_oop_not_null $dst,$src" %}
    ins_encode %{
      Register s = $src$$Register;