aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-09-07 04:05:49 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-09-07 04:05:49 +0000
commitd34b0b1cda785af1aae4e07c7ba70360b9f9b430 (patch)
tree3557caaf959487b51830e1ed4f5c2b13d24fc4b1
parent53a99f9cda67af459dbfd08253def5ea14299240 (diff)
downloadexternal_llvm-d34b0b1cda785af1aae4e07c7ba70360b9f9b430.zip
external_llvm-d34b0b1cda785af1aae4e07c7ba70360b9f9b430.tar.gz
external_llvm-d34b0b1cda785af1aae4e07c7ba70360b9f9b430.tar.bz2
Disable MDNode uniquing.
- Hopefully this unbreaks some llvm-gcc bootstraps. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@81141 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/VMCore/Metadata.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/lib/VMCore/Metadata.cpp b/lib/VMCore/Metadata.cpp
index 8e025b6..76f2528 100644
--- a/lib/VMCore/Metadata.cpp
+++ b/lib/VMCore/Metadata.cpp
@@ -90,11 +90,16 @@ MDNode *MDNode::get(LLVMContext &Context, Value*const* Vals, unsigned NumVals) {
for (unsigned i = 0; i != NumVals; ++i)
ID.AddPointer(Vals[i]);
+ // FIXME: MDNode uniquing disabled temporarily.
+#ifndef ENABLE_MDNODE_UNIQUING
+ return new MDNode(Context, Vals, NumVals);
+#endif
+
pImpl->ConstantsLock.reader_acquire();
void *InsertPoint;
MDNode *N = pImpl->MDNodeSet.FindNodeOrInsertPos(ID, InsertPoint);
pImpl->ConstantsLock.reader_release();
-
+
if (!N) {
sys::SmartScopedWriter<true> Writer(pImpl->ConstantsLock);
N = pImpl->MDNodeSet.FindNodeOrInsertPos(ID, InsertPoint);
@@ -115,12 +120,27 @@ void MDNode::dropAllReferences() {
}
MDNode::~MDNode() {
+ // FIXME: MDNode uniquing disabled temporarily.
+#ifdef ENABLE_MDNODE_UNIQUING
getType()->getContext().pImpl->MDNodeSet.RemoveNode(this);
+#endif
dropAllReferences();
}
// Replace value from this node's element list.
void MDNode::replaceElement(Value *From, Value *To) {
+ // FIXME: MDNode uniquing disabled temporarily.
+#ifndef ENABLE_MDNODE_UNIQUING
+ if (From == To || !getType())
+ return;
+
+ for (SmallVector<ElementVH, 4>::iterator I = Node.begin(),
+ E = Node.end(); I != E; ++I)
+ if (*I && *I == From)
+ *I = ElementVH(To, this);
+ return;
+#endif
+
if (From == To || !getType())
return;
LLVMContext &Context = getType()->getContext();