truffle: src/share/vm/ci/ciMethod.cpp comparison

comparison src/share/vm/ci/ciMethod.cpp @ 13086:096c224171c4

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/

author	Doug Simon <doug.simon@oracle.com>
date	Wed, 20 Nov 2013 00:10:38 +0100
parents	cefad50507d8 b2ee5dc63353
children	d8041d695d19

comparison

equal deleted inserted replaced

-:92b7ec34ddfa
+:096c224171c4
 _receiver[i] = receiver;
 _receiver_count[i] = receiver_count;
 if (_limit < MorphismLimit) _limit++;
 }
+void ciMethod::assert_virtual_call_type_ok(int bci) {
+assert(java_code_at_bci(bci) == Bytecodes::_invokevirtual ||
+java_code_at_bci(bci) == Bytecodes::_invokeinterface, err_msg("unexpected bytecode %s", Bytecodes::name(java_code_at_bci(bci))));
+}
+void ciMethod::assert_call_type_ok(int bci) {
+assert(java_code_at_bci(bci) == Bytecodes::_invokestatic ||
+java_code_at_bci(bci) == Bytecodes::_invokespecial ||
+java_code_at_bci(bci) == Bytecodes::_invokedynamic, err_msg("unexpected bytecode %s", Bytecodes::name(java_code_at_bci(bci))));
+}
+/**
+* Check whether profiling provides a type for the argument i to the
+* call at bci bci
+*
+* @param bci  bci of the call
+* @param i    argument number
+* @return     profiled type
+*
+* If the profile reports that the argument may be null, return false
+* at least for now.
+*/
+ciKlass* ciMethod::argument_profiled_type(int bci, int i) {
+if (MethodData::profile_parameters() && method_data() != NULL && method_data()->is_mature()) {
+ciProfileData* data = method_data()->bci_to_data(bci);
+if (data != NULL) {
+if (data->is_VirtualCallTypeData()) {
+assert_virtual_call_type_ok(bci);
+ciVirtualCallTypeData* call = (ciVirtualCallTypeData*)data->as_VirtualCallTypeData();
+if (i >= call->number_of_arguments()) {
+return NULL;
+}
+ciKlass* type = call->valid_argument_type(i);
+if (type != NULL && !call->argument_maybe_null(i)) {
+return type;
+}
+} else if (data->is_CallTypeData()) {
+assert_call_type_ok(bci);
+ciCallTypeData* call = (ciCallTypeData*)data->as_CallTypeData();
+if (i >= call->number_of_arguments()) {
+return NULL;
+}
+ciKlass* type = call->valid_argument_type(i);
+if (type != NULL && !call->argument_maybe_null(i)) {
+return type;
+}
+}
+}
+}
+return NULL;
+}
+/**
+* Check whether profiling provides a type for the return value from
+* the call at bci bci
+*
+* @param bci  bci of the call
+* @return     profiled type
+*
+* If the profile reports that the argument may be null, return false
+* at least for now.
+*/
+ciKlass* ciMethod::return_profiled_type(int bci) {
+if (MethodData::profile_return() && method_data() != NULL && method_data()->is_mature()) {
+ciProfileData* data = method_data()->bci_to_data(bci);
+if (data != NULL) {
+if (data->is_VirtualCallTypeData()) {
+assert_virtual_call_type_ok(bci);
+ciVirtualCallTypeData* call = (ciVirtualCallTypeData*)data->as_VirtualCallTypeData();
+ciKlass* type = call->valid_return_type();
+if (type != NULL && !call->return_maybe_null()) {
+return type;
+}
+} else if (data->is_CallTypeData()) {
+assert_call_type_ok(bci);
+ciCallTypeData* call = (ciCallTypeData*)data->as_CallTypeData();
+ciKlass* type = call->valid_return_type();
+if (type != NULL && !call->return_maybe_null()) {
+return type;
+}
+}
+}
+}
+return NULL;
+}
+/**
+* Check whether profiling provides a type for the parameter i
+*
+* @param i    parameter number
+* @return     profiled type
+*
+* If the profile reports that the argument may be null, return false
+* at least for now.
+*/
+ciKlass* ciMethod::parameter_profiled_type(int i) {
+if (MethodData::profile_parameters() && method_data() != NULL && method_data()->is_mature()) {
+ciParametersTypeData* parameters = method_data()->parameters_type_data();
+if (parameters != NULL && i < parameters->number_of_parameters()) {
+ciKlass* type = parameters->valid_parameter_type(i);
+if (type != NULL && !parameters->parameter_maybe_null(i)) {
+return type;
+}
+}
+}
+return NULL;
+}
 // ------------------------------------------------------------------
 // ciMethod::find_monomorphic_target
 //
 // Given a certain calling environment, find the monomorphic target
 // for the call.  Return NULL if the call is not monomorphic in
 //
 // Generate new MethodData* objects at compile time.
 // Return true if allocation was successful or no MDO is required.
 bool ciMethod::ensure_method_data(methodHandle h_m) {
 EXCEPTION_CONTEXT;
-if (is_native() || is_abstract() || h_m()->is_accessor()) return true;
+if (is_native() || is_abstract() || h_m()->is_accessor()) {
+return true;
+}
 if (h_m()->method_data() == NULL) {
 Method::build_interpreter_method_data(h_m, THREAD);
 if (HAS_PENDING_EXCEPTION) {
 CLEAR_PENDING_EXCEPTION;
 }
 // ciMethod::method_data_or_null
 // Returns a pointer to ciMethodData if MDO exists on the VM side,
 // NULL otherwise.
 ciMethodData* ciMethod::method_data_or_null() {
 ciMethodData *md = method_data();
-if (md->is_empty()) return NULL;
+if (md->is_empty()) {
+return NULL;
+}
 return md;
 }
 // ------------------------------------------------------------------
 // ciMethod::ensure_method_counters
 //
-address ciMethod::ensure_method_counters() {
+MethodCounters* ciMethod::ensure_method_counters() {
 check_is_loaded();
 VM_ENTRY_MARK;
 methodHandle mh(THREAD, get_Method());
-MethodCounters *counter = mh->method_counters();
+MethodCounters* method_counters = mh->get_method_counters(CHECK_NULL);
-if (counter == NULL) {
+return method_counters;
-counter = Method::build_method_counters(mh(), CHECK_AND_CLEAR_NULL);
-}
-return (address)counter;
 }
 // ------------------------------------------------------------------
 // ciMethod::should_exclude
 //
 }
 #undef FETCH_FLAG_FROM_VM
 void ciMethod::dump_replay_data(outputStream* st) {
-ASSERT_IN_VM;
 ResourceMark rm;
 Method* method = get_Method();
 MethodCounters* mcs = method->method_counters();
 Klass*  holder = method->method_holder();
 st->print_cr("ciMethod %s %s %s %d %d %d %d %d",

Mercurial > hg > truffle

comparison src/share/vm/ci/ciMethod.cpp @ 13086:096c224171c4