From 489fee1b64564540d46231c94e92fea84ed97cc5 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 18 Aug 2011 17:39:28 +0000 Subject: [PATCH] Rip out the old StructType APIs as warned about on llvmdev last week. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137953 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/DerivedTypes.h | 14 -------------- lib/VMCore/Type.cpp | 38 ------------------------------------- 2 files changed, 52 deletions(-) diff --git a/include/llvm/DerivedTypes.h b/include/llvm/DerivedTypes.h index f28c3747a1b..445c3deb7ce 100644 --- a/include/llvm/DerivedTypes.h +++ b/include/llvm/DerivedTypes.h @@ -224,20 +224,6 @@ public: static StructType *create(LLVMContext &Context, ArrayRef 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, - StringRef Name); - - static StructType *createNamed(StringRef Name, ArrayRef Elements, - bool isPacked = false); - static StructType *createNamed(LLVMContext &Context, StringRef Name, - ArrayRef 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 Elements, diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp index dd3450a0f7b..10184bc6f0e 100644 --- a/lib/VMCore/Type.cpp +++ b/lib/VMCore/Type.cpp @@ -521,44 +521,6 @@ StructType *StructType::create(StringRef Name, Type *type, ...) { } -#if 1 - -StructType *StructType::createNamed(LLVMContext &Context, StringRef Name, - ArrayRef Elements, bool isPacked) { - StructType *ST = createNamed(Context, Name); - ST->setBody(Elements, isPacked); - 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 Elements, - bool isPacked) { - assert(!Elements.empty() && - "This method may not be invoked with an empty list"); - return createNamed(Elements[0]->getContext(), Name, Elements, isPacked); -} - -StructType *StructType::createNamed(StringRef Name, Type *type, ...) { - assert(type != 0 && "Cannot create a struct type with no elements with this"); - LLVMContext &Ctx = type->getContext(); - va_list ap; - SmallVector StructFields; - va_start(ap, type); - while (type) { - StructFields.push_back(type); - type = va_arg(ap, llvm::Type*); - } - return llvm::StructType::createNamed(Ctx, Name, StructFields); -} -#endif - StringRef StructType::getName() const { assert(!isLiteral() && "Literal structs never have names"); if (SymbolTableEntry == 0) return StringRef();