Skip to content

[KeyInstr][Clang] Copy ctor/assignment operator source atoms #144346

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 3 commits into from
Jun 30, 2025
Merged

[KeyInstr][Clang] Copy ctor/assignment operator source atoms #144346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c40d7
[KeyInstr][Clang] Memcopyable members init - store
OCHyams Jun 16, 2025
c21aa94
[KeyInstr][Clang] Memcopyable members init - memcpy
OCHyams Jun 16, 2025
79a8bb1
copy operator and shuffle AApplyAtomGroup around for symmetry
OCHyams Jun 17, 2025
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
9 changes: 7 additions & 2 deletions clang/lib/CodeGen/CGClass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,6 +627,7 @@ static void EmitMemberInitializer(CodeGenFunction &CGF,
CXXCtorInitializer *MemberInit,
const CXXConstructorDecl *Constructor,
FunctionArgList &Args) {
ApplyAtomGroup Grp(CGF.getDebugInfo());
ApplyDebugLocation Loc(CGF, MemberInit->getSourceLocation());
assert(MemberInit->isAnyMemberInitializer() &&
"Must have member initializer!");
Expand Down Expand Up @@ -1000,7 +1001,8 @@ namespace {
void emitMemcpyIR(Address DestPtr, Address SrcPtr, CharUnits Size) {
DestPtr = DestPtr.withElementType(CGF.Int8Ty);
SrcPtr = SrcPtr.withElementType(CGF.Int8Ty);
CGF.Builder.CreateMemCpy(DestPtr, SrcPtr, Size.getQuantity());
auto *I = CGF.Builder.CreateMemCpy(DestPtr, SrcPtr, Size.getQuantity());
CGF.addInstToCurrentSourceAtom(I, nullptr);
}

void addInitialField(FieldDecl *F) {
Expand Down Expand Up @@ -1113,6 +1115,7 @@ namespace {
}

pushEHDestructors();
ApplyAtomGroup Grp(CGF.getDebugInfo());
emitMemcpy();
AggregatedInits.clear();
}
Expand Down Expand Up @@ -1248,6 +1251,7 @@ namespace {
reset();
}

ApplyAtomGroup Grp(CGF.getDebugInfo());
emitMemcpy();
AggregatedStmts.clear();
}
Expand Down Expand Up @@ -1338,9 +1342,9 @@ void CodeGenFunction::EmitCtorPrologue(const CXXConstructorDecl *CD,
assert(!Member->isBaseInitializer());
assert(Member->isAnyMemberInitializer() &&
"Delegating initializer on non-delegating constructor");
ApplyAtomGroup Grp(getDebugInfo());
CM.addMemberInitializer(Member);
}

CM.finish();
}

Expand Down Expand Up @@ -1563,6 +1567,7 @@ void CodeGenFunction::emitImplicitAssignmentOperatorBody(FunctionArgList &Args)
AssignmentMemcpyizer AM(*this, AssignOp, Args);
for (auto *I : RootCS->body())
AM.emitAssignment(I);

AM.finish();
}

Expand Down
59 changes: 59 additions & 0 deletions clang/test/DebugInfo/KeyInstructions/init-member-memcopyable-2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions %s -gno-column-info -debug-info-kind=line-tables-only -emit-llvm -o - \
// RUN: | FileCheck %s

// g::h and i can be memcpy'd, check the assignment gets Key Instructions metadata.

struct e {
e(e &);
e& operator=(const e&);
};

struct g {
e f;
int h;
int i;
};

// Copy assignment operator.
// CHECK: define{{.*}}ptr @_ZN1gaSERKS_
Copy link
Member

Choose a reason for hiding this comment

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

This'll trip on Windows machines IMO, there's a %clang_cc1 macro that ensures you're targetting an Itanium ABI I think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Isn't that already covered by -triple x86_64-linux-gnu? Happy to change it to %itanium_abi_triple if you think that's better?

Copy link
Member

Choose a reason for hiding this comment

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

Ah, yeah missed that sorry.

// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 8
// CHECK-NEXT: %.addr = alloca ptr, align 8
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 8
// CHECK-NEXT: store ptr %0, ptr %.addr, align 8
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 8
// CHECK-NEXT: %1 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %call = call {{.*}}ptr @_ZN1eaSERKS_(ptr {{.*}}%this1, ptr {{.*}}%1)
// CHECK-NEXT: %h = getelementptr inbounds nuw %struct.g, ptr %this1, i32 0, i32 1
// CHECK-NEXT: %2 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %h2 = getelementptr inbounds nuw %struct.g, ptr %2, i32 0, i32 1
// CHECK-NEXT: call void @llvm.memcpy{{.*}}(ptr align 4 %h, ptr align 4 %h2, i64 8, i1 false), !dbg [[S1_G1R1:!.*]]
// CHECK-NEXT: ret ptr %this1, !dbg

// Copy ctor.
// CHECK: define{{.*}}void @_ZN1gC2ERS_
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 8
// CHECK-NEXT: %.addr = alloca ptr, align 8
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 8
// CHECK-NEXT: store ptr %0, ptr %.addr, align 8
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 8
// CHECK-NEXT: %1 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: call void @_ZN1eC1ERS_
// CHECK-NEXT: %h = getelementptr inbounds nuw %struct.g, ptr %this1, i32 0, i32 1
// CHECK-NEXT: %2 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %h2 = getelementptr inbounds nuw %struct.g, ptr %2, i32 0, i32 1
// CHECK-NEXT: call void @llvm.memcpy{{.*}}(ptr align 4 %h, ptr align 4 %h2, i64 8, i1 false), !dbg [[S2_G1R1:!.*]]
// CHECK-NEXT: ret void, !dbg

// CHECK: [[S1:!.*]] = distinct !DISubprogram(name: "operator=",
// CHECK: [[S1_G1R1]] = !DILocation(line: 11, scope: [[S1]], atomGroup: 1, atomRank: 1)

// CHECK: [[S2:!.*]] = distinct !DISubprogram(name: "g",
// CHECK: [[S2_G1R1]] = !DILocation(line: 11, scope: [[S2]], atomGroup: 1, atomRank: 1)

[[gnu::nodebug]]
void fun(g *x) {
g y = g(*x);
y = *x;
}
62 changes: 62 additions & 0 deletions clang/test/DebugInfo/KeyInstructions/init-member-memcopyable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// RUN: %clang_cc1 -triple x86_64-linux-gnu -gkey-instructions %s -gno-column-info -debug-info-kind=line-tables-only -emit-llvm -o - \
// RUN: | FileCheck %s

// g::h can be memcpy'd (in this case emitted as load/stored), check the
// assignment gets Key Instructions metadata.

struct e {
e(e&);
e& operator=(const e&);
};

struct g {
e f;
int h;
};

// Copy assignment operator.
// CHECK: define{{.*}}ptr @_ZN1gaSERKS_
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 8
// CHECK-NEXT: %.addr = alloca ptr, align 8
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 8
// CHECK-NEXT: store ptr %0, ptr %.addr, align 8
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 8
// CHECK-NEXT: %1 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %call = call {{.*}}ptr @_ZN1eaSERKS_(ptr {{.*}}%this1, ptr {{.*}}%1)
// CHECK-NEXT: %2 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %h = getelementptr inbounds nuw %struct.g, ptr %2, i32 0, i32 1
// CHECK-NEXT: %3 = load i32, ptr %h, align 4, !dbg [[S1_G1R2:!.*]]
// CHECK-NEXT: %h2 = getelementptr inbounds nuw %struct.g, ptr %this1, i32 0, i32 1
// CHECK-NEXT: store i32 %3, ptr %h2, align 4, !dbg [[S1_G1R1:!.*]]
// CHECK-NEXT: ret ptr %this1, !dbg

// Copy ctor.
// CHECK: define{{.*}}void @_ZN1gC2ERS_
// CHECK-NEXT: entry:
// CHECK-NEXT: %this.addr = alloca ptr, align 8
// CHECK-NEXT: %.addr = alloca ptr, align 8
// CHECK-NEXT: store ptr %this, ptr %this.addr, align 8
// CHECK-NEXT: store ptr %0, ptr %.addr, align 8
// CHECK-NEXT: %this1 = load ptr, ptr %this.addr, align 8
// CHECK-NEXT: %1 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: call void @_ZN1eC1ERS_
// CHECK-NEXT: %h = getelementptr inbounds nuw %struct.g, ptr %this1, i32 0, i32 1
// CHECK-NEXT: %2 = load ptr, ptr %.addr, align 8
// CHECK-NEXT: %h2 = getelementptr inbounds nuw %struct.g, ptr %2, i32 0, i32 1
// CHECK-NEXT: %3 = load i32, ptr %h2, align 4, !dbg [[S2_G1R2:!.*]]
// CHECK-NEXT: store i32 %3, ptr %h, align 4, !dbg [[S2_G1R1:!.*]]
// CHECK-NEXT: ret void, !dbg

// CHECK: [[S1:!.*]] = distinct !DISubprogram(name: "operator=",
// CHECK: [[S1_G1R2]] = !DILocation(line: 12, scope: [[S1]], atomGroup: 1, atomRank: 2)
// CHECK: [[S1_G1R1]] = !DILocation(line: 12, scope: [[S1]], atomGroup: 1, atomRank: 1)

// CHECK: [[S2:!.*]] = distinct !DISubprogram(name: "g",
// CHECK: [[S2_G1R2]] = !DILocation(line: 12, scope: [[S2]], atomGroup: 1, atomRank: 2)
// CHECK: [[S2_G1R1]] = !DILocation(line: 12, scope: [[S2]], atomGroup: 1, atomRank: 1)

void fun(g *x) {
g y = g(*x);
y = *x;
}
Loading