diff --git a/clang/include/clang/Analysis/FlowSensitive/ControlFlowContext.h b/clang/include/clang/Analysis/FlowSensitive/ControlFlowContext.h
--- a/clang/include/clang/Analysis/FlowSensitive/ControlFlowContext.h
+++ b/clang/include/clang/Analysis/FlowSensitive/ControlFlowContext.h
@@ -40,12 +40,6 @@
   static llvm::Expected<ControlFlowContext> build(const Decl &D, Stmt &S,
                                                   ASTContext &C);
 
-  /// Builds a ControlFlowContext from an AST node. `D` is the function in which
-  /// `S` resides. `D` must not be null and `D->isTemplated()` must be false.
-  LLVM_DEPRECATED("Use the version that takes a const Decl & instead", "")
-  static llvm::Expected<ControlFlowContext> build(const Decl *D, Stmt &S,
-                                                  ASTContext &C);
-
   /// Returns the `Decl` containing the statement used to construct the CFG, if
   /// available.
   const Decl &getDecl() const { return ContainingDecl; }
diff --git a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
--- a/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
+++ b/clang/lib/Analysis/FlowSensitive/ControlFlowContext.cpp
@@ -109,15 +109,5 @@
                             std::move(BlockReachable));
 }
 
-llvm::Expected<ControlFlowContext>
-ControlFlowContext::build(const Decl *D, Stmt &S, ASTContext &C) {
-  if (D == nullptr)
-    return llvm::createStringError(
-        std::make_error_code(std::errc::invalid_argument),
-        "Declaration must not be null");
-
-  return build(*D, S, C);
-}
-
 } // namespace dataflow
 } // namespace clang