Rebased PNaCl localmods in LLVM to 223109

include/llvm/IR/InstrTypes.h

Index: include/llvm/IR/InstrTypes.h
diff --git a/include/llvm/IR/InstrTypes.h b/include/llvm/IR/InstrTypes.h
index 030f5d690a0ca73c9003c17ebadc219cb1d67b7f..ddbced3240f3ebd51b8d9004d529b9790f2fc73c 100644
--- a/include/llvm/IR/InstrTypes.h
+++ b/include/llvm/IR/InstrTypes.h
@@ -656,7 +656,13 @@ public:
   /// Opcode op is valid or not.
   /// @returns true iff the proposed cast is valid.
   /// @brief Determine if a cast is valid without creating one.
-  static bool castIsValid(Instruction::CastOps op, Value *S, Type *DstTy);
+  // @LOCALMOD-BEGIN
+  static bool castIsValid(Instruction::CastOps op, Type *SrcTy, Type *DstTy);
+
+  static bool castIsValid(Instruction::CastOps op, Value *S, Type *DstTy) {
+    return castIsValid(op, S->getType(), DstTy);
+  }
+  // @LOCALMOD-END
 
   /// @brief Methods for support type inquiry through isa, cast, and dyn_cast:
   static inline bool classof(const Instruction *I) {