Simplify refactored signature for _d_arrayctor

The current form still does not perform NRVO

Signed-off-by: Teodor Dutu <teodor.dutu@gmail.com>

Author: teodutu

src/core/internal/array/construction.d

@@ -9,8 +9,6 @@
 */
 module core.internal.array.construction;
 
-import core.internal.traits : Unqual;
-
 /**
  * Does array initialization (not assignment) from another array of the same element type.
  * Params:
@@ -23,8 +21,7 @@ import core.internal.traits : Unqual;
  *  purity, and throwabilty checks. To prevent breaking existing code, this function template
  *  is temporarily declared `@trusted` until the implementation can be brought up to modern D expectations.
  */
-Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t length) @trusted
-    if (is(Unqual!T1 == Unqual!T2))
+T[] _d_arrayctor(Tarr : T[], T)(scope Tarr from, size_t length) @trusted
 {
     pragma(inline, false);
     import core.internal.traits : hasElaborateCopyConstructor, Unqual;
@@ -33,15 +30,10 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
     import core.stdc.stdint : uintptr_t;
     debug(PRINTF) import core.stdc.stdio : printf;
 
-    debug(PRINTF) printf("_d_arrayctor(to = %p,%d, from = %p,%d) size = %d\n", from.ptr, from.length, to.ptr, to.length, T1.tsize);
+    debug(PRINTF) printf("_d_arrayctor(to = %p,%d, from = %p,%d) size = %d\n", from.ptr, from.length, to.ptr, to.length, T.tsize);
 
-    Tarr1 to;
-    // Check if Tarr1 is a dynamic array.
-    // Otherwise, to.length is already set.
-    static if (__traits(compiles, {to.length = length;}))
-    {
-        to.length = length;
-    }
+    T[] to;
+    to.length = length;    
 
     void[] vFrom = (cast(void*)from.ptr)[0..from.length];
     void[] vTo = (cast(void*)to.ptr)[0..to.length];
@@ -57,11 +49,13 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
         (cast(Type)&enforceRawArraysConformableNogc)(action, elementSize, a1, a2, false);
     }
 
-    enforceRawArraysConformable("initialization", T1.sizeof, vFrom, vTo);
+    enforceRawArraysConformable("initialization", T.sizeof, vFrom, vTo);
 
-    static if (hasElaborateCopyConstructor!T1)
+    static if (hasElaborateCopyConstructor!T)
     {
-        size_t i;
+        // Use uint instead of size_t as a temporary workaround until this bug is fixed:
+        // https://issues.dlang.org/show_bug.cgi?id=22372
+        uint i;
         try
         {
             for (i = 0; i < to.length; i++)
@@ -73,7 +67,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
             */
             while (i--)
             {
-                auto elem = cast(Unqual!T1*)&to[i];
+                auto elem = cast(Unqual!T*)&to[i];
                 destroy(*elem);
             }
 
@@ -83,7 +77,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
     else
     {
         // blit all elements at once
-        memcpy(cast(void*) to.ptr, from.ptr, to.length * T1.sizeof);
+        memcpy(cast(void*) to.ptr, from.ptr, to.length * T.sizeof);
     }
 
     return to;
@@ -101,7 +95,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
 
     S[4] arr1;
     S[4] arr2 = [S(0), S(1), S(2), S(3)];
-    arr1 = _d_arrayctor!(S[4])(arr2[], arr1.length);
+    arr1 = _d_arrayctor(arr2[], arr1.length);
 
     assert(counter == 4);
     assert(arr1 == arr2);
@@ -124,7 +118,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
 
     S[4] arr1;
     S[4] arr2 = [S(0), S(1), S(2), S(3)];
-    arr1 = _d_arrayctor!(S[4])(arr2[], arr1.length);
+    arr1 = _d_arrayctor(arr2[], arr1.length);
 
     assert(counter == 4);
     assert(arr1 == arr2);
@@ -150,7 +144,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
     {
         Throw[4] a;
         Throw[4] b = [Throw(1), Throw(2), Throw(3), Throw(4)];
-        a = _d_arrayctor!(Throw[4])(b[], a.length);
+        a = _d_arrayctor(b[], a.length);
     }
     catch (Exception)
     {
@@ -175,7 +169,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
     {
         NoThrow[4] a;
         NoThrow[4] b = [NoThrow(1), NoThrow(2), NoThrow(3), NoThrow(4)];
-        a = _d_arrayctor!(NoThrow[4])(b[], a.length);
+        a = _d_arrayctor(b[], a.length);
     }
     catch (Exception)
     {
@@ -199,6 +193,7 @@ Tarr1 _d_arrayctor(Tarr1 : T1[], Tarr2 : T2[], T1, T2)(scope Tarr2 from, size_t
 void _d_arraysetctor(Tarr : T[], T)(scope Tarr p, scope ref T value) @trusted
 {
     pragma(inline, false);
+    import core.internal.traits : Unqual;
     import core.lifetime : copyEmplace;
 
     size_t i;
@@ -281,7 +276,7 @@ void _d_arraysetctor(Tarr : T[], T)(scope Tarr p, scope ref T value) @trusted
     {
         Throw[4] a;
         Throw[4] b = [Throw(1), Throw(2), Throw(3), Throw(4)];
-        a = _d_arrayctor!(Throw[4])(b[], a.length);
+        a = _d_arrayctor(b[], a.length);
     }
     catch (Exception)
     {