diff options
| -rw-r--r-- | include/llvm/DerivedTypes.h | 5 | ||||
| -rw-r--r-- | lib/VMCore/Type.cpp | 18 |
2 files changed, 13 insertions, 10 deletions
diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h index 408014e774..f28c3747a1 100644 --- a/include/llvm/DerivedTypes.h +++ b/include/llvm/DerivedTypes.h @@ -224,7 +224,7 @@ public: static StructType *create(LLVMContext &Context, ArrayRef<Type*> Elements); static StructType *create(StringRef Name, Type *elt1, ...) END_WITH_NULL; - +#if 1 // FIXME: Remove these. bool isAnonymous() const {return (getSubclassData() & SCDB_IsLiteral) != 0;} static StructType *createNamed(LLVMContext &Context, @@ -236,7 +236,8 @@ public: ArrayRef<Type*> Elements, bool isPacked = false); static StructType *createNamed(StringRef Name, Type *elt1, ...) END_WITH_NULL; - +#endif + /// StructType::get - This static method is the primary way to create a /// literal StructType. static StructType *get(LLVMContext &Context, ArrayRef<Type*> Elements, diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index decb50cd4d..dd3450a0f7 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -412,13 +412,6 @@ void StructType::setBody(ArrayRef<Type*> Elements, bool isPacked) { NumContainedTys = Elements.size(); } -StructType *StructType::createNamed(LLVMContext &Context, StringRef Name) { - StructType *ST = new (Context.pImpl->TypeAllocator) StructType(Context); - if (!Name.empty()) - ST->setName(Name); - return ST; -} - void StructType::setName(StringRef Name) { if (Name == getName()) return; @@ -528,7 +521,7 @@ StructType *StructType::create(StringRef Name, Type *type, ...) { } - +#if 1 StructType *StructType::createNamed(LLVMContext &Context, StringRef Name, ArrayRef<Type*> Elements, bool isPacked) { @@ -537,6 +530,14 @@ StructType *StructType::createNamed(LLVMContext &Context, StringRef Name, return ST; } +StructType *StructType::createNamed(LLVMContext &Context, StringRef Name) { + StructType *ST = new (Context.pImpl->TypeAllocator) StructType(Context); + if (!Name.empty()) + ST->setName(Name); + return ST; +} + + StructType *StructType::createNamed(StringRef Name, ArrayRef<Type*> Elements, bool isPacked) { assert(!Elements.empty() && @@ -556,6 +557,7 @@ StructType *StructType::createNamed(StringRef Name, Type *type, ...) { } return llvm::StructType::createNamed(Ctx, Name, StructFields); } +#endif StringRef StructType::getName() const { assert(!isLiteral() && "Literal structs never have names"); |