Merge pull request #2127 from MartinNowak/merge_stable

Merge remote-tracking branch 'upstream/stable' into merge_stable
merged-on-behalf-of: Sebastian Wilzbach <sebi.wilzbach@gmail.com>

Author: dlang-bot

changelog/core-memory-__delete.dd

@@ -208,11 +208,11 @@ pure @safe:
         {
             assert( contains( dst[0 .. len], val ) );
             debug(info) printf( "removing (%.*s)\n", cast(int) val.length, val.ptr );
-
             size_t v = &val[0] - &dst[0];
+            assert( len >= val.length && len <= dst.length );
+            len -= val.length;
             for (size_t p = v; p < len; p++)
                 dst[p] = dst[p + val.length];
-            len -= val.length;
         }
     }
 
@@ -227,8 +227,7 @@ pure @safe:
             assert( !contains( dst[0 .. len], val ) );
             debug(info) printf( "appending (%.*s)\n", cast(int) val.length, val.ptr );
 
-            if( &dst[len] == &val[0] &&
-                dst.length - len >= val.length )
+            if( dst.length - len >= val.length && &dst[len] == &val[0] )
             {
                 // data is already in place
                 auto t = dst[len .. len + val.length];
@@ -2563,8 +2562,43 @@ version(unittest)
         static assert( r == table[i][1],
                 "demangled \"" ~ table[i][0] ~ "\" as \"" ~ r ~ "\" but expected \"" ~ table[i][1] ~ "\"");
     }
+
+    {
+        // https://issues.dlang.org/show_bug.cgi?id=18531
+        auto symbol = `_D3std3uni__T6toCaseS_DQvQt12toLowerIndexFNaNbNiNewZtVii1043S_DQCjQCi10toLowerTabFNaNbNiNemZwSQDo5ascii7toLowerTAyaZQDzFNaNeQmZ14__foreachbody2MFNaNeKmKwZ14__foreachbody3MFNaNeKwZi`;
+        auto demangled = `pure @trusted int std.uni.toCase!(std.uni.toLowerIndex(dchar), 1043, std.uni.toLowerTab(ulong), std.ascii.toLower, immutable(char)[]).toCase(immutable(char)[]).__foreachbody2(ref ulong, ref dchar).__foreachbody3(ref dchar)`;
+        auto dst = new char[200];
+        auto ret = demangle( symbol, dst);
+        assert( ret == demangled );
+    }
 }
 
+unittest
+{
+    // https://issues.dlang.org/show_bug.cgi?id=18300
+    string s = demangle.mangleof;
+    foreach(i; 1..77)
+    {
+        char[] buf = new char[i];
+        auto ds = demangle(s, buf);
+        assert(ds == "pure nothrow @safe char[] core.demangle.demangle(const(char)[], char[])");
+    }
+}
+
+unittest
+{
+    // https://issues.dlang.org/show_bug.cgi?id=18300
+    string s = "_D1";
+    string expected = "int ";
+    foreach (_; 0..10_000)
+    {
+        s ~= "a1";
+        expected ~= "a.";
+    }
+    s ~= "FiZi";
+    expected ~= "F";
+    assert(s.demangle == expected);
+}
 
 /*
  *

changelog/lazy-gc-init.dd

@@ -40,7 +40,7 @@ T[] arrayOp(T : T[], Args...)(T[] res, Filter!(isType, Args) args) @trusted @nog
         // Given that there are at most as many scalars broadcast as there are
         // operations in any `ary[] = ary[] op const op const`, it should always be
         // worthwhile to choose vector operations.
-        if (res.length >= vec.length)
+        if (!__ctfe && res.length >= vec.length)
         {
             mixin(initScalarVecs!Args);
 
@@ -574,3 +574,15 @@ unittest
     foreach (v; res[])
         assert(v == 2 * 3 + 4);
 }
+
+unittest
+{
+    // https://issues.dlang.org/show_bug.cgi?id=17964
+    uint bug(){
+        uint[] a = [1, 2, 3, 5, 6, 7];
+        uint[] b = [1, 2, 3, 5, 6, 7];
+        a[] |= ~b[];
+        return a[1];
+    }
+    enum x = bug();
+}

src/core/demangle.d

@@ -32,12 +32,24 @@ extern (C):
 /* Placed outside @nogc in order to not constrain what the callback does.
  */
 ///
-alias int function(scope const void*, scope const void*) _compare_fp_t;
+alias int function(const void*, const void*) _compare_fp_t;
 ///
-inout(void)* bsearch(scope const void* key, scope inout(void)* base, size_t nmemb, size_t size, _compare_fp_t compar);
+inout(void)* bsearch(const void* key, inout(void)* base, size_t nmemb, size_t size, _compare_fp_t compar);
 ///
-void    qsort(scope void* base, size_t nmemb, size_t size, _compare_fp_t compar);
+void    qsort(void* base, size_t nmemb, size_t size, _compare_fp_t compar);
 
+// https://issues.dlang.org/show_bug.cgi?id=17188
+@system unittest
+{
+    struct S
+    {
+        extern(C) static int cmp(const void*, const void*) { return 0; }
+    }
+    int[4] arr;
+    qsort(arr.ptr, arr[0].sizeof, arr.length, &S.cmp);
+    int key;
+    bsearch(&key, arr.ptr, arr[0].sizeof, arr.length, &S.cmp);
+}
 
 nothrow:
 @nogc:

src/core/internal/arrayop.d

@@ -4286,18 +4286,18 @@ class Fiber
     ///////////////////////////////////////////////////////////////////////////
 
 
-    /**
-     * A fiber may occupy one of three states: HOLD, EXEC, and TERM.  The HOLD
-     * state applies to any fiber that is suspended and ready to be called.
-     * The EXEC state will be set for any fiber that is currently executing.
-     * And the TERM state is set when a fiber terminates.  Once a fiber
-     * terminates, it must be reset before it may be called again.
-     */
+    /// A fiber may occupy one of three states: HOLD, EXEC, and TERM.
     enum State
     {
-        HOLD,   ///
-        EXEC,   ///
-        TERM    ///
+        /** The HOLD state applies to any fiber that is suspended and ready to
+        be called. */
+        HOLD,
+        /** The EXEC state will be set for any fiber that is currently
+        executing. */
+        EXEC,
+        /** The TERM state is set when a fiber terminates. Once a fiber
+        terminates, it must be reset before it may be called again. */
+        TERM
     }