workaround for dmc codegen bug

dlang · Oct 17, 2012 · 290ae43 · 290ae43
1 parent 81dfc8e
commit 290ae43
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -3070,11 +3070,17 @@ int ctfeRawCmp(Loc loc, Expression *e1, Expression *e2)
     {
         uinteger_t len1 = resolveArrayLength(e1);
         uinteger_t len2 = resolveArrayLength(e2);
-        uinteger_t len = (len1 < len2 ? len1 : len2);
-        int res = len == 0 ? 0 : ctfeCmpArrays(loc, e1, e2, len);
-        if (res == 0) // if equal, the longer is greater
-            return len1 - len2;
-        return res;
+        // workaround for dmc optimizer bug calculating wrong len for
+        // uinteger_t len = (len1 < len2 ? len1 : len2);
+        // if(len == 0) ...
+        if(len1 > 0 && len2 > 0)
+        {
+            uinteger_t len = (len1 < len2 ? len1 : len2);
+            int res = ctfeCmpArrays(loc, e1, e2, len);
+            if (res != 0)
+                return res;
+        }
+        return len1 - len2;
     }
     if (e1->type->isintegral())
     {