Remove the dmd front-end inliner and related code

dlang · Feb 10, 2024 · f97053d · f97053d
1 parent 8ab0636
commit f97053d
Show file tree

Hide file tree

Showing 15 changed files with 437 additions and 2,304 deletions.
diff --git a/compiler/src/dmd/declaration.h b/compiler/src/dmd/declaration.h
@@ -617,8 +617,6 @@ class FuncDeclaration : public Declaration
     // Sibling nested functions which called this one
     FuncDeclarations siblingCallers;
 
-    FuncDeclarations *inlinedNestedCallees;
-
     AttributeViolation* safetyViolation;
     AttributeViolation* nogcViolation;
     AttributeViolation* pureViolation;
@@ -666,8 +664,6 @@ class FuncDeclaration : public Declaration
     bool inferRetType(bool v);
     bool hasDualContext() const;
     bool hasDualContext(bool v);
-    bool hasAlwaysInlines() const;
-    bool hasAlwaysInlines(bool v);
     bool isCrtCtor() const;
     bool isCrtCtor(bool v);
     bool isCrtDtor() const;

diff --git a/compiler/src/dmd/dmodule.d b/compiler/src/dmd/dmodule.d
@@ -345,7 +345,6 @@ extern (C++) final class Module : Package
     uint errors;                // if any errors in file
     uint numlines;              // number of lines in source file
     FileType filetype;          // source file type
-    bool hasAlwaysInlines;      // contains references to functions that must be inlined
     bool isPackageFile;         // if it is a package.d
     Package pkg;                // if isPackageFile is true, the Package that contains this package.d
     Strings contentImportedFiles; // array of files whose content was imported

diff --git a/compiler/src/dmd/dsymbol.d b/compiler/src/dmd/dsymbol.d
@@ -197,8 +197,6 @@ enum PASS : ubyte
     semantic2done,  // semantic2() done
     semantic3,      // semantic3() started
     semantic3done,  // semantic3() done
-    inline,         // inline started
-    inlinedone,     // inline done
     obj,            // toObjFile() run
 }
 

diff --git a/compiler/src/dmd/dsymbol.h b/compiler/src/dmd/dsymbol.h
@@ -126,8 +126,6 @@ enum class PASS : uint8_t
     semantic2done,  // semantic2() done
     semantic3,      // semantic3() started
     semantic3done,  // semantic3() done
-    inline_,         // inline started
-    inlinedone,     // inline done
     obj             // toObjFile() run
 };
 

diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
@@ -2880,17 +2880,6 @@ private bool functionParameters(const ref Loc loc, Scope* sc,
         }
     }
 
-    /* If calling a pragma(inline, true) function,
-     * set flag to later scan for inlines.
-     */
-    if (fd && fd.inlining == PINLINE.always)
-    {
-        if (sc._module)
-            sc._module.hasAlwaysInlines = true;
-        if (sc.func)
-            sc.func.hasAlwaysInlines = true;
-    }
-
     const isCtorCall = fd && fd.needThis() && fd.isCtorDeclaration();
 
     const size_t n = (nargs > nparams) ? nargs : nparams; // n = max(nargs, nparams)

diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
@@ -3709,7 +3709,6 @@ class FuncDeclaration : public Declaration
     Array<VarDeclaration* > closureVars;
     Array<VarDeclaration* > outerVars;
     Array<FuncDeclaration* > siblingCallers;
-    Array<FuncDeclaration* >* inlinedNestedCallees;
     AttributeViolation* safetyViolation;
     AttributeViolation* nogcViolation;
     AttributeViolation* pureViolation;
@@ -3754,8 +3753,6 @@ class FuncDeclaration : public Declaration
     bool inferRetType(bool v);
     bool hasDualContext() const;
     bool hasDualContext(bool v);
-    bool hasAlwaysInlines() const;
-    bool hasAlwaysInlines(bool v);
     bool isCrtCtor() const;
     bool isCrtCtor(bool v);
     bool isCrtDtor() const;
@@ -7195,7 +7192,6 @@ class Module final : public Package
     uint32_t errors;
     uint32_t numlines;
     FileType filetype;
-    bool hasAlwaysInlines;
     bool isPackageFile;
     Package* pkg;
     Array<const char* > contentImportedFiles;

diff --git a/compiler/src/dmd/func.d b/compiler/src/dmd/func.d
@@ -224,7 +224,6 @@ private struct FUNCFLAG
     bool inferRetType;       /// Return type is to be inferred
     bool hasDualContext;     /// has a dual-context 'this' parameter
 
-    bool hasAlwaysInlines;   /// Contains references to functions that must be inlined
     bool isCrtCtor;          /// Has attribute pragma(crt_constructor)
     bool isCrtDtor;          /// Has attribute pragma(crt_destructor)
     bool hasEscapingSiblings;/// Has sibling functions that escape
@@ -372,8 +371,6 @@ extern (C++) class FuncDeclaration : Declaration
     /// Sibling nested functions which called this one
     FuncDeclarations siblingCallers;
 
-    FuncDeclarations *inlinedNestedCallees;
-
     /// In case of failed `@safe` inference, store the error that made the function `@system` for
     /// better diagnostics
     AttributeViolation* safetyViolation;

diff --git a/compiler/src/dmd/glue.d b/compiler/src/dmd/glue.d
@@ -857,23 +857,6 @@ public void FuncDeclaration_toObjFile(FuncDeclaration fd, bool multiobj)
         }
     }
 
-    if (fd.inlinedNestedCallees)
-    {
-        /* https://issues.dlang.org/show_bug.cgi?id=15333
-         * If fd contains inlined expressions that come from
-         * nested function bodies, the enclosing of the functions must be
-         * generated first, in order to calculate correct frame pointer offset.
-         */
-        foreach (fdc; *fd.inlinedNestedCallees)
-        {
-            FuncDeclaration fp = fdc.toParent2().isFuncDeclaration();
-            if (fp && fp.semanticRun < PASS.obj)
-            {
-                toObjFile(fp, multiobj);
-            }
-        }
-    }
-
     if (fd.isNested())
     {
         //if (!(config.flags3 & CFG3pic))