From a327524b691795d1cb2161454e1e3e7ef12996de Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Mon, 28 Dec 2009 07:57:01 +0000 Subject: [PATCH] eliminate the elem_* iterator stuff from NamedMDNode. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@92208 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Metadata.h | 9 --------- lib/Bitcode/Writer/ValueEnumerator.cpp | 7 ++----- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/include/llvm/Metadata.h b/include/llvm/Metadata.h index e7d9c1a868b..18da7a5b18c 100644 --- a/include/llvm/Metadata.h +++ b/include/llvm/Metadata.h @@ -203,15 +203,6 @@ public: Node.push_back(TrackingVH(M)); } - typedef SmallVectorImpl >::iterator elem_iterator; - typedef SmallVectorImpl >::const_iterator - const_elem_iterator; - bool elem_empty() const { return Node.empty(); } - const_elem_iterator elem_begin() const { return Node.begin(); } - const_elem_iterator elem_end() const { return Node.end(); } - elem_iterator elem_begin() { return Node.begin(); } - elem_iterator elem_end() { return Node.end(); } - /// Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const NamedMDNode *) { return true; } static bool classof(const Value *V) { diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp index d840d4ae9fe..d5b810c8544 100644 --- a/lib/Bitcode/Writer/ValueEnumerator.cpp +++ b/lib/Bitcode/Writer/ValueEnumerator.cpp @@ -226,11 +226,8 @@ void ValueEnumerator::EnumerateMetadata(const MetadataBase *MD) { } if (const NamedMDNode *N = dyn_cast(MD)) { - for(NamedMDNode::const_elem_iterator I = N->elem_begin(), - E = N->elem_end(); I != E; ++I) { - MetadataBase *M = *I; - EnumerateValue(M); - } + for (unsigned i = 0, e = N->getNumElements(); i != e; ++i) + EnumerateValue(N->getElement(i)); MDValues.push_back(std::make_pair(MD, 1U)); MDValueMap[MD] = Values.size(); return; -- 2.34.1