Merge remote-tracking branch 'origin/dmd-rewrite-stable' into merge-2…

….107 Conflicts: dmd/declaration.d dmd/declaration.h dmd/expression.d dmd/expression.h dmd/globals.d dmd/inline.d dmd/osmodel.mak dmd/vsoptions.d dmd/vsoptions.h runtime/druntime/src/rt/aaA.d runtime/druntime/test/common.mak runtime/druntime/test/coverage/Makefile runtime/druntime/test/cycles/Makefile runtime/druntime/test/gc/Makefile runtime/druntime/test/profile/Makefile runtime/druntime/test/shared/Makefile runtime/druntime/test/stdcpp/Makefile runtime/druntime/test/thread/Makefile tests/dmd/Makefile tests/dmd/fail_compilation/fail19890a.d tests/dmd/fail_compilation/fail19890b.d tests/dmd/fail_compilation/fail4611.d tests/dmd/runnable/cov2.d tests/dmd/runnable/extra-files/runnable-cov2.lst tests/dmd/tools/d_do_test.d
bangbangsheshotmedown · Jan 10, 2024 · 2a1f97f · 2a1f97f
2 parents 1254838 + c58f8a8
commit 2a1f97f
Show file tree

Hide file tree

Showing 367 changed files with 16,076 additions and 13,894 deletions.
diff --git a/dmd/access.d b/dmd/access.d
@@ -3,7 +3,7 @@
  *
  * Specification: $(LINK2 https://dlang.org/spec/attribute.html#visibility_attributes, Visibility Attributes)
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/access.d, _access.d)

