Merge remote-tracking branch 'upstream/stable' into merge_stable

VERSION

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

src/dmd/access.d

@@ -41,7 +41,8 @@ bool checkAccess(AggregateDeclaration ad, Loc loc, Scope* sc, Dsymbol smember)
         printf("AggregateDeclaration::checkAccess() for %s.%s in function %s() in scope %s\n", ad.toChars(), smember.toChars(), f ? f.toChars() : null, cdscope ? cdscope.toChars() : null);
     }
 
-    if (smember.toParent().isTemplateInstance())
+    const p = smember.toParent();
+    if (p && p.isTemplateInstance())
     {
         return false; // for backward compatibility
     }

src/dmd/aggregate.d

@@ -217,17 +217,20 @@ extern (C++) abstract class AggregateDeclaration : ScopeDsymbol
             return 0;
         }
 
-        for (size_t i = 0; i < members.dim; i++)
+        if (members)
         {
-            auto s = (*members)[i];
-            if (s.apply(&func, cast(void*)this))
+            for (size_t i = 0; i < members.dim; i++)
             {
-                if (sizeok != Sizeok.none)
+                auto s = (*members)[i];
+                if (s.apply(&func, cast(void*)this))
                 {
-                    // recursive determineFields already finished
-                    return true;
+                    if (sizeok != Sizeok.none)
+                    {
+                        // recursive determineFields already finished
+                        return true;
+                    }
+                    return false;
                 }
-                return false;
             }
         }
 

src/dmd/astbase.d

