cgraph.c (cgraph_create_indirect_edge): Use get_polymorphic_call_info.

	* cgraph.c (cgraph_create_indirect_edge): Use get_polymorphic_call_info.
	* cgraph.h (cgraph_indirect_call_info): Add outer_type, maybe_in_construction
	and maybe_derived_type.
	* ipa-utils.h (ipa_polymorphic_call_context): New structure.
	(ipa_dummy_polymorphic_call_context): New global var.
	(possible_polymorphic_call_targets): Add context paramter.
	(dump_possible_polymorphic_call_targets): Likewise; update
	wrappers.
	(possible_polymorphic_call_target_p): Likewise.
	(get_polymorphic_call_info): New function.
	* ipa-devirt.c (ipa_dummy_polymorphic_call_context): New function.
	(add_type_duplicate): Remove forgotten debug output.
	(method_class_type): Add sanity check.
	(maybe_record_node): Add FINALP parameter.
	(record_binfo): Add OUTER_TYPE and OFFSET; walk the inner
	by info by get_binfo_at_offset.
	(possible_polymorphic_call_targets_1): Add OUTER_TYPE/OFFSET parameters;
	pass them to record-binfo.
	(polymorphic_call_target_d): Add context and FINAL.
	(polymorphic_call_target_hasher::hash): Hash context.
	(polymorphic_call_target_hasher::equal): Compare context.
	(free_polymorphic_call_targets_hash):
	(get_class_context): New function.
	(contains_type_p): New function.
	(get_polymorphic_call_info): New function.
	(walk_bases): New function.
	(possible_polymorphic_call_targets): Add context parameter; honnor it.
	(dump_possible_polymorphic_call_targets): Dump context.
	(possible_polymorphic_call_target_p): Add context.
	(update_type_inheritance_graph): Update comment.s
	(ipa_set_jf_known_type): Assert that compoentn type is known.
	(ipa_note_param_call): Do not tamper with offsets.
	(ipa_analyze_indirect_call_uses): When offset is being changed; clear
	outer type.
	(update_indirect_edges_after_inlining): Likewise.
	(ipa_write_indirect_edge_info): Stream new fields.
	(ipa_read_indirect_edge_info): Stream in new fields.

	* ipa/devirt9.C: Verify that the optimization happens already before.
	whole-program.

From-SVN: r205019

gcc/ChangeLog

@@ -1,3 +1,43 @@
+2013-11-19  Jan Hubicka  <[email protected]>
+
+	* cgraph.c (cgraph_create_indirect_edge): Use get_polymorphic_call_info.
+	* cgraph.h (cgraph_indirect_call_info): Add outer_type, maybe_in_construction
+	and maybe_derived_type.
+	* ipa-utils.h (ipa_polymorphic_call_context): New structure.
+	(ipa_dummy_polymorphic_call_context): New global var.
+	(possible_polymorphic_call_targets): Add context paramter.
+	(dump_possible_polymorphic_call_targets): Likewise; update
+	wrappers.
+	(possible_polymorphic_call_target_p): Likewise.
+	(get_polymorphic_call_info): New function.
+	* ipa-devirt.c (ipa_dummy_polymorphic_call_context): New function.
+	(add_type_duplicate): Remove forgotten debug output.
+	(method_class_type): Add sanity check.
+	(maybe_record_node): Add FINALP parameter.
+	(record_binfo): Add OUTER_TYPE and OFFSET; walk the inner
+	by info by get_binfo_at_offset.
+	(possible_polymorphic_call_targets_1): Add OUTER_TYPE/OFFSET parameters;
+	pass them to record-binfo.
+	(polymorphic_call_target_d): Add context and FINAL.
+	(polymorphic_call_target_hasher::hash): Hash context.
+	(polymorphic_call_target_hasher::equal): Compare context.
+	(free_polymorphic_call_targets_hash):
+	(get_class_context): New function.
+	(contains_type_p): New function.
+	(get_polymorphic_call_info): New function.
+	(walk_bases): New function.
+	(possible_polymorphic_call_targets): Add context parameter; honnor it.
+	(dump_possible_polymorphic_call_targets): Dump context.
+	(possible_polymorphic_call_target_p): Add context.
+	(update_type_inheritance_graph): Update comment.s
+	(ipa_set_jf_known_type): Assert that compoentn type is known.
+	(ipa_note_param_call): Do not tamper with offsets.
+	(ipa_analyze_indirect_call_uses): When offset is being changed; clear
+	outer type.
+	(update_indirect_edges_after_inlining): Likewise.
+	(ipa_write_indirect_edge_info): Stream new fields.
+	(ipa_read_indirect_edge_info): Stream in new fields.
+
 2013-11-19  Jan Hubicka  <[email protected]>
 
 	* tree-pretty-print.c (dump_generic_node): Print class type of

gcc/cgraph.c

@@ -959,16 +959,26 @@ cgraph_create_indirect_edge (struct cgraph_node *caller, gimple call_stmt,
       && (target = gimple_call_fn (call_stmt))
       && virtual_method_call_p (target))
     {
-      tree type = obj_type_ref_class (target);
+      tree otr_type;
+      HOST_WIDE_INT otr_token;
+      ipa_polymorphic_call_context context;
 
+      get_polymorphic_call_info (caller->decl,
+				 target,
+				 &otr_type, &otr_token,
+				 &context);
 
       /* Only record types can have virtual calls.  */
-      gcc_assert (TREE_CODE (type) == RECORD_TYPE);
+      gcc_assert (TREE_CODE (otr_type) == RECORD_TYPE);
+      edge->indirect_info->polymorphic = true;
       edge->indirect_info->param_index = -1;
-      edge->indirect_info->otr_token
-	 = tree_to_uhwi (OBJ_TYPE_REF_TOKEN (target));
-      edge->indirect_info->otr_type = type;
-      edge->indirect_info->polymorphic = 1;
+      edge->indirect_info->otr_token = otr_token;
+      edge->indirect_info->otr_type = otr_type;
+      edge->indirect_info->outer_type = context.outer_type;
+      edge->indirect_info->offset = context.offset;
+      edge->indirect_info->maybe_in_construction
+	 = context.maybe_in_construction;
+      edge->indirect_info->maybe_derived_type = context.maybe_derived_type;
     }
 
   edge->next_callee = caller->indirect_calls;

gcc/cgraph.h

@@ -434,7 +434,7 @@ struct GTY(()) cgraph_indirect_call_info
   /* OBJ_TYPE_REF_TOKEN of a polymorphic call (if polymorphic is set).  */
   HOST_WIDE_INT otr_token;
   /* Type of the object from OBJ_TYPE_REF_OBJECT. */
-  tree otr_type;
+  tree otr_type, outer_type;
   /* Index of the parameter that is called.  */
   int param_index;
   /* ECF flags determined from the caller.  */
@@ -455,6 +455,8 @@ struct GTY(()) cgraph_indirect_call_info
   /* When the previous bit is set, this one determines whether the destination
      is loaded from a parameter passed by reference. */
   unsigned by_ref : 1;
+  unsigned int maybe_in_construction : 1;
+  unsigned int maybe_derived_type : 1;
 };
 
 struct GTY((chain_next ("%h.next_caller"), chain_prev ("%h.prev_caller"))) cgraph_edge {