[llvm] ebb4ea1 - IR: Simplify two loops walking ConstantDataSequential, NFC
Duncan P. N. Exon Smith via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 26 18:55:57 PDT 2020
Author: Duncan P. N. Exon Smith
Date: 2020-10-26T21:55:48-04:00
New Revision: ebb4ea1d53aaccd91138bfd6afdc9b39fd784d83
URL: https://github.com/llvm/llvm-project/commit/ebb4ea1d53aaccd91138bfd6afdc9b39fd784d83
DIFF: https://github.com/llvm/llvm-project/commit/ebb4ea1d53aaccd91138bfd6afdc9b39fd784d83.diff
LOG: IR: Simplify two loops walking ConstantDataSequential, NFC
Follow-up to b2b7cf39d596b1528cd64015575b3f5d1461c011.
Differential Revision: https://reviews.llvm.org/D90198
Added:
Modified:
llvm/lib/IR/Constants.cpp
Removed:
################################################################################
diff --git a/llvm/lib/IR/Constants.cpp b/llvm/lib/IR/Constants.cpp
index 0436a6e99e3b..3d8555bb44f2 100644
--- a/llvm/lib/IR/Constants.cpp
+++ b/llvm/lib/IR/Constants.cpp
@@ -2784,10 +2784,9 @@ Constant *ConstantDataSequential::getImpl(StringRef Elements, Type *Ty) {
// of i8, or a 1-element array of i32. They'll both end up in the same
/// StringMap bucket, linked up by their Next pointers. Walk the list.
std::unique_ptr<ConstantDataSequential> *Entry = &Slot.second;
- for (ConstantDataSequential *Node = Entry->get(); Node;
- Entry = &Node->Next, Node = Entry->get())
- if (Node->getType() == Ty)
- return Node;
+ for (; *Entry; Entry = &(*Entry)->Next)
+ if ((*Entry)->getType() == Ty)
+ return Entry->get();
// Okay, we didn't get a hit. Create a node of the right class, link it in,
// and return it.
@@ -2825,14 +2824,16 @@ void ConstantDataSequential::destroyConstantImpl() {
// Otherwise, there are multiple entries linked off the bucket, unlink the
// node we care about but keep the bucket around.
- for (ConstantDataSequential *Node = Entry->get();;
- Entry = &Node->Next, Node = Entry->get()) {
+ while (true) {
+ std::unique_ptr<ConstantDataSequential> &Node = *Entry;
assert(Node && "Didn't find entry in its uniquing hash table!");
// If we found our entry, unlink it from the list and we're done.
- if (Node == this) {
- *Entry = std::move(Node->Next);
+ if (Node.get() == this) {
+ Node = std::move(Node->Next);
return;
}
+
+ Entry = &Node->Next;
}
}
More information about the llvm-commits
mailing list