Merge fix for Bug #24 from upstream

D-Programming-GDC · Jun 13, 2014 · 91835c9 · 91835c9
1 parent d4ec1b0
commit 91835c9
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/gcc/d/dfrontend/optimize.c b/gcc/d/dfrontend/optimize.c
@@ -385,18 +385,23 @@ Expression *PtrExp::optimize(int result, bool keepLvalue)
     //printf("PtrExp::optimize(result = x%x) %s\n", result, toChars());
     e1 = e1->optimize(result);
     // Convert *&ex to ex
+    // But only if there is no type punning involved
     if (e1->op == TOKaddress)
     {   Expression *e;
         Expression *ex;
 
         ex = ((AddrExp *)e1)->e1;
         if (type->equals(ex->type))
             e = ex;
-        else
+        else if (ex->type->implicitConvTo(type) >= MATCHconst)
         {
             e = ex->copy();
             e->type = type;
         }
+        else
+        {
+            return this;
+        }
         return e;
     }
     if (keepLvalue)

diff --git a/gcc/testsuite/gdc.test/runnable/gdc.d b/gcc/testsuite/gdc.test/runnable/gdc.d
@@ -167,6 +167,23 @@ void test19()
 
 /******************************************/
 
+// Bug 24
+
+void test24()
+{
+    struct S24
+    {
+        char[1] b;
+    }
+
+    S24 a;
+
+    if (*a.b.ptr)
+        return;
+}
+
+/******************************************/
+
 // Bug 29
 
 void test29()