On 3/21/24 17:01, Marek Polacek wrote:
Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk?
-- >8 --
Patrick noticed that my r14-9339-gdc6c3bfb59baab patch is wrong;
we're dealing with a noexcept-spec there, not a noexcept-expr, so
setting cp_noexcept_operand et al is incorrect. Back to the drawing
board then.
To fix noexcept84.C, we should probably avoid doing push_to_top_level
in certain cases. Patrick suggested checking:
const bool push_to_top = current_function_decl != fn;
which works, but I'm not sure I follow the logic there. I also came
up with
const bool push_to_top = !decl_function_context (fn);
which also works. But ultimately I went with !DECL_TEMPLATE_INSTANTIATED;
if DECL_TEMPLATE_INSTANTIATED is set, we've already pushed to top level
if it was necessary in instantiate_body.
This sort of thing is what maybe_push_to_top_level is for, does that
also work?
This also fixes c++/114349, introduced by r14-9339.
PR c++/114349
gcc/cp/ChangeLog:
* pt.cc (maybe_instantiate_noexcept): Don't push_to_top_level if
fn has already been instantiated. Don't save/restore
cp_unevaluated_operand, c_inhibit_evaluation_warnings, and
cp_noexcept_operand around the tsubst_expr call.
gcc/testsuite/ChangeLog:
* g++.dg/cpp0x/noexcept85.C: New test.
* g++.dg/cpp0x/noexcept86.C: New test.
---
gcc/cp/pt.cc | 17 ++++++-------
gcc/testsuite/g++.dg/cpp0x/noexcept85.C | 33 +++++++++++++++++++++++++
gcc/testsuite/g++.dg/cpp0x/noexcept86.C | 25 +++++++++++++++++++
3 files changed, 66 insertions(+), 9 deletions(-)
create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept85.C
create mode 100644 gcc/testsuite/g++.dg/cpp0x/noexcept86.C
diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc
index 8cf0d5b7a8d..b7ebd93ac7d 100644
--- a/gcc/cp/pt.cc
+++ b/gcc/cp/pt.cc
@@ -26855,7 +26855,12 @@ maybe_instantiate_noexcept (tree fn, tsubst_flags_t
complain)
}
else if (push_tinst_level (fn))
{
- push_to_top_level ();
+ /* If we've already instantiated FN, there's no need to push to
+ top level (as instantiate_body already pushed to top level if
+ needed). */
+ const bool push_to_top = !DECL_TEMPLATE_INSTANTIATED (fn);
+ if (push_to_top)
+ push_to_top_level ();
push_access_scope (fn);
push_deferring_access_checks (dk_no_deferred);
input_location = DECL_SOURCE_LOCATION (fn);
@@ -26878,17 +26883,10 @@ maybe_instantiate_noexcept (tree fn, tsubst_flags_t
complain)
if (orig_fn)
++processing_template_decl;
- ++cp_unevaluated_operand;
- ++c_inhibit_evaluation_warnings;
- ++cp_noexcept_operand;
/* Do deferred instantiation of the noexcept-specifier. */
noex = tsubst_expr (DEFERRED_NOEXCEPT_PATTERN (noex),
DEFERRED_NOEXCEPT_ARGS (noex),
tf_warning_or_error, fn);
- --cp_unevaluated_operand;
- --c_inhibit_evaluation_warnings;
- --cp_noexcept_operand;
-
/* Build up the noexcept-specification. */
spec = build_noexcept_spec (noex, tf_warning_or_error);
@@ -26898,7 +26896,8 @@ maybe_instantiate_noexcept (tree fn, tsubst_flags_t complain)
pop_deferring_access_checks ();
pop_access_scope (fn);
pop_tinst_level ();
- pop_from_top_level ();
+ if (push_to_top)
+ pop_from_top_level ();
}
else
spec = noexcept_false_spec;
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept85.C
b/gcc/testsuite/g++.dg/cpp0x/noexcept85.C
new file mode 100644
index 00000000000..b415bb46bc9
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept85.C
@@ -0,0 +1,33 @@
+// PR c++/114349
+// { dg-do compile { target c++11 } }
+
+using A = struct {};
+template <template <typename> class, typename, typename>
+using B = A;
+template <typename T>
+using C = typename T::D;
+struct E {
+ using D = B<C, int, A>;
+};
+template <class> constexpr bool foo (A) { return false; }
+template <class T> struct F {
+ using G = T;
+ using H = E;
+ F(const F &);
+ void operator=(F) noexcept(foo <G> (H::D{}));
+};
+template <typename, typename, typename>
+using I = F<int>;
+template <typename K, typename V, typename H = K>
+using J = I<K, V, H>;
+struct K {
+ typedef J<long, char> L;
+ L k;
+ K();
+};
+struct M {
+ bool bar () const;
+ K::L m;
+};
+K n;
+bool M::bar () const { n.k = m; return true; }
diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept86.C
b/gcc/testsuite/g++.dg/cpp0x/noexcept86.C
new file mode 100644
index 00000000000..2d040c090f5
--- /dev/null
+++ b/gcc/testsuite/g++.dg/cpp0x/noexcept86.C
@@ -0,0 +1,25 @@
+// PR c++/114349
+// { dg-do compile { target c++14 } }
+
+struct B
+{
+ int i;
+};
+
+template <bool BA>
+void
+goo ()
+{
+ constexpr bool is_yes = BA;
+ struct C
+ {
+ static auto g(B b) noexcept(is_yes) { }
+ };
+ C::g({});
+}
+
+void
+x ()
+{
+ goo<false>();
+}
base-commit: 48d49200510198cafcab55601cd8e5f8eb541f01