Merge remote-tracking branch 'upstream/stable'

Author: Geod24

VERSION

@@ -1 +1 @@
-v2.087.0
+v2.087.1-beta.1

src/dmd/cppmangle.d

@@ -236,7 +236,24 @@ private final class CppMangleVisitor : Visitor
         }
     }
 
-    bool substitute(RootObject p)
+    /**
+     * Attempt to perform substitution on `p`
+     *
+     * If `p` already appeared in the mangling, it is stored as
+     * a 'part', and short references in the form of `SX_` can be used.
+     * Note that `p` can be anything: template declaration, struct declaration,
+     * class declaration, namespace...
+     *
+     * Params:
+     *   p = The object to attempt to substitute
+     *   nested = Whether or not `p` is to be considered nested.
+     *            When `true`, `N` will be prepended before the substitution.
+     *
+     * Returns:
+     *   Whether `p` already appeared in the mangling,
+     *   and substitution has been written to `this.buf`.
+     */
+    bool substitute(RootObject p, bool nested = false)
     {
         //printf("substitute %s\n", p ? p.toChars() : null);
         auto i = find(p);
@@ -245,6 +262,8 @@ private final class CppMangleVisitor : Visitor
             //printf("\tmatch\n");
             /* Sequence is S_, S0_, .., S9_, SA_, ..., SZ_, S10_, ...
              */
+            if (nested)
+                buf.writeByte('N');
             buf.writeByte('S');
             writeSequenceFromIndex(i);
             buf.writeByte('_');
@@ -550,19 +569,24 @@ private final class CppMangleVisitor : Visitor
         if (TemplateInstance ti = s.isTemplateInstance())
         {
             bool needsTa = false;
-            if (substitute(ti.tempdecl))
+            const isNested = !!ti.tempdecl.namespace || !!getQualifier(ti.tempdecl);
+            if (substitute(ti.tempdecl, !haveNE && isNested))
+            {
                 template_args(ti);
+                if (!haveNE && isNested)
+                    buf.writeByte('E');
+            }
             else if (this.writeStdSubstitution(ti, needsTa))
             {
                 if (needsTa)
                     template_args(ti);
             }
             else
             {
-                append(ti.tempdecl);
                 this.writeNamespace(
                     s.namespace, () {
                         this.writeIdentifier(ti.tempdecl.toAlias().ident);
+                        append(ti.tempdecl);
                         template_args(ti);
                     }, haveNE);
             }
@@ -811,7 +835,6 @@ private final class CppMangleVisitor : Visitor
                         isChar((*ti.tiargs)[0]) &&
                         isChar_traits_char((*ti.tiargs)[1]) &&
                         isAllocator_char((*ti.tiargs)[2]))
-
                     {
                         buf.writestring("Ss");
                         return;

test/compilable/cppmangle.d

@@ -1155,3 +1155,16 @@ version (Posix)
     static assert(fun20022_5.mangleof == `_ZN7ns2002210fun20022_5ENS_11Enum20022_1E`);
     static assert(fun20022_6.mangleof == `_ZN7ns2002210fun20022_6ENS_11Enum20022_2E`);
 }
+
+// https://issues.dlang.org/show_bug.cgi?id=20094
+version (Posix)
+{
+    extern(C++, "ns20094")
+    {
+        struct xvector20094 (T) {}
+        alias V20094 = xvector20094!(ubyte);
+    }
+
+    extern(C++) void test20094(xvector20094!(V20094)* v);
+    static assert(test20094.mangleof == `_Z9test20094PN7ns2009412xvector20094INS0_IhEEEE`);
+}