diff options
| author | Jason Merrill <jason@redhat.com> | 2018-02-26 14:04:42 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-02-26 14:04:42 -0500 |
| commit | 106b15eac3345e62475f6087d53711c9e33c25d5 (patch) | |
| tree | a7775f1b176a83add2a7063bcc89305e521aad5c /gcc | |
| parent | b671df813a16a75345cceb35030333ccc36c39f9 (diff) | |
| download | gcc-106b15eac3345e62475f6087d53711c9e33c25d5.zip gcc-106b15eac3345e62475f6087d53711c9e33c25d5.tar.gz gcc-106b15eac3345e62475f6087d53711c9e33c25d5.tar.bz2 | |
PR c++/84551 - ICE with concepts and -g.
* parser.c (add_debug_begin_stmt): Do nothing in a concept.
From-SVN: r258009
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 3 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/concepts/debug1.C | 10 |
3 files changed, 18 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7499992..bf995f0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2018-02-26 Jason Merrill <jason@redhat.com> + + PR c++/84551 - ICE with concepts and -g. + * parser.c (add_debug_begin_stmt): Do nothing in a concept. + 2018-02-26 Marek Polacek <polacek@redhat.com> PR c++/84325 diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 4fa546a..f305c9c 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10699,6 +10699,9 @@ add_debug_begin_stmt (location_t loc) { if (!MAY_HAVE_DEBUG_MARKER_STMTS) return; + if (DECL_DECLARED_CONCEPT_P (current_function_decl)) + /* A concept is never expanded normally. */ + return; tree stmt = build0 (DEBUG_BEGIN_STMT, void_type_node); SET_EXPR_LOCATION (stmt, loc); diff --git a/gcc/testsuite/g++.dg/concepts/debug1.C b/gcc/testsuite/g++.dg/concepts/debug1.C new file mode 100644 index 0000000..eeb6365 --- /dev/null +++ b/gcc/testsuite/g++.dg/concepts/debug1.C @@ -0,0 +1,10 @@ +// PR c++/84551 +// { dg-options "-g -O -std=c++17 -fconcepts" } + +template<typename> concept bool C() { return true; } + +template<template<typename T> requires C<T>() class> struct A {}; + +template<typename> requires true struct B {}; + +A<B> a; |