Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/code/nmethod.cpp	Tue Aug 08 12:02:01 2017 +0100
     1.2 +++ b/src/share/vm/code/nmethod.cpp	Fri Sep 29 14:30:05 2017 -0400
     1.3 @@ -1748,12 +1748,11 @@
     1.4      CompiledICHolder* cichk_oop = ic->cached_icholder();
     1.5  
     1.6      if (mark_on_stack) {
     1.7 -      Metadata::mark_on_stack(cichk_oop->holder_method());
     1.8 +      Metadata::mark_on_stack(cichk_oop->holder_metadata());
     1.9        Metadata::mark_on_stack(cichk_oop->holder_klass());
    1.10      }
    1.11  
    1.12 -    if (cichk_oop->holder_method()->method_holder()->is_loader_alive(is_alive) &&
    1.13 -        cichk_oop->holder_klass()->is_loader_alive(is_alive)) {
    1.14 +    if (cichk_oop->is_loader_alive(is_alive)) {
    1.15        return;
    1.16      }
    1.17    } else {
    1.18 @@ -2180,7 +2179,7 @@
    1.19          CompiledIC *ic = CompiledIC_at(&iter);
    1.20          if (ic->is_icholder_call()) {
    1.21            CompiledICHolder* cichk = ic->cached_icholder();
    1.22 -          f(cichk->holder_method());
    1.23 +          f(cichk->holder_metadata());
    1.24            f(cichk->holder_klass());
    1.25          } else {
    1.26            Metadata* ic_oop = ic->cached_metadata();