mangleCXXRtti obviously needs to take a type, what was I thinking...

llvm-svn: 85555
This commit is contained in:
Anders Carlsson 2009-10-30 01:26:12 +00:00
parent 6c5a8e2555
commit 430046321b
3 changed files with 19 additions and 17 deletions

View File

@ -16,32 +16,32 @@ using namespace clang;
using namespace CodeGen;
llvm::Constant *CodeGenModule::GenerateRtti(const CXXRecordDecl *RD) {
llvm::Type *Ptr8Ty;
Ptr8Ty = llvm::PointerType::get(llvm::Type::getInt8Ty(VMContext), 0);
llvm::Constant *Rtti = llvm::Constant::getNullValue(Ptr8Ty);
const llvm::Type *Int8PtrTy = llvm::Type::getInt8PtrTy(VMContext);
if (!getContext().getLangOptions().Rtti)
return Rtti;
return llvm::Constant::getNullValue(Int8PtrTy);
llvm::SmallString<256> OutName;
llvm::raw_svector_ostream Out(OutName);
mangleCXXRtti(getMangleContext(), RD, Out);
mangleCXXRtti(getMangleContext(),
Context.getTagDeclType(RD).getTypePtr(), Out);
llvm::GlobalVariable::LinkageTypes linktype;
linktype = llvm::GlobalValue::WeakAnyLinkage;
std::vector<llvm::Constant *> info;
// assert(0 && "FIXME: implement rtti descriptor");
// FIXME: descriptor
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
info.push_back(llvm::Constant::getNullValue(Int8PtrTy));
// assert(0 && "FIXME: implement rtti ts");
// FIXME: TS
info.push_back(llvm::Constant::getNullValue(Ptr8Ty));
info.push_back(llvm::Constant::getNullValue(Int8PtrTy));
llvm::Constant *C;
llvm::ArrayType *type = llvm::ArrayType::get(Ptr8Ty, info.size());
llvm::ArrayType *type = llvm::ArrayType::get(Int8PtrTy, info.size());
C = llvm::ConstantArray::get(type, info);
Rtti = new llvm::GlobalVariable(getModule(), type, true, linktype, C,
Out.str());
Rtti = llvm::ConstantExpr::getBitCast(Rtti, Ptr8Ty);
llvm::Constant *Rtti =
new llvm::GlobalVariable(getModule(), type, true, linktype, C,
Out.str());
Rtti = llvm::ConstantExpr::getBitCast(Rtti, Int8PtrTy);
return Rtti;
}

View File

@ -53,7 +53,7 @@ namespace {
void mangleCXXVtable(const CXXRecordDecl *RD);
void mangleCXXVTT(const CXXRecordDecl *RD);
void mangleCXXRtti(const CXXRecordDecl *RD);
void mangleCXXRtti(const Type *Ty);
void mangleCXXCtor(const CXXConstructorDecl *D, CXXCtorType Type);
void mangleCXXDtor(const CXXDestructorDecl *D, CXXDtorType Type);
@ -212,10 +212,12 @@ void CXXNameMangler::mangleCXXVTT(const CXXRecordDecl *RD) {
mangleName(RD);
}
void CXXNameMangler::mangleCXXRtti(const CXXRecordDecl *RD) {
void CXXNameMangler::mangleCXXRtti(const Type *Ty) {
// <special-name> ::= TI <type> # typeinfo structure
Out << "_ZTI";
mangleName(RD);
// FIXME: mangleType should probably take a const Type * instead.
mangleType(QualType(Ty, 0));
}
void CXXNameMangler::mangleGuardVariable(const VarDecl *D) {
@ -1432,10 +1434,10 @@ namespace clang {
os.flush();
}
void mangleCXXRtti(MangleContext &Context, const CXXRecordDecl *RD,
void mangleCXXRtti(MangleContext &Context, const Type *Ty,
llvm::raw_ostream &os) {
CXXNameMangler Mangler(Context, os);
Mangler.mangleCXXRtti(RD);
Mangler.mangleCXXRtti(Ty);
os.flush();
}

View File

@ -67,7 +67,7 @@ namespace clang {
llvm::raw_ostream &os);
void mangleCXXVTT(MangleContext &Context, const CXXRecordDecl *RD,
llvm::raw_ostream &os);
void mangleCXXRtti(MangleContext &Context, const CXXRecordDecl *RD,
void mangleCXXRtti(MangleContext &Context, const Type *T,
llvm::raw_ostream &os);
void mangleCXXCtor(MangleContext &Context, const CXXConstructorDecl *D,
CXXCtorType Type, llvm::raw_ostream &os);