diff options
| author | Jason Merrill <jason@redhat.com> | 2020-02-04 17:18:35 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2020-02-04 17:25:09 -0500 |
| commit | 85409531ff032a008ebfbb715344648f15492dac (patch) | |
| tree | b921d2b26e88dd58a1501ccd1f25b266a0506e4e /gcc/cp | |
| parent | 0712ea6313bc44f9ae8feb235c1b02c92cdd0527 (diff) | |
| download | gcc-85409531ff032a008ebfbb715344648f15492dac.zip gcc-85409531ff032a008ebfbb715344648f15492dac.tar.gz gcc-85409531ff032a008ebfbb715344648f15492dac.tar.bz2 | |
c++: Fix error-recovery with concepts.
Here, push_tinst_level refused to push into the scope of Foo::Foo
because it was triggered from the ill-formed function fun. But we didn't
check the return value and tried to pop the un-pushed level.
PR c++/93551
* constraint.cc (satisfy_declaration_constraints): Check return
value of push_tinst_level.
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/constraint.cc | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 956e94b..4e4235d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2020-02-04 Jason Merrill <jason@redhat.com> + PR c++/93551 + * constraint.cc (satisfy_declaration_constraints): Check return + value of push_tinst_level. + PR c++/90951 * constexpr.c (cxx_eval_array_reference): {}-initialize missing elements instead of value-initializing them. diff --git a/gcc/cp/constraint.cc b/gcc/cp/constraint.cc index cda644e..58044cd 100644 --- a/gcc/cp/constraint.cc +++ b/gcc/cp/constraint.cc @@ -2692,7 +2692,8 @@ satisfy_declaration_constraints (tree t, subst_info info) tree result = boolean_true_node; if (norm) { - push_tinst_level (t); + if (!push_tinst_level (t)) + return result; push_access_scope (t); result = satisfy_associated_constraints (norm, args, info); pop_access_scope (t); |