Move search_toString to semantic3 (#21590)

Author: thewilsonator

compiler/src/dmd/cxxfrontend.d

@@ -32,6 +32,7 @@ import dmd.init : Initializer, NeedInterpret;
 import dmd.location : Loc;
 import dmd.mtype /*: Covariant, Type, Parameter, ParameterList*/;
 import dmd.rootobject : RootObject;
+import dmd.semantic3;
 import dmd.statement : Statement, AsmStatement, GccAsmStatement;
 
 // NB: At some point in the future, we can switch to shortened function syntax.
@@ -132,7 +133,7 @@ void gendocfile(Module m, const char* ddoctext_ptr, size_t ddoctext_length,
  */
 FuncDeclaration search_toString(StructDeclaration sd)
 {
-    return dmd.dstruct.search_toString(sd);
+    return dmd.semantic3.search_toString(sd);
 }
 
 /***********************************************************

compiler/src/dmd/dstruct.d

@@ -37,35 +37,9 @@ import dmd.mtype;
 import dmd.opover;
 import dmd.target;
 import dmd.tokens;
-import dmd.typesem : merge;
 import dmd.typinf;
 import dmd.visitor;
 
-/***************************************
- * Search sd for a member function of the form:
- *   `extern (D) string toString();`
- * Params:
- *   sd = struct declaration to search
- * Returns:
- *   FuncDeclaration of `toString()` if found, `null` if not
- */
-FuncDeclaration search_toString(StructDeclaration sd)
-{
-    Dsymbol s = search_function(sd, Id.tostring);
-    FuncDeclaration fd = s ? s.isFuncDeclaration() : null;
-    if (fd)
-    {
-        __gshared TypeFunction tftostring;
-        if (!tftostring)
-        {
-            tftostring = new TypeFunction(ParameterList(), Type.tstring, LINK.d);
-            tftostring = tftostring.merge().toTypeFunction();
-        }
-        fd = fd.overloadExactMatch(tftostring);
-    }
-    return fd;
-}
-
 enum StructFlags : int
 {
     none        = 0x0,

compiler/src/dmd/semantic3.d

@@ -1665,6 +1665,30 @@ private struct FuncDeclSem3
     }
 }
 
+/***************************************
+ * Search sd for a member function of the form:
+ *   `extern (D) string toString();`
+ * Params:
+ *   sd = struct declaration to search
+ * Returns:
+ *   FuncDeclaration of `toString()` if found, `null` if not
+ */
+FuncDeclaration search_toString(StructDeclaration sd)
+{
+    Dsymbol s = search_function(sd, Id.tostring);
+    FuncDeclaration fd = s ? s.isFuncDeclaration() : null;
+    if (!fd)
+        return null;
+
+    __gshared TypeFunction tftostring;
+    if (!tftostring)
+    {
+        tftostring = new TypeFunction(ParameterList(), Type.tstring, LINK.d);
+        tftostring = tftostring.merge().toTypeFunction();
+    }
+    return fd.overloadExactMatch(tftostring);
+}
+
 /**
  * Ensures special members of a struct are fully analysed
  * before the backend emits TypeInfo.

compiler/src/dmd/todt.d

@@ -40,6 +40,7 @@ import dmd.init;
 import dmd.location;
 import dmd.mtype;
 import dmd.optimize;
+import dmd.semantic3 : search_toString;
 import dmd.target;
 import dmd.tokens;
 import dmd.tocsym;