From: Kirill Yukhin <kirill.yukhin@gmail.com>
To: gcc-patches List <gcc-patches@gcc.gnu.org>
Cc: rguenther@suse.de, "H.J. Lu" <hjl.tools@gmail.com>
Subject: [PATCH, testsuite] Fix for PR49519, miscompiled 447.dealII in SPEC CPU 2006
Date: Wed, 06 Jul 2011 16:11:00 -0000 [thread overview]
Message-ID: <CAGs3RftAtUz-pbXg7x362rNiAXvREJm9m0FQsAAsuR6Uco_bVA@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 799 bytes --]
Hi,
I've prepared a patch for: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49519
I've also prepared a test which reproduces the error.
ChangeLog entry:
2011-07-06 Kirill Yukhin <kirill.yukhin@intel.com>
PR tailcall-optimization/49519
* calls.c (mem_overlaps_already_clobbered_arg_p): Additional
check if address is stored in register. If so - give up.
(check_sibcall_argument_overlap_1): Do not perform check of
overlapping when it is call to address.
tessuite/ChangeLog entry:
2011-07-06 Kirill Yukhin <kirill.yukhin@intel.com>
* g++.dg/torture/pr49519.C: New test for tailcall fix.
Bootstrapped, new test fails without patch, passes when it is applied.
This fixes the bprblem with SPEC2006/447.dealII miscompile
Ok for trunk?
Thanks, K
[-- Attachment #2: pr49519.gcc.patch --]
[-- Type: application/octet-stream, Size: 3386 bytes --]
diff --git a/gcc/calls.c b/gcc/calls.c
index 7538e4e..a19d739 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -1591,6 +1591,8 @@ mem_overlaps_already_clobbered_arg_p (rtx addr, unsigned HOST_WIDE_INT size)
&& (XEXP (addr, 0) == crtl->args.internal_arg_pointer
|| XEXP (addr, 1) == crtl->args.internal_arg_pointer))
return true;
+ else if (GET_CODE (addr) == REG)
+ return true;
else
return false;
@@ -1831,6 +1833,9 @@ check_sibcall_argument_overlap_1 (rtx x)
code = GET_CODE (x);
+ if (code == CALL)
+ return 0;
+
if (code == MEM)
return mem_overlaps_already_clobbered_arg_p (XEXP (x, 0),
GET_MODE_SIZE (GET_MODE (x)));
diff --git a/gcc/testsuite/g++.dg/torture/pr49519.C b/gcc/testsuite/g++.dg/torture/pr49519.C
new file mode 100644
index 0000000..2888709
--- /dev/null
+++ b/gcc/testsuite/g++.dg/torture/pr49519.C
@@ -0,0 +1,135 @@
+/* { dg-do run } */
+
+#include <stdlib.h>
+
+struct null_type {};
+
+inline const null_type cnull() { return null_type(); }
+
+template <class TT> struct cons;
+class tuple;
+
+template< int N >
+struct get_class {
+ template<class TT >
+ inline static int& get(cons<TT>& t)
+ {
+ return get_class<N-1>::template get(t.tail);
+ }
+};
+
+template<>
+struct get_class<0> {
+ template<class TT>
+ inline static int& get(cons<TT>& t)
+ {
+ return t.head;
+ }
+};
+
+template<int N, class T>
+struct element
+{
+private:
+ typedef typename T::tail_type Next;
+public:
+ typedef typename element<N-1, Next>::type type;
+};
+
+template<class T>
+struct element<0,T>
+{
+ typedef int type;
+};
+
+template<int N, class TT>
+inline int& get(cons<TT>& c) {
+ return get_class<N>::template get(c);
+}
+
+template <class TT>
+struct cons {
+ typedef TT tail_type;
+
+ int head;
+ tail_type tail;
+
+ cons() : head(), tail() {}
+
+ template <class T1, class T2, class T3, class T4>
+ cons( T1& t1, T2& t2, T3& t3, T4& t4 )
+ : head (t1),
+ tail (t2, t3, t4, cnull())
+ {}
+};
+
+template <>
+struct cons<null_type> {
+ typedef null_type tail_type;
+
+ int head;
+
+ cons() : head() {}
+
+ template<class T1>
+ cons(T1& t1, const null_type&, const null_type&, const null_type&)
+ : head (t1) {}
+};
+
+template <class T0, class T1, class T2, class T3>
+struct map_tuple_to_cons
+{
+ typedef cons<typename map_tuple_to_cons<T1, T2, T3, null_type>::type> type;
+};
+
+template <>
+struct map_tuple_to_cons<null_type, null_type, null_type, null_type>
+{
+ typedef null_type type;
+};
+
+class tuple :
+ public map_tuple_to_cons<int, int, int, int>::type
+{
+public:
+ typedef typename
+ map_tuple_to_cons<int, int, int, int>::type inherited;
+
+ tuple(const int &t0,
+ const int &t1,
+ const int &t2,
+ const int &t3)
+ : inherited(t0, t1, t2, t3) {}
+};
+
+void foo(void (*boo)(int, int, int, int), tuple t)
+{
+ boo(get<0>(t), get<1>(t), get<2>(t), get<3>(t));
+}
+
+int tailcalled_t1;
+int tailcalled_t2;
+int tailcalled_t3;
+int tailcalled_t4;
+
+void print(int t1, int t2, int t3, int t4)
+{
+ tailcalled_t1 = t1;
+ tailcalled_t2 = t2;
+ tailcalled_t3 = t3;
+ tailcalled_t4 = t4;
+}
+
+int main ()
+{
+ tuple t(1,2,3,4);
+ foo(print, t);
+
+ if( (get<0>(t) != tailcalled_t1)
+ ||(get<1>(t) != tailcalled_t2)
+ ||(get<2>(t) != tailcalled_t3)
+ ||(get<3>(t) != tailcalled_t4))
+ abort();
+
+ return 0;
+}
next reply other threads:[~2011-07-06 16:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-06 16:11 Kirill Yukhin [this message]
2011-07-06 19:43 ` Eric Botcazou
2011-07-07 8:56 ` Kirill Yukhin
2011-07-07 19:56 ` Eric Botcazou
2011-07-07 20:03 ` Jakub Jelinek
2011-07-08 10:33 ` Kirill Yukhin
2011-07-08 11:24 ` Eric Botcazou
2011-07-08 13:13 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAGs3RftAtUz-pbXg7x362rNiAXvREJm9m0FQsAAsuR6Uco_bVA@mail.gmail.com \
--to=kirill.yukhin@gmail.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=hjl.tools@gmail.com \
--cc=rguenther@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).