From cb1b5d32fd227cd791fbd0614f75b32f291a5cca Mon Sep 17 00:00:00 2001 From: Mike Stump Date: Tue, 4 Aug 2009 20:06:48 +0000 Subject: [PATCH] Will I ever get used to CamelCase? Will I ever like capitols for random variables? --This line, and those below, will be ignored-- M lib/CodeGen/CGCXX.cpp git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@78094 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CGCXX.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp index 356d31829b..21fba14571 100644 --- a/lib/CodeGen/CGCXX.cpp +++ b/lib/CodeGen/CGCXX.cpp @@ -164,8 +164,6 @@ static bool GetNestedPaths(llvm::SmallVectorImpl &NestedBasePaths, const CXXRecordDecl *ClassDecl, const CXXRecordDecl *BaseClassDecl) { - assert(!ClassDecl->isPolymorphic() && - "FIXME: We don't support polymorphic classes yet!"); for (CXXRecordDecl::base_class_const_iterator i = ClassDecl->bases_begin(), e = ClassDecl->bases_end(); i != e; ++i) { if (i->isVirtual()) @@ -493,10 +491,10 @@ const char *CodeGenModule::getMangledCXXDtorName(const CXXDestructorDecl *D, llvm::Constant *CodeGenFunction::GenerateRtti(const CXXRecordDecl *RD) { llvm::Type *Ptr8Ty; Ptr8Ty = llvm::PointerType::get(llvm::Type::Int8Ty, 0); - llvm::Constant *rtti = llvm::Constant::getNullValue(Ptr8Ty); + llvm::Constant *Rtti = llvm::Constant::getNullValue(Ptr8Ty); if (!getContext().getLangOptions().Rtti) - return rtti; + return Rtti; llvm::SmallString<256> OutName; llvm::raw_svector_ostream Out(OutName); @@ -519,10 +517,10 @@ llvm::Constant *CodeGenFunction::GenerateRtti(const CXXRecordDecl *RD) { llvm::Constant *C; llvm::ArrayType *type = llvm::ArrayType::get(Ptr8Ty, info.size()); C = llvm::ConstantArray::get(type, info); - rtti = new llvm::GlobalVariable(CGM.getModule(), type, true, linktype, C, + Rtti = new llvm::GlobalVariable(CGM.getModule(), type, true, linktype, C, Name); - rtti = llvm::ConstantExpr::getBitCast(rtti, Ptr8Ty); - return rtti; + Rtti = llvm::ConstantExpr::getBitCast(Rtti, Ptr8Ty); + return Rtti; } llvm::Value *CodeGenFunction::GenerateVtable(const CXXRecordDecl *RD) { -- 2.40.0