Revert 80839 for now. It causes test failures.
llvm-svn: 80841
diff --git a/llvm/lib/VMCore/LLVMContext.cpp b/llvm/lib/VMCore/LLVMContext.cpp
index 0ed21fb..1803a9a 100644
--- a/llvm/lib/VMCore/LLVMContext.cpp
+++ b/llvm/lib/VMCore/LLVMContext.cpp
@@ -13,7 +13,6 @@
//===----------------------------------------------------------------------===//
#include "llvm/LLVMContext.h"
-#include "llvm/Metadata.h"
#include "llvm/Constants.h"
#include "llvm/Instruction.h"
#include "llvm/Support/ManagedStatic.h"
@@ -49,10 +48,10 @@
bool Changed = false;
while (1) {
- for (FoldingSet<MDNode>::iterator
- I = pImpl->MDNodeSet.begin(),
- E = pImpl->MDNodeSet.end(); I != E; ++I) {
- const MDNode *N = &(*I);
+ for (SmallPtrSet<const MDNode *, 8>::iterator
+ I = pImpl->MDNodes.begin(),
+ E = pImpl->MDNodes.end(); I != E; ++I) {
+ const MDNode *N = cast<MDNode>(*I);
if (N->use_empty())
DeadMDNodes.push_back(N);
}