Skip to content

[NFC][LLVM] Cleanup namespace usage in DFAJumpThreading.cpp #162179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
+14 −14
Merged

[NFC][LLVM] Cleanup namespace usage in DFAJumpThreading.cpp #162179

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3101f3
[NFC][LLVM] Cleanup namespace usage in DFAJumpThreading.cpp
jurahul Oct 6, 2025
57c5751
Review feedback
jurahul Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions llvm/lib/Transforms/Scalar/DFAJumpThreading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ static cl::opt<unsigned>
cl::Hidden, cl::init(50));

namespace {

class SelectInstToUnfold {
SelectInst *SI;
PHINode *SIUse;
Expand All @@ -134,11 +133,14 @@ class SelectInstToUnfold {

explicit operator bool() const { return SI && SIUse; }
};
} // namespace

void unfold(DomTreeUpdater *DTU, LoopInfo *LI, SelectInstToUnfold SIToUnfold,
std::vector<SelectInstToUnfold> *NewSIsToUnfold,
std::vector<BasicBlock *> *NewBBs);
static void unfold(DomTreeUpdater *DTU, LoopInfo *LI,
SelectInstToUnfold SIToUnfold,
std::vector<SelectInstToUnfold> *NewSIsToUnfold,
std::vector<BasicBlock *> *NewBBs);

namespace {
class DFAJumpThreading {
public:
DFAJumpThreading(AssumptionCache *AC, DominatorTree *DT, LoopInfo *LI,
Expand Down Expand Up @@ -173,10 +175,7 @@ class DFAJumpThreading {
TargetTransformInfo *TTI;
OptimizationRemarkEmitter *ORE;
};

} // end anonymous namespace

namespace {
} // namespace

/// Unfold the select instruction held in \p SIToUnfold by replacing it with
/// control flow.
Expand All @@ -185,9 +184,10 @@ namespace {
/// created basic blocks into \p NewBBs.
///
/// TODO: merge it with CodeGenPrepare::optimizeSelectInst() if possible.
void unfold(DomTreeUpdater *DTU, LoopInfo *LI, SelectInstToUnfold SIToUnfold,
std::vector<SelectInstToUnfold> *NewSIsToUnfold,
std::vector<BasicBlock *> *NewBBs) {
static void unfold(DomTreeUpdater *DTU, LoopInfo *LI,
SelectInstToUnfold SIToUnfold,
std::vector<SelectInstToUnfold> *NewSIsToUnfold,
std::vector<BasicBlock *> *NewBBs) {
SelectInst *SI = SIToUnfold.getInst();
PHINode *SIUse = SIToUnfold.getUse();
assert(SI->hasOneUse());
Expand Down Expand Up @@ -342,10 +342,12 @@ void unfold(DomTreeUpdater *DTU, LoopInfo *LI, SelectInstToUnfold SIToUnfold,
SI->eraseFromParent();
}

namespace {
struct ClonedBlock {
BasicBlock *BB;
APInt State; ///< \p State corresponds to the next value of a switch stmnt.
};
} // namespace

typedef std::deque<BasicBlock *> PathType;
typedef std::vector<PathType> PathsType;
Expand Down Expand Up @@ -379,6 +381,7 @@ inline raw_ostream &operator<<(raw_ostream &OS, const PathType &Path) {
/// by cloning necessary basic blocks and replacing conditional branches with
/// unconditional ones. A threading path includes a list of basic blocks, the
/// exit state, and the block that determines the next state.
namespace {
struct ThreadingPath {
/// Exit value is DFA's exit state for the given path.
APInt getExitValue() const { return ExitVal; }
Expand Down Expand Up @@ -1336,6 +1339,7 @@ struct TransformDFA {
SmallPtrSet<const Value *, 32> EphValues;
std::vector<ThreadingPath> TPaths;
};
} // namespace

bool DFAJumpThreading::run(Function &F) {
LLVM_DEBUG(dbgs() << "\nDFA Jump threading: " << F.getName() << "\n");
Expand Down Expand Up @@ -1415,8 +1419,6 @@ bool DFAJumpThreading::run(Function &F) {
return MadeChanges;
}

} // end anonymous namespace

/// Integrate with the new Pass Manager
PreservedAnalyses DFAJumpThreadingPass::run(Function &F,
FunctionAnalysisManager &AM) {
Expand Down