Fix Issue 17625 - Confusing error message for private functions in different modules

Author: RazvanN7

src/dmd/dsymbol.d

@@ -1349,9 +1349,15 @@ public:
                             /* If both s2 and s are overloadable (though we only
                              * need to check s once)
                              */
+
                             if ((s2.isOverloadSet() || s2.isOverloadable()) && (a || s.isOverloadable()))
                             {
-                                a = mergeOverloadSet(ident, a, s2);
+                                if (symbolIsVisible(this, s2))
+                                {
+                                    a = mergeOverloadSet(ident, a, s2);
+                                }
+                                if (!symbolIsVisible(this, s))
+                                    s = s2;
                                 continue;
                             }
                             if (flags & IgnoreAmbiguous) // if return NULL on ambiguity

src/dmd/func.d

@@ -2341,6 +2341,7 @@ extern (D) int overloadApply(Dsymbol fstart, scope int delegate(Dsymbol) dg, Sco
     Dsymbol next;
     for (Dsymbol d = fstart; d; d = next)
     {
+        import dmd.access : checkSymbolAccess;
         if (auto od = d.isOverDeclaration())
         {
             if (od.hasOverloads)
@@ -2353,7 +2354,6 @@ extern (D) int overloadApply(Dsymbol fstart, scope int delegate(Dsymbol) dg, Sco
                  */
                 if (sc)
                 {
-                    import dmd.access : checkSymbolAccess;
                     if (checkSymbolAccess(sc, od))
                     {
                         if (int r = overloadApply(od.aliassym, dg, sc))
@@ -2393,7 +2393,6 @@ extern (D) int overloadApply(Dsymbol fstart, scope int delegate(Dsymbol) dg, Sco
         {
             if (sc)
             {
-                import dmd.access : checkSymbolAccess;
                 if (checkSymbolAccess(sc, ad))
                     next = ad.toAlias();
             }

test/compilable/checkimports3.d

@@ -0,0 +1,11 @@
+/*
+REQUIRED_ARGS: -transition=checkimports -de
+*/
+import imports.checkimports3a;
+import imports.checkimports3b;
+import imports.checkimports3c;
+
+void test()
+{
+    foo();
+}

…ail_compilation/imports/checkimports3a.d test/compilable/imports/checkimports3a.dtest/fail_compilation/imports/checkimports3a.d renamed to test/compilable/imports/checkimports3a.d test/fail_compilation/imports/checkimports3a.d renamed to test/compilable/imports/checkimports3a.d

@@ -4,7 +4,7 @@ TEST_OUTPUT:
 ---
 fail_compilation/dip22e.d(16): Deprecation: imports.dip22d.foo is not visible from module dip22e
 fail_compilation/dip22e.d(16): Error: function `imports.dip22d.foo` is not accessible from module `dip22e`
-fail_compilation/dip22e.d(17): Deprecation: local import search method found overloadset dip22e.bar (2 overloads) instead of function imports.dip22e.bar
+fail_compilation/dip22e.d(17): Deprecation: local import search method found overloadset dip22e.bar (1 overloads) instead of function imports.dip22e.bar
 ---
 */
 

…ail_compilation/imports/checkimports3b.d test/compilable/imports/checkimports3b.dtest/fail_compilation/imports/checkimports3b.d renamed to test/compilable/imports/checkimports3b.d test/fail_compilation/imports/checkimports3b.d renamed to test/compilable/imports/checkimports3b.d

@@ -0,0 +1,17 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/fail17625.d(16): Deprecation: b17625.boo is not visible from module fail17625
+fail_compilation/fail17625.d(16): Error: function `b17625.boo` is not accessible from module `fail17625`
+---
+*/
+
+module fail17625;
+
+import imports.a17625;
+import imports.b17625;
+
+void main()
+{
+    boo();
+}

…ail_compilation/imports/checkimports3c.d test/compilable/imports/checkimports3c.dtest/fail_compilation/imports/checkimports3c.d renamed to test/compilable/imports/checkimports3c.d test/fail_compilation/imports/checkimports3c.d renamed to test/compilable/imports/checkimports3c.d

@@ -0,0 +1,3 @@
+module a17625;
+
+private int boo() { return 69; }