[llvm] 3a7986f - Reapply 51c705fbe5d, "[JITLink] Include LinkGraph name in...", with fixes.

[Lang Hames via llvm-commits]

Author: Lang Hames
Date: 2022-07-09T09:33:04-07:00
New Revision: 3a7986f57354e5bba5d94e0b5645a576c96cf495

URL: https://github.com/llvm/llvm-project/commit/3a7986f57354e5bba5d94e0b5645a576c96cf495
DIFF: https://github.com/llvm/llvm-project/commit/3a7986f57354e5bba5d94e0b5645a576c96cf495.diff

LOG: Reapply 51c705fbe5d, "[JITLink] Include LinkGraph name in...", with fixes.

Original commit reverted in 976de7130b338aa0d0e63255826a79347635c107 due to test
failures. This commit includes fixes for the tests.

Added: 
    

Modified: 
    llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
    llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s
    llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s

Removed: 
    


################################################################################
diff  --git a/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp b/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
index b1492cd745083..389fd14c0f29a 100644
--- a/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
+++ b/llvm/lib/ExecutionEngine/JITLink/EHFrameSupport.cpp
@@ -33,7 +33,7 @@ Error EHFrameEdgeFixer::operator()(LinkGraph &G) {
   if (!EHFrame) {
     LLVM_DEBUG({
       dbgs() << "EHFrameEdgeFixer: No " << EHFrameSectionName
-             << " section. Nothing to do\n";
+             << " section in \"" << G.getName() << "\". Nothing to do.\n";
     });
     return Error::success();
   }
@@ -44,7 +44,8 @@ Error EHFrameEdgeFixer::operator()(LinkGraph &G) {
         "EHFrameEdgeFixer only supports 32 and 64 bit targets");
 
   LLVM_DEBUG({
-    dbgs() << "EHFrameEdgeFixer: Processing " << EHFrameSectionName << "...\n";
+    dbgs() << "EHFrameEdgeFixer: Processing " << EHFrameSectionName << " in \""
+           << G.getName() << "\"...\n";
   });
 
   ParseContext PC(G);

diff  --git a/llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s b/llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s
index ff7e5a6546f6f..770cd60a1d70d 100644
--- a/llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s
+++ b/llvm/test/ExecutionEngine/JITLink/AArch64/ELF_aarch64_ehframe.s
@@ -11,7 +11,7 @@
 # CHECK:      Extracted {{.*}} section = .eh_frame
 # CHECK:    Processing CFI record at
 # CHECK:      Extracted {{.*}} section = .eh_frame
-# CHECK: EHFrameEdgeFixer: Processing .eh_frame...
+# CHECK: EHFrameEdgeFixer: Processing .eh_frame in "{{.*}}"...
 # CHECK:   Processing block at
 # CHECK:     Processing CFI record at
 # CHECK:       Record is CIE
@@ -77,4 +77,4 @@ dup:
 	bl	__cxa_throw
 .dup_end:
 	.size	dup, .dup_end-dup
-	.cfi_endproc
\ No newline at end of file
+	.cfi_endproc

diff  --git a/llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s b/llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s
index 6ae5973fb8230..5f82127628861 100644
--- a/llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s
+++ b/llvm/test/ExecutionEngine/JITLink/AArch64/MachO_arm64_ehframe.s
@@ -11,7 +11,7 @@
 # CHECK:      Extracted {{.*}} section = __TEXT,__eh_frame
 # CHECK:    Processing CFI record at
 # 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 CFI record at
 # CHECK:       Record is CIE