Skip to content

[PowerPC] Function descriptor symbol can be omitted for external symbol. #97526

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.

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
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 2 deletions llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2325,8 +2325,10 @@ bool AsmPrinter::doFinalization(Module &M) {
// Emit linkage for the function entry point.
emitLinkage(&F, FnEntryPointSym);

// Emit linkage for the function descriptor.
emitLinkage(&F, Name);
// If address is taken from an extern function, we need to emit linkage for
// its function descriptor symbol.
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: we can change the comment a little bit here like "if function's address is taken, means it may be called via a function pointer, we need the function descriptor for it."

if (F.hasAddressTaken())
emitLinkage(&F, Name);
}

// Emit the remarks section contents.
Expand Down
16 changes: 0 additions & 16 deletions llvm/test/CodeGen/PowerPC/aix-available-externally-linkage-fun.ll
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ entry:
}

; CHECK: .extern .foo[PR]
; CHECK: .extern foo[DS]

; OBJ: Name: .foo
; OBJ-NEXT: Value (RelocatableAddress): 0x0
Expand All @@ -34,18 +33,3 @@ entry:
; OBJ-NEXT: SymbolAlignmentLog2: 0
; OBJ-NEXT: SymbolType: XTY_ER (0x0)
; OBJ-NEXT: StorageMappingClass: XMC_PR (0x0)

