should no longer need the else clause (#17093)

dlang · Nov 25, 2024 · a36acce · a36acce
1 parent 2a76803
commit a36acce
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
@@ -2081,17 +2081,8 @@ public void errorSupplementalInferredAttr(FuncDeclaration fd, int maxDepth, bool
             errorSupplementalInferredAttr(s.fd, maxDepth - 1, deprecation, stc, eSink);
         }
     }
-    else if (auto sa = s.arg0.isDsymbol())
-    {
-        if (FuncDeclaration fd2 = sa.isFuncDeclaration())
-        {
-            if (maxDepth > 0)
-            {
-                errorFunc(s.loc, "which calls `%s`", fd2.toPrettyChars());
-                errorSupplementalInferredAttr(fd2, maxDepth - 1, deprecation, stc, eSink);
-            }
-        }
-    }
+    else
+        assert(0);
 }
 
 /*******************************************

diff --git a/compiler/src/dmd/func.d b/compiler/src/dmd/func.d
@@ -685,26 +685,30 @@ extern (C++) class FuncDeclaration : Declaration
      *
      * Params:
      *     loc = location of action
-     *     fmt = format string for error message
+     *     format = format string for error message
      *     arg0 = (optional) argument to format string
      */
-    extern (D) final void setThrow(Loc loc, const(char)* fmt, RootObject arg0 = null)
+    extern (D) final void setThrow(Loc loc, const(char)* format, RootObject arg0 = null)
     {
         if (nothrowInprocess && !nothrowViolation)
         {
-            nothrowViolation = new AttributeViolation(loc, fmt, arg0); // action that requires GC
+            assert(format);
+            nothrowViolation = new AttributeViolation(loc, format, arg0); // action that requires GC
         }
     }
 
     /**************************************
      * The function calls non-`nothrow` function f, register that in case nothrow is being inferred
      * Params:
      *     loc = location of call
-     *     f = function being called
+     *     fd = function being called
      */
-    extern (D) final void setThrowCall(Loc loc, FuncDeclaration f)
+    extern (D) final void setThrowCall(Loc loc, FuncDeclaration fd)
     {
-        return setThrow(loc, null, f);
+        if (nothrowInprocess && !nothrowViolation)
+        {
+            nothrowViolation = new AttributeViolation(loc, fd); // action that requires GC
+        }
     }
 
     /****************************************
@@ -1886,7 +1890,7 @@ struct AttributeViolation
 
     this(ref Loc loc, const(char)* format, RootObject arg0 = null, RootObject arg1 = null, RootObject arg2 = null)
     {
-        //assert(format);
+        assert(format);
         this.loc = loc;
         this.format = format;
         this.arg0 = arg0;