diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/DerivedTypes.h | 2 | ||||
| -rw-r--r-- | include/llvm/Type.def | 10 | ||||
| -rw-r--r-- | include/llvm/Type.h | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h index da972562df..c0d66bebad 100644 --- a/include/llvm/DerivedTypes.h +++ b/include/llvm/DerivedTypes.h @@ -138,7 +138,7 @@ public: // Methods for support type inquiry through isa, cast, and dyn_cast: static inline bool classof(const FunctionType *T) { return true; } static inline bool classof(const Type *T) { - return T->getPrimitiveID() == MethodTyID; + return T->getPrimitiveID() == FunctionTyID; } static inline bool classof(const Value *V) { return isa<Type>(V) && classof(cast<const Type>(V)); diff --git a/include/llvm/Type.def b/include/llvm/Type.def index ea4cdc1cac..99a9569ce8 100644 --- a/include/llvm/Type.def +++ b/include/llvm/Type.def @@ -47,11 +47,11 @@ HANDLE_PRIM_TYPE(Label , 8) // Type Name: This is the symbolic name of the type, without the trailing Ty. // Class Name: This is the subclass that implements the derived type. // -HANDLE_DERV_TYPE(Method , MethodType) -HANDLE_DERV_TYPE(Array , ArrayType) -HANDLE_DERV_TYPE(Pointer, PointerType) -HANDLE_DERV_TYPE(Struct , StructType) -HANDLE_DERV_TYPE(Opaque , OpaqueType) +HANDLE_DERV_TYPE(Function, FunctionType) +HANDLE_DERV_TYPE(Array , ArrayType) +HANDLE_DERV_TYPE(Pointer , PointerType) +HANDLE_DERV_TYPE(Struct , StructType) +HANDLE_DERV_TYPE(Opaque , OpaqueType) // Kill the macros on exit... #undef HANDLE_PRIM_TYPE diff --git a/include/llvm/Type.h b/include/llvm/Type.h index 1bbe02337b..07d9615ba9 100644 --- a/include/llvm/Type.h +++ b/include/llvm/Type.h @@ -30,7 +30,7 @@ #include "Support/GraphTraits.h" class DerivedType; -class MethodType; +class FunctionType; class ArrayType; class PointerType; class StructType; @@ -58,14 +58,14 @@ public: // Derived types... see DerivedTypes.h file... // Make sure FirstDerivedTyID stays up to date!!! - MethodTyID , StructTyID, // Methods... Structs... + FunctionTyID , StructTyID, // Functions... Structs... ArrayTyID , PointerTyID, // Array... pointer... OpaqueTyID, // Opaque type instances... //PackedTyID , // SIMD 'packed' format... TODO //... NumPrimitiveIDs, // Must remain as last defined ID - FirstDerivedTyID = MethodTyID, + FirstDerivedTyID = FunctionTyID, }; private: @@ -151,7 +151,7 @@ public: // TargetData subsystem to do this. // bool isSized() const { - return ID != TypeTyID && ID != MethodTyID && ID != OpaqueTyID; + return ID != TypeTyID && ID != FunctionTyID && ID != OpaqueTyID; } //===--------------------------------------------------------------------===// |