From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Tue, 22 Apr 2025 18:02:56 +0000 (+0200)
Subject: gccrs: derive(Hash): Use new Builder API
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54b7f68b45bf1945571dd1305c92167634783054;p=thirdparty%2Fgcc.git

gccrs: derive(Hash): Use new Builder API

gcc/rust/ChangeLog:

	* expand/rust-derive-hash.cc (DeriveHash::visit_enum): Use new APIs.
---

diff --git a/gcc/rust/expand/rust-derive-hash.cc b/gcc/rust/expand/rust-derive-hash.cc
index 0c9b0f7b105..94aede2fe03 100644
--- a/gcc/rust/expand/rust-derive-hash.cc
+++ b/gcc/rust/expand/rust-derive-hash.cc
@@ -231,14 +231,7 @@ DeriveHash::visit_enum (Enum &item)
   auto cases = std::vector<MatchCase> ();
   auto type_name = item.get_identifier ().as_string ();
 
-  auto intrinsic = ptrify (
-    builder.path_in_expression ({"core", "intrinsics", "discriminant_value"},
-				true));
-
-  auto let_discr
-    = builder.let (builder.identifier_pattern (DeriveHash::discr), nullptr,
-		   builder.call (std::move (intrinsic),
-				 builder.identifier ("self")));
+  auto let_discr = builder.discriminant_value (DeriveHash::discr);
 
   auto discr_hash = builder.statementify (
     hash_call (builder.ref (builder.identifier (DeriveHash::discr))));