diff --git a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h --- a/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h +++ b/clang/include/clang/Analysis/FlowSensitive/DataflowAnalysis.h @@ -66,7 +66,8 @@ /// Deprecated. Use the `DataflowAnalysisOptions` constructor instead. explicit DataflowAnalysis(ASTContext &Context, bool ApplyBuiltinTransfer) - : TypeErasedDataflowAnalysis(ApplyBuiltinTransfer), Context(Context) {} + : DataflowAnalysis(Context, DataflowAnalysisOptions{ApplyBuiltinTransfer, + TransferOptions{}}) {} explicit DataflowAnalysis(ASTContext &Context, DataflowAnalysisOptions Options) diff --git a/clang/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h b/clang/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h --- a/clang/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h +++ b/clang/include/clang/Analysis/FlowSensitive/TypeErasedDataflowAnalysis.h @@ -59,10 +59,6 @@ public: TypeErasedDataflowAnalysis() : Options({}) {} - /// Deprecated. Use the `DataflowAnalysisOptions` constructor instead. - TypeErasedDataflowAnalysis(bool ApplyBuiltinTransfer) - : Options({ApplyBuiltinTransfer, TransferOptions{}}) {} - TypeErasedDataflowAnalysis(DataflowAnalysisOptions Options) : Options(Options) {}