1.1 --- a/src/share/vm/ci/ciMethod.cpp Mon Oct 07 14:13:28 2013 +0400
1.2 +++ b/src/share/vm/ci/ciMethod.cpp Mon Oct 07 10:41:56 2013 -0700
1.3 @@ -846,7 +846,9 @@
1.4 // Return true if allocation was successful or no MDO is required.
1.5 bool ciMethod::ensure_method_data(methodHandle h_m) {
1.6 EXCEPTION_CONTEXT;
1.7 - if (is_native() || is_abstract() || h_m()->is_accessor()) return true;
1.8 + if (is_native() || is_abstract() || h_m()->is_accessor()) {
1.9 + return true;
1.10 + }
1.11 if (h_m()->method_data() == NULL) {
1.12 Method::build_interpreter_method_data(h_m, THREAD);
1.13 if (HAS_PENDING_EXCEPTION) {
1.14 @@ -903,22 +905,21 @@
1.15 // NULL otherwise.
1.16 ciMethodData* ciMethod::method_data_or_null() {
1.17 ciMethodData *md = method_data();
1.18 - if (md->is_empty()) return NULL;
1.19 + if (md->is_empty()) {
1.20 + return NULL;
1.21 + }
1.22 return md;
1.23 }
1.24
1.25 // ------------------------------------------------------------------
1.26 // ciMethod::ensure_method_counters
1.27 //
1.28 -address ciMethod::ensure_method_counters() {
1.29 +MethodCounters* ciMethod::ensure_method_counters() {
1.30 check_is_loaded();
1.31 VM_ENTRY_MARK;
1.32 methodHandle mh(THREAD, get_Method());
1.33 - MethodCounters *counter = mh->method_counters();
1.34 - if (counter == NULL) {
1.35 - counter = Method::build_method_counters(mh(), CHECK_AND_CLEAR_NULL);
1.36 - }
1.37 - return (address)counter;
1.38 + MethodCounters* method_counters = mh->get_method_counters(CHECK_NULL);
1.39 + return method_counters;
1.40 }
1.41
1.42 // ------------------------------------------------------------------
