src/share/vm/opto/library_call.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File
*** old/src/share/vm/opto/library_call.cpp	Fri Sep 20 16:09:54 2013
--- new/src/share/vm/opto/library_call.cpp	Fri Sep 20 16:09:54 2013

*** 541,562 **** --- 541,562 ---- JVMState* LibraryIntrinsic::generate(JVMState* jvms) { LibraryCallKit kit(jvms, this); Compile* C = kit.C; int nodes = C->unique(); #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { char buf[1000]; const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf)); tty->print_cr("Intrinsic %s", str); } #endif ciMethod* callee = kit.callee(); const int bci = kit.bci(); // Try to inline the intrinsic. if (kit.try_to_inline()) { ! if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) { ! if (C->print_intrinsics() || C->print_inlining()) { C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)"); } C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked); if (C->log()) { C->log()->elem("intrinsic id='%s'%s nodes='%d'",
*** 568,578 **** --- 568,578 ---- kit.push_result(); return kit.transfer_exceptions_into_jvms(); } // The intrinsic bailed out ! if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) { ! if (C->print_intrinsics() || C->print_inlining()) { if (jvms->has_method()) { // Not a root compile. const char* msg = is_virtual() ? "failed to inline (intrinsic, virtual)" : "failed to inline (intrinsic)"; C->print_inlining(callee, jvms->depth() - 1, bci, msg); } else {
*** 590,611 **** --- 590,611 ---- LibraryCallKit kit(jvms, this); Compile* C = kit.C; int nodes = C->unique(); #ifndef PRODUCT assert(is_predicted(), "sanity"); ! if ((PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { char buf[1000]; const char* str = vmIntrinsics::short_name_as_C_string(intrinsic_id(), buf, sizeof(buf)); tty->print_cr("Predicate for intrinsic %s", str); } #endif ciMethod* callee = kit.callee(); const int bci = kit.bci(); Node* slow_ctl = kit.try_to_predicate(); if (!kit.failing()) { ! if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) { ! if (C->print_intrinsics() || C->print_inlining()) { C->print_inlining(callee, jvms->depth() - 1, bci, is_virtual() ? "(intrinsic, virtual)" : "(intrinsic)"); } C->gather_intrinsic_statistics(intrinsic_id(), is_virtual(), Compile::_intrinsic_worked); if (C->log()) { C->log()->elem("predicate_intrinsic id='%s'%s nodes='%d'",
*** 615,625 **** --- 615,625 ---- } return slow_ctl; // Could be NULL if the check folds. } // The intrinsic bailed out ! if (PrintIntrinsics || PrintInlining NOT_PRODUCT( || PrintOptoInlining) ) { ! if (C->print_intrinsics() || C->print_inlining()) { if (jvms->has_method()) { // Not a root compile. const char* msg = "failed to generate predicate for intrinsic"; C->print_inlining(kit.callee(), jvms->depth() - 1, bci, msg); } else {
*** 2297,2307 **** --- 2297,2307 ---- // contraint in place. if (sharpened_klass != NULL && sharpened_klass->is_loaded()) { const TypeOopPtr* tjp = TypeOopPtr::make_from_klass(sharpened_klass); #ifndef PRODUCT ! if (PrintIntrinsics || PrintInlining || PrintOptoInlining) { ! if (C->print_intrinsics() || C->print_inlining()) { tty->print(" from base type: "); adr_type->dump(); tty->print(" sharpened value: "); tjp->dump(); } #endif // Sharpen the value type.
*** 3258,3268 **** --- 3258,3268 ---- const TypeInstPtr* mirror_con = _gvn.type(mirror)->isa_instptr(); if (mirror_con == NULL) return false; // cannot happen? #ifndef PRODUCT ! if (PrintIntrinsics || PrintInlining || PrintOptoInlining) { ! if (C->print_intrinsics() || C->print_inlining()) { ciType* k = mirror_con->java_mirror_type(); if (k) { tty->print("Inlining %s on constant Class ", vmIntrinsics::name_at(intrinsic_id())); k->print_name(); tty->cr();
*** 3950,3967 **** --- 3950,3967 ---- // NOTE: This code must perform the same logic as JVM_GetCallerClass // in that it must skip particular security frames and checks for // caller sensitive methods. bool LibraryCallKit::inline_native_Reflection_getCallerClass() { #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { tty->print_cr("Attempting to inline sun.reflect.Reflection.getCallerClass"); } #endif if (!jvms()->has_method()) { #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { tty->print_cr(" Bailing out because intrinsic was inlined at top level"); } #endif return false; }
*** 3981,3991 **** --- 3981,3991 ---- break; case 1: // Frame 0 and 1 must be caller sensitive (see JVM_GetCallerClass). if (!m->caller_sensitive()) { #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { tty->print_cr(" Bailing out: CallerSensitive annotation expected at frame %d", n); } #endif return false; // bail-out; let JVM_GetCallerClass do the work }
*** 3997,4007 **** --- 3997,4007 ---- ciInstanceKlass* caller_klass = caller_jvms->method()->holder(); ciInstance* caller_mirror = caller_klass->java_mirror(); set_result(makecon(TypeInstPtr::make(caller_mirror))); #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { tty->print_cr(" Succeeded: caller = %d) %s.%s, JVMS depth = %d", n, caller_klass->name()->as_utf8(), caller_jvms->method()->name()->as_utf8(), jvms()->depth()); tty->print_cr(" JVM state at this point:"); for (int i = jvms()->depth(), n = 1; i >= 1; i--, n++) { ciMethod* m = jvms()->of_depth(i)->method(); tty->print_cr(" %d) %s.%s", n, m->holder()->name()->as_utf8(), m->name()->as_utf8());
*** 4013,4023 **** --- 4013,4023 ---- break; } } #ifndef PRODUCT ! if ((PrintIntrinsics || PrintInlining || PrintOptoInlining) && Verbose) { ! if ((C->print_intrinsics() || C->print_inlining()) && Verbose) { tty->print_cr(" Bailing out because caller depth exceeded inlining depth = %d", jvms()->depth()); tty->print_cr(" JVM state at this point:"); for (int i = jvms()->depth(), n = 1; i >= 1; i--, n++) { ciMethod* m = jvms()->of_depth(i)->method(); tty->print_cr(" %d) %s.%s", n, m->holder()->name()->as_utf8(), m->name()->as_utf8());

src/share/vm/opto/library_call.cpp
Index Unified diffs Context diffs Sdiffs Wdiffs Patch New Old Previous File Next File