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

     1.1 --- a/src/share/vm/opto/callGenerator.cpp	Wed Nov 20 11:08:09 2013 -0800
     1.2 +++ b/src/share/vm/opto/callGenerator.cpp	Thu Nov 21 12:30:35 2013 -0800
     1.3 @@ -776,7 +776,7 @@
     1.4          guarantee(!target->is_method_handle_intrinsic(), "should not happen");  // XXX remove
     1.5          const int vtable_index = Method::invalid_vtable_index;
     1.6          CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, NULL, true, true);
     1.7 -        assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
     1.8 +        assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
     1.9          if (cg != NULL && cg->is_inline())
    1.10            return cg;
    1.11        }
    1.12 @@ -846,7 +846,7 @@
    1.13          }
    1.14  
    1.15          CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, speculative_receiver_type, true, true);
    1.16 -        assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
    1.17 +        assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
    1.18          if (cg != NULL && cg->is_inline())
    1.19            return cg;
    1.20        }