6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2026-04-24 13:18:17 +00:00
Code Issues Projects Releases Wiki Activity

IR: Cleanup MDNode field use, NFC

Browse Source 
Swap usage of `SubclassData32` and `MDNodeSubclassData`, and rename
`MDNodeSubclassData` to `NumUnresolved`.  Small drive-by cleanup to
`countUnresolvedOperands()` since otherwise the name clash with local
vars named `NumUnresolved` would be confusing.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226523 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2015-01-19 23:18:34 +00:00
parent c062fbe4ca
commit 0d7ab29889
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/IR/Metadata.cpp
+14 -19
View File
@@ -398,23 +398,20 @@ void MDNode::operator delete(void *Mem) {
MDNode::MDNode(LLVMContext &Context, unsigned ID, StorageType Storage,
ArrayRef<Metadata *> MDs)
: Metadata(ID, Storage), Context(Context), NumOperands(MDs.size()),
MDNodeSubclassData(0) {
: Metadata(ID, Storage), NumOperands(MDs.size()), NumUnresolved(0),
Context(Context) {
for (unsigned I = 0, E = MDs.size(); I != E; ++I)
setOperand(I, MDs[I]);
if (isDistinct())
return;
if (isUniqued()) {
// Check whether any operands are unresolved, requiring re-uniquing.
unsigned NumUnresolved = countUnresolvedOperands();
if (!NumUnresolved)
if (isUniqued())
// Check whether any operands are unresolved, requiring re-uniquing. If
// not, don't support RAUW.
if (!countUnresolvedOperands())
return;
SubclassData32 = NumUnresolved;
}
this->Context.makeReplaceable(make_unique<ReplaceableMetadataImpl>(Context));
}
@@ -424,8 +421,8 @@ static bool isOperandUnresolved(Metadata *Op) {
return false;
}
unsigned MDNode::countUnresolvedOperands() const {
unsigned NumUnresolved = 0;
unsigned MDNode::countUnresolvedOperands() {
assert(NumUnresolved == 0 && "Expected unresolved ops to be uncounted");
for (const auto &Op : operands())
NumUnresolved += unsigned(isOperandUnresolved(Op));
return NumUnresolved;
@@ -437,9 +434,7 @@ void MDNode::makeUniqued() {
// Make this 'uniqued'.
Storage = Uniqued;
if (unsigned NumUnresolved = countUnresolvedOperands())
SubclassData32 = NumUnresolved;
else
if (!countUnresolvedOperands())
resolve();
assert(isUniqued() && "Expected this to be uniqued");
@@ -464,7 +459,7 @@ void MDNode::resolve() {
// Move the map, so that this immediately looks resolved.
auto Uses = Context.takeReplaceableUses();
SubclassData32 = 0;
NumUnresolved = 0;
assert(isResolved() && "Expected this to be resolved");
// Drop RAUW support.
@@ -472,19 +467,19 @@ void MDNode::resolve() {
}
void MDNode::resolveAfterOperandChange(Metadata *Old, Metadata *New) {
assert(SubclassData32 != 0 && "Expected unresolved operands");
assert(NumUnresolved != 0 && "Expected unresolved operands");
// Check if an operand was resolved.
if (!isOperandUnresolved(Old)) {
if (isOperandUnresolved(New))
// An operand was un-resolved!
++SubclassData32;
++NumUnresolved;
} else if (!isOperandUnresolved(New))
decrementUnresolvedOperandCount();
}
void MDNode::decrementUnresolvedOperandCount() {
if (!--SubclassData32)
if (!--NumUnresolved)
// Last unresolved operand has just been resolved.
resolve();
}
@@ -694,7 +689,7 @@ MDLocation::MDLocation(LLVMContext &C, StorageType Storage, unsigned Line,
assert(Line < (1u << 24) && "Expected 24-bit line");
assert(Column < (1u << 16) && "Expected 16-bit column");
MDNodeSubclassData = Line;
SubclassData32 = Line;
SubclassData16 = Column;
}