diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2012-08-06 16:19:09 +0000 |
|---|---|---|
| committer | Dodji Seketeli <dodji@gcc.gnu.org> | 2012-08-06 18:19:09 +0200 |
| commit | 61b6d4cdee65148788a7638495ae61f8f2c93272 (patch) | |
| tree | 7715884997385ba1fb75caae6a47b4cf5b6ec6ad /gcc | |
| parent | a4a837968d01562e9caf7930670e236ae0fbf6a9 (diff) | |
| download | gcc-61b6d4cdee65148788a7638495ae61f8f2c93272.zip gcc-61b6d4cdee65148788a7638495ae61f8f2c93272.tar.gz gcc-61b6d4cdee65148788a7638495ae61f8f2c93272.tar.bz2 | |
Avoid crashing on erroneous static_assert usage
When working on something else, I noticed that failing to provide the
second argument to the static_assert operator would lead to an ICE.
Fixed thus, and tested against trunk on x86_64-unknown-linux-gnu.
gcc/cp/
* semantics.c (finish_static_assert): Don't crash on erroneous
message or condition.
gcc/testsuite/
* g++.dg/cpp0x/static_assert8.C: New test.
From-SVN: r190182
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 6 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/static_assert8.C | 7 |
4 files changed, 24 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 86c9097..5452a1c 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-08-06 Dodji Seketeli <dodji@redhat.com> + + Avoid crashing on erroneous static_assert usage + * semantics.c (finish_static_assert): Don't crash on erroneous + message or condition. + 2012-08-06 Marc Glisse <marc.glisse@inria.fr> Paolo Carlini <paolo.carlini@oracle.com> diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index b27e8ab..230e967 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -5099,6 +5099,12 @@ void finish_static_assert (tree condition, tree message, location_t location, bool member_p) { + if (message == NULL_TREE + || message == error_mark_node + || condition == NULL_TREE + || condition == error_mark_node) + return; + if (check_for_bare_parameter_packs (condition)) condition = error_mark_node; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b362c79..cca64c4 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-08-06 Dodji Seketeli <dodji@redhat.com> + + Avoid crashing on erroneous static_assert usage + * g++.dg/cpp0x/static_assert8.C: New test. + 2012-08-06 Jason Merrill <jason@redhat.com> * g++.dg/cpp0x/sfinae38.C: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/static_assert8.C b/gcc/testsuite/g++.dg/cpp0x/static_assert8.C new file mode 100644 index 0000000..ea23afb --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/static_assert8.C @@ -0,0 +1,7 @@ +// { dg-do compile { target c++11 } } + +static_assert (1 == 0); // { dg-error "expected (string-literal|',') before" } + +static_assert (1 == 0,); // { dg-error "expected string-literal before '\\)'" } + +static_assert (1 == 0, "oops"); // { dg-error "static assertion failed" } |