https://github.com/david-arm created
https://github.com/llvm/llvm-project/pull/155407
After a rebase when building clang I noticed a significant increase in the
number of build warnings, due to this:
warning: ‘template<class PointerType, unsigned int N> class
llvm::DeprecatedSmallSet’ is deprecated: Use SmallPtrSet instead
[-Wdeprecated-declarations]
I am seeing these build warnings even when the SmallSet class isn't used by any
of the code that included the header. I've created a patch to either remove the
SmallSet header when not required, or move it into the actual .cpp or .h file
where it's used.
>From 666262503c1ab18e0fc3563b1a79313f0faaa3d4 Mon Sep 17 00:00:00 2001
From: David Sherwood <david.sherw...@arm.com>
Date: Tue, 26 Aug 2025 12:41:11 +0000
Subject: [PATCH] Remove some "DeprecatedSmallSet is deprecated" warnings from
the build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
After a rebase when building clang I noticed a significant increase
in the number of build warnings, due to this:
warning: ‘template<class PointerType, unsigned int N> class
llvm::DeprecatedSmallSet’ is deprecated: Use SmallPtrSet instead
[-Wdeprecated-declarations]
I am seeing these build warnings even when the SmallSet class isn't
used by any of the code that included the header. I've created a
patch to either remove the SmallSet header when not required, or
move it into the actual .cpp file where it's used.
---
clang/include/clang/AST/CXXInheritance.h | 2 +-
llvm/include/llvm/Analysis/GenericDomTreeUpdater.h | 2 +-
llvm/include/llvm/Analysis/GenericDomTreeUpdaterImpl.h | 1 +
llvm/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h | 1 -
llvm/include/llvm/CodeGen/LiveVariables.h | 1 -
llvm/include/llvm/CodeGen/MachineDominators.h | 1 -
llvm/include/llvm/CodeGen/ScheduleDAG.h | 1 -
llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h | 1 -
llvm/include/llvm/IR/DebugInfo.h | 1 -
llvm/include/llvm/Transforms/Scalar/JumpThreading.h | 1 -
llvm/include/llvm/Transforms/Utils/PredicateInfo.h | 1 -
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 1 +
llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h | 1 +
llvm/lib/CodeGen/CodeGenPrepare.cpp | 1 +
llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp | 1 +
llvm/lib/CodeGen/MachineBasicBlock.cpp | 1 +
llvm/lib/CodeGen/WindowScheduler.cpp | 1 +
llvm/lib/Transforms/IPO/StripSymbols.cpp | 4 ++--
llvm/lib/Transforms/InstCombine/InstructionCombining.cpp | 1 +
llvm/lib/Transforms/Scalar/JumpThreading.cpp | 1 +
llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp | 1 +
llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h | 1 -
llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp | 1 +
23 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/clang/include/clang/AST/CXXInheritance.h
b/clang/include/clang/AST/CXXInheritance.h
index e89326081a180..77ec2c884096f 100644
--- a/clang/include/clang/AST/CXXInheritance.h
+++ b/clang/include/clang/AST/CXXInheritance.h
@@ -21,7 +21,7 @@
#include "clang/Basic/Specifiers.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/MapVector.h"
-#include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/iterator_range.h"
#include <list>
diff --git a/llvm/include/llvm/Analysis/GenericDomTreeUpdater.h
b/llvm/include/llvm/Analysis/GenericDomTreeUpdater.h
index 4a03f548823ee..62329267e7788 100644
--- a/llvm/include/llvm/Analysis/GenericDomTreeUpdater.h
+++ b/llvm/include/llvm/Analysis/GenericDomTreeUpdater.h
@@ -15,7 +15,7 @@
#define LLVM_ANALYSIS_GENERICDOMTREEUPDATER_H
#include "llvm/ADT/ArrayRef.h"
-#include "llvm/ADT/SmallSet.h"
+#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/Support/Compiler.h"
namespace llvm {
diff --git a/llvm/include/llvm/Analysis/GenericDomTreeUpdaterImpl.h
b/llvm/include/llvm/Analysis/GenericDomTreeUpdaterImpl.h
index 6bfad783b529b..70a04eba738c1 100644
--- a/llvm/include/llvm/Analysis/GenericDomTreeUpdaterImpl.h
+++ b/llvm/include/llvm/Analysis/GenericDomTreeUpdaterImpl.h
@@ -17,6 +17,7 @@
#define LLVM_ANALYSIS_GENERICDOMTREEUPDATERIMPL_H
#include "llvm/ADT/SmallBitVector.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/Analysis/GenericDomTreeUpdater.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
diff --git a/llvm/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
b/llvm/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
index 4b7506e013762..ba3aa2b5fccae 100644
--- a/llvm/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
+++ b/llvm/include/llvm/CodeGen/GlobalISel/LoadStoreOpt.h
@@ -16,7 +16,6 @@
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Analysis/AliasAnalysis.h"
#include "llvm/CodeGen/GlobalISel/MachineIRBuilder.h"
diff --git a/llvm/include/llvm/CodeGen/LiveVariables.h
b/llvm/include/llvm/CodeGen/LiveVariables.h
index dbf736ad65a99..5b837d7c8e0c1 100644
--- a/llvm/include/llvm/CodeGen/LiveVariables.h
+++ b/llvm/include/llvm/CodeGen/LiveVariables.h
@@ -30,7 +30,6 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/IndexedMap.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/SparseBitVector.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
diff --git a/llvm/include/llvm/CodeGen/MachineDominators.h
b/llvm/include/llvm/CodeGen/MachineDominators.h
index 41df86468aa37..9cff63522a9fa 100644
--- a/llvm/include/llvm/CodeGen/MachineDominators.h
+++ b/llvm/include/llvm/CodeGen/MachineDominators.h
@@ -14,7 +14,6 @@
#ifndef LLVM_CODEGEN_MACHINEDOMINATORS_H
#define LLVM_CODEGEN_MACHINEDOMINATORS_H
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/CodeGen/MachineBasicBlock.h"
#include "llvm/CodeGen/MachineFunctionPass.h"
diff --git a/llvm/include/llvm/CodeGen/ScheduleDAG.h
b/llvm/include/llvm/CodeGen/ScheduleDAG.h
index aee1514581485..29c788495a29a 100644
--- a/llvm/include/llvm/CodeGen/ScheduleDAG.h
+++ b/llvm/include/llvm/CodeGen/ScheduleDAG.h
@@ -17,7 +17,6 @@
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/PointerIntPair.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/iterator.h"
#include "llvm/CodeGen/MachineInstr.h"
diff --git a/llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h
b/llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h
index 9c0d6e86d279f..e57e62cdd0505 100644
--- a/llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h
+++ b/llvm/include/llvm/ExecutionEngine/Orc/LLJIT.h
@@ -13,7 +13,6 @@
#ifndef LLVM_EXECUTIONENGINE_ORC_LLJIT_H
#define LLVM_EXECUTIONENGINE_ORC_LLJIT_H
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ExecutionEngine/Orc/AbsoluteSymbols.h"
#include "llvm/ExecutionEngine/Orc/CompileOnDemandLayer.h"
#include "llvm/ExecutionEngine/Orc/CompileUtils.h"
diff --git a/llvm/include/llvm/IR/DebugInfo.h b/llvm/include/llvm/IR/DebugInfo.h
index 220e4c1cad4f7..c7c9441ebe93f 100644
--- a/llvm/include/llvm/IR/DebugInfo.h
+++ b/llvm/include/llvm/IR/DebugInfo.h
@@ -20,7 +20,6 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/ADT/SmallPtrSet.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/TinyPtrVector.h"
#include "llvm/ADT/iterator_range.h"
diff --git a/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
b/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
index a03a38466b27b..b110c2d404649 100644
--- a/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
+++ b/llvm/include/llvm/Transforms/Scalar/JumpThreading.h
@@ -16,7 +16,6 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseSet.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/Analysis/BlockFrequencyInfo.h"
#include "llvm/Analysis/BranchProbabilityInfo.h"
diff --git a/llvm/include/llvm/Transforms/Utils/PredicateInfo.h
b/llvm/include/llvm/Transforms/Utils/PredicateInfo.h
index 3df3495f84470..618c3294d81b4 100644
--- a/llvm/include/llvm/Transforms/Utils/PredicateInfo.h
+++ b/llvm/include/llvm/Transforms/Utils/PredicateInfo.h
@@ -51,7 +51,6 @@
#define LLVM_TRANSFORMS_UTILS_PREDICATEINFO_H
#include "llvm/ADT/DenseMap.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/IR/Instructions.h"
#include "llvm/IR/PassManager.h"
#include "llvm/IR/ValueHandle.h"
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index c27f100775625..132443a069b3c 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -17,6 +17,7 @@
#include "DwarfExpression.h"
#include "DwarfUnit.h"
#include "llvm/ADT/APInt.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/ADT/Twine.h"
diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
index 89813dcf0fdab..39b30e332e0da 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.h
@@ -13,6 +13,7 @@
#ifndef LLVM_LIB_CODEGEN_ASMPRINTER_DWARFDEBUG_H
#define LLVM_LIB_CODEGEN_ASMPRINTER_DWARFDEBUG_H
+#include <set>
#include "AddressPool.h"
#include "DebugLocEntry.h"
#include "DebugLocStream.h"
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp
b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 0e40a92fd8d64..bd7cfed9a6f18 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -20,6 +20,7 @@
#include "llvm/ADT/PointerIntPair.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/BlockFrequencyInfo.h"
diff --git a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
index 0674f5fd1ae06..d4069f1c43dea 100644
--- a/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
+++ b/llvm/lib/CodeGen/GlobalISel/CombinerHelper.cpp
@@ -9,6 +9,7 @@
#include "llvm/ADT/APFloat.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallBitVector.h"
#include "llvm/Analysis/CmpInstAnalysis.h"
#include "llvm/CodeGen/GlobalISel/GISelChangeObserver.h"
diff --git a/llvm/lib/CodeGen/MachineBasicBlock.cpp
b/llvm/lib/CodeGen/MachineBasicBlock.cpp
index 08a51b9b0242a..e78c175ca0f0a 100644
--- a/llvm/lib/CodeGen/MachineBasicBlock.cpp
+++ b/llvm/lib/CodeGen/MachineBasicBlock.cpp
@@ -11,6 +11,7 @@
//===----------------------------------------------------------------------===//
#include "llvm/CodeGen/MachineBasicBlock.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringExtras.h"
#include "llvm/CodeGen/LiveIntervals.h"
diff --git a/llvm/lib/CodeGen/WindowScheduler.cpp
b/llvm/lib/CodeGen/WindowScheduler.cpp
index 2492dfc3ca553..c0f1807aa283a 100644
--- a/llvm/lib/CodeGen/WindowScheduler.cpp
+++ b/llvm/lib/CodeGen/WindowScheduler.cpp
@@ -36,6 +36,7 @@
//
//===----------------------------------------------------------------------===//
#include "llvm/CodeGen/WindowScheduler.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/CodeGen/LiveIntervals.h"
#include "llvm/CodeGen/MachineLoopInfo.h"
diff --git a/llvm/lib/Transforms/IPO/StripSymbols.cpp
b/llvm/lib/Transforms/IPO/StripSymbols.cpp
index ec701b6d0037b..2fe92ad500c18 100644
--- a/llvm/lib/Transforms/IPO/StripSymbols.cpp
+++ b/llvm/lib/Transforms/IPO/StripSymbols.cpp
@@ -19,8 +19,7 @@
//
//===----------------------------------------------------------------------===//
-#include "llvm/Transforms/IPO/StripSymbols.h"
-
+#include <set>
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/IR/Constants.h"
#include "llvm/IR/DebugInfo.h"
@@ -34,6 +33,7 @@
#include "llvm/IR/ValueSymbolTable.h"
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
+#include "llvm/Transforms/IPO/StripSymbols.h"
#include "llvm/Transforms/Utils/Local.h"
using namespace llvm;
diff --git a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
index 1c512ec1e21bb..fbfbba3bc2f5e 100644
--- a/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -38,6 +38,7 @@
#include "llvm/ADT/ArrayRef.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/AliasAnalysis.h"
diff --git a/llvm/lib/Transforms/Scalar/JumpThreading.cpp
b/llvm/lib/Transforms/Scalar/JumpThreading.cpp
index c2a737d8f9a4a..20d1a6dcb99fd 100644
--- a/llvm/lib/Transforms/Scalar/JumpThreading.cpp
+++ b/llvm/lib/Transforms/Scalar/JumpThreading.cpp
@@ -16,6 +16,7 @@
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/ScopeExit.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Analysis/AliasAnalysis.h"
diff --git a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
index 10c162bc6463a..e2585f04c4c3d 100644
--- a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
+++ b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
@@ -19,6 +19,7 @@
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/SmallPtrSet.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/ADT/Twine.h"
diff --git a/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
b/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
index 838476dcae661..5d1189ddbf052 100644
--- a/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
+++ b/llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h
@@ -25,7 +25,6 @@
#define LLVM_TRANSFORMS_VECTORIZE_LOOPVECTORIZATIONPLANNER_H
#include "VPlan.h"
-#include "llvm/ADT/SmallSet.h"
#include "llvm/Support/InstructionCost.h"
namespace {
diff --git a/llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp
b/llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp
index ea830bd5f753d..3ff5f96a926df 100644
--- a/llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp
+++ b/llvm/tools/llvm-exegesis/lib/RISCV/Target.cpp
@@ -18,6 +18,7 @@
#include "RISCVExegesisPasses.h"
#include "RISCVInstrInfo.h"
#include "RISCVRegisterInfo.h"
+#include "llvm/ADT/SmallSet.h"
#include "llvm/Support/Regex.h"
#include "llvm/Support/raw_ostream.h"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
