Fix bypassing nothrow in debug statements

dlang · Jan 16, 2025 · 981df6b · 981df6b
1 parent b237d03
commit 981df6b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
@@ -1363,11 +1363,6 @@ private Expression resolveUFCSProperties(Scope* sc, Expression e1, Expression e2
         auto arguments = new Expressions(1);
         (*arguments)[0] = eleft;
         e = new CallExp(loc, e, arguments);
-
-        // https://issues.dlang.org/show_bug.cgi?id=24017
-        if (sc.flags & SCOPE.debug_)
-            e.isCallExp().inDebugStatement = true;
-
         e = e.expressionSemantic(sc);
         return e;
     }

diff --git a/compiler/src/dmd/statementsem.d b/compiler/src/dmd/statementsem.d
@@ -3461,6 +3461,7 @@ Statement statementSemanticVisit(Statement s, Scope* sc)
             sc = sc.push();
             sc.flags |= SCOPE.debug_;
             ds.statement = ds.statement.statementSemantic(sc);
+            debugThrowWalker(ds.statement);
             sc.pop();
         }
         result = ds.statement;
@@ -4736,7 +4737,6 @@ private Statements* flatten(Statement statement, Scope* sc)
                 if (dc)
                 {
                     s = new DebugStatement(cs.loc, cs.ifbody);
-                    debugThrowWalker(cs.ifbody);
                 }
                 else
                     s = cs.ifbody;

diff --git a/compiler/test/compilable/test16492.d → ...t/compilable/debug_statement_attributes.d b/compiler/test/compilable/test16492.d → ...t/compilable/debug_statement_attributes.d
@@ -85,3 +85,14 @@ void test6() nothrow
         () {throw new Exception("");}();
     }
 }
+
+void writeln() {}
+void writeln(string) {}
+
+void test7() nothrow
+{
+    debug writeln("Hello"); // https://issues.dlang.org/show_bug.cgi?id=24017
+    debug "Hello".writeln;
+    debug writeln = "Hello"; // https://github.com/dlang/dmd/issues/20719
+    debug writeln;
+}
diff --git a/compiler/test/compilable/test24017.d b/compiler/test/compilable/test24017.d