Skip to content

[lld-macho] Mark local personality functions as INDIRECT_SYMBOL_LOCAL #95171

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 1 commit into from
Jun 13, 2024
Merged

[lld-macho] Mark local personality functions as INDIRECT_SYMBOL_LOCAL #95171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 4 deletions lld/MachO/SyntheticSections.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1478,11 +1478,8 @@ void IndirectSymtabSection::finalizeContents() {
}

static uint32_t indirectValue(const Symbol *sym) {
if (sym->symtabIndex == UINT32_MAX)
if (sym->symtabIndex == UINT32_MAX || !needsBinding(sym))
return INDIRECT_SYMBOL_LOCAL;
if (auto *defined = dyn_cast<Defined>(sym))
if (defined->privateExtern)
return INDIRECT_SYMBOL_LOCAL;
return sym->symtabIndex;
}

Expand Down
4 changes: 2 additions & 2 deletions lld/test/MachO/arm64-reloc-pointer-to-got.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
## POINTER_TO_GOT, we should still be able to relax this GOT_LOAD reference to
## it.
# CHECK: _main:
# CHECK-NEXT: adrp x8, [[#]] ;
# CHECK-NEXT: ldr x8, [x8] ; literal pool symbol address: _foo
# CHECK-NEXT: adrp x8, [[#]] ; 0x100004000
# CHECK-NEXT: ldr x8, [x8]
# CHECK-NEXT: ret

# CHECK: Idx Name Size VMA Type
Expand Down
22 changes: 11 additions & 11 deletions lld/test/MachO/compact-unwind-both-local-and-dylib-personality.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,16 @@
# A: Indirect symbols for (__DATA_CONST,__got) 4 entries
# A-NEXT: address index name
# A: 0x[[#%x,GXX_PERSONALITY_LO:]] [[#]] ___gxx_personality_v0
# A: 0x[[#%x,PERSONALITY_1:]] [[#]] _personality_1
# A: 0x[[#%x,PERSONALITY_2:]] [[#]] _personality_2
# A: 0x[[#%x,GXX_PERSONALITY_HI:]] [[#]] ___gxx_personality_v0
# A: 0x[[#%x,PERSONALITY_1:]] LOCAL
# A: 0x[[#%x,PERSONALITY_2:]] LOCAL
# A: 0x[[#%x,GXX_PERSONALITY_HI:]] LOCAL

# BC: Indirect symbols for (__DATA_CONST,__got)
# BC-NEXT: address index name
# BC: 0x[[#%x,GXX_PERSONALITY_LO:]] LOCAL
# C: 0x[[#%x,GXX_PERSONALITY_HI:]] [[#]] ___gxx_personality_v0
# BC: 0x[[#%x,PERSONALITY_1:]] [[#]] _personality_1
# BC: 0x[[#%x,PERSONALITY_2:]] [[#]] _personality_2
# C: 0x[[#%x,GXX_PERSONALITY_HI:]] LOCAL
# BC: 0x[[#%x,PERSONALITY_1:]] LOCAL
# BC: 0x[[#%x,PERSONALITY_2:]] LOCAL
# BC-EMPTY:

# CHECK: Personality functions: (count = 3)
Expand All @@ -70,11 +70,11 @@
# D: Indirect symbols for (__DATA_CONST,__got) 6 entries
# D-NEXT: address index name
# D: 0x[[#%x,GXX_PERSONALITY_HI:]] [[#]] ___gxx_personality_v0
# D: 0x[[#%x,PERSONALITY_1:]] [[#]] _personality_1
# D: 0x[[#%x,PERSONALITY_2:]] [[#]] _personality_2
# D: 0x[[#%x,PERSONALITY_3:]] [[#]] _personality_3
# D: 0x[[#%x,PERSONALITY_4:]] [[#]] _personality_4
# D: 0x[[#%x,GXX_PERSONALITY_LO:]] [[#]] ___gxx_personality_v0
# D: 0x[[#%x,PERSONALITY_1:]] LOCAL
# D: 0x[[#%x,PERSONALITY_2:]] LOCAL
# D: 0x[[#%x,PERSONALITY_3:]] LOCAL
# D: 0x[[#%x,PERSONALITY_4:]] LOCAL
# D: 0x[[#%x,GXX_PERSONALITY_LO:]] LOCAL

# D: Contents of __unwind_info section:
# D: Personality functions: (count = 1)
Expand Down
4 changes: 2 additions & 2 deletions lld/test/MachO/compact-unwind.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@
# FIRST: Indirect symbols for (__DATA_CONST,__got)
# FIRST-NEXT: address index name
# FIRST-DAG: 0x[[#%x,GXX_PERSONALITY:]] [[#]] ___gxx_personality_v0
# FIRST-DAG: 0x[[#%x,MY_PERSONALITY:]]
# FIRST-DAG: 0x[[#%x,MY_PERSONALITY:]] LOCAL

# SECOND: Indirect symbols for (__DATA_CONST,__got)
# SECOND-NEXT: address index name
# SECOND-DAG: 0x[[#%x,GXX_PERSONALITY:]] [[#]] ___gxx_personality_v0
# SECOND-DAG: 0x[[#%x,MY_PERSONALITY:]] [[#]] _my_personality
# SECOND-DAG: 0x[[#%x,MY_PERSONALITY:]] LOCAL

# CHECK: SYMBOL TABLE:
# CHECK-DAG: [[#%x,MAIN:]] g F __TEXT,__text _main
Expand Down
2 changes: 1 addition & 1 deletion lld/test/MachO/dead-strip.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# EXEC-DAG: g {{.*}} __mh_execute_header
# EXECDATA-LABEL: Indirect symbols
# EXECDATA-NEXT: name
# EXECDATA-NEXT: _ref_com
# EXECDATA-NEXT: LOCAL
# EXECDATA-LABEL: Contents of (__DATA,__ref_section) section
# EXECDATA-NEXT: 04 00 00 00 00 00 00 00 05 00 00 00 00 00 00 00
# EXECDATA-LABEL: Exports trie:
Expand Down
6 changes: 3 additions & 3 deletions lld/test/MachO/invalid/compact-unwind-personalities.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# DWARF: Indirect symbols
# DWARF: address index name
# DWARF: 0x[[#%x,GXX_PERSONALITY:]] {{.*}} ___gxx_personality_v0
# DWARF: 0x[[#%x,PERSONALITY_1:]] {{.*}} _personality_1
# DWARF: 0x[[#%x,PERSONALITY_2:]] {{.*}} _personality_2
# DWARF: 0x[[#%x,PERSONALITY_3:]] {{.*}} _personality_3
# DWARF: 0x[[#%x,PERSONALITY_1:]] LOCAL
# DWARF: 0x[[#%x,PERSONALITY_2:]] LOCAL
# DWARF: 0x[[#%x,PERSONALITY_3:]] LOCAL
# DWARF: .eh_frame contents:
# DWARF: Personality Address: [[#%.16x,GXX_PERSONALITY]]
# DWARF: Personality Address: [[#%.16x,PERSONALITY_1]]
Expand Down