caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[ORC][JITLink] Treat common symbols as weak definitions."

Browse Source 
This reverts commit 785d376d12 while I
investigate some bot failures (e.g.
https://lab.llvm.org/buildbot/#/builders/3/builds/1983).
This commit is contained in:
Lang Hames
2024-07-24 13:26:17 +10:00
parent 690dc4eff1
commit c49837f5f6
8 changed files with 11 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/ExecutionEngine/JITLink/COFFLinkGraphBuilder.cpp
View File

@@ -467,7 +467,7 @@ Expected<Symbol *> COFFLinkGraphBuilder::createDefinedSymbol(
return &G->addDefinedSymbol(
G->createZeroFillBlock(getCommonSection(), Symbol.getValue(),
orc::ExecutorAddr(), Symbol.getValue(), 0),
0, SymbolName, Symbol.getValue(), Linkage::Weak, Scope::Default,
0, SymbolName, Symbol.getValue(), Linkage::Strong, Scope::Default,
false, false);
}
if (Symbol.isAbsolute())

2
llvm/lib/ExecutionEngine/JITLink/ELFLinkGraphBuilder.h
View File

@@ -472,7 +472,7 @@ template <typename ELFT> Error ELFLinkGraphBuilder<ELFT>::graphifySymbols() {
Symbol &GSym = G->addDefinedSymbol(
G->createZeroFillBlock(getCommonSection(), Sym.st_size,
orc::ExecutorAddr(), Sym.getValue(), 0),
0, *Name, Sym.st_size, Linkage::Weak, Scope::Default, false, false);
0, *Name, Sym.st_size, Linkage::Strong, Scope::Default, false, false);
setGraphSymbol(SymIndex, GSym);
continue;
}

2
llvm/lib/ExecutionEngine/JITLink/MachOLinkGraphBuilder.cpp
View File

@@ -366,7 +366,7 @@ Error MachOLinkGraphBuilder::graphifyRegularSymbols() {
orc::ExecutorAddrDiff(NSym.Value),
orc::ExecutorAddr(),
1ull << MachO::GET_COMM_ALIGN(NSym.Desc), 0),
0, *NSym.Name, orc::ExecutorAddrDiff(NSym.Value), Linkage::Weak,
0, *NSym.Name, orc::ExecutorAddrDiff(NSym.Value), Linkage::Strong,
NSym.S, false, NSym.Desc & MachO::N_NO_DEAD_STRIP);
} else {
if (!NSym.Name)

22
llvm/lib/ExecutionEngine/Orc/Core.cpp
View File

@@ -932,17 +932,13 @@ Error JITDylib::resolve(MaterializationResponsibility &MR,
if (SymI->second.getFlags().hasError())
SymbolsInErrorState.insert(KV.first);
else {
auto ExpectedFlags = SymI->second.getFlags();
if (ExpectedFlags & JITSymbolFlags::Common) {
ExpectedFlags &= ~JITSymbolFlags::Common;
ExpectedFlags |= JITSymbolFlags::Weak;
}
assert(KV.second.getFlags() == ExpectedFlags &&
auto Flags = KV.second.getFlags();
Flags &= ~JITSymbolFlags::Common;
assert(Flags ==
(SymI->second.getFlags() & ~JITSymbolFlags::Common) &&
"Resolved flags should match the declared flags");
Worklist.push_back(
{SymI, {KV.second.getAddress(), SymI->second.getFlags()}});
Worklist.push_back({SymI, {KV.second.getAddress(), Flags}});
}
}
@@ -2903,12 +2899,8 @@ Error ExecutionSession::OL_notifyResolved(MaterializationResponsibility &MR,
"Resolving symbol outside this responsibility set");
assert(!I->second.hasMaterializationSideEffectsOnly() &&
"Can't resolve materialization-side-effects-only symbol");
auto ExpectedFlags = I->second;
if (ExpectedFlags & JITSymbolFlags::Common) {
ExpectedFlags &= ~JITSymbolFlags::Common;
ExpectedFlags |= JITSymbolFlags::Weak;
}
assert(KV.second.getFlags() == ExpectedFlags &&
assert((KV.second.getFlags() & ~JITSymbolFlags::Common) ==
(I->second & ~JITSymbolFlags::Common) &&
"Resolving symbol with incorrect flags");
}
#endif

10
llvm/test/ExecutionEngine/JITLink/AArch64/Inputs/MachO_common_x_and_addr_getter.s
View File

@@ -1,10 +0,0 @@
.section __TEXT,__text,regular,pure_instructions
.globl _getXAddr
.p2align 2
_getXAddr:
adrp x0, _x@GOTPAGE
ldr x0, [x0, _x@GOTPAGEOFF]
ret
.comm _x,4,2
.subsections_via_symbols

15
llvm/test/ExecutionEngine/JITLink/AArch64/Inputs/MachO_strong_x_and_addr_getter.s
View File

@@ -1,15 +0,0 @@
.section __TEXT,__text,regular,pure_instructions
.globl _getXAddr
.p2align 2
_getXAddr:
adrp x0, _x@PAGE
add x0, x0, _x@PAGEOFF
ret
.section __DATA,__data
.globl _x
.p2align 2, 0x0
_x:
.long 42
.subsections_via_symbols

33
llvm/test/ExecutionEngine/JITLink/AArch64/MachO_common_symbol_x_multiple_defs.s
View File

@@ -1,33 +0,0 @@
# RUN: rm -rf %t && mkdir -p %t
# RUN: llvm-mc -triple=arm64-apple-darwin19 -filetype=obj -o %t/main.o %s
# RUN: llvm-mc -triple=arm64-apple-darwin19 -filetype=obj -o %t/aux_common.o \
# RUN: %S/Inputs/MachO_common_x_and_addr_getter.s
# RUN: llvm-mc -triple=arm64-apple-darwin19 -filetype=obj -o %t/aux_strong.o \
# RUN: %S/Inputs/MachO_strong_x_and_addr_getter.s
# RUN: llvm-jitlink -noexec %t/main.o %t/aux_common.o
# RUN: llvm-jitlink -noexec -check=%s %t/main.o %t/aux_strong.o
#
# Check that linking multiple common definitions of the same symbol (in this
# case _x) doesn't lead to an "Unexpected definitions" error.
#
# rdar://132314264
#
# Check that strong defs override:
# jitlink-check: *{8}_x = 42
.section __TEXT,__text,regular,pure_instructions
.globl _main
.p2align 2
_main:
stp x29, x30, [sp, #-16]!
mov x29, sp
bl _getXAddr
adrp x8, _x@GOTPAGE
ldr x8, [x8, _x@GOTPAGEOFF]
cmp x0, x8
cset w0, eq
ldp x29, x30, [sp], #16
ret
.comm _x,4,2
.subsections_via_symbols

2
llvm/test/ExecutionEngine/JITLink/x86-64/COFF_common_symbol.s
View File

@@ -6,7 +6,7 @@
#
# CHECK: Creating graph symbols...
# CHECK: 7: Creating defined graph symbol for COFF symbol "var" in (common) (index: 0)
# CHECK-NEXT: 0x0 (block + 0x00000000): size: 0x00000004, linkage: weak, scope: default, dead - var
# CHECK-NEXT: 0x0 (block + 0x00000000): size: 0x00000004, linkage: strong, scope: default, dead - var
.text