diff --git a/dmd/aggregate.d b/dmd/aggregate.d
@@ -4,7 +4,7 @@
  * Specification: $(LINK2 https://dlang.org/spec/struct.html, Structs, Unions),
  *                $(LINK2 https://dlang.org/spec/class.html, Class).
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/aggregate.d, _aggregate.d)
@@ -65,7 +65,7 @@ enum ClassKind : ubyte
  * Returns:
  *     0-terminated string for `c`
  */
-const(char)* toChars(ClassKind c) @safe
+const(char)* ClassKindToChars(ClassKind c) @safe
 {
     final switch (c)
     {
@@ -178,16 +178,6 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
         return sc2;
     }
 
-    override final void setScope(Scope* sc)
-    {
-        // Might need a scope to resolve forward references. The check for
-        // semanticRun prevents unnecessary setting of _scope during deferred
-        // setScope phases for aggregates which already finished semantic().
-        // See https://issues.dlang.org/show_bug.cgi?id=16607
-        if (semanticRun < PASS.semanticdone)
-            ScopeDsymbol.setScope(sc);
-    }
-
     /***************************************
      * Returns:
      *      The total number of fields minus the number of hidden fields.
@@ -663,7 +653,7 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
      */
     extern (D) final Dsymbol searchCtor()
     {
-        auto s = search(Loc.initial, Id.ctor);
+        auto s = this.search(Loc.initial, Id.ctor);
         if (s)
         {
             if (!(s.isCtorDeclaration() ||

diff --git a/dmd/aggregate.h b/dmd/aggregate.h
@@ -1,6 +1,6 @@
 
 /* Compiler implementation of the D programming language
- * Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * written by Walter Bright
  * https://www.digitalmars.com
  * Distributed under the Boost Software License, Version 1.0.
@@ -113,7 +113,6 @@ class AggregateDeclaration : public ScopeDsymbol
     Sizeok sizeok;              // set when structsize contains valid data
 
     virtual Scope *newScope(Scope *sc);
-    void setScope(Scope *sc) override final;
     virtual void finalizeSize() = 0;
     uinteger_t size(const Loc &loc) override final;
     bool fill(const Loc &loc, Expressions &elements, bool ctorinit);
@@ -169,7 +168,6 @@ class StructDeclaration : public AggregateDeclaration
 public:
     static StructDeclaration *create(const Loc &loc, Identifier *id, bool inObject);
     StructDeclaration *syntaxCopy(Dsymbol *s) override;
-    Dsymbol *search(const Loc &loc, Identifier *ident, int flags = SearchLocalsOnly) override final;
     const char *kind() const override;
     void finalizeSize() override final;
     bool isPOD();
@@ -291,7 +289,6 @@ class ClassDeclaration : public AggregateDeclaration
     virtual bool isBaseOf(ClassDeclaration *cd, int *poffset);
 
     bool isBaseInfoComplete();
-    Dsymbol *search(const Loc &loc, Identifier *ident, int flags = SearchLocalsOnly) override final;
     void finalizeSize() override;
     bool hasMonitor();
     bool isFuncHidden(FuncDeclaration *fd);

diff --git a/dmd/aliasthis.d b/dmd/aliasthis.d
@@ -3,7 +3,7 @@
  *
  * Specification: $(LINK2 https://dlang.org/spec/class.html#alias-this, Alias This)
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/aliasthis.d, _aliasthis.d)
@@ -14,16 +14,10 @@
 module dmd.aliasthis;
 
 import core.stdc.stdio;
-import dmd.aggregate;
-import dmd.dscope;
+
 import dmd.dsymbol;
-import dmd.expression;
-import dmd.expressionsem;
-import dmd.globals;
 import dmd.identifier;
 import dmd.location;
-import dmd.mtype;
-import dmd.tokens;
 import dmd.visitor;
 
 /***********************************************************
@@ -71,161 +65,3 @@ extern (C++) final class AliasThis : Dsymbol
         return this.isDeprecated_;
     }
 }
-
-/*************************************
- * Find the `alias this` symbol of e's type.
- * Params:
- *      sc = context
- *      e = expression forming the `this`
- *      gag = do not print errors, return `null` instead
- *      findOnly = don't do further processing like resolving properties,
- *                 i.e. just return plain dotExp() result.
- * Returns:
- *      Expression that is `e.aliasthis`
- */
-Expression resolveAliasThis(Scope* sc, Expression e, bool gag = false, bool findOnly = false)
-{
-    import dmd.typesem : dotExp;
-    for (AggregateDeclaration ad = isAggregate(e.type); ad;)
-    {
-        if (ad.aliasthis)
-        {
-            Loc loc = e.loc;
-            Type tthis = (e.op == EXP.type ? e.type : null);
-            const flags = cast(DotExpFlag) (DotExpFlag.noAliasThis | (gag * DotExpFlag.gag));
-            uint olderrors = gag ? global.startGagging() : 0;
-            e = dotExp(ad.type, sc, e, ad.aliasthis.ident, flags);
-            if (!e || findOnly)
-                return gag && global.endGagging(olderrors) ? null : e;
-
-            if (tthis && ad.aliasthis.sym.needThis())
-            {
-                if (auto ve = e.isVarExp())
-                {
-                    if (auto fd = ve.var.isFuncDeclaration())
-                    {
-                        // https://issues.dlang.org/show_bug.cgi?id=13009
-                        // Support better match for the overloaded alias this.
-                        bool hasOverloads;
-                        if (auto f = fd.overloadModMatch(loc, tthis, hasOverloads))
-                        {
-                            if (!hasOverloads)
-                                fd = f;     // use exact match
-                            e = new VarExp(loc, fd, hasOverloads);
-                            e.type = f.type;
-                            e = new CallExp(loc, e);
-                            goto L1;
-                        }
-                    }
-                }
-                /* non-@property function is not called inside typeof(),
-                 * so resolve it ahead.
-                 */
-                {
-                    int save = sc.intypeof;
-                    sc.intypeof = 1; // bypass "need this" error check
-                    e = resolveProperties(sc, e);
-                    sc.intypeof = save;
-                }
-            L1:
-                e = new TypeExp(loc, new TypeTypeof(loc, e));
-                e = e.expressionSemantic(sc);
-            }
-            e = resolveProperties(sc, e);
-            if (!gag)
-                ad.aliasthis.checkDeprecatedAliasThis(loc, sc);
-            else if (global.endGagging(olderrors))
-                e = null;
-        }
-
-        import dmd.dclass : ClassDeclaration;
-        auto cd = ad.isClassDeclaration();
-        if ((!e || !ad.aliasthis) && cd && cd.baseClass && cd.baseClass != ClassDeclaration.object)
-        {
-            ad = cd.baseClass;
-            continue;
-        }
-        break;
-    }
-    return e;
-}
-
-/**
- * Check if an `alias this` is deprecated
- *
- * Usually one would use `expression.checkDeprecated(scope, aliasthis)` to
- * check if `expression` uses a deprecated `aliasthis`, but this calls
- * `toPrettyChars` which lead to the following message:
- * "Deprecation: alias this `fullyqualified.aggregate.__anonymous` is deprecated"
- *
- * Params:
- *   at  = The `AliasThis` object to check
- *   loc = `Loc` of the expression triggering the access to `at`
- *   sc  = `Scope` of the expression
- *         (deprecations do not trigger in deprecated scopes)
- *
- * Returns:
- *   Whether the alias this was reported as deprecated.
- */
-bool checkDeprecatedAliasThis(AliasThis at, const ref Loc loc, Scope* sc)
-{
-    import dmd.errors : deprecation, Classification;
-    import dmd.dsymbolsem : getMessage;
-
-    if (global.params.useDeprecated != DiagnosticReporting.off
-        && at.isDeprecated() && !sc.isDeprecated())
-    {
-        const(char)* message = null;
-        for (Dsymbol p = at; p; p = p.parent)
-        {
-            message = p.depdecl ? p.depdecl.getMessage() : null;
-            if (message)
-                break;
-        }
-        if (message)
-            deprecation(loc, "`alias %s this` is deprecated - %s",
-                        at.sym.toChars(), message);
-        else
-            deprecation(loc, "`alias %s this` is deprecated",
-                        at.sym.toChars());
-
-        if (auto ti = sc.parent ? sc.parent.isInstantiated() : null)
-            ti.printInstantiationTrace(Classification.deprecation);
-
-        return true;
-    }
-    return false;
-}
-
-/**************************************
- * Check and set 'att' if 't' is a recursive 'alias this' type
- *
- * The goal is to prevent endless loops when there is a cycle in the alias this chain.
- * Since there is no multiple `alias this`, the chain either ends in a leaf,
- * or it loops back on itself as some point.
- *
- * Example: S0 -> (S1 -> S2 -> S3 -> S1)
- *
- * `S0` is not a recursive alias this, so this returns `false`, and a rewrite to `S1` can be tried.
- * `S1` is a recursive alias this type, but since `att` is initialized to `null`,
- * this still returns `false`, but `att1` is set to `S1`.
- * A rewrite to `S2` and `S3` can be tried, but when we want to try a rewrite to `S1` again,
- * we notice `att == t`, so we're back at the start of the loop, and this returns `true`.
- *
- * Params:
- *   att = type reference used to detect recursion. Should be initialized to `null`.
- *   t   = type of 'alias this' rewrite to attempt
- *
- * Returns:
- *   `false` if the rewrite is safe, `true` if it would loop back around
- */
-bool isRecursiveAliasThis(ref Type att, Type t)
-{
-    //printf("+isRecursiveAliasThis(att = %s, t = %s)\n", att ? att.toChars() : "null", t.toChars());
-    auto tb = t.toBasetype();
-    if (att && tb.equivalent(att))
-        return true;
-    else if (!att && tb.checkAliasThisRec())
-        att = tb;
-    return false;
-}
diff --git a/dmd/aliasthis.h b/dmd/aliasthis.h
@@ -1,6 +1,6 @@
 
 /* Compiler implementation of the D programming language
- * Copyright (C) 2009-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright (C) 2009-2024 by The D Language Foundation, All Rights Reserved
  * written by Walter Bright
  * https://www.digitalmars.com
  * Distributed under the Boost Software License, Version 1.0.

diff --git a/dmd/argtypes_aarch64.d b/dmd/argtypes_aarch64.d
@@ -1,7 +1,7 @@
 /**
  * Break down a D type into basic (register) types for the AArch64 ABI.
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     Martin Kinkelin
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/argtypes_aarch64.d, _argtypes_aarch64.d)

diff --git a/dmd/argtypes_sysv_x64.d b/dmd/argtypes_sysv_x64.d
@@ -1,7 +1,7 @@
 /**
  * Break down a D type into basic (register) types for the x86_64 System V ABI.
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     Martin Kinkelin
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/argtypes_sysv_x64.d, _argtypes_sysv_x64.d)

diff --git a/dmd/argtypes_x86.d b/dmd/argtypes_x86.d
@@ -1,7 +1,7 @@
 /**
  * Break down a D type into basic (register) types for the 32-bit x86 ABI.
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/argtypes_x86.d, _argtypes_x86.d)

diff --git a/dmd/arrayop.d b/dmd/arrayop.d
@@ -3,7 +3,7 @@
  *
  * Specification: $(LINK2 https://dlang.org/spec/arrays.html#array-operations, Array Operations)
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/arrayop.d, _arrayop.d)
@@ -172,7 +172,7 @@ Expression arrayOp(BinAssignExp e, Scope* sc)
     }
     if (e.e1.op == EXP.arrayLiteral)
     {
-        return e.e1.modifiableLvalue(sc, e.e1);
+        return e.e1.modifiableLvalue(sc);
     }
 
     return arrayOp(e.isBinExp(), sc);

diff --git a/dmd/arraytypes.d b/dmd/arraytypes.d
@@ -1,7 +1,7 @@
 /**
  * Provide aliases for arrays of certain declarations or statements.
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/arraytypes.d, _arraytypes.d)

diff --git a/dmd/arraytypes.h b/dmd/arraytypes.h
@@ -1,6 +1,6 @@
 
 /* Compiler implementation of the D programming language
- * Copyright (C) 2006-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright (C) 2006-2024 by The D Language Foundation, All Rights Reserved
  * written by Walter Bright
  * https://www.digitalmars.com
  * Distributed under the Boost Software License, Version 1.0.

diff --git a/dmd/ast_node.d b/dmd/ast_node.d
@@ -1,7 +1,7 @@
 /**
  * Defines the base class for all nodes which are part of the AST.
  *
- * Copyright:   Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright:   Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * Authors:     $(LINK2 https://www.digitalmars.com, Walter Bright)
  * License:     $(LINK2 https://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
  * Source:      $(LINK2 https://github.com/dlang/dmd/blob/master/src/dmd/ast_node.d, _ast_node.d)

diff --git a/dmd/ast_node.h b/dmd/ast_node.h
@@ -1,6 +1,6 @@
 
 /* Compiler implementation of the D programming language
- * Copyright (C) 1999-2023 by The D Language Foundation, All Rights Reserved
+ * Copyright (C) 1999-2024 by The D Language Foundation, All Rights Reserved
  * written by Walter Bright
  * https://www.digitalmars.com
  * Distributed under the Boost Software License, Version 1.0.

diff --git a/dmd/astcodegen.d b/dmd/astcodegen.d
@@ -97,6 +97,6 @@ struct ASTCodegen
     alias isExpression              = dmd.dtemplate.isExpression;
     alias isTuple                   = dmd.dtemplate.isTuple;
 
-    alias IgnoreErrors              = dmd.dsymbol.IgnoreErrors;
+    alias SearchOpt                 = dmd.dsymbol.SearchOpt;
     alias PASS                      = dmd.dsymbol.PASS;
 }