; OBJ: Name: foo
; OBJ-NEXT: Value (RelocatableAddress): 0x0
; OBJ-NEXT: Section: N_UNDEF
; OBJ-NEXT: Type: 0x0
; OBJ-NEXT: StorageClass: C_EXT (0x2)
; OBJ-NEXT: NumberOfAuxEntries: 1
; OBJ-NEXT: CSECT Auxiliary Entry {
; OBJ-NEXT: Index: [[#NFA+4]]
; OBJ-NEXT: SectionLen: 0
; OBJ-NEXT: ParameterHashIndex: 0x0
; OBJ-NEXT: TypeChkSectNum: 0x0
; OBJ-NEXT: SymbolAlignmentLog2: 0
; OBJ-NEXT: SymbolType: XTY_ER (0x0)
; OBJ-NEXT: StorageMappingClass: XMC_DS (0xA)
56 changes: 17 additions & 39 deletions llvm/test/CodeGen/PowerPC/aix-extern-weak.ll
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ declare extern_weak void @foo_ext_weak(ptr)
; COMMON-NEXT: .weak .foo_ext_weak_ref[PR]
; COMMON-NEXT: .weak foo_ext_weak_ref[DS]
; COMMON-NEXT: .weak .foo_ext_weak[PR]
; COMMON-NEXT: .weak foo_ext_weak[DS]
; COMMON-NEXT: .toc
; COMMON-NEXT: L..C0:
; COMMON-NEXT: .tc foo_ext_weak_p[TC],foo_ext_weak_p
Expand Down Expand Up @@ -159,35 +158,14 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+8]]
; CHECKSYM-NEXT: Name: foo_ext_weak
; CHECKSYM-NEXT: Value (RelocatableAddress): 0x0
; CHECKSYM-NEXT: Section: N_UNDEF
; CHECKSYM-NEXT: Type: 0x0
; CHECKSYM-NEXT: StorageClass: C_WEAKEXT (0x6F)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+9]]
; CHECKSYM-NEXT: SectionLen: 0
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
; CHECKSYM-NEXT: TypeChkSectNum: 0x0
; CHECKSYM-NEXT: SymbolAlignmentLog2: 0
; CHECKSYM-NEXT: SymbolType: XTY_ER (0x0)
; CHECKSYM-NEXT: StorageMappingClass: XMC_DS (0xA)
; CHECKSYM32-NEXT: StabInfoIndex: 0x0
; CHECKSYM32-NEXT: StabSectNum: 0x0
; CHECKSYM64-NEXT: Auxiliary Type: AUX_CSECT (0xFB)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+10]]
; CHECKSYM-NEXT: Name:
; CHECKSYM-NEXT: Value (RelocatableAddress): 0x0
; CHECKSYM-NEXT: Section: .text
; CHECKSYM-NEXT: Type: 0x0
; CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+11]]
; CHECKSYM-NEXT: Index: [[#Index+9]]
; CHECKSYM-NEXT: SectionLen: 80
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
; CHECKSYM-NEXT: TypeChkSectNum: 0x0
Expand All @@ -200,16 +178,16 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+12]]
; CHECKSYM-NEXT: Index: [[#Index+10]]
; CHECKSYM-NEXT: Name: .main
; CHECKSYM-NEXT: Value (RelocatableAddress): 0x0
; CHECKSYM-NEXT: Section: .text
; CHECKSYM-NEXT: Type: 0x0
; CHECKSYM-NEXT: StorageClass: C_EXT (0x2)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+13]]
; CHECKSYM-NEXT: ContainingCsectSymbolIndex: [[#Index+10]]
; CHECKSYM-NEXT: Index: [[#Index+11]]
; CHECKSYM-NEXT: ContainingCsectSymbolIndex: [[#Index+8]]
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
; CHECKSYM-NEXT: TypeChkSectNum: 0x0
; CHECKSYM-NEXT: SymbolAlignmentLog2: 0
Expand All @@ -221,15 +199,15 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+14]]
; CHECKSYM-NEXT: Index: [[#Index+12]]
; CHECKSYM-NEXT: Name: .data
; CHECKSYM-NEXT: Value (RelocatableAddress): 0x50
; CHECKSYM-NEXT: Section: .data
; CHECKSYM-NEXT: Type: 0x0
; CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+15]]
; CHECKSYM-NEXT: Index: [[#Index+13]]
; CHECKSYM32-NEXT: SectionLen: 4
; CHECKSYM64-NEXT: SectionLen: 8
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
Expand All @@ -244,16 +222,16 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+16]]
; CHECKSYM-NEXT: Index: [[#Index+14]]
; CHECKSYM-NEXT: Name: foo_ext_weak_p
; CHECKSYM-NEXT: Value (RelocatableAddress): 0x50
; CHECKSYM-NEXT: Section: .data
; CHECKSYM-NEXT: Type: 0x0
; CHECKSYM-NEXT: StorageClass: C_EXT (0x2)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+17]]
; CHECKSYM-NEXT: ContainingCsectSymbolIndex: [[#Index+14]]
; CHECKSYM-NEXT: Index: [[#Index+15]]
; CHECKSYM-NEXT: ContainingCsectSymbolIndex: [[#Index+12]]
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
; CHECKSYM-NEXT: TypeChkSectNum: 0x0
; CHECKSYM-NEXT: SymbolAlignmentLog2: 0
Expand All @@ -265,7 +243,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+18]]
; CHECKSYM-NEXT: Index: [[#Index+16]]
; CHECKSYM-NEXT: Name: main
; CHECKSYM32-NEXT: Value (RelocatableAddress): 0x54
; CHECKSYM64-NEXT: Value (RelocatableAddress): 0x58
Expand All @@ -274,7 +252,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: StorageClass: C_EXT (0x2)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+19]]
; CHECKSYM-NEXT: Index: [[#Index+17]]
; CHECKSYM32-NEXT: SectionLen: 12
; CHECKSYM64-NEXT: SectionLen: 24
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
Expand All @@ -289,7 +267,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+20]]
; CHECKSYM-NEXT: Index: [[#Index+18]]
; CHECKSYM-NEXT: Name: TOC
; CHECKSYM32-NEXT: Value (RelocatableAddress): 0x60
; CHECKSYM64-NEXT: Value (RelocatableAddress): 0x70
Expand All @@ -298,7 +276,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+21]]
; CHECKSYM-NEXT: Index: [[#Index+19]]
; CHECKSYM-NEXT: SectionLen: 0
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
; CHECKSYM-NEXT: TypeChkSectNum: 0x0
Expand All @@ -311,7 +289,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+22]]
; CHECKSYM-NEXT: Index: [[#Index+20]]
; CHECKSYM-NEXT: Name: foo_ext_weak_p
; CHECKSYM32-NEXT: Value (RelocatableAddress): 0x60
; CHECKSYM64-NEXT: Value (RelocatableAddress): 0x70
Expand All @@ -320,7 +298,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+23]]
; CHECKSYM-NEXT: Index: [[#Index+21]]
; CHECKSYM32-NEXT: SectionLen: 4
; CHECKSYM64-NEXT: SectionLen: 8
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
Expand All @@ -335,7 +313,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: }
; CHECKSYM-NEXT: Symbol {
; CHECKSYM-NEXT: Index: [[#Index+24]]
; CHECKSYM-NEXT: Index: [[#Index+22]]
; CHECKSYM-NEXT: Name: b_w
; CHECKSYM32-NEXT: Value (RelocatableAddress): 0x64
; CHECKSYM64-NEXT: Value (RelocatableAddress): 0x78
Expand All @@ -344,7 +322,7 @@ declare extern_weak void @foo_ext_weak(ptr)
; CHECKSYM-NEXT: StorageClass: C_HIDEXT (0x6B)
; CHECKSYM-NEXT: NumberOfAuxEntries: 1
; CHECKSYM-NEXT: CSECT Auxiliary Entry {
; CHECKSYM-NEXT: Index: [[#Index+25]]
; CHECKSYM-NEXT: Index: [[#Index+23]]
; CHECKSYM32-NEXT: SectionLen: 4
; CHECKSYM64-NEXT: SectionLen: 8
; CHECKSYM-NEXT: ParameterHashIndex: 0x0
Expand Down
Loading
Loading