*** old/src/cpu/x86/vm/relocInfo_x86.cpp	Thu Aug 15 09:48:18 2013
--- new/src/cpu/x86/vm/relocInfo_x86.cpp	Thu Aug 15 09:48:17 2013

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1998, 2013, Oracle and/or its affiliates. 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.

*** 53,65 ****
--- 53,65 ----
      } else {
        *(int32_t*) disp = oopDesc::encode_heap_oop((oop)x);
      }
    } else {
        if (verify_only) {
!         assert(*(uint32_t*) disp == oopDesc::encode_klass((Klass*)x), "instructions must match");
!         assert(*(uint32_t*) disp == Klass::encode_klass((Klass*)x), "instructions must match");
        } else {
!         *(int32_t*) disp = oopDesc::encode_klass((Klass*)x);
!         *(int32_t*) disp = Klass::encode_klass((Klass*)x);
        }
      }
    } else {
      // Note:  Use runtime_call_type relocations for call32_operand.
      address ip = addr();