comparison src/share/vm/c1/c1_LIRGenerator.cpp @ 23974:f13e777eb255

Merge with jdk8u111-b14
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Wed, 16 Nov 2016 12:32:54 -0800
parents b5f3a471e646 d109bda16490
children
comparison
equal deleted inserted replaced
23792:3953f8820df8 23974:f13e777eb255
3345 increment_event_counter_impl(info, x->inlinee(), (1 << Tier23InlineeNotifyFreqLog) - 1, InvocationEntryBci, false, true); 3345 increment_event_counter_impl(info, x->inlinee(), (1 << Tier23InlineeNotifyFreqLog) - 1, InvocationEntryBci, false, true);
3346 } 3346 }
3347 } 3347 }
3348 3348
3349 void LIRGenerator::increment_event_counter(CodeEmitInfo* info, int bci, bool backedge) { 3349 void LIRGenerator::increment_event_counter(CodeEmitInfo* info, int bci, bool backedge) {
3350 int freq_log; 3350 int freq_log = 0;
3351 int level = compilation()->env()->comp_level(); 3351 int level = compilation()->env()->comp_level();
3352 if (level == CompLevel_limited_profile) { 3352 if (level == CompLevel_limited_profile) {
3353 freq_log = (backedge ? Tier2BackedgeNotifyFreqLog : Tier2InvokeNotifyFreqLog); 3353 freq_log = (backedge ? Tier2BackedgeNotifyFreqLog : Tier2InvokeNotifyFreqLog);
3354 } else if (level == CompLevel_full_profile) { 3354 } else if (level == CompLevel_full_profile) {
3355 freq_log = (backedge ? Tier3BackedgeNotifyFreqLog : Tier3InvokeNotifyFreqLog); 3355 freq_log = (backedge ? Tier3BackedgeNotifyFreqLog : Tier3InvokeNotifyFreqLog);
3366 assert(frequency == 0 || is_power_of_2(frequency + 1), "Frequency must be x^2 - 1 or 0"); 3366 assert(frequency == 0 || is_power_of_2(frequency + 1), "Frequency must be x^2 - 1 or 0");
3367 int level = _compilation->env()->comp_level(); 3367 int level = _compilation->env()->comp_level();
3368 assert(level > CompLevel_simple, "Shouldn't be here"); 3368 assert(level > CompLevel_simple, "Shouldn't be here");
3369 3369
3370 int offset = -1; 3370 int offset = -1;
3371 LIR_Opr counter_holder; 3371 LIR_Opr counter_holder = NULL;
3372 if (level == CompLevel_limited_profile) { 3372 if (level == CompLevel_limited_profile) {
3373 MethodCounters* counters_adr = method->ensure_method_counters(); 3373 MethodCounters* counters_adr = method->ensure_method_counters();
3374 if (counters_adr == NULL) { 3374 if (counters_adr == NULL) {
3375 bailout("method counters allocation failed"); 3375 bailout("method counters allocation failed");
3376 return; 3376 return;