# HG changeset patch
# User jprovino
# Date 1380810354 14400
# Node ID d0cfa6502dfe9d3d2e9dd02f244163b41df7512b
# Parent  31f0118ea58470491b705982f61d33329a76d457# Parent  5186dcaca431d975b8fba45d5846f2da9427d88f
Merge

diff -r 31f0118ea584 -r d0cfa6502dfe src/share/vm/c1/c1_Runtime1.cpp
--- a/src/share/vm/c1/c1_Runtime1.cpp	Tue Oct 01 11:06:35 2013 -0400
+++ b/src/share/vm/c1/c1_Runtime1.cpp	Thu Oct 03 10:25:54 2013 -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;