Rebased PNaCl localmods in LLVM to 223109

lib/IR/Instructions.cpp

Index: lib/IR/Instructions.cpp
diff --git a/lib/IR/Instructions.cpp b/lib/IR/Instructions.cpp
index f4c6a289b804e0ef60c410b5544fba7255adc681..ec58c0c71799b0137146e90bec8cd0858c60f4bc 100644
--- a/lib/IR/Instructions.cpp
+++ b/lib/IR/Instructions.cpp
@@ -2850,11 +2850,9 @@ CastInst::getCastOpcode(
 /// 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;