1.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Thu Dec 02 01:02:55 2010 -0800
1.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Thu Dec 02 17:21:12 2010 -0800
1.3 @@ -1716,11 +1716,8 @@
1.4 ciMethod* method = op->profiled_method();
1.5 assert(method != NULL, "Should have method");
1.6 int bci = op->profiled_bci();
1.7 - md = method->method_data();
1.8 - if (md == NULL) {
1.9 - bailout("out of memory building methodDataOop");
1.10 - return;
1.11 - }
1.12 + md = method->method_data_or_null();
1.13 + assert(md != NULL, "Sanity");
1.14 data = md->bci_to_data(bci);
1.15 assert(data != NULL, "need data for type check");
1.16 assert(data->is_ReceiverTypeData(), "need ReceiverTypeData for type check");
1.17 @@ -1879,11 +1876,8 @@
1.18 ciMethod* method = op->profiled_method();
1.19 assert(method != NULL, "Should have method");
1.20 int bci = op->profiled_bci();
1.21 - md = method->method_data();
1.22 - if (md == NULL) {
1.23 - bailout("out of memory building methodDataOop");
1.24 - return;
1.25 - }
1.26 + md = method->method_data_or_null();
1.27 + assert(md != NULL, "Sanity");
1.28 data = md->bci_to_data(bci);
1.29 assert(data != NULL, "need data for type check");
1.30 assert(data->is_ReceiverTypeData(), "need ReceiverTypeData for type check");
1.31 @@ -3373,11 +3367,8 @@
1.32 int bci = op->profiled_bci();
1.33
1.34 // Update counter for all call types
1.35 - ciMethodData* md = method->method_data();
1.36 - if (md == NULL) {
1.37 - bailout("out of memory building methodDataOop");
1.38 - return;
1.39 - }
1.40 + ciMethodData* md = method->method_data_or_null();
1.41 + assert(md != NULL, "Sanity");
1.42 ciProfileData* data = md->bci_to_data(bci);
1.43 assert(data->is_CounterData(), "need CounterData for calls");
1.44 assert(op->mdo()->is_single_cpu(), "mdo must be allocated");
