d: Merge upstream dmd 3982604c5, druntime bc58b1e9, phobos 12329adb6.

[thirdparty/gcc.git] / gcc / d / dmd / func.d

diff --git a/gcc/d/dmd/func.d b/gcc/d/dmd/func.d
index 2d6a756178e9322c20ae46fc4c24837b7aa68a40..da33587fc88a802718c5945e3abd85ceb37c045d 100644 (file)
--- a/gcc/d/dmd/func.d
+++ b/gcc/d/dmd/func.d
@@ -1306,7 +1306,14 @@ extern (C++) class FuncDeclaration : Declaration
         if (!fbody)
             return false;
 
-        if (isVirtualMethod())
+        if (isVirtualMethod() &&
+            /*
+             * https://issues.dlang.org/show_bug.cgi?id=21719
+             *
+             * If we have an auto virtual function we can infer
+             * the attributes.
+             */
+            !(inferRetType && !isCtorDeclaration()))
             return false;               // since they may be overridden
 
         if (sc.func &&