Merge pull request #7278 from WalterBright/fix17915

fix Issue 17915 - [REG 2.073] core.exception.AssertError@ddmd/optimiz… merged-on-behalf-of: Iain Buclaw <ibuclaw@gdcproject.org>
dlang · Nov 3, 2017 · 1fa67d0 · 1fa67d0
2 parents 56e4861 + dd2fcfa
commit 1fa67d0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/ddmd/optimize.d b/src/ddmd/optimize.d
@@ -610,6 +610,8 @@ extern (C++) Expression Expression_optimize(Expression e, int result, bool keepL
                 // See if we can remove an unnecessary cast
                 ClassDeclaration cdfrom = e.e1.type.isClassHandle();
                 ClassDeclaration cdto = e.type.isClassHandle();
+                if (cdto == ClassDeclaration.object && !cdfrom.isInterfaceDeclaration())
+                    goto L1;    // can always convert a class to Object
                 // Need to determine correct offset before optimizing away the cast.
                 // https://issues.dlang.org/show_bug.cgi?id=16980
                 cdfrom.size(e.loc);

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -7942,6 +7942,22 @@ void test17349()
     assert(i == 2);
 }
 
+/***************************************************/
+// https://issues.dlang.org/show_bug.cgi?id=17915
+
+void test17915()
+{
+    static class MyClass
+    {
+        S17915!MyClass m_member;
+    }
+}
+
+struct S17915(T)
+{
+    T owner;
+}
+
 /***************************************************/
 
 int main()
@@ -8262,6 +8278,7 @@ int main()
     test16466();
     test16408();
     test17349();
+    test17915();
 
     printf("Success\n");
     return 0;