diff --git a/lib/Bitcode/Writer/ValueEnumerator.cpp b/lib/Bitcode/Writer/ValueEnumerator.cpp
index d808e347dd8..830ac612fb5 100644
--- a/lib/Bitcode/Writer/ValueEnumerator.cpp
+++ b/lib/Bitcode/Writer/ValueEnumerator.cpp
@@ -178,11 +178,12 @@ void ValueEnumerator::incorporateFunction(const Function &F) {
             isa<InlineAsm>(*OI))
           EnumerateValue(*OI);
       }
+    ValueMap[BB] = BasicBlocks.size();
+    BasicBlocks.push_back(BB);
   }
   
   // Add all of the instructions.
   for (Function::const_iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
-    EnumerateValue(BB);
     for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I!=E; ++I) {
       if (I->getType() != Type::VoidTy)
         EnumerateValue(I);
@@ -194,6 +195,10 @@ void ValueEnumerator::purgeFunction() {
   /// Remove purged values from the ValueMap.
   for (unsigned i = ModuleLevel, e = Values.size(); i != e; ++i)
     ValueMap.erase(Values[i].first);
+  for (unsigned i = 0, e = BasicBlocks.size(); i != e; ++i)
+    ValueMap.erase(BasicBlocks[i]);
+    
   Values.resize(ModuleLevel);
+  BasicBlocks.clear();
 }
 
diff --git a/lib/Bitcode/Writer/ValueEnumerator.h b/lib/Bitcode/Writer/ValueEnumerator.h
index c0db9d968e0..d9839c6c83e 100644
--- a/lib/Bitcode/Writer/ValueEnumerator.h
+++ b/lib/Bitcode/Writer/ValueEnumerator.h
@@ -19,13 +19,13 @@
 
 namespace llvm {
 
-class Value;
 class Type;
-class Module;
+class Value;
+class BasicBlock;
 class Function;
+class Module;
 class TypeSymbolTable;
 class ValueSymbolTable;
-class ConstantArray;
 
 class ValueEnumerator {
 public:
@@ -43,6 +43,10 @@ private:
   ValueMapType ValueMap;
   ValueList Values;
   
+  /// BasicBlocks - This contains all the basic blocks for the currently
+  /// incorporated function.  Their reverse mapping is stored in ValueMap.
+  std::vector<const BasicBlock*> BasicBlocks;
+  
   /// When a function is incorporated, this is the size of the Values list
   /// before incorporation.
   unsigned ModuleLevel;
@@ -66,6 +70,9 @@ public:
 
   const ValueList &getValues() const { return Values; }
   const TypeList &getTypes() const { return Types; }
+  const std::vector<const BasicBlock*> &getBasicBlocks() const {
+    return BasicBlocks; 
+  }
 
   /// PurgeAggregateValues - If there are any aggregate values at the end of the
   /// value list, remove them and return the count of the remaining values.  If