https://gcc.gnu.org/g:b8ef598308e7bd08fb40651bf4c17490ccbb855f
commit b8ef598308e7bd08fb40651bf4c17490ccbb855f
Author: Ryutaro Okada <1015ry...@gmail.com>
Date: Sun Mar 30 09:28:41 2025 -0700
Evaluate the enum's discriminant in a const context
gcc/rust/ChangeLog:
* backend/rust-compile-resolve-path.cc: Evaluate the enum's
discriminant in a const context
gcc/testsuite/ChangeLog:
* rust/compile/enum_discriminant1.rs: New test.
Signed-off-by: Ryutaro Okada <1015ry...@gmail.com>
Diff:
---
gcc/rust/backend/rust-compile-resolve-path.cc | 2 ++
gcc/testsuite/rust/compile/enum_discriminant1.rs | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc
b/gcc/rust/backend/rust-compile-resolve-path.cc
index d4901a44bead..cdea2925e59b 100644
--- a/gcc/rust/backend/rust-compile-resolve-path.cc
+++ b/gcc/rust/backend/rust-compile-resolve-path.cc
@@ -105,7 +105,9 @@ ResolvePathRef::attempt_constructor_expression_lookup (
// make the ctor for the union
HIR::Expr &discrim_expr = variant->get_discriminant ();
+ ctx->push_const_context ();
tree discrim_expr_node = CompileExpr::Compile (discrim_expr, ctx);
+ ctx->pop_const_context ();
tree folded_discrim_expr = fold_expr (discrim_expr_node);
tree qualifier = folded_discrim_expr;
diff --git a/gcc/testsuite/rust/compile/enum_discriminant1.rs
b/gcc/testsuite/rust/compile/enum_discriminant1.rs
new file mode 100644
index 000000000000..32092b2c2a5b
--- /dev/null
+++ b/gcc/testsuite/rust/compile/enum_discriminant1.rs
@@ -0,0 +1,7 @@
+enum Foo {
+ Bar = 3 + 12,
+}
+
+fn test() -> Foo { // { dg-warning "function is never used" }
+ return Foo::Bar;
+}
\ No newline at end of file
