Skip to content

Fix typeinfo types #369

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
DutChen18 wants to merge 4 commits into from
Closed

Fix typeinfo types #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ba28c
Rename GetClassTypeInfoType to GetTypeInfoType
DutChen18 Jun 3, 2026
9a9d8fb
Change return type of GetTypeInfoType to StructType
DutChen18 Jun 3, 2026
1812f5e
CodeGen: Fixed type info types
DutChen18 Jun 3, 2026
90b0fec
fixup! CodeGen: Fixed type info types
DutChen18 Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 42 additions & 8 deletions clang/lib/CodeGen/CGVTables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -849,7 +849,7 @@ void CodeGenVTables::addVTableComponent(ConstantAggregateBuilderBase &builder,
vtableHasLocalLinkage,
/*isCompleteDtor=*/false);
else
return builder.add(llvm::ConstantExpr::getBitCast(rtti, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetClassTypeInfoType()->getPointerTo()));
return builder.add(llvm::ConstantExpr::getBitCast(rtti, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetTypeInfoType()->getPointerTo()));

case VTableComponent::CK_FunctionPointer:
case VTableComponent::CK_CompleteDtorPointer:
Expand Down Expand Up @@ -1530,7 +1530,7 @@ llvm::Type* CodeGenTypes::GetVTableSubObjectType(CodeGenModule& CGM,
VTableTypes.push_back(OffsetTy);
break;
case VTableComponent::CK_RTTI:
VTableTypes.push_back(CGM.getTypes().GetClassTypeInfoType()->getPointerTo());
VTableTypes.push_back(CGM.getTypes().GetTypeInfoType()->getPointerTo());
break;
case VTableComponent::CK_FunctionPointer:
case VTableComponent::CK_CompleteDtorPointer:
Expand Down Expand Up @@ -1581,7 +1581,7 @@ llvm::Type* CodeGenTypes::GetBasicVTableType(uint32_t virtualMethodsCount, bool
}

// RTTI
VTableTypes.push_back(GetClassTypeInfoType()->getPointerTo());
VTableTypes.push_back(GetTypeInfoType()->getPointerTo());

// Virtual functions
for(uint32_t j=0;j<virtualMethodsCount;j++)
Expand All @@ -1590,10 +1590,44 @@ llvm::Type* CodeGenTypes::GetBasicVTableType(uint32_t virtualMethodsCount, bool
return llvm::StructType::get(getLLVMContext(), VTableTypes, false, cast<llvm::StructType>(GetVTableBaseType(asmjs)), /*isByteLayout*/false, asmjs);
}

llvm::Type* CodeGenTypes::GetClassTypeInfoType()
static llvm::StructType* GetOrCreateStructType(llvm::LLVMContext& Context, StringRef Name)
{
llvm::Type* ResultType = llvm::StructType::getTypeByName(CGM.getLLVMContext(), "class._ZSt9type_info");
if(!ResultType)
ResultType = llvm::StructType::create(CGM.getLLVMContext(),"class._ZSt9type_info");
return ResultType;
if (llvm::StructType* Result = llvm::StructType::getTypeByName(Context, Name))
return Result;
return llvm::StructType::create(Context, Name);
}

llvm::StructType* CodeGenTypes::GetTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZSt9type_info");
}

llvm::StructType* CodeGenTypes::GetClassTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZN10__cxxabiv117__class_type_infoE");
}

llvm::StructType* CodeGenTypes::GetBaseClassTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "struct._ZN10__cxxabiv122__base_class_type_infoE");
}

llvm::StructType* CodeGenTypes::GetSIClassTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZN10__cxxabiv120__si_class_type_infoE");
}

llvm::StructType* CodeGenTypes::GetVMIClassTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZN10__cxxabiv121__vmi_class_type_infoE");
}

llvm::StructType* CodeGenTypes::GetPointerTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZN10__cxxabiv119__pointer_type_infoE");
}

llvm::StructType* CodeGenTypes::GetPointerToMemberTypeInfoType()
{
return GetOrCreateStructType(CGM.getLLVMContext(), "class._ZN10__cxxabiv129__pointer_to_member_type_infoE");
}
8 changes: 7 additions & 1 deletion clang/lib/CodeGen/CodeGenTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,13 @@ class CodeGenTypes {
uint32_t extraOffsets,
bool asmjs);

