Remove the createInferredCast methods now that their last uses have been

removed. All casting is now explicit and not inferred by VMCore.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@32655 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/InstrTypes.h b/include/llvm/InstrTypes.h
index 6fa9f19f634884280c942d633737ddfce9bf2e34..b3ec55921fdf8cec0bd28a4dd98f5f0576a35489 100644 (file)
--- a/include/llvm/InstrTypes.h
+++ b/include/llvm/InstrTypes.h
@@ -398,7 +398,8 @@ public:
   );
 
   /// Returns the opcode necessary to cast Val into Ty using usual casting
-  /// rules.
+  /// rules. 
+  /// @brief Infer the opcode for cast operand and type
   static Instruction::CastOps getCastOpcode(
     const Value *Val, ///< The value to cast
     bool SrcIsSigned, ///< Whether to treat the source as signed
@@ -406,60 +407,6 @@ public:
     bool DstIsSigned  ///< Whether to treate the dest. as signed
   );
 
-  /// Joins the create method (with insert-before-instruction semantics) above 
-  /// with the getCastOpcode method. getOpcode(S,Ty) is called first to
-  /// obtain the opcode for casting S to type Ty. Then the get(...) method is 
-  /// called to create the CastInst and insert it. The instruction is
-  /// inserted before InsertBefore (if it is non-null). The cast created is
-  /// inferred, because only the types involved are used in determining which
-  /// cast opcode to use. For specific casts, use one of the create methods.
-  /// @brief Inline helper method to join create with getCastOpcode.
-  inline static CastInst *createInferredCast(
-    Value *S,                     ///< The value to be casted (operand 0)
-    bool SrcIsSigned,             ///< Whether to treat the source as signed
-    const Type *Ty,               ///< Type to which operand should be casted
-    bool DstIsSigned,             ///< Whether to treate the dest. as signed
-    const std::string &Name = "", ///< Name for the instruction
-    Instruction *InsertBefore = 0 ///< Place to insert the CastInst
-  ) {
-    return create(getCastOpcode(S, SrcIsSigned, Ty, DstIsSigned), 
-                  S, Ty, Name, InsertBefore);
-  }
-  static CastInst *createInferredCast(
-    Value *S,                     ///< The value to be casted (operand 0)
-    const Type *Ty,               ///< Type to which operand should be casted
-    const std::string &Name = "", ///< Name for the instruction
-    Instruction *InsertBefore = 0 ///< Place to insert the CastInst
-  );
-
-  /// Joins the get method (with insert-at-end-of-block semantics) method 
-  /// above with the getCastOpcode method. getOpcode(S,Ty) is called first to
-  /// obtain the usual casting opcode for casting S to type Ty. Then the 
-  /// get(...) method is called to create the CastInst and insert it. The 
-  /// instruction is inserted at the end of InsertAtEnd (if it is non-null).
-  /// The created cast is inferred, because only the types involved are used 
-  /// in determining which cast opcode to use. For specific casts, use one of 
-  /// the create methods.
-  /// @brief Inline helper method to join create with getCastOpcode.
-  inline static CastInst *createInferredCast(
-    Value *S,                     ///< The value to be casted (operand 0)
-    bool SrcIsSigned,             ///< Whether to treat the source as signed
-    const Type *Ty,               ///< Type to which operand should be casted
-    bool DstIsSigned,             ///< Whether to treate the dest. as signed
-    const std::string &Name,      ///< Name for the instruction
-    BasicBlock *InsertAtEnd       ///< The block to insert the instruction into
-  ) {
-    return create(getCastOpcode(S, SrcIsSigned, Ty, DstIsSigned), 
-                  S, Ty, Name, InsertAtEnd);
-  }
-
-  static CastInst *createInferredCast(
-    Value *S,                     ///< The value to be casted (operand 0)
-    const Type *Ty,               ///< Type to which operand should be casted
-    const std::string &Name,      ///< Name for the instruction
-    BasicBlock *InsertAtEnd       ///< The block to insert the instruction into
-  );
-
   /// There are several places where we need to know if a cast instruction 
   /// only deals with integer source and destination types. To simplify that
   /// logic, this method is provided.

diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 07a44ee750f0568dde0c9748f88bcfde8047f6af..cf1e5e91e54e6bcaf9ac9859f88d0568e4ecfa58 100644 (file)
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -1782,20 +1782,6 @@ checkCast(Instruction::CastOps op, Value *S, const Type *DstTy) {
   }
 }
 
-CastInst *CastInst::createInferredCast(
-  Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore)
-{
-  return createInferredCast(S, S->getType()->isSigned(), Ty, Ty->isSigned(),
-      Name, InsertBefore);
-}
-
-CastInst *CastInst::createInferredCast(
-  Value *S, const Type *Ty, const std::string &Name, BasicBlock *InsertAtEnd) 
-{
-  return createInferredCast(S, S->getType()->isSigned(), Ty, Ty->isSigned(),
-      Name, InsertAtEnd);
-}
-
 TruncInst::TruncInst(
   Value *S, const Type *Ty, const std::string &Name, Instruction *InsertBefore
 ) : CastInst(Ty, Trunc, S, Name, InsertBefore) {