diff --git a/gcc/rust/resolve/rust-ast-resolve-item.cc b/gcc/rust/resolve/rust-ast-resolve-item.cc
index 89cf0f3c07e3..ce51d9294e84 100644
--- a/gcc/rust/resolve/rust-ast-resolve-item.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-item.cc
@@ -356,6 +356,7 @@ ResolveItem::visit (AST::EnumItemDiscriminant &item)
   auto cpath = canonical_prefix.append (decl);
 
   mappings.insert_canonical_path (item.get_node_id (), cpath);
+  ResolveExpr::go (item.get_expr (), path, cpath);
 }
 
 void
diff --git a/gcc/rust/resolve/rust-ast-resolve-stmt.h b/gcc/rust/resolve/rust-ast-resolve-stmt.h
index 8791fd46f8f0..2f851779a35d 100644
--- a/gcc/rust/resolve/rust-ast-resolve-stmt.h
+++ b/gcc/rust/resolve/rust-ast-resolve-stmt.h
@@ -234,6 +234,7 @@ class ResolveStmt : public ResolverBase
 	redefined_error (r);
       });
 
+    ResolveExpr::go (item.get_expr (), path, cpath);
     // Done, no fields.
   }
 
diff --git a/gcc/testsuite/rust/compile/enum_discriminant2.rs b/gcc/testsuite/rust/compile/enum_discriminant2.rs
new file mode 100644
index 000000000000..578251ee2620
--- /dev/null
+++ b/gcc/testsuite/rust/compile/enum_discriminant2.rs
@@ -0,0 +1,7 @@
+fn main() {
+    let y = 3;
+    enum Foo {
+        Bar = y,
+        // { dg-error "cannot find value .y. in this scope" "" { target *-*-* } .-1 }
+    }
+}
diff --git a/gcc/testsuite/rust/compile/enum_discriminant3.rs b/gcc/testsuite/rust/compile/enum_discriminant3.rs
new file mode 100644
index 000000000000..32c79a5cd0a6
--- /dev/null
+++ b/gcc/testsuite/rust/compile/enum_discriminant3.rs
@@ -0,0 +1,8 @@
+const x: isize = 1;
+// { dg-warning "unused name" "" { target *-*-* } .-1 }
+
+fn main() {
+    enum Foo {
+        Bar = x,
+    }
+}
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index 76ef39f982d3..6e04b059cb42 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -29,4 +29,5 @@ torture/name_resolve1.rs
 issue-3568.rs
 issue-3663.rs
 issue-3671.rs
+enum_discriminant2.rs
 # please don't delete the trailing newline