truffle: src/share/vm/opto/library

comparison src/share/vm/opto/library_call.cpp @ 17474:6fa574bfd32a

Merge

author	chegar
date	Thu, 03 Oct 2013 19:13:12 +0100
parents	1b64d46620a3
children	c9ccd7b85f20

comparison

equal deleted inserted replaced

-:9b4ce069642e
+:6fa574bfd32a
 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'",
 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 {
 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'",
 }
 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 {
 Node* target = _gvn.transform( makecon(TypeOopPtr::make_from_constant(target_array, true)));
 jint target_length = target_array->length();
 const TypeAry* target_array_type = TypeAry::make(TypeInt::CHAR, TypeInt::make(0, target_length, Type::WidenMin));
 const TypeAryPtr* target_type = TypeAryPtr::make(TypePtr::BotPTR, target_array_type, target_array->klass(), true, Type::OffsetBot);
+// String.value field is known to be @Stable.
+if (UseImplicitStableValues) {
+target = cast_array_to_stable(target, target_type);
+}
 IdealKit kit(this, false, true);
 #define __ kit.
 Node* zero             = __ ConI(0);
 Node* one              = __ ConI(1);
 Node* cache            = __ ConI(cache_i);
 // 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.
 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();
 // Helper for hashCode and clone.  Peeks inside the vtable to avoid a call.
 Node* LibraryCallKit::generate_virtual_guard(Node* obj_klass,
 RegionNode* slow_region) {
 ciMethod* method = callee();
 int vtable_index = method->vtable_index();
+assert(vtable_index >= 0 || vtable_index == Method::nonvirtual_vtable_index,
+err_msg_res("bad index %d", vtable_index));
 // Get the Method* out of the appropriate vtable entry.
 int entry_offset  = (InstanceKlass::vtable_start_offset() +
 vtable_index*vtableEntry::size()) * wordSize +
 vtableEntry::method_offset_in_bytes();
 Node* entry_addr  = basic_plus_adr(obj_klass, entry_offset);
 } else {
 // hashCode and clone are not a miranda methods,
 // so the vtable index is fixed.
 // No need to use the linkResolver to get it.
 vtable_index = method->vtable_index();
+assert(vtable_index >= 0 || vtable_index == Method::nonvirtual_vtable_index,
+err_msg_res("bad index %d", vtable_index));
 }
 slow_call = new(C) CallDynamicJavaNode(tf,
 SharedRuntime::get_resolve_virtual_call_stub(),
 method, vtable_index, bci());
 } else {  // neither virtual nor static:  opt_virtual
 // 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;
 }
 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
 }
 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());
 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());
 // base_off:
 // 8  - 32-bit VM
 // 12 - 64-bit VM, compressed klass
 // 16 - 64-bit VM, normal klass
 if (base_off % BytesPerLong != 0) {
-assert(UseCompressedKlassPointers, "");
+assert(UseCompressedClassPointers, "");
 if (is_array) {
 // Exclude length to copy by 8 bytes words.
 base_off += sizeof(int);
 } else {
 // Include klass to copy by 8 bytes words.

Mercurial > hg > truffle

comparison src/share/vm/opto/library_call.cpp @ 17474:6fa574bfd32a