--- old/src/share/vm/ci/ciMethodData.cpp	2013-10-08 17:59:58.394128276 +0200
+++ new/src/share/vm/ci/ciMethodData.cpp	2013-10-08 17:59:58.201222730 +0200
@@ -137,12 +137,17 @@
 
 
 void ciTypeStackSlotEntries::translate_type_data_from(const TypeStackSlotEntries* entries) {
-  for (int i = 0; i < number_of_arguments(); i++) {
+  for (int i = 0; i < _nb_entries; i++) {
     intptr_t k = entries->type(i);
     TypeStackSlotEntries::set_type(i, translate_klass(k));
   }
 }
 
+void ciReturnTypeEntry::translate_type_data_from(const ReturnTypeEntry* ret) {
+  intptr_t k = ret->type();
+  set_type(translate_klass(k));
+}
+
 // Get the data at an arbitrary (sort of) data index.
 ciProfileData* ciMethodData::data_at(int data_index) {
   if (out_of_bounds(data_index)) {
@@ -313,6 +318,20 @@
   }
 }
 
+void ciMethodData::set_return_type(int bci, ciKlass* k) {
+  VM_ENTRY_MARK;
+  MethodData* mdo = get_MethodData();
+  if (mdo != NULL) {
+    ProfileData* data = mdo->bci_to_data(bci);
+    if (data->is_CallTypeData()) {
+      data->as_CallTypeData()->set_return_type(k->get_Klass());
+    } else {
+      assert(data->is_VirtualCallTypeData(), "no arguments!");
+      data->as_VirtualCallTypeData()->set_return_type(k->get_Klass());
+    }
+  }
+}
+
 bool ciMethodData::has_escape_info() {
   return eflag_set(MethodData::estimated);
 }
@@ -517,9 +536,7 @@
 }
 
 void ciTypeStackSlotEntries::print_data_on(outputStream* st) const {
-  _pd->tab(st, true);
-  st->print("argument types");
-  for (int i = 0; i < number_of_arguments(); i++) {
+  for (int i = 0; i < _nb_entries; i++) {
     _pd->tab(st);
     st->print("%d: stack (%u) ", i, stack_slot(i));
     print_ciklass(st, type(i));
@@ -527,9 +544,16 @@
   }
 }
 
+void ciReturnTypeEntry::print_data_on(outputStream* st) const {
+  _pd->tab(st);
+  st->print("ret ");
+  print_ciklass(st, type());
+  st->cr();
+}
+
 void ciCallTypeData::print_data_on(outputStream* st) const {
   print_shared(st, "ciCallTypeData");
-  args()->print_data_on(st);
+  args_and_ret()->print_data_on(st);
 }
 
 void ciReceiverTypeData::print_receiver_data_on(outputStream* st) const {
@@ -561,6 +585,6 @@
 void ciVirtualCallTypeData::print_data_on(outputStream* st) const {
   print_shared(st, "ciVirtualCallTypeData");
   rtd_super()->print_receiver_data_on(st);
-  args()->print_data_on(st);
+  args_and_ret()->print_data_on(st);
 }
 #endif