[NFC][DominanceFrontier] Remove unused return value #178708
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
llvmbot
added
the
llvm:analysis
Contributor
Author
|
Can't add reviewers, tagging @fhahn . |
Member
|
@llvm/pr-subscribers-llvm-analysis Author: Andrei Elovikov (eas) ChangesFull diff: https://github.com/llvm/llvm-project/pull/178708.diff 2 Files Affected:
diff --git a/llvm/include/llvm/Analysis/DominanceFrontier.h b/llvm/include/llvm/Analysis/DominanceFrontier.h
index 787793501f98a..ec49b36d64cfd 100644
--- a/llvm/include/llvm/Analysis/DominanceFrontier.h
+++ b/llvm/include/llvm/Analysis/DominanceFrontier.h
@@ -116,7 +116,7 @@ class ForwardDominanceFrontierBase
calculate(DT, DT[this->Roots[0]]);
}
- const DomSetType &calculate(const DomTreeT &DT, const DomTreeNodeT *Node);
+ void calculate(const DomTreeT &DT, const DomTreeNodeT *Node);
};
class DominanceFrontier : public ForwardDominanceFrontierBase<BasicBlock> {
diff --git a/llvm/include/llvm/Analysis/DominanceFrontierImpl.h b/llvm/include/llvm/Analysis/DominanceFrontierImpl.h
index 1483588581f4e..c7fc463fd3af5 100644
--- a/llvm/include/llvm/Analysis/DominanceFrontierImpl.h
+++ b/llvm/include/llvm/Analysis/DominanceFrontierImpl.h
@@ -74,11 +74,9 @@ void DominanceFrontierBase<BlockT, IsPostDom>::dump() const {
#endif
template <class BlockT>
-const typename ForwardDominanceFrontierBase<BlockT>::DomSetType &
-ForwardDominanceFrontierBase<BlockT>::calculate(const DomTreeT &DT,
- const DomTreeNodeT *Node) {
+void ForwardDominanceFrontierBase<BlockT>::calculate(const DomTreeT &DT,
+ const DomTreeNodeT *Node) {
BlockT *BB = Node->getBlock();
- DomSetType *Result = nullptr;
std::vector<DFCalculateWorkObject<BlockT>> workList;
SmallPtrSet<BlockT *, 32> visited;
@@ -126,7 +124,6 @@ ForwardDominanceFrontierBase<BlockT>::calculate(const DomTreeT &DT,
// from the workList.
if (!visitChild) {
if (!parentBB) {
- Result = &S;
break;
}
@@ -140,8 +137,6 @@ ForwardDominanceFrontierBase<BlockT>::calculate(const DomTreeT &DT,
}
} while (!workList.empty());
-
- return *Result;
}
} // end namespace llvm
|
| calculate(DT, DT[this->Roots[0]]); | ||
| } | ||
|
|
||
| const DomSetType &calculate(const DomTreeT &DT, const DomTreeNodeT *Node); |
Contributor
There was a problem hiding this comment.
We can get rid of the using for DomSetType here too.
Contributor
Author
There was a problem hiding this comment.
It's still used inside the definition of calculate, so we need this using somewhere. Either here or in the calculate itself. The reason why we need it is because C++ template classes don't automatically "inherit" type aliases from their base class templates (see https://godbolt.org/z/vvPPrcr4K), something with type needed to be template-dependent, I believe.
Given "why" we need this using (to fight C++), there can be argument made that we should do it here at the class definition and not inside calculate. I don't object to doing this move, but can you please confirm you really want it done?
Contributor
There was a problem hiding this comment.
if desired, may be better to do this move as separate PR
Contributor
There was a problem hiding this comment.
Ah, didn't see the extra use. Seems reasonable enough to me then.
fhahn
approved these changes
Jan 29, 2026
| calculate(DT, DT[this->Roots[0]]); | ||
| } | ||
|
|
||
| const DomSetType &calculate(const DomTreeT &DT, const DomTreeNodeT *Node); |
Contributor
There was a problem hiding this comment.
if desired, may be better to do this move as separate PR
boomanaiden154
approved these changes
Jan 29, 2026
Contributor
Author
|
@fhahn , @boomanaiden154 , I will need help to get this merged, thank you! |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/162/builds/39851 Here is the relevant piece of the build log for the reference |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.