diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2010-11-16 21:49:57 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2010-11-16 21:49:57 +0100 |
| commit | 07078664fd6fdcb046cee4adf01ee697e56fcbd3 (patch) | |
| tree | 94166703e70b79443946831b62354ecb2d897536 | |
| parent | 18c33e032d3ed09866beed6bd6f711ff72fc1976 (diff) | |
| download | gcc-07078664fd6fdcb046cee4adf01ee697e56fcbd3.zip gcc-07078664fd6fdcb046cee4adf01ee697e56fcbd3.tar.gz gcc-07078664fd6fdcb046cee4adf01ee697e56fcbd3.tar.bz2 | |
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
| -rw-r--r-- | gcc/c-family/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 22 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wsequence-point-3.C | 20 |
4 files changed, 50 insertions, 3 deletions
diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 3af8ebe..57d3ab8 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 7e71640..afe9b9d 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 fd40483..87aebe6 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 0000000..5f73ca1 --- /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); |