re PR ipa/62015 (ipa-cp-clone uses a clone that is too specialized for the call context)

2014-09-03  Martin Jambor  <mjambor@suse.cz>

	PR ipa/62015
	* ipa-cp.c (intersect_aggregates_with_edge): Handle impermissible
	pass-trough jump functions correctly.

testsuite/
	* g++.dg/ipa/pr62015.C: New test.

From-SVN: r214878

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fdafce834612180e7636fda2ef3136f1c2b13830..de6481613d1297e799b479a80f87160b8d7ee887 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-03  Martin Jambor  <mjambor@suse.cz>
+
+       PR ipa/62015
+       * ipa-cp.c (intersect_aggregates_with_edge): Handle impermissible
+       pass-trough jump functions correctly.
+
 2014-09-03  Martin Jambor  <mjambor@suse.cz>
 
        PR ipa/61986

diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 58121d4df3e052073b3ed34bcfb551c10fdd24e6..d36563490160d1940ae20e419078627b74aff828 100644 (file)
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -3048,6 +3048,11 @@ intersect_aggregates_with_edge (struct cgraph_edge *cs, int index,
                intersect_with_agg_replacements (cs->caller, src_idx,
                                                 &inter, 0);
            }
+         else
+           {
+             inter.release ();
+             return vNULL;
+           }
        }
       else
        {
@@ -3063,6 +3068,11 @@ intersect_aggregates_with_edge (struct cgraph_edge *cs, int index,
              else
                intersect_with_plats (src_plats, &inter, 0);
            }
+         else
+           {
+             inter.release ();
+             return vNULL;
+           }
        }
     }
   else if (jfunc->type == IPA_JF_ANCESTOR

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d3c32b560d4bcde2dd3f3ac664b22b37fae37d2..f0bca8f0bc2bdb927e128001c57a06fab12660d1 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-03  Martin Jambor  <mjambor@suse.cz>
+
+       PR ipa/62015
+       * g++.dg/ipa/pr62015.C: New test.
+
 2014-09-03  Martin Jambor  <mjambor@suse.cz>
 
        PR ipa/61986

diff --git a/gcc/testsuite/g++.dg/ipa/pr62015.C b/gcc/testsuite/g++.dg/ipa/pr62015.C
new file mode 100644 (file)
index 0000000..950b46e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/ipa/pr62015.C
@@ -0,0 +1,55 @@
+/* { dg-do run } */
+/* { dg-options "-O3 -std=c++11"  } */
+
+
+extern "C" int printf(const char *fmt, ...);
+extern "C" void abort(void);
+
+struct Side {
+    enum _Value { Left, Right, Invalid };
+
+    constexpr Side() : _value(Invalid) {}
+    constexpr Side(_Value value) : _value(value) {}
+    operator _Value() const { return (_Value)_value; }
+
+  private:
+    char _value;
+};
+
+struct A {
+    void init();
+    void adjust(Side side, bool final);
+    void move(Side side);
+};
+
+void A::init()
+{
+    adjust(Side::Invalid, false);
+}
+
+static void __attribute__((noinline))
+check (int v, int final)
+{
+    if (v != 0)
+      abort();
+}
+
+
+__attribute__((noinline))
+void A::adjust(Side side, bool final)
+{
+  check ((int)side, final);
+}
+
+void A::move(Side side)
+{
+    adjust(side, false);
+    adjust(side, true);
+}
+
+int main()
+{
+    A t;
+    t.move(Side::Left);
+    return 0;
+}