From 07078664fd6fdcb046cee4adf01ee697e56fcbd3 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue, 16 Nov 2010 21:49:57 +0100
Subject: [PATCH] re PR c++/46401 (very slow compile time with
-Wsequence-point)
PR c++/46401
* c-common.c (warning_candidate_p): Don't track non-const calls
or STRING_CSTs.
* g++.dg/warn/Wsequence-point-3.C: New test.
From-SVN: r166823
---
gcc/c-family/ChangeLog | 6 +++++
gcc/c-family/c-common.c | 22 ++++++++++++++++---
gcc/testsuite/ChangeLog | 5 +++++
gcc/testsuite/g++.dg/warn/Wsequence-point-3.C | 20 +++++++++++++++++
4 files changed, 50 insertions(+), 3 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/warn/Wsequence-point-3.C
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index 3af8ebeb5d6e..57d3ab833740 100644
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/46401
+ * c-common.c (warning_candidate_p): Don't track non-const calls
+ or STRING_CSTs.
+
2010-11-15 Ian Lance Taylor <iant@google.com>
* c-lex.c (init_c_lex): Set macro debug callbacks if
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 7e7164075088..afe9b9d6e19d 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -2324,10 +2324,26 @@ warn_for_collisions (struct tlist *list)
static int
warning_candidate_p (tree x)
{
- /* !VOID_TYPE_P (TREE_TYPE (x)) is workaround for cp/tree.c
+ if (DECL_P (x) && DECL_ARTIFICIAL (x))
+ return 0;
+
+ /* VOID_TYPE_P (TREE_TYPE (x)) is workaround for cp/tree.c
(lvalue_p) crash on TRY/CATCH. */
- return !(DECL_P (x) && DECL_ARTIFICIAL (x))
- && TREE_TYPE (x) && !VOID_TYPE_P (TREE_TYPE (x)) && lvalue_p (x);
+ if (TREE_TYPE (x) == NULL_TREE || VOID_TYPE_P (TREE_TYPE (x)))
+ return 0;
+
+ if (!lvalue_p (x))
+ return 0;
+
+ /* No point to track non-const calls, they will never satisfy
+ operand_equal_p. */
+ if (TREE_CODE (x) == CALL_EXPR && (call_expr_flags (x) & ECF_CONST) == 0)
+ return 0;
+
+ if (TREE_CODE (x) == STRING_CST)
+ return 0;
+
+ return 1;
}
/* Return nonzero if X and Y appear to be the same candidate (or NULL) */
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index fd40483a5328..87aebe6931fc 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16 Jakub Jelinek <jakub@redhat.com>
+
+ PR c++/46401
+ * g++.dg/warn/Wsequence-point-3.C: New test.
+
2010-11-16 Kai Tietz <kai.tietz@onevision.com>
PR preprocessor/17349
diff --git a/gcc/testsuite/g++.dg/warn/Wsequence-point-3.C b/gcc/testsuite/g++.dg/warn/Wsequence-point-3.C
new file mode 100644
index 000000000000..5f73ca18b9d0
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wsequence-point-3.C
@@ -0,0 +1,20 @@
+// PR c++/46401
+// { dg-do compile }
+// { dg-options "-Wsequence-point" }
+
+struct S
+{
+ S ();
+ S &operator<< (const char *);
+ S (const S &);
+};
+
+#define N1(n) << #n
+#define N2(n) N1(n)
+#define N3(n) N2(n##0) N2(n##1) N2(n##2) N2(n##3) N2(n##4) \
+ N2(n##5) N2(n##6) N2(n##7) N2(n##8) N2(n##9)
+#define N4(n) N3(n##0) N3(n##1) N3(n##2) N3(n##3) N3(n##4) \
+ N3(n##5) N3(n##6) N3(n##7) N3(n##8) N3(n##9)
+#define N5(n) N4(n##0) N4(n##1) N4(n##2) N4(n##3) N4(n##4) \
+ N4(n##5) N4(n##6) N4(n##7) N4(n##8) N4(n##9)
+S s = S () N5(a) N5(b);