llvm::Type* GetClassTypeInfoType();
llvm::StructType* GetTypeInfoType();
llvm::StructType* GetClassTypeInfoType();
llvm::StructType* GetBaseClassTypeInfoType();
llvm::StructType* GetSIClassTypeInfoType();
llvm::StructType* GetVMIClassTypeInfoType();
llvm::StructType* GetPointerTypeInfoType();
llvm::StructType* GetPointerToMemberTypeInfoType();

const CGRecordLayout &getCGRecordLayout(const RecordDecl*);

Expand Down
31 changes: 19 additions & 12 deletions clang/lib/CodeGen/ItaniumCXXABI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1494,7 +1494,7 @@ static llvm::FunctionCallee getItaniumDynamicCastFn(CodeGenFunction &CGF, bool a
llvm::FunctionType *FTy = NULL;
llvm::StringRef FName;
if(!CGF.getTarget().isByteAddressable()) {
llvm::Type* classTypeInfoPtr = CGF.getTypes().GetClassTypeInfoType()->getPointerTo();
llvm::Type* classTypeInfoPtr = CGF.getTypes().GetTypeInfoType()->getPointerTo();
llvm::Type *Args[5] = { PtrDiffTy, CGF.getTypes().GetVTableBaseType(asmjs)->getPointerTo(), classTypeInfoPtr, classTypeInfoPtr, PtrDiffTy };
FTy = llvm::FunctionType::get(PtrDiffTy, Args, false);
FName = asmjs? "__dynamic_cast_asmjs" : "__dynamic_cast_genericjs";
Expand Down Expand Up @@ -3589,7 +3589,7 @@ ItaniumRTTIBuilder::GetAddrOfExternalRTTIDescriptor(QualType Ty) {
}
}

return llvm::ConstantExpr::getBitCast(GV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetClassTypeInfoType()->getPointerTo());
return llvm::ConstantExpr::getBitCast(GV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetTypeInfoType()->getPointerTo());
}

/// TypeInfoIsInStandardLibrary - Given a builtin type, returns whether the type
Expand Down Expand Up @@ -4072,7 +4072,7 @@ llvm::Constant *ItaniumRTTIBuilder::BuildTypeInfo(QualType Ty) {
assert(!OldGV->hasAvailableExternallyLinkage() &&
"available_externally typeinfos not yet implemented");

return llvm::ConstantExpr::getBitCast(OldGV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetClassTypeInfoType()->getPointerTo());
return llvm::ConstantExpr::getBitCast(OldGV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetTypeInfoType()->getPointerTo());
}

