1.1 --- a/src/share/vm/opto/library_call.cpp Mon Dec 17 11:00:22 2012 -0800
1.2 +++ b/src/share/vm/opto/library_call.cpp Tue Dec 18 14:55:25 2012 +0100
1.3 @@ -412,16 +412,16 @@
1.4 break;
1.5
1.6 case vmIntrinsics::_reverseBytes_c:
1.7 - if (!Matcher::match_rule_supported(Op_ReverseBytesUS)) return false;
1.8 + if (!Matcher::match_rule_supported(Op_ReverseBytesUS)) return NULL;
1.9 break;
1.10 case vmIntrinsics::_reverseBytes_s:
1.11 - if (!Matcher::match_rule_supported(Op_ReverseBytesS)) return false;
1.12 + if (!Matcher::match_rule_supported(Op_ReverseBytesS)) return NULL;
1.13 break;
1.14 case vmIntrinsics::_reverseBytes_i:
1.15 - if (!Matcher::match_rule_supported(Op_ReverseBytesI)) return false;
1.16 + if (!Matcher::match_rule_supported(Op_ReverseBytesI)) return NULL;
1.17 break;
1.18 case vmIntrinsics::_reverseBytes_l:
1.19 - if (!Matcher::match_rule_supported(Op_ReverseBytesL)) return false;
1.20 + if (!Matcher::match_rule_supported(Op_ReverseBytesL)) return NULL;
1.21 break;
1.22
1.23 case vmIntrinsics::_Reference_get:
1.24 @@ -536,7 +536,7 @@
1.25 // Try to inline the intrinsic.
1.26 if (kit.try_to_inline()) {
1.27 if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
1.28 - CompileTask::print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
1.29 + C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
1.30 }
1.31 C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
1.32 if (C->log()) {
1.33 @@ -555,7 +555,7 @@
1.34 if (jvms->has_method()) {
1.35 // Not a root compile.
1.36 const char* msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)";
1.37 - CompileTask::print_inlining(callee, jvms->depth() - 1, bci, msg);
1.38 + C->print_inlining(callee, jvms->depth() - 1, bci, msg);
1.39 } else {
1.40 // Root compile
1.41 tty->print("Did not generate intrinsic %s%s at bci:%d in",
1.42 @@ -585,7 +585,7 @@
1.43 Node* slow_ctl = kit.try_to_predicate();
1.44 if (!kit.failing()) {
1.45 if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) {
1.46 - CompileTask::print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
1.47 + C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)");
1.48 }
1.49 C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked);
1.50 if (C->log()) {
1.51 @@ -602,12 +602,12 @@
1.52 if (jvms->has_method()) {
1.53 // Not a root compile.
1.54 const char* msg = "failed to generate predicate for intrinsic";
1.55 - CompileTask::print_inlining(kit.callee(), jvms->depth() - 1, bci, msg);
1.56 + C->print_inlining(kit.callee(), jvms->depth() - 1, bci, msg);
1.57 } else {
1.58 // Root compile
1.59 - tty->print("Did not generate predicate for intrinsic %s%s at bci:%d in",
1.60 - vmIntrinsics::name_at(intrinsic_id()),
1.61 - (is_virtual() ? " (virtual)" : ""), bci);
1.62 + C->print_inlining_stream()->print("Did not generate predicate for intrinsic %s%s at bci:%d in",
1.63 + vmIntrinsics::name_at(intrinsic_id()),
1.64 + (is_virtual() ? " (virtual)" : ""), bci);
1.65 }
1.66 }
1.67 C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_failed);
1.68 @@ -3319,7 +3319,7 @@
1.69 Node* arg = args[which_arg];
1.70 arg = null_check(arg);
1.71 if (stopped()) break;
1.72 - args[which_arg] = _gvn.transform(arg);
1.73 + args[which_arg] = arg;
1.74
1.75 Node* p = basic_plus_adr(arg, class_klass_offset);
1.76 Node* kls = LoadKlassNode::make(_gvn, immutable_memory(), p, adr_type, kls_type);
