Win64

dlang · Aug 31, 2012 · 31f858b · 31f858b
1 parent d909c4f
commit 31f858b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/backend/cgelem.c b/src/backend/cgelem.c
@@ -2670,14 +2670,14 @@ CEXTERN elem * elstruct(elem *e)
                     goto L1;
                 }
             }
-            if (config.exe == EX_WIN64)
-                goto Ldefault;
-            if (targ1 && !targ2)
-                goto L1;
             if (I64 && ty == TYstruct)
             {   tym = TYucent;
                 goto L1;
             }
+            if (config.exe == EX_WIN64)
+                goto Ldefault;
+            if (targ1 && !targ2)
+                goto L1;
             goto Ldefault;
 
         L1:

diff --git a/src/e2ir.c b/src/e2ir.c
@@ -3923,6 +3923,8 @@ elem *CastExp::toElem(IRState *irs)
 
         if (fsize != tsize)
         {   // Array element sizes do not match, so we must adjust the dimensions
+            if (config.exe == EX_WIN64)
+                e = addressElem(e, t, true);
             elem *ep = el_params(e, el_long(TYsize_t, fsize), el_long(TYsize_t, tsize), NULL);
             e = el_bin(OPcall, type->totym(), el_var(rtlsym[RTLSYM_ARRAYCAST]), ep);
         }