*** old/src/cpu/x86/vm/x86_64.ad	Mon May 19 21:08:25 2008
--- new/src/cpu/x86/vm/x86_64.ad	Mon May 19 21:08:25 2008

*** 6062,6072 ****
--- 6062,6072 ----
  
  // Load Klass Pointer
  instruct loadKlass(rRegP dst, memory mem)
  %{
    match(Set dst (LoadKlass mem));
!   predicate(!n->in(MemNode::Address)->bottom_type()->is_narrow());
!   predicate(!n->in(MemNode::Address)->bottom_type()->is_ptr_to_narrowoop());
  
    ins_cost(125); // XXX
    format %{ "movq    $dst, $mem\t# class" %}
    opcode(0x8B);
    ins_encode(REX_reg_mem_wide(dst, mem), OpcP, reg_mem(dst, mem));

*** 6075,6085 ****
--- 6075,6085 ----
  
  // Load Klass Pointer
  instruct loadKlassComp(rRegP dst, memory mem)
  %{
    match(Set dst (LoadKlass mem));
!   predicate(n->in(MemNode::Address)->bottom_type()->is_narrow());
!   predicate(n->in(MemNode::Address)->bottom_type()->is_ptr_to_narrowoop());
  
    ins_cost(125); // XXX
    format %{ "movl    $dst, $mem\t# compressed class\n\t"
              "decode_heap_oop $dst,$dst" %}
    ins_encode %{