PNaCl localmod mods in LLVM to 223109 (local files only)

lib/Transforms/NaCl/ReplacePtrsWithInts.cpp

 //===- ReplacePtrsWithInts.cpp - Convert pointer values to integer values--===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This pass strips out aggregate pointer types and replaces them with
@@ skipping 151 matching lines @@
 
 void FunctionConverter::recordConvertedAndErase(Instruction *From, Value *To) {
   recordConverted(From, To);
   // There may still be references to this value, so defer deleting it.
   ToErase.push_back(From);
 }
 
 Value *FunctionConverter::stripNoopCasts(Value *Val) {
   SmallPtrSet<Value *, 4> Visited;
   for (;;) {
-    if (!Visited.insert(Val)) {
+    if (!Visited.insert(Val).second) {
       // It is possible to get a circular reference in unreachable
       // basic blocks.  Handle this case for completeness.
       return UndefValue::get(Val->getType());
     }
     if (CastInst *Cast = dyn_cast<CastInst>(Val)) {
       Value *Src = Cast->getOperand(0);
       if ((isa<BitCastInst>(Cast) && Cast->getType()->isPointerTy()) ||
           (isa<PtrToIntInst>(Cast) && Cast->getType() == IntPtrType) ||
           (isa<IntToPtrInst>(Cast) && Src->getType() == IntPtrType)) {
         Val = Src;
@@ skipping 435 matching lines @@
     // Delete the now-unused bitcast ConstantExprs that we created so
     // that they don't interfere with StripDeadPrototypes.
     Func->removeDeadConstantUsers();
   }
   return true;
 }
 
 ModulePass *llvm::createReplacePtrsWithIntsPass() {
   return new ReplacePtrsWithInts();
 }