derive(Ord, Eq): Use different node IDs for variant paths

gcc/rust/ChangeLog:

	* expand/rust-derive-cmp-common.cc (EnumMatchBuilder::tuple): Create two different
	variant paths.
	(EnumMatchBuilder::strukt): Likewise.
	* expand/rust-derive-cmp-common.h: Change API.
	* expand/rust-derive-ord.cc (DeriveOrd::visit_enum): Use new EnumMatchBuilder API.
	* expand/rust-derive-partial-eq.cc (DerivePartialEq::visit_enum): Likewise.

gcc/testsuite/ChangeLog:

	* rust/compile/derive_partial_ord1.rs: New test.

Author: CohenArthur

gcc/rust/expand/rust-derive-cmp-common.cc

@@ -96,19 +96,23 @@ EnumMatchBuilder::tuple (EnumItem &variant_raw)
       });
     }
 
+  // TODO: Replace with `reconstruct()` instead of building these twice
+  auto self_variant_path = builder.variant_path (enum_path, variant_path);
+  auto other_variant_path = builder.variant_path (enum_path, variant_path);
+
   auto self_pattern_items = std::unique_ptr<TupleStructItems> (
     new TupleStructItemsNoRange (std::move (self_patterns)));
   auto other_pattern_items = std::unique_ptr<TupleStructItems> (
     new TupleStructItemsNoRange (std::move (other_patterns)));
 
   auto self_pattern = std::unique_ptr<Pattern> (
     new ReferencePattern (std::unique_ptr<Pattern> (new TupleStructPattern (
-			    variant_path, std::move (self_pattern_items))),
-			  false, false, builder.loc));
-  auto other_pattern = std::unique_ptr<Pattern> (
-    new ReferencePattern (std::unique_ptr<Pattern> (new TupleStructPattern (
-			    variant_path, std::move (other_pattern_items))),
+			    self_variant_path, std::move (self_pattern_items))),
 			  false, false, builder.loc));
+  auto other_pattern = std::unique_ptr<Pattern> (new ReferencePattern (
+    std::unique_ptr<Pattern> (new TupleStructPattern (
+      other_variant_path, std::move (other_pattern_items))),
+    false, false, builder.loc));
 
   auto tuple_items = std::make_unique<TuplePatternItemsMultiple> (
     vec (std::move (self_pattern), std::move (other_pattern)));
@@ -155,16 +159,21 @@ EnumMatchBuilder::strukt (EnumItem &variant_raw)
       });
     }
 
+  // TODO: Replace with `reconstruct()` instead of building these twice
+  auto self_variant_path = builder.variant_path (enum_path, variant_path);
+  auto other_variant_path = builder.variant_path (enum_path, variant_path);
+
   auto self_elts = StructPatternElements (std::move (self_fields));
   auto other_elts = StructPatternElements (std::move (other_fields));
 
-  auto self_pattern = std::unique_ptr<Pattern> (
-    new ReferencePattern (std::unique_ptr<Pattern> (new StructPattern (
-			    variant_path, builder.loc, std::move (self_elts))),
-			  false, false, builder.loc));
+  auto self_pattern = std::unique_ptr<Pattern> (new ReferencePattern (
+    std::unique_ptr<Pattern> (new StructPattern (self_variant_path, builder.loc,
+						 std::move (self_elts))),
+    false, false, builder.loc));
   auto other_pattern = std::unique_ptr<Pattern> (
-    new ReferencePattern (std::unique_ptr<Pattern> (new StructPattern (
-			    variant_path, builder.loc, std::move (other_elts))),
+    new ReferencePattern (std::unique_ptr<Pattern> (
+			    new StructPattern (other_variant_path, builder.loc,
+					       std::move (other_elts))),
 			  false, false, builder.loc));
 
   auto tuple_items = std::make_unique<TuplePatternItemsMultiple> (

gcc/rust/expand/rust-derive-cmp-common.h

@@ -65,8 +65,11 @@ class EnumMatchBuilder
   using ExprFn
     = std::function<std::unique_ptr<Expr> (std::vector<SelfOther> &&)>;
 
-  EnumMatchBuilder (PathInExpression &variant_path, ExprFn fn, Builder &builder)
-    : variant_path (variant_path), fn (fn), builder (builder)
+  EnumMatchBuilder (const std::string &enum_path,
+		    const std::string &variant_path, ExprFn fn,
+		    Builder &builder)
+    : enum_path (enum_path), variant_path (variant_path), fn (fn),
+      builder (builder)
   {}
 
   /**
@@ -84,7 +87,8 @@ class EnumMatchBuilder
   MatchCase strukt (EnumItem &variant);
 
 private:
-  PathInExpression &variant_path;
+  const std::string &enum_path;
+  const std::string &variant_path;
   ExprFn fn;
   Builder &builder;
 };

gcc/rust/expand/rust-derive-ord.cc

@@ -274,11 +274,9 @@ DeriveOrd::visit_enum (Enum &item)
 
   for (auto &variant : item.get_variants ())
     {
-      auto variant_path
-	= builder.variant_path (type_name,
-				variant->get_identifier ().as_string ());
       auto enum_builder
-	= EnumMatchBuilder (variant_path, recursive_match_fn, builder);
+	= EnumMatchBuilder (type_name, variant->get_identifier ().as_string (),
+			    recursive_match_fn, builder);
 
       switch (variant->get_enum_item_kind ())
 	{

gcc/rust/expand/rust-derive-partial-eq.cc

@@ -287,11 +287,9 @@ DerivePartialEq::visit_enum (Enum &item)
 
   for (auto &variant : item.get_variants ())
     {
-      auto variant_path
-	= builder.variant_path (type_name,
-				variant->get_identifier ().as_string ());
-
-      auto enum_builder = EnumMatchBuilder (variant_path, eq_expr_fn, builder);
+      auto enum_builder
+	= EnumMatchBuilder (type_name, variant->get_identifier ().as_string (),
+			    eq_expr_fn, builder);
 
       switch (variant->get_enum_item_kind ())
 	{