mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-06 02:10:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

c++: Error recovery with erroneous DECL_INITIAL [PR94475]

Browse Source 
Here we're ICE'ing in do_narrow during error-recovery, because ocp_convert
returns error_mark_node after it attempts to reduce a const decl to its
erroneous DECL_INITIAL via scalar_constant_value, and we later pass this
error_mark_node to fold_build2 which isn't prepared to handle error_mark_nodes.

We could fix this ICE in do_narrow by checking if ocp_convert returns
error_mark_node, but for the sake of consistency and for better error recovery
it seems it'd be preferable if ocp_convert didn't care that a const decl's
initializer is erroneous and would instead proceed as if the decl was not const,
which is the approach that this patch takes.

gcc/cp/ChangeLog:

	PR c++/94475
	* cvt.c (ocp_convert): If the result of scalar_constant_value is
	erroneous, ignore it and use the original expression.

gcc/testsuite/ChangeLog:

	PR c++/94475
	* g++.dg/conversion/err-recover2.C: New test.
	* g++.dg/diagnostic/pr84138.C: Remove now-bogus warning.
	* g++.dg/warn/Wsign-compare-8.C: Remove now-bogus warning.
This commit is contained in:
Patrick Palka 2020-04-15 12:47:41 -04:00
parent 44b326839d
commit effcb4181e
6 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/cp/ChangeLog
View File

@ -1,3 +1,9 @@
2020-04-16 Patrick Palka <ppalka@redhat.com>
PR c++/94475
* cvt.c (ocp_convert): If the result of scalar_constant_value is
erroneous, ignore it and use the original expression.
2020-04-16 Jakub Jelinek <jakub@redhat.com>
PR c++/94571

4
gcc/cp/cvt.c
View File

@ -723,7 +723,9 @@ ocp_convert (tree type, tree expr, int convtype, int flags,
if (!CLASS_TYPE_P (type))
{
e = mark_rvalue_use (e);
e = scalar_constant_value (e);
tree v = scalar_constant_value (e);
if (!error_operand_p (v))
e = v;
}
if (error_operand_p (e))
return error_mark_node;

7
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,10 @@
2020-04-16 Patrick Palka <ppalka@redhat.com>
PR c++/94475
* g++.dg/conversion/err-recover2.C: New test.
* g++.dg/diagnostic/pr84138.C: Remove now-bogus warning.
* g++.dg/warn/Wsign-compare-8.C: Remove now-bogus warning.
2020-04-16 Richard Sandiford <richard.sandiford@arm.com>
PR rtl-optimization/94605

10
gcc/testsuite/g++.dg/conversion/err-recover2.C Normal file
View File

@ -0,0 +1,10 @@
// PR c++/94475
// { dg-do compile }
unsigned char
sr ()
{
const unsigned char xz = EI; // { dg-error "not declared" }
return xz - (xz >> 1);
}

2
gcc/testsuite/g++.dg/diagnostic/pr84138.C
View File

@ -5,4 +5,4 @@ foo()
{
const int i = 0 = 0; // { dg-error "lvalue required as left operand" }
return 1 ? 0 : (char)i;
} // { dg-warning "control reaches" }
}

2
gcc/testsuite/g++.dg/warn/Wsign-compare-8.C
View File

@ -5,4 +5,4 @@ bool foo (char c)
{
const int i = 0 = 0; // { dg-error "lvalue" }
return c = i;
} // { dg-warning "control reaches" }
}