re PR rtl-optimization/66351 (r223883 miscompiles stage2 compiler on ia64)

	PR ipa/66351
	* ipa-polymorphic-call.c
	(ipa_polymorphic_call_context::get_dynamic_type): Fix thinko when
	initializing alias oracle; fix formating; set base_alias_set if it
	is known.

From-SVN: r224719

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 737178c..60f835e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-06-22  Jan Hubicka  <hubicka@ucw.cz>
+
+       PR ipa/66351
+       * ipa-polymorphic-call.c
+       (ipa_polymorphic_call_context::get_dynamic_type): Fix thinko when
+       initializing alias oracle; fix formating; set base_alias_set if it
+       is known.
+
 2015-06-22  Mikhail Maltsev  <maltsevm@gmail.com>
 
        * auto-inc-dec.c (reverse_mem, reverse_inc): Remove.

diff --git a/gcc/ipa-polymorphic-call.c b/gcc/ipa-polymorphic-call.c
index 0036565..ac8c78e 100644 (file)
--- a/gcc/ipa-polymorphic-call.c
+++ b/gcc/ipa-polymorphic-call.c
@@ -1574,13 +1574,15 @@ ipa_polymorphic_call_context::get_dynamic_type (tree instance,
                  tree base_ref = get_ref_base_and_extent
                                   (ref_exp, &offset2, &size, &max_size);
 
-                 /* Finally verify that what we found looks like read from OTR_OBJECT
-                    or from INSTANCE with offset OFFSET.  */
+                 /* Finally verify that what we found looks like read from
+                    OTR_OBJECT or from INSTANCE with offset OFFSET.  */
                  if (base_ref
                      && ((TREE_CODE (base_ref) == MEM_REF
                           && ((offset2 == instance_offset
                                && TREE_OPERAND (base_ref, 0) == instance)
-                              || (!offset2 && TREE_OPERAND (base_ref, 0) == otr_object)))
+                              || (!offset2
+                                  && TREE_OPERAND (base_ref, 0)
+                                     == otr_object)))
                          || (DECL_P (instance) && base_ref == instance
                              && offset2 == instance_offset)))
                    {
@@ -1608,9 +1610,17 @@ ipa_polymorphic_call_context::get_dynamic_type (tree instance,
   /* We look for vtbl pointer read.  */
   ao.size = POINTER_SIZE;
   ao.max_size = ao.size;
+  /* We are looking for stores to vptr pointer within the instance of
+     outer type.
+     TODO: The vptr pointer type is globally known, we probably should
+     keep it and do that even when otr_type is unknown.  */
   if (otr_type)
-    ao.ref_alias_set
-      = get_deref_alias_set (TREE_TYPE (BINFO_VTABLE (TYPE_BINFO (otr_type))));
+    {
+      ao.base_alias_set
+       = get_alias_set (outer_type ? outer_type : otr_type);
+      ao.ref_alias_set
+        = get_alias_set (TREE_TYPE (BINFO_VTABLE (TYPE_BINFO (otr_type))));
+    }
 
   if (dump_file)
     {