From 566e599c8194f789b077eb94a5e45ced2de5b31e Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 17 Jun 2022 17:40:49 +0200 Subject: [PATCH] c++: Use fold_non_dependent_expr rather than maybe_constant_value in __builtin_shufflevector handling [PR106001] In this case the STATIC_CAST_EXPR expressions in the call aren't type nor value dependent, but maybe_constant_value still ICEs on those when processing_template_decl. Calling fold_non_dependent_expr on it instead fixes the ICE and folds them to INTEGER_CSTs. 2022-06-17 Jakub Jelinek PR c++/106001 * typeck.cc (build_x_shufflevector): Use fold_non_dependent_expr instead of maybe_constant_value. * g++.dg/ext/builtin-shufflevector-4.C: New test. (cherry picked from commit a284fadcce8ef443cc3cc047a8017745efb51758) --- gcc/cp/typeck.cc | 2 +- gcc/testsuite/g++.dg/ext/builtin-shufflevector-4.C | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/ext/builtin-shufflevector-4.C diff --git a/gcc/cp/typeck.cc b/gcc/cp/typeck.cc index a6c3936..ceb80d9 100644 --- a/gcc/cp/typeck.cc +++ b/gcc/cp/typeck.cc @@ -6334,7 +6334,7 @@ build_x_shufflevector (location_t loc, vec *args, auto_vec mask; for (unsigned i = 2; i < args->length (); ++i) { - tree idx = maybe_constant_value ((*args)[i]); + tree idx = fold_non_dependent_expr ((*args)[i], complain); mask.safe_push (idx); } tree exp = c_build_shufflevector (loc, arg0, arg1, mask, complain & tf_error); diff --git a/gcc/testsuite/g++.dg/ext/builtin-shufflevector-4.C b/gcc/testsuite/g++.dg/ext/builtin-shufflevector-4.C new file mode 100644 index 0000000..dae129b --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/builtin-shufflevector-4.C @@ -0,0 +1,18 @@ +// PR c++/106001 +// { dg-do compile } + +typedef int V __attribute__((vector_size (2 * sizeof (int)))); + +template +void +foo () +{ + V v = {}; + v = __builtin_shufflevector (v, v, static_cast(1), static_cast(0)); +} + +void +bar () +{ + foo <0> (); +} -- 2.7.4