]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: pack indexing and if consteval
authorJason Merrill <jason@redhat.com>
Sat, 22 Mar 2025 14:52:14 +0000 (10:52 -0400)
committerJason Merrill <jason@redhat.com>
Mon, 24 Mar 2025 17:03:18 +0000 (13:03 -0400)
The pack index is manifestly constant-evaluated, and the call to
maybe_constant_value needs to reflect that or we wrongly complain about
non-constant index if the evaluation uses if consteval.

gcc/cp/ChangeLog:

* semantics.cc (finish_type_pack_element): Pass mce_true to
maybe_constant_value.

gcc/testsuite/ChangeLog:

* g++.dg/cpp26/pack-indexing16.C: New test.

gcc/cp/semantics.cc
gcc/testsuite/g++.dg/cpp26/pack-indexing16.C [new file with mode: 0644]

index b0a5f9ad660747f9074404849070915593e67752..b390d663e2433b61162ee1807deb68d626ddc83b 100644 (file)
@@ -5086,7 +5086,7 @@ finish_underlying_type (tree type)
 static tree
 finish_type_pack_element (tree idx, tree types, tsubst_flags_t complain)
 {
-  idx = maybe_constant_value (idx);
+  idx = maybe_constant_value (idx, NULL_TREE, mce_true);
   if (TREE_CODE (idx) != INTEGER_CST || !INTEGRAL_TYPE_P (TREE_TYPE (idx)))
     {
       if (complain & tf_error)
diff --git a/gcc/testsuite/g++.dg/cpp26/pack-indexing16.C b/gcc/testsuite/g++.dg/cpp26/pack-indexing16.C
new file mode 100644 (file)
index 0000000..92ade86
--- /dev/null
@@ -0,0 +1,16 @@
+// { dg-do compile { target c++26 } }
+
+int i;
+constexpr int idx()
+{
+  if consteval { return 0; }
+  else { return i; }
+}
+
+template <int... Ns>
+int first () { return Ns...[idx()]; }
+
+int main()
+{
+  return first<0,1,2>();
+}