Rebased PNaCl localmods in LLVM to 223109

lib/IR/Instructions.cpp

 //===-- Instructions.cpp - Implement the LLVM instructions ----------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file implements all of the non-inline methods for the LLVM instruction
@@ skipping 2832 matching lines @@
 
 //===----------------------------------------------------------------------===//
 //                    CastInst SubClass Constructors
 //===----------------------------------------------------------------------===//
 
 /// Check that the construction parameters for a CastInst are correct. This
 /// could be broken out into the separate constructors but it is useful to have
 /// it in one place and to eliminate the redundant code for getting the sizes
 /// of the types involved.
 bool 
-CastInst::castIsValid(Instruction::CastOps op, Value *S, Type *DstTy) {
-
-  // Check for type sanity on the arguments
-  Type *SrcTy = S->getType();
-
+// @LOCALMOD-BEGIN
+CastInst::castIsValid(Instruction::CastOps op, Type *SrcTy, Type *DstTy) {
+// @LOCALMOD-END
   // If this is a cast to the same type then it's trivially true.
   if (SrcTy == DstTy)
     return true;
 
   if (!SrcTy->isFirstClassType() || !DstTy->isFirstClassType() ||
       SrcTy->isAggregateType() || DstTy->isAggregateType())
     return false;
 
   // Get the size of the types in bits, we'll need this later
   unsigned SrcBitSize = SrcTy->getScalarSizeInBits();
@@ skipping 935 matching lines @@
 }
 
 ResumeInst *ResumeInst::clone_impl() const {
   return new(1) ResumeInst(*this);
 }
 
 UnreachableInst *UnreachableInst::clone_impl() const {
   LLVMContext &Context = getContext();
   return new UnreachableInst(Context);
 }