From c4d0e9fbddfe6b0ee5d5d7ef8eb1b341a8a242cf Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 12 Aug 2011 18:07:07 +0000 Subject: [PATCH] switch to the new struct apis. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137481 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/CBackend/CBackend.cpp | 4 ++-- lib/Target/CppBackend/CPPBackend.cpp | 6 +++--- lib/VMCore/AsmWriter.cpp | 6 +++--- lib/VMCore/Core.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Target/CBackend/CBackend.cpp b/lib/Target/CBackend/CBackend.cpp index 5b9a0a297fb..73c8225a214 100644 --- a/lib/Target/CBackend/CBackend.cpp +++ b/lib/Target/CBackend/CBackend.cpp @@ -363,7 +363,7 @@ static std::string CBEMangle(const std::string &S) { } std::string CWriter::getStructName(StructType *ST) { - if (!ST->isAnonymous() && !ST->getName().empty()) + if (!ST->isLiteral() && !ST->getName().empty()) return CBEMangle("l_"+ST->getName().str()); return "l_unnamed_" + utostr(UnnamedStructIDs[ST]); @@ -2052,7 +2052,7 @@ void CWriter::printModuleTypes() { for (unsigned i = 0, e = StructTypes.size(); i != e; ++i) { StructType *ST = StructTypes[i]; - if (ST->isAnonymous() || ST->getName().empty()) + if (ST->isLiteral() || ST->getName().empty()) UnnamedStructIDs[ST] = NextTypeID++; std::string Name = getStructName(ST); diff --git a/lib/Target/CppBackend/CPPBackend.cpp b/lib/Target/CppBackend/CPPBackend.cpp index f16cfaca91f..204a14fff71 100644 --- a/lib/Target/CppBackend/CPPBackend.cpp +++ b/lib/Target/CppBackend/CPPBackend.cpp @@ -533,9 +533,9 @@ void CppWriter::printType(Type* Ty) { } case Type::StructTyID: { StructType* ST = cast(Ty); - if (!ST->isAnonymous()) { + if (!ST->isLiteral()) { Out << "StructType *" << typeName << " = "; - Out << "StructType::createNamed(mod->getContext(), \""; + Out << "StructType::create(mod->getContext(), \""; printEscapedString(ST->getName()); Out << "\");"; nl(Out); @@ -556,7 +556,7 @@ void CppWriter::printType(Type* Ty) { nl(Out); } - if (ST->isAnonymous()) { + if (ST->isLiteral()) { Out << "StructType *" << typeName << " = "; Out << "StructType::get(" << "mod->getContext(), "; } else { diff --git a/lib/VMCore/AsmWriter.cpp b/lib/VMCore/AsmWriter.cpp index 005f51aae30..62214a1a2eb 100644 --- a/lib/VMCore/AsmWriter.cpp +++ b/lib/VMCore/AsmWriter.cpp @@ -171,7 +171,7 @@ void TypePrinting::incorporateTypes(const Module &M) { StructType *STy = *I; // Ignore anonymous types. - if (STy->isAnonymous()) + if (STy->isLiteral()) continue; if (STy->getName().empty()) @@ -221,7 +221,7 @@ void TypePrinting::print(Type *Ty, raw_ostream &OS) { case Type::StructTyID: { StructType *STy = cast(Ty); - if (STy->isAnonymous()) + if (STy->isLiteral()) return printStructBody(STy, OS); if (!STy->getName().empty()) @@ -2024,7 +2024,7 @@ void Type::print(raw_ostream &OS) const { // If the type is a named struct type, print the body as well. if (StructType *STy = dyn_cast(const_cast(this))) - if (!STy->isAnonymous()) { + if (!STy->isLiteral()) { OS << " = type "; TP.printStructBody(STy, OS); } diff --git a/lib/VMCore/Core.cpp b/lib/VMCore/Core.cpp index bff0d865cf0..883ad91343e 100644 --- a/lib/VMCore/Core.cpp +++ b/lib/VMCore/Core.cpp @@ -299,7 +299,7 @@ LLVMTypeRef LLVMStructType(LLVMTypeRef *ElementTypes, LLVMTypeRef LLVMStructCreateNamed(LLVMContextRef C, const char *Name) { - return wrap(StructType::createNamed(*unwrap(C), Name)); + return wrap(StructType::create(*unwrap(C), Name)); } void LLVMStructSetBody(LLVMTypeRef StructTy, LLVMTypeRef *ElementTypes,