truffle: src/share/vm/opto/graphKit.cpp comparison

comparison src/share/vm/opto/graphKit.cpp @ 14513:16c705d792be

Merge

author	morris
date	Fri, 28 Feb 2014 08:02:20 -0800
parents	bb9356ec5967 484a359ff649
children	d8041d695d19 5e2306b00977

comparison

equal deleted inserted replaced

-:7d30d4f37d31
+:16c705d792be
 // create the stack trace.
 // Usual case:  Bail to interpreter.
 // Reserve the right to recompile if we haven't seen anything yet.
+assert(!Deoptimization::reason_is_speculate(reason), "unsupported");
 Deoptimization::DeoptAction action = Deoptimization::Action_maybe_recompile;
 if (treat_throw_as_hot
-&& (method()->method_data()->trap_recompiled_at(bci())
+&& (method()->method_data()->trap_recompiled_at(bci(), NULL)
 || C->too_many_traps(reason))) {
 // We cannot afford to take more traps here.  Suffer in the interpreter.
 if (C->log() != NULL)
 C->log()->elem("hot_throw preallocated='0' reason='%s' mcount='%d'",
 Deoptimization::trap_reason_name(reason),
 * @param exact_kls  type from profiling
 *
 * @return           node with improved type
 */
 Node* GraphKit::record_profile_for_speculation(Node* n, ciKlass* exact_kls) {
-const TypeOopPtr* current_type = _gvn.type(n)->isa_oopptr();
+const Type* current_type = _gvn.type(n);
 assert(UseTypeSpeculation, "type speculation must be on");
-if (exact_kls != NULL &&
-// nothing to improve if type is already exact
+const TypeOopPtr* speculative = current_type->speculative();
-(current_type == NULL ||
-(!current_type->klass_is_exact() &&
+if (current_type->would_improve_type(exact_kls, jvms()->depth())) {
-(current_type->speculative() == NULL ||
-!current_type->speculative()->klass_is_exact())))) {
 const TypeKlassPtr* tklass = TypeKlassPtr::make(exact_kls);
 const TypeOopPtr* xtype = tklass->as_instance_type();
 assert(xtype->klass_is_exact(), "Should be exact");
+// record the new speculative type's depth
+speculative = xtype->with_inline_depth(jvms()->depth());
+}
+if (speculative != current_type->speculative()) {
 // Build a type with a speculative type (what we think we know
 // about the type but will need a guard when we use it)
-const TypeOopPtr* spec_type = TypeOopPtr::make(TypePtr::BotPTR, Type::OffsetBot, TypeOopPtr::InstanceBot, xtype);
+const TypeOopPtr* spec_type = TypeOopPtr::make(TypePtr::BotPTR, Type::OffsetBot, TypeOopPtr::InstanceBot, speculative);
-// We're changing the type, we need a new cast node to carry the
+// We're changing the type, we need a new CheckCast node to carry
-// new type. The new type depends on the control: what profiling
+// the new type. The new type depends on the control: what
-// tells us is only valid from here as far as we can tell.
+// profiling tells us is only valid from here as far as we can
-Node* cast = new(C) CastPPNode(n, spec_type);
+// tell.
-cast->init_req(0, control());
+Node* cast = new(C) CheckCastPPNode(control(), n, current_type->remove_speculative()->join_speculative(spec_type));
 cast = _gvn.transform(cast);
 replace_in_map(n, cast);
 n = cast;
 }
 return n;
 }
 /**
 * Record profiling data from receiver profiling at an invoke with the
 * type system so that it can propagate it (speculation)
 *
 * @param n  receiver node
 *
-* @return           node with improved type
+* @return   node with improved type
 */
 Node* GraphKit::record_profiled_receiver_for_speculation(Node* n) {
 if (!UseTypeSpeculation) {
 return n;
 }
 //------------------------maybe_cast_profiled_receiver-------------------------
 // If the profile has seen exactly one type, narrow to exactly that type.
 // Subsequent type checks will always fold up.
 Node* GraphKit::maybe_cast_profiled_receiver(Node* not_null_obj,
 ciKlass* require_klass,
 ciKlass* spec_klass,
 bool safe_for_replace) {
 if (!UseTypeProfile || !TypeProfileCasts) return NULL;
+Deoptimization::DeoptReason reason = spec_klass == NULL ? Deoptimization::Reason_class_check : Deoptimization::Reason_speculate_class_check;
 // Make sure we haven't already deoptimized from this tactic.
-if (too_many_traps(Deoptimization::Reason_class_check))
+if (too_many_traps(reason))
 return NULL;
 // (No, this isn't a call, but it's enough like a virtual call
 // to use the same ciMethod accessor to get the profile info...)
 // If we have a speculative type use it instead of profiling (which
 Node* exact_obj = not_null_obj; // will get updated in place...
 Node* slow_ctl  = type_check_receiver(exact_obj, exact_kls, 1.0,
 &exact_obj);
 { PreserveJVMState pjvms(this);
 set_control(slow_ctl);
-uncommon_trap(Deoptimization::Reason_class_check,
+uncommon_trap(reason,
 Deoptimization::Action_maybe_recompile);
 }
 if (safe_for_replace) {
 replace_in_map(not_null_obj, exact_obj);
 }
 Node* GraphKit::maybe_cast_profiled_obj(Node* obj,
 ciKlass* type,
 bool not_null) {
 // type == NULL if profiling tells us this object is always null
 if (type != NULL) {
-if (!too_many_traps(Deoptimization::Reason_null_check) &&
+Deoptimization::DeoptReason class_reason = Deoptimization::Reason_speculate_class_check;
-!too_many_traps(Deoptimization::Reason_class_check)) {
+Deoptimization::DeoptReason null_reason = Deoptimization::Reason_null_check;
+if (!too_many_traps(null_reason) &&
+!too_many_traps(class_reason)) {
 Node* not_null_obj = NULL;
 // not_null is true if we know the object is not null and
 // there's no need for a null check
 if (!not_null) {
 Node* null_ctl = top();
 Node* slow_ctl  = type_check_receiver(exact_obj, exact_kls, 1.0,
 &exact_obj);
 {
 PreserveJVMState pjvms(this);
 set_control(slow_ctl);
-uncommon_trap(Deoptimization::Reason_class_check,
+uncommon_trap(class_reason,
 Deoptimization::Action_maybe_recompile);
 }
 replace_in_map(not_null_obj, exact_obj);
 obj = exact_obj;
 }
 known_statically = (static_res == SSC_always_true || static_res == SSC_always_false);
 }
 }
 if (known_statically && UseTypeSpeculation) {
-// If we know the type check always succeed then we don't use the
+// If we know the type check always succeeds then we don't use the
 // profiling data at this bytecode. Don't lose it, feed it to the
 // type system as a speculative type.
 not_null_obj = record_profiled_receiver_for_speculation(not_null_obj);
 } else {
 const TypeOopPtr* obj_type = _gvn.type(obj)->is_oopptr();

Mercurial > hg > truffle

comparison src/share/vm/opto/graphKit.cpp @ 14513:16c705d792be