merge DMD #10200 Posix x64 ABI fixes 2

Author: WalterBright

dm/src/dmc/cdef.d

@@ -772,10 +772,11 @@ enum THRESHMAX = 0xFFFF;
 
 // Language for error messages
 enum LANG
-{       english,
-        german,
-        french,
-        japanese,
+{
+    english,
+    german,
+    french,
+    japanese,
 }
 
 // Configuration that is not saved in precompiled header

dm/src/dmc/cg87.d

@@ -268,6 +268,7 @@ void note87(elem *e, uint offset, int i, int linnum)
     {
         printf("note87(e = %p.%d, i = %d, stackused = %d, line = %d)\n",e,offset,i,global87.stackused,linnum);
         elem_print(e);
+        exit(1);
     }
     assert(i < global87.stackused);
 

dm/src/dmc/cgelem.d

@@ -28,6 +28,7 @@ import core.stdc.stdlib;
 import core.stdc.string;
 
 import dmd.backend.cc;
+import dmd.backend.code;
 import dmd.backend.cdef;
 import dmd.backend.code_x86;
 import dmd.backend.oper;
@@ -3484,14 +3485,6 @@ elem * elstruct(elem *e, goal_t goal)
 
     uint sz = (e.Eoper == OPstrpar && type_zeroSize(t, global_tyf)) ? 0 : cast(uint)type_size(t);
     //printf("\tsz = %d\n", (int)sz);
-    if (sz == 16)
-    {
-        while (ty == TYarray && t.Tdim == 1)
-        {
-            t = t.Tnext;
-            ty = tybasic(t.Tty);
-        }
-    }
 
     type *targ1 = null;
     type *targ2 = null;
@@ -3501,6 +3494,13 @@ elem * elstruct(elem *e, goal_t goal)
         targ2 = t.Ttag.Sstruct.Sarg2type;
     }
 
+    if (ty == TYarray && sz && config.exe != EX_WIN64)
+    {
+        argtypes(t, targ1, targ2);
+        if (!targ1)
+            goto Ldefault;
+        goto L1;
+    }
     //if (targ1) { printf("targ1\n"); type_print(targ1); }
     //if (targ2) { printf("targ2\n"); type_print(targ2); }
     switch (cast(int)sz)
@@ -3521,7 +3521,7 @@ elem * elstruct(elem *e, goal_t goal)
             {
                  goto L1;
             }
-            if (e.Eoper == OPstrpar && I64 && ty == TYstruct)
+            if (I64 && config.exe != EX_WIN64)
             {
                 goto L1;
             }
@@ -3542,7 +3542,7 @@ elem * elstruct(elem *e, goal_t goal)
         case 13:
         case 14:
         case 15:
-            if (e.Eoper == OPstrpar && I64 && ty == TYstruct && config.exe != EX_WIN64)
+            if (I64 && config.exe != EX_WIN64)
             {
                 goto L1;
             }
@@ -3577,8 +3577,9 @@ elem * elstruct(elem *e, goal_t goal)
             goto Ldefault;
 
         L1:
-            if (ty == TYstruct)
-            {   // This needs to match what TypeFunction::retStyle() does
+            if (ty == TYstruct || ty == TYarray)
+            {
+                // This needs to match what TypeFunction::retStyle() does
                 if (config.exe == EX_WIN64)
                 {
                     //if (t.Ttag.Sstruct.Sflags & STRnotpod)
@@ -3603,13 +3604,38 @@ elem * elstruct(elem *e, goal_t goal)
                         tym = TYcdouble;
                     else
                         tym = TYucent;
+                    if ((0 == tyfloating(targ1.Tty)) ^ (0 == tyfloating(targ2.Tty)))
+                    {
+                        tym |= tyfloating(targ1.Tty) ? mTYxmmgpr : mTYgprxmm;
+                    }
                 }
+                else if (I32 && targ1 && targ2)
+                    tym = TYllong;
                 assert(tym != TYstruct);
             }
             assert(tym != ~0);
             switch (e.Eoper)
             {
                 case OPstreq:
+                    if (sz != tysize(tym))
+                    {
+                        // we can't optimize OPstreq in this case,
+                        // there will be memory corruption in the assignment
+                        elem *e2 = e.EV.E2;
+                        if (e2.Eoper != OPvar && e2.Eoper != OPind)
+                        {
+                            // the source may come in registers. ex: returned from a function.
+                            assert(tyaggregate(e2.Ety));
+                            e2 = optelem(e2, GOALvalue);
+                            e2 = elstruct(e2, GOALvalue);
+                            e2 = exp2_copytotemp(e2); // (tmp = e2, tmp)
+                            e2.EV.E2.EV.Vsym.Sfl = FLauto;
+                            e2.Ety = e2.EV.E2.Ety = e.Ety;
+                            e2.ET = e2.EV.E2.ET = e.ET;
+                            e.EV.E2 = e2;
+                        }
+                        break;
+                    }
                     e.Eoper = OPeq;
                     e.Ety = (e.Ety & ~mTYbasic) | tym;
                     elstructwalk(e.EV.E1,tym);
@@ -6141,6 +6167,8 @@ private elem *elToPair(elem *e)
              */
             tym_t ty0;
             tym_t ty = e.Ety;
+            if (ty & (mTYxmmgpr | mTYgprxmm))
+                break; // register allocation doesn't support it yet.
             switch (tybasic(ty))
             {
                 case TYcfloat:      ty0 = TYfloat  | (ty & ~mTYbasic); goto L1;
@@ -6167,6 +6195,8 @@ private elem *elToPair(elem *e)
              */
             tym_t ty0;
             tym_t ty = e.Ety;
+            if (ty & (mTYxmmgpr | mTYgprxmm))
+                break; // register allocation doesn't support it yet.
             switch (tybasic(ty))
             {
                 case TYcfloat:      ty0 = TYfloat  | (ty & ~mTYbasic); goto L2;