diff options
| author | iveresov <none@none> | 2013-10-08 07:08:27 -0700 |
|---|---|---|
| committer | iveresov <none@none> | 2013-10-08 07:08:27 -0700 |
| commit | 3df475b376f7c1b4b533aa15954170dbe80966d5 (patch) | |
| tree | 38a677952bdf3cc437b4daa80ad237201c1625d0 /src/share/vm/c1 | |
| parent | 78f91ecb063bc4a027d21ce52cf5818f0ae90838 (diff) | |
| parent | be32bec5abc992e936229026ecd534f8ec573187 (diff) | |
Merge
Diffstat (limited to 'src/share/vm/c1')
| -rw-r--r-- | src/share/vm/c1/c1_LIRGenerator.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/share/vm/c1/c1_LIRGenerator.cpp b/src/share/vm/c1/c1_LIRGenerator.cpp index dbe3476aa..f71470e5e 100644 --- a/src/share/vm/c1/c1_LIRGenerator.cpp +++ b/src/share/vm/c1/c1_LIRGenerator.cpp @@ -3053,7 +3053,11 @@ void LIRGenerator::increment_event_counter_impl(CodeEmitInfo* info, int offset = -1; LIR_Opr counter_holder; if (level == CompLevel_limited_profile) { - address counters_adr = method->ensure_method_counters(); + MethodCounters* counters_adr = method->ensure_method_counters(); + if (counters_adr == NULL) { + bailout("method counters allocation failed"); + return; + } counter_holder = new_pointer_register(); __ move(LIR_OprFact::intptrConst(counters_adr), counter_holder); offset = in_bytes(backedge ? MethodCounters::backedge_counter_offset() : |