From 550880a31688f1031a21efe7923c86db423cbbf1 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Wed, 23 Dec 2020 22:45:56 +0100 Subject: [PATCH] c++: Fix up floating point complex handling in build_zero_init_1 [PR98353] While the gimplifier patch I've just committed fixed an ICE, in some cases like on the committed testcase cp folding doesn't happen after build_zero_init_1 because it is called already during gimplification. For the scalar types, if we want to use convert, the problem with complex floats is that it returns a COMPLEX_EXPR with FLOAT_EXPR arguments which have INTEGER_CST 0 as argument. As fold isn't recursive, it doesn't do anything in that case, we need to first fold those FLOAT_EXPRs to REAL_CST 0.0 and only afterwards the COMPLEX_EXPR can be folded into COMPLEX_CST with 0.0 arguments. This patch instead just uses build_zero_cst that creates the zero constant for any scalar types (and more) directly, instead of going through multiple hops. 2020-12-23 Jakub Jelinek PR c++/98353 * init.c (build_zero_init_1): Use build_zero_cst for SCALAR_TYPE_P zero initializers. --- gcc/cp/init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 3c3e05d9b21..903d17fedc6 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -187,7 +187,7 @@ build_zero_init_1 (tree type, tree nelts, bool static_storage_p, else if (NULLPTR_TYPE_P (type)) init = build_int_cst (type, 0); else if (SCALAR_TYPE_P (type)) - init = fold (convert (type, integer_zero_node)); + init = build_zero_cst (type); else if (RECORD_OR_UNION_CODE_P (TREE_CODE (type))) { tree field; -- 2.30.2