maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Reapply 51c705fbe5, "[JITLink] Include LinkGraph name in...", with fixes. 

Original commit reverted in 976de7130b due to test
failures. This commit includes fixes for the tests.
This commit is contained in:
Lang Hames 2022-07-09 09:12:19 -07:00
parent b17754bcaa
commit 3a7986f573
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
View File

@ -33,7 +33,7 @@ Error EHFrameEdgeFixer::operator()(LinkGraph &G) {
if (!EHFrame) { if (!EHFrame) {
LLVM_DEBUG({ LLVM_DEBUG({
dbgs() << "EHFrameEdgeFixer: No " << EHFrameSectionName dbgs() << "EHFrameEdgeFixer: No " << EHFrameSectionName
<< " section. Nothing to do\n"; << " section in \"" << G.getName() << "\". Nothing to do.\n";
}); });
return Error::success(); return Error::success();
} }
@ -44,7 +44,8 @@ Error EHFrameEdgeFixer::operator()(LinkGraph &G) {
"EHFrameEdgeFixer only supports 32 and 64 bit targets"); "EHFrameEdgeFixer only supports 32 and 64 bit targets");
LLVM_DEBUG({ LLVM_DEBUG({
dbgs() << "EHFrameEdgeFixer: Processing " << EHFrameSectionName << "...\n"; dbgs() << "EHFrameEdgeFixer: Processing " << EHFrameSectionName << " in \""
<< G.getName() << "\"...\n";
}); });
ParseContext PC(G); ParseContext PC(G);

4
llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s
View File

@ -11,7 +11,7 @@
# CHECK: Extracted {{.*}} section = .eh_frame # CHECK: Extracted {{.*}} section = .eh_frame
# CHECK: Processing CFI record at # CHECK: Processing CFI record at
# CHECK: Extracted {{.*}} section = .eh_frame # CHECK: Extracted {{.*}} section = .eh_frame
# CHECK: EHFrameEdgeFixer: Processing .eh_frame... # CHECK: EHFrameEdgeFixer: Processing .eh_frame in "{{.*}}"...
# CHECK: Processing block at # CHECK: Processing block at
# CHECK: Processing CFI record at # CHECK: Processing CFI record at
# CHECK: Record is CIE # CHECK: Record is CIE
@ -77,4 +77,4 @@ dup:
bl __cxa_throw bl __cxa_throw
.dup_end: .dup_end:
.size dup, .dup_end-dup .size dup, .dup_end-dup
.cfi_endproc .cfi_endproc

2
llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s
View File

@ -11,7 +11,7 @@
# CHECK: Extracted {{.*}} section = __TEXT,__eh_frame # CHECK: Extracted {{.*}} section = __TEXT,__eh_frame
# CHECK: Processing CFI record at # CHECK: Processing CFI record at
# CHECK: Extracted {{.*}} section = __TEXT,__eh_frame # CHECK: Extracted {{.*}} section = __TEXT,__eh_frame
# CHECK: EHFrameEdgeFixer: Processing __TEXT,__eh_frame... # CHECK: EHFrameEdgeFixer: Processing __TEXT,__eh_frame in "{{.*}}"...
# CHECK: Processing block at # CHECK: Processing block at
# CHECK: Processing CFI record at # CHECK: Processing CFI record at
# CHECK: Record is CIE # CHECK: Record is CIE