[llvm] 8e1d4fc - Revert "Emit unwind information in the .debug_frame section when the .cfi_sections .debug_frame directive is used."

[Shubham Sandeep Rastogi via llvm-commits]

Author: Shubham Sandeep Rastogi
Date: 2022-12-14T16:41:00-08:00
New Revision: 8e1d4fcdc3eca80e1a09bac825a0540ba6cc0f11

URL: https://github.com/llvm/llvm-project/commit/8e1d4fcdc3eca80e1a09bac825a0540ba6cc0f11
DIFF: https://github.com/llvm/llvm-project/commit/8e1d4fcdc3eca80e1a09bac825a0540ba6cc0f11.diff

LOG: Revert "Emit unwind information in the .debug_frame section when the .cfi_sections .debug_frame directive is used."

This reverts commit 28edf3349bd1d595270c17ec73e49999175f1212.

This is because:

The Buildbot has detected a failed build on builder llvm-clang-x86_64-sie-ubuntu-fast while building llvm.

Full details are available at:
   https://lab.llvm.org/buildbot#builders/139/builds/32856

Worker for this Build: sie-linux-worker
Blamelist:
   Shubham Sandeep Rastogi <srastogi22 at apple.com>

BUILD FAILED: 40459 expected passes 83 expected failures 26251 unsupported tests 1 unexpected failures (failure)

Step 6 (test-build-unified-tree-check-all) failure: 40459 expected passes 83 expected failures 26251 unsupported tests 1 unexpected failures (failure)
******************** TEST 'LLVM :: DebugInfo/debugframeinfo.s' FAILED ********************
Script:
--
: 'RUN: at line 1';   /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/bin/llvm-mc -filetype=obj -triple=arm64-apple-darwin22.1.0 /home/buildbot/buildbot-root/llvm-project/llvm/test/DebugInfo/debugframeinfo.s -o /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/test/DebugInfo/Output/debugframeinfo.s.tmp.o
: 'RUN: at line 2';   /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/bin/llvm-dwarfdump -debug-frame /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/test/DebugInfo/Output/debugframeinfo.s.tmp.o | /home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/bin/FileCheck /home/buildbot/buildbot-root/llvm-project/llvm/test/DebugInfo/debugframeinfo.s
--
Exit Code: 1

Command Output (stderr):
--
/home/buildbot/buildbot-root/llvm-clang-x86_64-sie-ubuntu-fast/build/bin/llvm-mc: error: unable to get target for 'arm64-apple-darwin22.1.0', see --version and --triple.

Added: 
    

Modified: 
    llvm/lib/MC/MCDwarf.cpp

Removed: 
    llvm/test/DebugInfo/debugframeinfo.s


################################################################################
diff  --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp
index 7d7e790a254cf..a3ecebbfa0385 100644
--- a/llvm/lib/MC/MCDwarf.cpp
+++ b/llvm/lib/MC/MCDwarf.cpp
@@ -1860,7 +1860,7 @@ void MCDwarfFrameEmitter::Emit(MCObjectStreamer &Streamer, MCAsmBackend *MAB,
 
   // Emit the compact unwind info if available.
   bool NeedsEHFrameSection = !MOFI->getSupportsCompactUnwindWithoutEHFrame();
-  if (MOFI->getCompactUnwindSection()) {
+  if (IsEH && MOFI->getCompactUnwindSection()) {
     Streamer.generateCompactUnwindEncodings(MAB);
     bool SectionEmitted = false;
     for (const MCDwarfFrameInfo &Frame : FrameArray) {

diff  --git a/llvm/test/DebugInfo/debugframeinfo.s b/llvm/test/DebugInfo/debugframeinfo.s
deleted file mode 100644
index 9c39a30c7733b..0000000000000
--- a/llvm/test/DebugInfo/debugframeinfo.s
+++ /dev/null
@@ -1,14 +0,0 @@
-# RUN: llvm-mc -filetype=obj -triple=arm64-apple-darwin22.1.0 %s -o %t.o
-# RUN: llvm-dwarfdump -debug-frame %t.o | FileCheck %s
-
-# CHECK: .debug_frame contents:
-# CHECK-EMPTY:
-# CHECK-NEXT: 00000000 00000014 ffffffff CIE
-# CHECK: .eh_frame contents:
-# CHECK-EMPTY:
-
- .cfi_startproc
- .cfi_signal_frame
- .cfi_def_cfa x28, 0x340
- .cfi_endproc
- .cfi_sections .debug_frame