@@ -4202,7 +4202,6 @@ struct ASTBase
     {
         TraitsExp exp;
         Loc loc;
-        bool inAliasDeclaration;
 
         extern (D) this(const ref Loc loc, TraitsExp exp)
         {

src/dmd/backend/cgcod.d

@@ -290,32 +290,6 @@ tryagain:
         regcon.params &= ~noparams;
     }
 
-    // See if we need to enforce a particular stack alignment
-    foreach (i; 0 .. globsym.top)
-    {
-        Symbol *s = globsym.tab[i];
-
-        switch (s.Sclass)
-        {
-            case SCregister:
-            case SCauto:
-            case SCfastpar:
-                if (s.Sfl == FLreg)
-                    break;
-
-                const sz = type_alignsize(s.Stype);
-                if (sz > STACKALIGN && (I64 || config.exe == EX_OSX))
-                {
-                    STACKALIGN = sz;
-                    enforcealign = true;
-                }
-                break;
-
-            default:
-                break;
-        }
-    }
-
     if (config.flags4 & CFG4optimized)
     {
         if (nretblocks == 0 &&                  // if no return blocks in function
@@ -375,6 +349,35 @@ tryagain:
             cgcod_eh();
     }
 
+    // See if we need to enforce a particular stack alignment
+    foreach (i; 0 .. globsym.top)
+    {
+        Symbol *s = globsym.tab[i];
+
+        if (Symbol_Sisdead(s, anyiasm))
+            continue;
+
+        switch (s.Sclass)
+        {
+            case SCregister:
+            case SCauto:
+            case SCfastpar:
+                if (s.Sfl == FLreg)
+                    break;
+
+                const sz = type_alignsize(s.Stype);
+                if (sz > STACKALIGN && (I64 || config.exe == EX_OSX))
+                {
+                    STACKALIGN = sz;
+                    enforcealign = true;
+                }
+                break;
+
+            default:
+                break;
+        }
+    }
+
     stackoffsets(1);            // compute addresses of stack variables
     cod5_prol_epi();            // see where to place prolog/epilog
     CSE.finish();               // compute addresses and sizes of CSE saves
@@ -995,7 +998,14 @@ else
     }
 
     /* Determine if we need BP set up   */
-    if (config.flags & CFGalwaysframe)
+    if (enforcealign)
+    {
+        // we need BP to reset the stack before return
+        // otherwise the return address is lost
+        needframe = 1;
+
+    }
+    else if (config.flags & CFGalwaysframe)
         needframe = 1;
     else
     {

src/dmd/backend/cgobj.d

@@ -460,24 +460,12 @@ version (X86ASM)
 {
 int insidx(char *p,uint index)
 {
-    // https://issues.dlang.org/show_bug.cgi?id=19974
-    static if (__VERSION__ >= 2086)
-        asm
-        {
-            naked                           ;
-            mov     EAX,index - [ESP]       ;
-            mov     ECX,p - [ESP]           ;
-        }
-    else
-        asm nothrow
-        {
-            naked                           ;
-            mov     EAX,index - [ESP+4]     ;
-            mov     ECX,p - [ESP+4]         ;
-        }
-
-    asm nothrow
+    asm
     {
+        naked                           ;
+        mov     EAX,[ESP+8]             ; // index
+        mov     ECX,[ESP+4]             ; // p
+
         cmp     EAX,0x7F                ;
         jae     L1                      ;
         mov     [ECX],AL                ;

src/dmd/backend/cod3.d

@@ -4187,7 +4187,7 @@ void epilog(block *b)
         {
         L4:
             assert(hasframe);
-            if (xlocalsize)
+            if (xlocalsize || enforcealign)
             {
                 if (config.flags2 & CFG2stomp)
                 {   /*   MOV  ECX,0xBEAF

src/dmd/backend/dcgcv.d

@@ -244,17 +244,16 @@ debtyp_t * debtyp_alloc(uint length)
         length += pad;
     }
 
+    length < 0x10000 || assert(0);
+    const len = debtyp_t.sizeof - (d.data).sizeof + length;
 debug
 {
-    const len = debtyp_t.sizeof - (d.data).sizeof + length;
-    assert(len < 4 * 4096 - 100);
     d = cast(debtyp_t *) mem_malloc(len /*+ 1*/);
     memset(d, 0xAA, len);
 //    (cast(char*)d)[len] = 0x2E;
 }
 else
 {
-    assert(length < 0x10000);
     d = cast(debtyp_t *) malloc(debtyp_t.sizeof - (d.data).sizeof + length);
 }
     d.length = cast(ushort)length;
@@ -277,8 +276,8 @@ private void debtyp_free(debtyp_t *d)
     //fflush(stdout);
 debug
 {
+    assert(d.length < 0x10000);
     uint len = debtyp_t.sizeof - (d.data).sizeof + d.length;
-    assert(len < 4 * 4096 - 100);
 //    assert((cast(char*)d)[len] == 0x2E);
     memset(d, 0x55, len);
     mem_free(d);

src/dmd/ctfeexpr.d

@@ -1835,6 +1835,8 @@ bool isCtfeValueValid(Expression newval)
         return true; //((StructLiteralExp *)newval)->ownedByCtfe;
     if (newval.op == TOK.classReference)
         return true;
+    if (newval.op == TOK.type)
+        return true;
     if (newval.op == TOK.vector)
         return true; // vector literal
     if (newval.op == TOK.function_)

src/dmd/delegatize.d

@@ -86,6 +86,25 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
         alias visit = typeof(super).visit;
         FuncDeclaration fd;
 
+        private void setParent(Dsymbol s)
+        {
+            VarDeclaration vd = s.isVarDeclaration();
+            FuncDeclaration pfd = s.parent ? s.parent.isFuncDeclaration() : null;
+            s.parent = fd;
+            if (!vd || !pfd)
+                return;
+            // move to fd's closure when applicable
+            foreach (i; 0 .. pfd.closureVars.dim)
+            {
+                if (vd == pfd.closureVars[i])
+                {
+                    pfd.closureVars.remove(i);
+                    fd.closureVars.push(vd);
+                    break;
+                }
+            }
+        }
+
     public:
         extern (D) this(FuncDeclaration fd)
         {
@@ -98,7 +117,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
 
         override void visit(DeclarationExp e)
         {
-            e.declaration.parent = fd;
+            setParent(e.declaration);
             e.declaration.accept(this);
         }
 
@@ -107,7 +126,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
             if (e.lengthVar)
             {
                 //printf("lengthVar\n");
-                e.lengthVar.parent = fd;
+                setParent(e.lengthVar);
                 e.lengthVar.accept(this);
             }
         }
@@ -117,7 +136,7 @@ private void lambdaSetParent(Expression e, FuncDeclaration fd)
             if (e.lengthVar)
             {
                 //printf("lengthVar\n");
-                e.lengthVar.parent = fd;
+                setParent(e.lengthVar);
                 e.lengthVar.accept(this);
             }
         }

src/dmd/dinterpret.d

@@ -2029,12 +2029,21 @@ public:
         {
             printf("%s Expression::interpret() '%s' %s\n", e.loc.toChars(), Token.toChars(e.op), e.toChars());
             printf("type = %s\n", e.type.toChars());
-            e.print();
+            showCtfeExpr(e);
         }
         e.error("cannot interpret `%s` at compile time", e.toChars());
         result = CTFEExp.cantexp;
     }
 
+    override void visit(TypeExp e)
+    {
+        debug (LOG)
+        {
+            printf("%s TypeExp.interpret() %s\n", e.loc.toChars(), e.toChars());
+        }
+        result = e;
+    }
+
     override void visit(ThisExp e)
     {
         debug (LOG)
@@ -2076,7 +2085,7 @@ public:
                 }
                 return;
             }
-            assert(result.op == TOK.structLiteral || result.op == TOK.classReference);
+            assert(result.op == TOK.structLiteral || result.op == TOK.classReference || result.op == TOK.type);
             return;
         }
         e.error("value of `this` is not known at compile time");
@@ -4262,6 +4271,13 @@ public:
                 lowerbound = 0;
                 upperbound = 0;
             }
+            else if (VectorExp ve = e1.isVectorExp())
+            {
+                // ve is not handled but a proper error message is returned
+                // this is to prevent https://issues.dlang.org/show_bug.cgi?id=20042
+                lowerbound = 0;
+                upperbound = ve.dim;
+            }
             else
                 assert(0);
 
@@ -5077,7 +5093,8 @@ public:
                 result = CTFEExp.cantexp;
                 return;
             }
-            assert(pthis.op == TOK.structLiteral || pthis.op == TOK.classReference);
+
+            assert(pthis.op == TOK.structLiteral || pthis.op == TOK.classReference || pthis.op == TOK.type);
 
             if (fd.isVirtual() && !e.directcall)
             {

src/dmd/dscope.d

@@ -60,6 +60,7 @@ enum SCOPE
     free          = 0x8000,   /// is on free list
 
     fullinst      = 0x10000,  /// fully instantiate templates
+    alias_        = 0x20000,  /// inside alias declaration.
 }
 
 // Flags that are carried along with a scope push()

src/dmd/dsymbol.d

@@ -441,7 +441,7 @@ extern (C++) class Dsymbol : ASTNode
     final inout(Dsymbol) pastMixin() inout
     {
         //printf("Dsymbol::pastMixin() %s\n", toChars());
-        if (!isTemplateMixin() && !isForwardingAttribDeclaration())
+        if (!isTemplateMixin() && !isForwardingAttribDeclaration() && !isForwardingScopeDsymbol())
             return this;
         if (!parent)
             return null;
@@ -494,7 +494,7 @@ extern (C++) class Dsymbol : ASTNode
     /// ditto
     final inout(Dsymbol) toParent2() inout
     {
-        if (!parent || !parent.isTemplateInstance && !parent.isForwardingAttribDeclaration())
+        if (!parent || !parent.isTemplateInstance && !parent.isForwardingAttribDeclaration() && !parent.isForwardingScopeDsymbol())
             return parent;
         return parent.toParent2;
     }