Changes from 3.7 merge to files not in upstream

lib/Bitcode/NaCl/Writer/NaClValueEnumerator.cpp

 //===-- NaClValueEnumerator.cpp ------------------------------------------===//
 //     Number values and types for bitcode writer
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ skipping 232 matching lines @@
        VI != VE; ++VI)
     EnumerateValue(VI->getValue());
 }
 
 void NaClValueEnumerator::EnumerateValue(const Value *VIn) {
   // Skip over elided values.
   const Value *V = ElideCasts(VIn);
   if (V != VIn) return;
 
   assert(!V->getType()->isVoidTy() && "Can't insert void values!");
-  assert(!isa<MDNode>(V) && !isa<MDString>(V) &&
-         "EnumerateValue doesn't handle Metadata!");
 
   // Check to see if it's already in!
   unsigned &ValueID = ValueMap[V];
   if (ValueID) {
     // Increment use count.
     Values[ValueID-1].second++;
     return;
   }
 
   // Enumerate the type of this value. Skip global values since no
@@ skipping 231 matching lines @@
       break;
     case Instruction::PtrToInt:
       if (IsIntPtrType(I->getType())) {
         V = I->getOperand(0);
       }
       break;
     }
   }
   return V;
 }