Add supplemental error

dlang · Jan 28, 2025 · c36a8e2 · c36a8e2
1 parent c94c2a2
commit c36a8e2
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 12 deletions.
diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
@@ -14775,6 +14775,8 @@ private bool checkArithmetic(Expression e, EXP op)
         // Deprecated in 2.111
         // In 2.121, remove this branch to let `checkValue` raise the error
         deprecation(e.loc, "type `%s` has no value", e.toChars);
+        if (!e.type.isOpaqueType)
+            deprecationSupplemental(e.loc, "perhaps use `%s`.init", e.toChars);
         return false;
     }
 
@@ -14847,6 +14849,8 @@ bool checkValue(Expression e)
     if (auto te = e.isTypeExp())
     {
         error(e.loc, "type `%s` has no value", e.toChars());
+        if (!e.type.isOpaqueType)
+            errorSupplemental(e.loc, "perhaps use `%s`.init", e.toChars());
         return true;
     }
 

diff --git a/compiler/src/dmd/typesem.d b/compiler/src/dmd/typesem.d
@@ -7609,6 +7609,18 @@ bool checkRetType(TypeFunction tf, const ref Loc loc)
     return false;
 }
 
+/// Returns: whether `t` is a struct/class/enum without a body
+bool isOpaqueType(Type t)
+{
+    if (auto te = t.isTypeEnum())
+        return te.sym.members is null;
+    if (auto ts = t.isTypeStruct())
+        return ts.sym.members is null;
+    if (auto tc = t.isTypeClass())
+        return tc.sym.members is null;
+    return false;
+}
+
 
 /******************************* Private *****************************************/
 

diff --git a/compiler/test/fail_compilation/b17285.d b/compiler/test/fail_compilation/b17285.d
@@ -1,9 +1,10 @@
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/b17285.d(14): Error: type `ONE` has no value
-fail_compilation/b17285.d(14): Error: type `TWO` has no value
-fail_compilation/b17285.d(14): Error: cannot implicitly convert expression `ONE` of type `b17285.ONE` to `int`
+fail_compilation/b17285.d(15): Error: type `ONE` has no value
+fail_compilation/b17285.d(15):        perhaps use `ONE`.init
+fail_compilation/b17285.d(15): Error: type `TWO` has no value
+fail_compilation/b17285.d(15): Error: cannot implicitly convert expression `ONE` of type `b17285.ONE` to `int`
 ---
 */
 

diff --git a/compiler/test/fail_compilation/ice9545.d b/compiler/test/fail_compilation/ice9545.d
@@ -2,7 +2,8 @@
 /*
 TEST_OUTPUT:
 ----
-fail_compilation/ice9545.d(13): Error: type `int` has no value
+fail_compilation/ice9545.d(14): Error: type `int` has no value
+fail_compilation/ice9545.d(14):        perhaps use `int`.init
 ----
 */
 

diff --git a/compiler/test/fail_compilation/test20763.d b/compiler/test/fail_compilation/test20763.d
@@ -3,14 +3,18 @@ REQUIRED_ARGS: -de
 
 TEST_OUTPUT:
 ---
-fail_compilation/test20763.d(21): Deprecation: type `ulong` has no value
-fail_compilation/test20763.d(21):        perhaps use `ulong.init` instead
-fail_compilation/test20763.d(22): Deprecation: type `ulong` has no value
-fail_compilation/test20763.d(22):        perhaps use `ulong.init` instead
-fail_compilation/test20763.d(23): Error: type `ulong` has no value
-fail_compilation/test20763.d(24): Error: type `ulong` has no value
-fail_compilation/test20763.d(25): Error: type `ulong` has no value
-fail_compilation/test20763.d(26): Error: type `ulong` has no value
+fail_compilation/test20763.d(25): Deprecation: type `ulong` has no value
+fail_compilation/test20763.d(25):        perhaps use `ulong`.init
+fail_compilation/test20763.d(26): Deprecation: type `ulong` has no value
+fail_compilation/test20763.d(26):        perhaps use `ulong`.init
+fail_compilation/test20763.d(27): Error: type `ulong` has no value
+fail_compilation/test20763.d(27):        perhaps use `ulong`.init
+fail_compilation/test20763.d(28): Error: type `ulong` has no value
+fail_compilation/test20763.d(28):        perhaps use `ulong`.init
+fail_compilation/test20763.d(29): Error: type `ulong` has no value
+fail_compilation/test20763.d(29):        perhaps use `ulong`.init
+fail_compilation/test20763.d(30): Error: type `ulong` has no value
+fail_compilation/test20763.d(30):        perhaps use `ulong`.init
 ---
 */