src/cpu/x86/vm/methodHandles_x86.cpp

*** 1,7 ****
  /*
!  * Copyright 1997-2009 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright 1997-2010 Sun Microsystems, Inc.  All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 582,592 ****
        __ movptr(rbx_klass, rcx_amh_argument); // this is a Class object!
        __ movptr(rbx_klass, Address(rbx_klass, java_lang_Class::klass_offset_in_bytes()));
  
        Label done;
        __ movptr(rdx_temp, vmarg);
!       __ testl(rdx_temp, rdx_temp);
        __ jccb(Assembler::zero, done);         // no cast if null
        __ load_klass(rdx_temp, rdx_temp);
  
        // live at this point:
        // - rbx_klass:  klass required by the target method
--- 582,592 ----
        __ movptr(rbx_klass, rcx_amh_argument); // this is a Class object!
        __ movptr(rbx_klass, Address(rbx_klass, java_lang_Class::klass_offset_in_bytes()));
  
        Label done;
        __ movptr(rdx_temp, vmarg);
!       __ testptr(rdx_temp, rdx_temp);
        __ jccb(Assembler::zero, done);         // no cast if null
        __ load_klass(rdx_temp, rdx_temp);
  
        // live at this point:
        // - rbx_klass:  klass required by the target method