From 12868e51402782f644653e9516b9c861c24f02a3 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 14 Apr 2026 13:03:10 +0200
Subject: [PATCH 1/2] C++: Remove deprecated code added more than a year ago

---
 .../code/cpp/models/interfaces/NonThrowing.qll      |  7 -------
 .../semmle/code/cpp/models/interfaces/Throwing.qll  | 13 -------------
 2 files changed, 20 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
index 85b9b66cd661..04826a487ca7 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/NonThrowing.qll
@@ -11,10 +11,3 @@ import semmle.code.cpp.models.Models
  * The function may still raise a structured exception handling (SEH) exception.
  */
 abstract class NonCppThrowingFunction extends Function { }
-
-/**
- * A function that is guaranteed to never throw.
- *
- * DEPRECATED: use `NonCppThrowingFunction` instead.
- */
-deprecated class NonThrowingFunction = NonCppThrowingFunction;
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
index 111b99533957..a781bab07c35 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/Throwing.qll
@@ -10,19 +10,6 @@ import semmle.code.cpp.Function
 import semmle.code.cpp.models.Models
 import semmle.code.cpp.models.interfaces.FunctionInputsAndOutputs
 
-/**
- * A function that is known to raise an exception.
- *
- * DEPRECATED: use `AlwaysSehThrowingFunction` instead.
- */
-abstract deprecated class ThrowingFunction extends Function {
-  /**
-   * Holds if this function may throw an exception during evaluation.
-   * If `unconditional` is `true` the function always throws an exception.
-   */
-  abstract predicate mayThrowException(boolean unconditional);
-}
-
 /**
  * A function that unconditionally raises a structured exception handling (SEH) exception.
  */

From 9ef088d4233ce2a12aa614caa5b63ade3fa017b3 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Tue, 14 Apr 2026 13:46:43 +0200
Subject: [PATCH 2/2] C++: Add change note

---
 cpp/ql/lib/change-notes/2026-04-14-throwing.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 cpp/ql/lib/change-notes/2026-04-14-throwing.md

diff --git a/cpp/ql/lib/change-notes/2026-04-14-throwing.md b/cpp/ql/lib/change-notes/2026-04-14-throwing.md
new file mode 100644
index 000000000000..6a15437e126e
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-04-14-throwing.md
@@ -0,0 +1,5 @@
+---
+category: breaking
+---
+* The deprecated `NonThrowingFunction` class has been removed, use `NonCppThrowingFunction` instead.
+* The deprecated `ThrowingFunction` class has been removed, use `AlwaysSehThrowingFunction` instead.