Fix Bug 286: Returning AA value whose key is a RefCounted type gets w…

…rong value.
D-Programming-GDC · Mar 12, 2018 · d26f777 · d26f777
1 parent 89aead4
commit d26f777
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 11 deletions.
diff --git a/gcc/d/d-codegen.cc b/gcc/d/d-codegen.cc
@@ -541,15 +541,6 @@ stabilize_expr (tree *valuep)
       *valuep = rhs;
       return lhs;
 
-    case MODIFY_EXPR:
-    case INIT_EXPR:
-      /* Given e1 = e2:
-	 Store the leftmost 'e1' expression in VALUEP.  */
-      lhs = TREE_OPERAND (expr, 0);
-      stabilize_expr (&lhs);
-      *valuep = lhs;
-      return expr;
-
     default:
       return NULL_TREE;
     }

diff --git a/gcc/d/expr.cc b/gcc/d/expr.cc
@@ -171,10 +171,18 @@ class ExprVisitor : public Visitor
 	e1b = ce->e1;
       }
 
-    /* The LHS expression could be an assignment, to which it's operation gets
-       lost during gimplification.  Stabilize lhs for assignment.  */
+    /* Stabilize LHS for assignment.  */
     tree lhs = build_expr (e1b);
     tree lexpr = stabilize_expr (&lhs);
+
+    /* The LHS expression could be an assignment, to which it's operation gets
+       lost during gimplification.  */
+    if (TREE_CODE (lhs) == MODIFY_EXPR)
+      {
+	lexpr = compound_expr (lexpr, lhs);
+	lhs = TREE_OPERAND (lhs, 0);
+      }
+
     lhs = stabilize_reference (lhs);
 
     /* Save RHS, to ensure that the expression is evaluated before LHS.  */

diff --git a/gcc/testsuite/gdc.dg/runnable.d b/gcc/testsuite/gdc.dg/runnable.d
@@ -1547,6 +1547,46 @@ void test285()
 
 /******************************************/
 
+// Bug 286
+
+void test286()
+{
+    import std.uni : CodepointSet, unicode;
+
+    struct S286
+    {
+        uint[4] filter;
+
+        this(CodepointSet set)
+        {
+            auto asciiSet = set & unicode.ASCII;
+            foreach (iv; asciiSet.byInterval)
+            {
+                foreach (v; iv.a .. iv.b)
+                {
+                    immutable i = ((v >> 7) ^ v) & 0x7F;
+                    filter[i >> 5] |= 1 << (i & 31);
+                }
+            }
+        }
+    }
+
+    S286 getS286(CodepointSet set)
+    {
+        static S286[CodepointSet] matcherCache;
+        auto p = set in matcherCache;
+        if (p)
+            return *p;
+        return (matcherCache[set] = S286(set));
+    }
+
+    auto t = getS286(unicode.Nd);
+    if (t.filter == [0,0,0,0])
+        assert(0);
+}
+
+/******************************************/
+
 void main()
 {
     test2();
@@ -1581,6 +1621,7 @@ void main()
     test250();
     test273();
     test285();
+    test286();
 
     printf("Success!\n");
 }