Merge pull request #4841 from WalterBright/fix14829

fix Issue 14829 - [REG2.066.0] wrong code with -O -inline
dlang · Jul 28, 2015 · 88bb355 · 88bb355
2 parents 56add65 + bc2ae82
commit 88bb355
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/src/backend/gother.c b/src/backend/gother.c
@@ -1101,21 +1101,14 @@ STATIC void cpwalk(elem *n,vec_t IN)
                          *  g = v   => g = f
                          *  f = x
                          *  d = g   => d = f !!error
-                         * Therefore, if g appears as an rvalue in expnod[], then recalc
+                         * Therefore, if n appears as an rvalue in expnod[], then recalc
                          */
                         for (size_t i = 1; i < exptop; ++i)
                         {
+                            //printf("expnod[%d]: ", i); elem_print(expnod[i]);
                             if (expnod[i]->E2 == n)
                             {
-                                symbol *g = expnod[i]->E1->EV.sp.Vsym;
-                                for (size_t j = 1; j < exptop; ++j)
-                                {
-                                    if (expnod[j]->E2->EV.sp.Vsym == g)
-                                    {
-                                        ++recalc;
-                                        break;
-                                    }
-                                }
+                                ++recalc;
                                 break;
                             }
                         }

diff --git a/test/runnable/mars1.d b/test/runnable/mars1.d
@@ -1324,6 +1324,26 @@ char[] dup(char[] a)
     return a;
 }
 
+////////////////////////////////////////////////////////////////////////
+
+int stripLeft(int str, int dc)
+{
+    while (true)
+    {
+	int a = str;
+        int s = a;
+        str += 1;
+        if (dc) return s;
+    }
+}
+
+void test14829()
+{
+    if (stripLeft(3, 1) != 3) // fails with -O
+	assert(0);
+}
+
+
 ////////////////////////////////////////////////////////////////////////
 
 int main()
@@ -1368,6 +1388,7 @@ int main()
     test12057();
     test13784();
     test14220();
+    test14829();
     printf("Success\n");
     return 0;
 }