Subzero: Update for LLVM 3.9 (trunk).

src/IceCfgNode.cpp

 //===- subzero/src/IceCfgNode.cpp - Basic block (node) implementation -----===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 1324 matching lines @@
         I = Helper.getBundleLockStart();
       }
       continue;
     }
 
     // I points to a non bundle_lock/bundle_unlock instruction.
     if (Helper.isInBundleLockRegion()) {
       I->emitIAS(Func);
       // Only update stats during the final pass.
       if (Retrying)
-        updateStats(Func, I);
+        updateStats(Func, iteratorToInst(I));
     } else {
       // Treat it as though there were an implicit bundle_lock and
       // bundle_unlock wrapping the instruction.
       Helper.enterBundleLock(I);
       I->emitIAS(Func);
       Helper.enterBundleUnlock();
       Helper.rollback();
       Helper.padToNextBundle();
       I->emitIAS(Func);
-      updateStats(Func, I);
+      updateStats(Func, iteratorToInst(I));
       Helper.leaveBundleLockRegion();
     }
   }
 
   // Don't allow bundle locking across basic blocks, to keep the backtracking
   // mechanism simple.
   assert(!Helper.isInBundleLockRegion());
   assert(!Retrying);
 }
 
@@ skipping 100 matching lines @@
   auto *Instr = InstIntrinsicCall::create(
       Func, 5, Func->makeVariable(IceType_i64), RMWI64Name, Info->Info);
   Instr->addArg(AtomicRMWOp);
   Instr->addArg(Counter);
   Instr->addArg(One);
   Instr->addArg(OrderAcquireRelease);
   Insts.push_front(Instr);
 }
 
 } // end of namespace Ice