// Check if there is already an external RTTI descriptor for this type.
Expand Down Expand Up @@ -4142,6 +4142,7 @@ llvm::Constant *ItaniumRTTIBuilder::BuildTypeInfo(

// CHEERP: for the cheerp-wasm target, we put the RTTI in the asmjs section
bool asmjs = CGM.getContext().getTargetInfo().getTriple().isCheerpWasm();
llvm::StructType *TypeInfoType = CGM.getTypes().GetTypeInfoType();

switch (Ty->getTypeClass()) {
#define TYPE(Class, Base)
Expand Down Expand Up @@ -4203,10 +4204,13 @@ llvm::Constant *ItaniumRTTIBuilder::BuildTypeInfo(
break;
}

if (CanUseSingleInheritance(RD))
if (CanUseSingleInheritance(RD)) {
BuildSIClassTypeInfo(RD);
else
TypeInfoType = CGM.getTypes().GetSIClassTypeInfoType();
} else {
BuildVMIClassTypeInfo(RD);
TypeInfoType = CGM.getTypes().GetVMIClassTypeInfoType();
}

break;
}
Expand All @@ -4218,23 +4222,26 @@ llvm::Constant *ItaniumRTTIBuilder::BuildTypeInfo(

case Type::ObjCObjectPointer:
BuildPointerTypeInfo(cast<ObjCObjectPointerType>(Ty)->getPointeeType());
TypeInfoType = CGM.getTypes().GetPointerTypeInfoType();
break;

case Type::Pointer:
BuildPointerTypeInfo(cast<PointerType>(Ty)->getPointeeType());
TypeInfoType = CGM.getTypes().GetPointerTypeInfoType();
break;

case Type::MemberPointer:
BuildPointerToMemberTypeInfo(cast<MemberPointerType>(Ty));
TypeInfoType = CGM.getTypes().GetPointerToMemberTypeInfoType();
break;

case Type::Atomic:
// No fields, at least for the moment.
break;
}

llvm::Type* directBase = CGM.getTarget().isByteAddressable() ? NULL : CGM.getTypes().GetClassTypeInfoType();
llvm::Constant *Init = llvm::ConstantStruct::getAnon(Fields, false, directBase ? cast<llvm::StructType>(directBase) : NULL, asmjs);
llvm::StructType* directBase = CGM.getTarget().isByteAddressable() ? NULL : TypeInfoType;
llvm::Constant *Init = llvm::ConstantStruct::getAnon(Fields, false, directBase ? directBase : NULL, asmjs);

SmallString<256> Name;
llvm::raw_svector_ostream Out(Name);
Expand Down Expand Up @@ -4307,7 +4314,7 @@ llvm::Constant *ItaniumRTTIBuilder::BuildTypeInfo(
TypeName->setPartition(CGM.getCodeGenOpts().SymbolPartition);
GV->setPartition(CGM.getCodeGenOpts().SymbolPartition);

return llvm::ConstantExpr::getBitCast(GV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetClassTypeInfoType()->getPointerTo());
return llvm::ConstantExpr::getBitCast(GV, CGM.getTarget().isByteAddressable() ? CGM.Int8PtrTy : CGM.getTypes().GetTypeInfoType()->getPointerTo());
}

/// BuildObjCObjectTypeInfo - Build the appropriate kind of type_info
Expand Down Expand Up @@ -4475,7 +4482,7 @@ void ItaniumRTTIBuilder::BuildVMIClassTypeInfo(const CXXRecordDecl *RD) {
for (const auto &Base : RD->bases()) {
llvm::SmallVector<llvm::Constant*, 8> baseFields;
// The __base_type member points to the RTTI for the base type.
baseFields.push_back(ItaniumRTTIBuilder(CXXABI).BuildTypeInfo(Base.getType()));
baseFields.push_back(llvm::ConstantExpr::getBitCast(ItaniumRTTIBuilder(CXXABI).BuildTypeInfo(Base.getType()), CGM.getTypes().GetClassTypeInfoType()->getPointerTo()));

auto *BaseDecl =
cast<CXXRecordDecl>(Base.getType()->castAs<RecordType>()->getDecl());
Expand Down Expand Up @@ -4508,7 +4515,7 @@ void ItaniumRTTIBuilder::BuildVMIClassTypeInfo(const CXXRecordDecl *RD) {
OffsetFlags |= BCTI_Public;

baseFields.push_back(llvm::ConstantInt::get(OffsetFlagsLTy, OffsetFlags));
basesFields.push_back(llvm::ConstantStruct::getAnon(baseFields, false, NULL, asmjs));
basesFields.push_back(llvm::ConstantStruct::getAnon(baseFields, false, CGM.getTypes().GetBaseClassTypeInfoType(), asmjs));
}
if(!CGM.getTarget().isByteAddressable()) {
typedef std::pair<const CXXRecordDecl*, unsigned> RdUnsignedPair;
Expand All @@ -4528,15 +4535,15 @@ void ItaniumRTTIBuilder::BuildVMIClassTypeInfo(const CXXRecordDecl *RD) {
llvm::SmallVector<llvm::Constant*, 8> baseFields;
// The __base_type member points to the RTTI for the base type.
QualType VBaseTy = CGM.getContext().getCanonicalType(CGM.getContext().getTagDeclType(pair.first));
baseFields.push_back(ItaniumRTTIBuilder(CXXABI).BuildTypeInfo(VBaseTy));
baseFields.push_back(llvm::ConstantExpr::getBitCast(ItaniumRTTIBuilder(CXXABI).BuildTypeInfo(VBaseTy), CGM.getTypes().GetClassTypeInfoType()->getPointerTo()));
unsigned Offset = 0;
if (asmjs)
Offset = Layout.getVBaseClassOffset(pair.first).getQuantity();
else
Offset = CGLayout.getTotalOffsetToBase(pair.second);
baseFields.push_back(llvm::ConstantInt::get(OffsetFlagsLTy, Offset));

basesFields.push_back(llvm::ConstantStruct::getAnon(baseFields, false, NULL, asmjs));
basesFields.push_back(llvm::ConstantStruct::getAnon(baseFields, false, CGM.getTypes().GetBaseClassTypeInfoType(), asmjs));
}
}
llvm::ArrayType* basesArrayType = llvm::ArrayType::get(basesFields[0]->getType(), basesFields.size());
Expand Down
Loading