--- old/src/share/vm/c1/c1_Runtime1.cpp 2013-09-26 15:16:55.083179843 -0400 +++ new/src/share/vm/c1/c1_Runtime1.cpp 2013-09-26 15:16:53.622986281 -0400 @@ -1078,14 +1078,17 @@ // replace instructions // first replace the tail, then the call #ifdef ARM - if(load_klass_or_mirror_patch_id && !VM_Version::supports_movw()) { + if((load_klass_or_mirror_patch_id || + stub_id == Runtime1::load_appendix_patching_id) && + !VM_Version::supports_movw()) { nmethod* nm = CodeCache::find_nmethod(instr_pc); address addr = NULL; assert(nm != NULL, "invalid nmethod_pc"); RelocIterator mds(nm, copy_buff, copy_buff + 1); while (mds.next()) { if (mds.type() == relocInfo::oop_type) { - assert(stub_id == Runtime1::load_mirror_patching_id, "wrong stub id"); + assert(stub_id == Runtime1::load_mirror_patching_id || + stub_id == Runtime1::load_appendix_patching_id, "wrong stub id"); oop_Relocation* r = mds.oop_reloc(); addr = (address)r->oop_addr(); break; @@ -1097,7 +1100,9 @@ } } assert(addr != NULL, "metadata relocation must exist"); - copy_buff -= *byte_count; + if (stub_id != Runtime1::load_appendix_patching_id) { + copy_buff -= *byte_count; + } NativeMovConstReg* n_copy2 = nativeMovConstReg_at(copy_buff); n_copy2->set_pc_relative_offset(addr, instr_pc); }