[flang] Ensure deterministic mod file output

Author: inaki-amatria

flang/lib/Semantics/mod-file.cpp

@@ -838,12 +838,9 @@ void ModFileWriter::PutUseExtraAttr(
 
 static inline SourceName NameInModuleFile(const Symbol &symbol) {
   if (const auto *use{symbol.detailsIf<UseDetails>()}) {
-    if (use->symbol().attrs().test(Attr::PRIVATE)) {
-      // Avoid the use in sorting of names created to access private
-      // specific procedures as a result of generic resolution;
-      // they're not in the cooked source.
-      return use->symbol().name();
-    }
+    // Avoid the use in sorting of names created to specific procedures as a
+    // result of generic resolution; they're not in the cooked source.
+    return use->symbol().name();
   }
   return symbol.name();
 }

flang/test/Semantics/Inputs/modfile72.f90

@@ -0,0 +1,13 @@
+module foo
+  interface do_foo
+    procedure do_foo_impl
+  end interface
+  interface do_bar
+    procedure do_bar_impl
+  end interface
+contains
+  subroutine do_foo_impl()
+  end
+  subroutine do_bar_impl()
+  end
+end

flang/test/Semantics/modfile03.f90

@@ -26,8 +26,8 @@ module m3
 end
 !Expect: m3.mod
 !module m3
-!use m2,only:y1
 !use m2,only:z1=>x1
+!use m2,only:y1
 !end
 
 module m4

flang/test/Semantics/modfile07.f90

@@ -154,9 +154,9 @@ module m1c
 !Expect: m1c.mod
 !module m1c
 ! use m1,only:myfoo=>foo
+! use m1,only:operator(+)
 ! use m1,only:operator(.bar.)
 ! use m1,only:operator(.mybar.)=>operator(.bar.)
-! use m1,only:operator(+)
 !end
 
 module m2

flang/test/Semantics/modfile72.f90

@@ -0,0 +1,28 @@
+! This test verifies that both invocations produce a consistent order in the
+! generated `.mod` file. Previous versions of Flang exhibited non-deterministic
+! behavior due to pointers outside the cooked source being used to order symbols
+! in the `.mod` file.
+
+! RUN: rm -rf %t && mkdir -p %t
+! RUN: %flang_fc1 -fsyntax-only -J%t %S/Inputs/modfile72.f90
+! RUN: %flang_fc1 -fsyntax-only -J%t %s
+! RUN: cat %t/bar.mod | FileCheck %s
+
+! RUN: rm -rf %t && mkdir -p %t
+! RUN: %flang_fc1 -fsyntax-only -J%t %S/Inputs/modfile72.f90 %s
+! RUN: cat %t/bar.mod | FileCheck %s
+
+module bar
+  use foo, only : do_foo
+  use foo, only : do_bar
+contains
+  subroutine do_baz()
+    call do_foo()
+    call do_bar()
+  end
+end
+
+!      CHECK: use foo,only:do_foo
+! CHECK-NEXT: use foo,only:do_bar
+! CHECK-NEXT: use foo,only:foo$foo$do_foo_impl=>do_foo_impl
+! CHECK-NEXT: use foo,only:foo$foo$do_bar_impl=>do_bar_impl