Changes from 3.7 merge to files not in upstream

lib/Transforms/NaCl/ExpandInsertExtractElement.cpp

 //==- ExpandInsertExtractElement.cpp - Expand vector insert and extract -=//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===------------------------------------------------------------------===//
 //
 // This pass expands insertelement and extractelement instructions with
@@ skipping 50 matching lines @@
   Instruction *Entry = F.getEntryBlock().begin();
   Type *Int32 = Type::getInt32Ty(F.getContext());
   Constant *Zero = ConstantInt::get(Int32, 0);
   for (inst_iterator I = inst_begin(&F), E = inst_end(&F); I != E; ) {
     Instruction *Inst = &*I++;
 
     if (InsertElementInst *III = dyn_cast<InsertElementInst>(Inst)) {
       if (isa<ConstantInt>(III->getOperand(2)))
           continue;
 
-      Instruction *A = new AllocaInst(III->getType(), 0, "", Entry);
+      Type *AllocaTy = III->getType();
+      Instruction *A = new AllocaInst(AllocaTy, 0, "", Entry);
       CopyDebug(new StoreInst(III->getOperand(0), A, III), III);
 
       Value *Idxs[] = { Zero, III->getOperand(2) };
-      Instruction *B = CopyDebug(GetElementPtrInst::Create(A, Idxs, "", III), III);
+      Instruction *B = CopyDebug(
+          GetElementPtrInst::Create(AllocaTy, A, Idxs, "", III), III);
       CopyDebug(new StoreInst(III->getOperand(1), B, III), III);
 
       Instruction *L = CopyDebug(new LoadInst(A, "", III), III);
       III->replaceAllUsesWith(L);
       III->eraseFromParent();
     } else if (ExtractElementInst *EII = dyn_cast<ExtractElementInst>(Inst)) {
       if (isa<ConstantInt>(EII->getOperand(1)))
           continue;
 
-      Instruction *A = new AllocaInst(EII->getOperand(0)->getType(), 0, "", Entry);
+      Type *AllocaTy = EII->getOperand(0)->getType();
+      Instruction *A = new AllocaInst(AllocaTy, 0, "", Entry);
       CopyDebug(new StoreInst(EII->getOperand(0), A, EII), EII);
 
       Value *Idxs[] = { Zero, EII->getOperand(1) };
-      Instruction *B = CopyDebug(GetElementPtrInst::Create(A, Idxs, "", EII), EII);
+      Instruction *B = CopyDebug(
+          GetElementPtrInst::Create(AllocaTy, A, Idxs, "", EII), EII);
       Instruction *L = CopyDebug(new LoadInst(B, "", EII), EII);
       EII->replaceAllUsesWith(L);
       EII->eraseFromParent();
     }
   }
 
   return Changed;
 }
 
 FunctionPass *llvm::createExpandInsertExtractElementPass() {
   return new ExpandInsertExtractElement();
 }