Fix Issue 18212 - Usage of cfloat,cdouble,cfloat,ifloat,idouble,ireal shouldn't trigger an error in deprecated code

Author: wilzbach

src/dmd/dscope.d

@@ -807,4 +807,28 @@ struct Scope
         else
             return STRUCTALIGN_DEFAULT;
     }
+
+    /**********************************
+    * Checks whether the current scope (or any of its parents) is deprecated.
+    *
+    * Returns: `true` if any parent scope is deprecated, `false` otherwise`
+    */
+    extern(D) bool isDeprecated()
+    {
+        for (Dsymbol sp = this.parent; sp; sp = sp.parent)
+        {
+            if (sp.isDeprecated())
+                return true;
+        }
+        for (Scope* sc2 = &this; sc2; sc2 = sc2.enclosing)
+        {
+            if (sc2.scopesym && sc2.scopesym.isDeprecated())
+                return true;
+
+            // If inside a StorageClassDeclaration that is deprecated
+            if (sc2.stc & STC.deprecated_)
+                return true;
+        }
+        return false;
+    }
 }

src/dmd/dsymbol.d

@@ -310,20 +310,9 @@ extern (C++) class Dsymbol : RootObject
         if (global.params.useDeprecated != 1 && isDeprecated())
         {
             // Don't complain if we're inside a deprecated symbol's scope
-            for (Dsymbol sp = sc.parent; sp; sp = sp.parent)
-            {
-                if (sp.isDeprecated())
-                    return false;
-            }
-            for (Scope* sc2 = sc; sc2; sc2 = sc2.enclosing)
-            {
-                if (sc2.scopesym && sc2.scopesym.isDeprecated())
-                    return false;
+            if (sc.isDeprecated())
+                return false;
 
-                // If inside a StorageClassDeclaration that is deprecated
-                if (sc2.stc & STC.deprecated_)
-                    return false;
-            }
             const(char)* message = null;
             for (Dsymbol p = this; p; p = p.parent)
             {

src/dmd/dsymbolsem.d

@@ -383,7 +383,7 @@ private extern(C++) final class DsymbolSemanticVisitor : Visitor
         //printf("storage_class = x%x\n", storage_class);
 
         if (global.params.vcomplex)
-            dsym.type.checkComplexTransition(dsym.loc);
+            dsym.type.checkComplexTransition(dsym.loc, sc);
 
         // Calculate type size + safety checks
         if (sc.func && !sc.intypeof)

src/dmd/expressionsem.d

@@ -1856,7 +1856,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
             assert(0);
 
         if (global.params.vcomplex)
-            exp.type.checkComplexTransition(exp.loc);
+            exp.type.checkComplexTransition(exp.loc, sc);
 
         result = e;
     }
@@ -3774,7 +3774,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
         }
 
         if (global.params.vcomplex)
-            ta.checkComplexTransition(exp.loc);
+            ta.checkComplexTransition(exp.loc, sc);
 
         Expression e;
         if (ea && ta.toBasetype().ty == Tclass)

src/dmd/mtype.d

@@ -3010,15 +3010,18 @@ extern (C++) abstract class Type : RootObject
      * Params:
      *  loc = The source location.
      */
-    final void checkComplexTransition(Loc loc)
+    final bool checkComplexTransition(Loc loc, Scope* sc)
     {
+        if (sc.isDeprecated())
+            return false;
+
         Type t = baseElemOf();
         while (t.ty == Tpointer || t.ty == Tarray)
             t = t.nextOf().baseElemOf();
 
         // Basetype is an opaque enum, nothing to check.
         if (t.ty == Tenum && !(cast(TypeEnum)t).sym.memtype)
-            return;
+            return false;
 
         if (t.isimaginary() || t.iscomplex())
         {
@@ -3047,13 +3050,16 @@ extern (C++) abstract class Type : RootObject
             {
                 deprecation(loc, "use of complex type `%s` is deprecated, use `std.complex.Complex!(%s)` instead",
                     toChars(), rt.toChars());
+                return true;
             }
             else
             {
                 deprecation(loc, "use of imaginary type `%s` is deprecated, use `%s` instead",
                     toChars(), rt.toChars());
+                return true;
             }
         }
+        return false;
     }
 
     static void error(Loc loc, const(char)* format, ...)

src/dmd/mtype.h

@@ -336,7 +336,7 @@ class Type : public RootObject
     uinteger_t sizemask();
     virtual bool needsDestruction();
     virtual bool needsNested();
-    void checkComplexTransition(Loc loc);
+    void checkComplexTransition(Loc loc, Scope *sc);
 
     static void error(Loc loc, const char *format, ...);
     static void warning(Loc loc, const char *format, ...);

src/dmd/semantic3.d

@@ -581,7 +581,7 @@ private extern(C++) final class Semantic3Visitor : Visitor
                         funcdecl.fbody = new ErrorStatement();
                 }
                 if (global.params.vcomplex && f.next !is null)
-                    f.next.checkComplexTransition(funcdecl.loc);
+                    f.next.checkComplexTransition(funcdecl.loc, sc);
 
                 if (funcdecl.returns && !funcdecl.fbody.isErrorStatement())
                 {

test/compilable/sw_transition_complex.d

@@ -141,3 +141,16 @@ struct S;
 void test14488c(E *e, S *s)
 {
 }
+
+// Issue 18212 - Usage of cfloat,cdouble,cfloat,ifloat,idouble,ireal shouldn't trigger an error in deprecated code
+deprecated void test18212(creal c){}
+deprecated unittest
+{
+    ireal = 2i;
+    creal = 2 + 3i;
+}
+deprecated struct Foo
+{
+    ifloat a = 2i;
+    cfloat b = 2f + 2i;
+}