Merge pull request #3934 from yebblies/issue13383

Issue 13383 - wrong code with -O with ints, longs and bitwise operations
dlang · Sep 3, 2014 · d1a3b4e · d1a3b4e
1 parent 88925ef
commit d1a3b4e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/backend/cgelem.c b/src/backend/cgelem.c
@@ -1445,12 +1445,14 @@ STATIC elem * elbitwise(elem *e, goal_t goal)
          *  b btst a
          */
         if (e1->Eoper == OPshl &&
-            ELCONST(e1->E1,1))
+            ELCONST(e1->E1,1) &&
+            tysize(e->E1->Ety) <= REGSIZE)
         {
             e->Eoper = OPbtst;
-            e->Ety = OPbool;
+            e->Ety = TYbool;
             e->E1 = e2;
             e->E2 = e1->E2;
+            e->E2->Ety = e->E1->Ety;
             e1->E2 = NULL;
             el_free(e1);
             return optelem(e, goal);

diff --git a/test/runnable/mars1.d b/test/runnable/mars1.d
@@ -891,6 +891,19 @@ void testbt()
 
 ////////////////////////////////////////////////////////////////////////
 
+void test13383()
+{
+    foreach (k; 32..33)
+    {
+        if (1L & (1L << k))
+        {
+            assert(0);
+        }
+    }
+}
+
+////////////////////////////////////////////////////////////////////////
+
 int andand1(int c)
 {
     return (c > 32 && c != 46 && c != 44
@@ -1231,6 +1244,7 @@ int main()
     testandand();
     testor_combine();
     testshrshl();
+    test13383();
     test13190();
     test10639();
     test10715();