1.1 --- a/src/share/vm/code/nmethod.cpp Thu Jun 26 11:36:58 2014 +0200
1.2 +++ b/src/share/vm/code/nmethod.cpp Tue Jul 01 09:03:55 2014 +0200
1.3 @@ -1166,7 +1166,7 @@
1.4 switch(iter.type()) {
1.5 case relocInfo::virtual_call_type:
1.6 case relocInfo::opt_virtual_call_type: {
1.7 - CompiledIC *ic = CompiledIC_at(iter.reloc());
1.8 + CompiledIC *ic = CompiledIC_at(&iter);
1.9 // Ok, to lookup references to zombies here
1.10 CodeBlob *cb = CodeCache::find_blob_unsafe(ic->ic_destination());
1.11 if( cb != NULL && cb->is_nmethod() ) {
1.12 @@ -1663,7 +1663,7 @@
1.13 RelocIterator iter(this, low_boundary);
1.14 while(iter.next()) {
1.15 if (iter.type() == relocInfo::virtual_call_type) {
1.16 - CompiledIC *ic = CompiledIC_at(iter.reloc());
1.17 + CompiledIC *ic = CompiledIC_at(&iter);
1.18 if (ic->is_icholder_call()) {
1.19 // The only exception is compiledICHolder oops which may
1.20 // yet be marked below. (We check this further below).
1.21 @@ -1772,7 +1772,7 @@
1.22 // compiled code is maintaining a link to dead metadata.
1.23 address static_call_addr = NULL;
1.24 if (iter.type() == relocInfo::opt_virtual_call_type) {
1.25 - CompiledIC* cic = CompiledIC_at(iter.reloc());
1.26 + CompiledIC* cic = CompiledIC_at(&iter);
1.27 if (!cic->is_call_to_interpreted()) {
1.28 static_call_addr = iter.addr();
1.29 }
1.30 @@ -1824,7 +1824,7 @@
1.31 }
1.32 } else if (iter.type() == relocInfo::virtual_call_type) {
1.33 // Check compiledIC holders associated with this nmethod
1.34 - CompiledIC *ic = CompiledIC_at(iter.reloc());
1.35 + CompiledIC *ic = CompiledIC_at(&iter);
1.36 if (ic->is_icholder_call()) {
1.37 CompiledICHolder* cichk = ic->cached_icholder();
1.38 f(cichk->holder_method());
1.39 @@ -2927,7 +2927,7 @@
1.40 case relocInfo::virtual_call_type:
1.41 case relocInfo::opt_virtual_call_type: {
1.42 VerifyMutexLocker mc(CompiledIC_lock);
1.43 - CompiledIC_at(iter.reloc())->print();
1.44 + CompiledIC_at(&iter)->print();
1.45 break;
1.46 }
1.47 case relocInfo::static_call_type:
