Skip to content

[NFC][DebugInfo] Maintain RemoveDIs flag when attributor creates functions #79143

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 2 commits into from
Jan 24, 2024
Merged

[NFC][DebugInfo] Maintain RemoveDIs flag when attributor creates functions #79143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0b24ef
[NFC][DebugInfo] Maintain RemoveDIs flag when attributor creates func…
jmorse Jan 22, 2024
ef6d9b7
Fiddle with a comment
jmorse Jan 24, 2024
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
6 changes: 6 additions & 0 deletions llvm/lib/Transforms/IPO/Attributor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2738,6 +2738,8 @@ void Attributor::createShallowWrapper(Function &F) {
Function::Create(FnTy, F.getLinkage(), F.getAddressSpace(), F.getName());
F.setName(""); // set the inside function anonymous
M.getFunctionList().insert(F.getIterator(), Wrapper);
// Flag whether the function is using new-debug-info or not.
Wrapper->IsNewDbgInfoFormat = M.IsNewDbgInfoFormat;

F.setLinkage(GlobalValue::InternalLinkage);

Expand Down Expand Up @@ -2818,6 +2820,8 @@ bool Attributor::internalizeFunctions(SmallPtrSetImpl<Function *> &FnSet,
VMap[&Arg] = &(*NewFArgIt++);
}
SmallVector<ReturnInst *, 8> Returns;
// Flag whether the function is using new-debug-info or not.
Copied->IsNewDbgInfoFormat = F->IsNewDbgInfoFormat;

// Copy the body of the original function to the new one
CloneFunctionInto(Copied, F, VMap,
Expand Down Expand Up @@ -3035,6 +3039,8 @@ ChangeStatus Attributor::rewriteFunctionSignatures(
OldFn->getParent()->getFunctionList().insert(OldFn->getIterator(), NewFn);
NewFn->takeName(OldFn);
NewFn->copyAttributesFrom(OldFn);
// Flag whether the function is using new-debug-info or not.
NewFn->IsNewDbgInfoFormat = OldFn->IsNewDbgInfoFormat;

// Patch the pointer to LLVM function in debug info descriptor.
NewFn->setSubprogram(OldFn->getSubprogram());
Expand Down
4 changes: 4 additions & 0 deletions llvm/test/Transforms/Attributor/ArgumentPromotion/alignment.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,TUNIT
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s | FileCheck %s --check-prefixes=CHECK,CGSCC

;; Test with RemoveDIs debug-info mode to exercise a potential crash path.
; RUN: opt -aa-pipeline=basic-aa -passes=attributor -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s --try-experimental-debuginfo-iterators | FileCheck %s --check-prefixes=CHECK,TUNIT
; RUN: opt -aa-pipeline=basic-aa -passes=attributor-cgscc -attributor-manifest-internal -attributor-annotate-decl-cs -S < %s --try-experimental-debuginfo-iterators | FileCheck %s --check-prefixes=CHECK,CGSCC

define void @f() {
; TUNIT-LABEL: define {{[^@]+}}@f() {
; TUNIT-NEXT: entry:
Expand Down