src/share/vm/opto/callGenerator.cpp

rev 5462 : 8024069: replace_in_map() should operate on parent maps
Summary: type information gets lost because replace_in_map() doesn't update parent maps
Reviewed-by:
rev 5464 : 8024070: C2 needs some form of type speculation
Summary: record unused type profile information with type system, propagate and use it.
Reviewed-by:
rev 5465 : imported patch speculative-cleanup

*** 484,493 ****
--- 484,495 ----
      C->add_string_late_inline(this);
  
      JVMState* new_jvms =  DirectCallGenerator::generate(jvms, parent_parser);
      return new_jvms;
    }
+ 
+   virtual bool is_string_late_inline() const { return true; }
  };
  
  CallGenerator* CallGenerator::for_string_late_inline(ciMethod* method, CallGenerator* inline_cg) {
    return new LateInlineStringCallGenerator(method, inline_cg);
  }
*** 771,781 ****
          input_not_const = false;
          const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
          ciMethod* target = oop_ptr->const_oop()->as_method_handle()->get_vmtarget();
          guarantee(!target->is_method_handle_intrinsic(), "should not happen");  // XXX remove
          const int vtable_index = Method::invalid_vtable_index;
!         CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, true, true);
          assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
          if (cg != NULL && cg->is_inline())
            return cg;
        }
      }
--- 773,783 ----
          input_not_const = false;
          const TypeOopPtr* oop_ptr = receiver->bottom_type()->is_oopptr();
          ciMethod* target = oop_ptr->const_oop()->as_method_handle()->get_vmtarget();
          guarantee(!target->is_method_handle_intrinsic(), "should not happen");  // XXX remove
          const int vtable_index = Method::invalid_vtable_index;
!         CallGenerator* cg = C->call_generator(target, vtable_index, false, jvms, true, PROB_ALWAYS, NULL, true, true);
          assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
          if (cg != NULL && cg->is_inline())
            return cg;
        }
      }
*** 827,847 ****
          const bool is_virtual              = (iid == vmIntrinsics::_linkToVirtual);
          const bool is_virtual_or_interface = (is_virtual || iid == vmIntrinsics::_linkToInterface);
          int  vtable_index       = Method::invalid_vtable_index;
          bool call_does_dispatch = false;
  
          if (is_virtual_or_interface) {
            ciInstanceKlass* klass = target->holder();
            Node*             receiver_node = kit.argument(0);
            const TypeOopPtr* receiver_type = gvn.type(receiver_node)->isa_oopptr();
            // call_does_dispatch and vtable_index are out-parameters.  They might be changed.
            target = C->optimize_virtual_call(caller, jvms->bci(), klass, target, receiver_type,
                                              is_virtual,
                                              call_does_dispatch, vtable_index);  // out-parameters
          }
  
!         CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, true, true);
          assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
          if (cg != NULL && cg->is_inline())
            return cg;
        }
      }
--- 829,853 ----
          const bool is_virtual              = (iid == vmIntrinsics::_linkToVirtual);
          const bool is_virtual_or_interface = (is_virtual || iid == vmIntrinsics::_linkToInterface);
          int  vtable_index       = Method::invalid_vtable_index;
          bool call_does_dispatch = false;
  
+         ciKlass* spec_receiver_type = NULL;
          if (is_virtual_or_interface) {
            ciInstanceKlass* klass = target->holder();
            Node*             receiver_node = kit.argument(0);
            const TypeOopPtr* receiver_type = gvn.type(receiver_node)->isa_oopptr();
            // call_does_dispatch and vtable_index are out-parameters.  They might be changed.
            target = C->optimize_virtual_call(caller, jvms->bci(), klass, target, receiver_type,
                                              is_virtual,
                                              call_does_dispatch, vtable_index);  // out-parameters
+           // We lack profiling at this call but type speculation may
+           // provide us with a type
+           spec_receiver_type = receiver_type->speculative_type();
          }
  
!         CallGenerator* cg = C->call_generator(target, vtable_index, call_does_dispatch, jvms, true, PROB_ALWAYS, spec_receiver_type, true, true);
          assert(!cg->is_late_inline() || cg->is_mh_late_inline(), "no late inline here");
          if (cg != NULL && cg->is_inline())
            return cg;
        }
      }