aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyutaro Okada <1015ryu88@gmail.com>2025-03-30 09:28:41 -0700
committerP-E-P <32375388+P-E-P@users.noreply.github.com>2025-03-31 14:55:15 +0000
commitb8ef598308e7bd08fb40651bf4c17490ccbb855f (patch)
tree76981e7659378c46880f435710315ea88b1fe2a1
parent765121736dfe3f5b319bbe9837880deda326394e (diff)
downloadgcc-b8ef598308e7bd08fb40651bf4c17490ccbb855f.zip
gcc-b8ef598308e7bd08fb40651bf4c17490ccbb855f.tar.gz
gcc-b8ef598308e7bd08fb40651bf4c17490ccbb855f.tar.bz2
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 <1015ryu88@gmail.com>
-rw-r--r--gcc/rust/backend/rust-compile-resolve-path.cc2
-rw-r--r--gcc/testsuite/rust/compile/enum_discriminant1.rs7
2 files changed, 9 insertions, 0 deletions
diff --git a/gcc/rust/backend/rust-compile-resolve-path.cc b/gcc/rust/backend/rust-compile-resolve-path.cc
index d4901a4..cdea292 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 0000000..32092b2
--- /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