From: Duncan P. N. Exon Smith Date: Mon, 12 Jan 2015 19:43:15 +0000 (+0000) Subject: IR: Separate out decrementUnresolvedOperandCount(), NFC X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=2912990d8689940552710585df78072e5b2dd319;p=oota-llvm.git IR: Separate out decrementUnresolvedOperandCount(), NFC git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@225667 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/IR/Metadata.h b/include/llvm/IR/Metadata.h index cf2dbd03ef2..263f7f21023 100644 --- a/include/llvm/IR/Metadata.h +++ b/include/llvm/IR/Metadata.h @@ -763,6 +763,7 @@ private: void resolve(); void resolveAfterOperandChange(Metadata *Old, Metadata *New); + void decrementUnresolvedOperandCount(); }; /// \brief Forward declaration of metadata. diff --git a/lib/IR/Metadata.cpp b/lib/IR/Metadata.cpp index ec9b8801b81..f78e7d2534d 100644 --- a/lib/IR/Metadata.cpp +++ b/lib/IR/Metadata.cpp @@ -228,8 +228,7 @@ void ReplaceableMetadataImpl::resolveAllUses(bool ResolveUsers) { continue; if (OwnerMD->isResolved()) continue; - if (!--OwnerMD->SubclassData32) - OwnerMD->resolve(); + OwnerMD->decrementUnresolvedOperandCount(); } } @@ -455,16 +454,19 @@ void GenericMDNode::resolveAfterOperandChange(Metadata *Old, Metadata *New) { // Check if the last unresolved operand has just been resolved; if so, // resolve this as well. if (isOperandUnresolved(Old)) { - if (!isOperandUnresolved(New)) { - if (!--SubclassData32) - resolve(); - } + if (!isOperandUnresolved(New)) + decrementUnresolvedOperandCount(); } else { // Operands shouldn't become unresolved. assert(isOperandUnresolved(New) && "Operand just became unresolved"); } } +void GenericMDNode::decrementUnresolvedOperandCount() { + if (!--SubclassData32) + resolve(); +} + void GenericMDNode::resolveCycles() { if (isResolved()) return;