Skip to content

[Clang] Emit type metadata on vtables when IRPGO instrumentation option is on. #70841

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

Merged
merged 6 commits into from
Nov 3, 2023
Merged

[Clang] Emit type metadata on vtables when IRPGO instrumentation option is on. #70841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
99abebc
[Clang]Emit type metadata when -fprofile-generate is on
mingmingl-llvm Oct 31, 2023
5b53f31
Emit type metadata on vtables if IRPGO instrumentation or profile use is
mingmingl-llvm Nov 1, 2023
33927fa
undo the change for -fprofile-use
mingmingl-llvm Nov 1, 2023
87b8de5
modify clang/test/CodeGenCXX/type-metadata.cpp directly instead of fo…
mingmingl-llvm Nov 3, 2023
3fcf25d
a real rm of forked test in clang/test/Driver dir
mingmingl-llvm Nov 3, 2023
478e8f2
resolve comments
mingmingl-llvm Nov 3, 2023
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
5 changes: 4 additions & 1 deletion clang/lib/CodeGen/CGVTables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,7 +1312,10 @@ llvm::GlobalObject::VCallVisibility CodeGenModule::GetVCallVisibilityLevel(
void CodeGenModule::EmitVTableTypeMetadata(const CXXRecordDecl *RD,
llvm::GlobalVariable *VTable,
const VTableLayout &VTLayout) {
if (!getCodeGenOpts().LTOUnit)
// Emit type metadata on vtables with LTO or IR instrumentation.
// In IR instrumentation, the type metadata is used to find out vtable
// definitions (for type profiling) among all global variables.
if (!getCodeGenOpts().LTOUnit && !getCodeGenOpts().hasProfileIRInstr())
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a comment here and in the other file noting why it is added for IR instrumentation.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

return;

CharUnits ComponentWidth = GetTargetTypeStoreSize(getVTableComponentType());
Expand Down
6 changes: 5 additions & 1 deletion clang/lib/CodeGen/MicrosoftCXXABI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1673,7 +1673,11 @@ void MicrosoftCXXABI::EmitDestructorCall(CodeGenFunction &CGF,
void MicrosoftCXXABI::emitVTableTypeMetadata(const VPtrInfo &Info,
const CXXRecordDecl *RD,
llvm::GlobalVariable *VTable) {
if (!CGM.getCodeGenOpts().LTOUnit)
// Emit type metadata on vtables with LTO or IR instrumentation.
// In IR instrumentation, the type metadata could be used to find out vtable
// definitions (for type profiling) among all global variables.
if (!CGM.getCodeGenOpts().LTOUnit &&
!CGM.getCodeGenOpts().hasProfileIRInstr())
return;

// TODO: Should VirtualFunctionElimination also be supported here?
Expand Down
Loading