Mercurial > hg > truffle
diff src/share/vm/opto/callGenerator.cpp @ 13081:e74074c34312
8028159: C2: compiler stack overflow during inlining of @ForceInline methods
Reviewed-by: roland, kvn
| author | vlivanov |
|---|---|
| date | Thu, 14 Nov 2013 09:14:39 -0800 |
| parents | b2ee5dc63353 |
| children | de6a9e811145 b0133e4187d3 |
line wrap: on
line diff
--- a/src/share/vm/opto/callGenerator.cpp Wed Nov 13 13:45:50 2013 +0100 +++ b/src/share/vm/opto/callGenerator.cpp Thu Nov 14 09:14:39 2013 -0800 @@ -776,7 +776,7 @@ guarantee(!target->is_method_handle_intrinsic(), "should not happen"); // XXX remove const int vtable_index = Method::invalid_vtable_index; CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, NULL, true, true); - assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here"); + assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here"); if (cg != NULL && cg->is_inline()) return cg; } @@ -846,7 +846,7 @@ } CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, speculative_receiver_type, true, true); - assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here"); + assert(cg == NULL || !cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here"); if (cg != NULL && cg->is_inline()) return cg; }