1.1 --- a/src/share/vm/opto/gcm.cpp Wed Aug 28 11:22:43 2013 +0200
1.2 +++ b/src/share/vm/opto/gcm.cpp Sun Sep 01 19:21:05 2013 +0200
1.3 @@ -1342,7 +1342,7 @@
1.4 Node* proj = _matcher._null_check_tests[i];
1.5 Node* val = _matcher._null_check_tests[i + 1];
1.6 Block* block = get_block_for_node(proj);
1.7 - block->implicit_null_check(this, proj, val, allowed_reasons);
1.8 + implicit_null_check(block, proj, val, allowed_reasons);
1.9 // The implicit_null_check will only perform the transformation
1.10 // if the null branch is truly uncommon, *and* it leads to an
1.11 // uncommon trap. Combined with the too_many_traps guards
1.12 @@ -1363,7 +1363,7 @@
1.13 visited.Clear();
1.14 for (uint i = 0; i < number_of_blocks(); i++) {
1.15 Block* block = get_block(i);
1.16 - if (!block->schedule_local(this, _matcher, ready_cnt, visited)) {
1.17 + if (!schedule_local(block, ready_cnt, visited)) {
1.18 if (!C->failure_reason_is(C2Compiler::retry_no_subsuming_loads())) {
1.19 C->record_method_not_compilable("local schedule failed");
1.20 }
1.21 @@ -1375,7 +1375,7 @@
1.22 // clone the instructions on all paths below the Catch.
1.23 for (uint i = 0; i < number_of_blocks(); i++) {
1.24 Block* block = get_block(i);
1.25 - block->call_catch_cleanup(this, C);
1.26 + call_catch_cleanup(block);
1.27 }
1.28
1.29 #ifndef PRODUCT
