Bump the DWARF version number to 5 on Darwin. #95164

adrian-prantl · 2024-06-11T19:18:48Z

The default debug info format for newer versions of Darwin is DWARF 5.

https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes

rdar://110925733

llvmbot · 2024-06-11T19:19:17Z

@llvm/pr-subscribers-debuginfo
@llvm/pr-subscribers-clang

@llvm/pr-subscribers-clang-driver

Author: Adrian Prantl (adrian-prantl)

Changes

rdar://110925733

Full diff: https://github.com/llvm/llvm-project/pull/95164.diff

2 Files Affected:

(modified) clang/lib/Driver/ToolChains/Darwin.cpp (+11-1)
(modified) clang/test/Driver/debug-options.c (+26-1)

diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
index ed5737915aa96..04e411eeeac92 100644
--- a/clang/lib/Driver/ToolChains/Darwin.cpp
+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1257,7 +1257,17 @@ unsigned DarwinClang::GetDefaultDwarfVersion() const {
   if ((isTargetMacOSBased() && isMacosxVersionLT(10, 11)) ||
       (isTargetIOSBased() && isIPhoneOSVersionLT(9)))
     return 2;
-  return 4;
+  // Default to use DWARF 4 on OS X 10.11 - macOS 14 / iOS - iOS 17.
+  if ((isTargetMacOSBased() && isMacosxVersionLT(15)) ||
+      (isTargetIOSBased() && isIPhoneOSVersionLT(18)) ||
+      (isTargetWatchOSBased() && TargetVersion < llvm::VersionTuple(11)) ||
+      (isTargetXROS() && TargetVersion < llvm::VersionTuple(2)) ||
+      (isTargetDriverKit() && TargetVersion < llvm::VersionTuple(24)) ||
+      (isTargetMacOSBased() &&
+       TargetVersion.empty()) || // apple-darwin, no version.
+      (TargetPlatform == llvm::Triple::BridgeOS))
+    return 4;
+  return 5;
 }
 
 void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs,
diff --git a/clang/test/Driver/debug-options.c b/clang/test/Driver/debug-options.c
index 07f6ca9e3902f..0a665f7017d63 100644
--- a/clang/test/Driver/debug-options.c
+++ b/clang/test/Driver/debug-options.c
@@ -68,7 +68,32 @@
 // RUN: %clang -### -c -g %s -target x86_64-apple-driverkit19.0 2>&1 \
 // RUN:             | FileCheck -check-prefix=G_STANDALONE \
 // RUN:                         -check-prefix=G_DWARF4 %s
-// RUN: %clang -### -c -fsave-optimization-record %s \
+// RUN: %clang -### -c -g %s -target x86_64-apple-macosx15 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+// RUN: %clang -### -c -g %s -target arm64-apple-ios17.0 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF4 %s
+// RUN: %clang -### -c -g %s -target arm64-apple-ios18.0 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+// RUN: %clang -### -c -g %s -target arm64_32-apple-watchos11 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+// RUN: %clang -### -c -g %s -target arm64-apple-tvos18.0 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+// RUN: %clang -### -c -g %s -target x86_64-apple-driverkit24.0 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+// RUN: %clang -### -c -g %s -target arm64-apple-xros1 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF4 %s
+// RUN: %clang -### -c -g %s -target arm64-apple-xros2 2>&1 \
+// RUN:             | FileCheck -check-prefix=G_STANDALONE \
+// RUN:                         -check-prefix=G_DWARF5 %s
+//
+// RUN: %clang -### -c -fsave-optimization-record %s    \
 // RUN:        -target x86_64-apple-darwin 2>&1 \
 // RUN:             | FileCheck -check-prefix=GLTO_ONLY %s
 // RUN: %clang -### -c -g -fsave-optimization-record %s \

JDevlieghere

🥳

pogo59 · 2024-06-11T19:38:17Z

Well, hmmm, I dunno, a radical change like this really wants an RFC and weeks of debate, right?
😄

dwblaikie · 2024-06-11T20:16:26Z

Congrats on the milestone! Glad to have more of us together on the same version for all the positive feedback loops, etc :)

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733

fmayer · 2024-06-12T22:50:01Z

This broke our buildbot: https://lab.llvm.org/buildbot/#/builders/37/builds/35987

FAILED: tools/clang/lib/Driver/CMakeFiles/obj.clangDriver.dir/ToolChains/Darwin.cpp.o 
CCACHE_CPP2=yes CCACHE_HASHDIR=yes /usr/bin/ccache /b/sanitizer-x86_64-linux/build/llvm_build0/bin/clang++ -DGTEST_HAS_RTTI=0 -D_DEBUG -D_GLIBCXX_ASSERTIONS -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -I/b/sanitizer-x86_64-linux/build/build_symbolizer/tools/clang/lib/Driver -I/b/sanitizer-x86_64-linux/build/llvm-project/clang/lib/Driver -I/b/sanitizer-x86_64-linux/build/llvm-project/clang/include -I/b/sanitizer-x86_64-linux/build/build_symbolizer/tools/clang/include -I/b/sanitizer-x86_64-linux/build/build_symbolizer/include -I/b/sanitizer-x86_64-linux/build/llvm-project/llvm/include -fPIC -fno-semantic-interposition -fvisibility-inlines-hidden -Werror -Werror=date-time -Werror=unguarded-availability-new -Wall -Wextra -Wno-unused-parameter -Wwrite-strings -Wcast-qual -Wmissing-field-initializers -pedantic -Wno-long-long -Wc++98-compat-extra-semi -Wimplicit-fallthrough -Wcovered-switch-default -Wno-noexcept-type -Wnon-virtual-dtor -Wdelete-non-virtual-dtor -Wsuggest-override -Wstring-conversion -Wmisleading-indentation -Wctad-maybe-unsupported -fdiagnostics-color -ffunction-sections -fdata-sections -fno-common -Woverloaded-virtual -Wno-nested-anon-types -O3 -DNDEBUG -std=c++17  -fno-exceptions -funwind-tables -fno-rtti -UNDEBUG -MD -MT tools/clang/lib/Driver/CMakeFiles/obj.clangDriver.dir/ToolChains/Darwin.cpp.o -MF tools/clang/lib/Driver/CMakeFiles/obj.clangDriver.dir/ToolChains/Darwin.cpp.o.d -o tools/clang/lib/Driver/CMakeFiles/obj.clangDriver.dir/ToolChains/Darwin.cpp.o -c /b/sanitizer-x86_64-linux/build/llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp
/b/sanitizer-x86_64-linux/build/llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp:1268:23: error: comparison of different enumeration types ('DarwinPlatformKind' and 'llvm::Triple::OSType') [-Werror,-Wenum-compare]
 1268 |       (TargetPlatform == llvm::Triple::BridgeOS))
      |        ~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~
/b/sanitizer-x86_64-linux/build/llvm-project/clang/lib/Driver/ToolChains/Darwin.cpp:1268:23: error: result of comparison of constant 'BridgeOS' (28) with expression of type 'DarwinPlatformKind' is always false [-Werror,-Wtautological-constant-out-of-range-compare]
 1268 |       (TargetPlatform == llvm::Triple::BridgeOS))
      |        ~~~~~~~~~~~~~~ ^  ~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
ninja: build stopped: subcommand failed.

This reverts commit 8f6acd9.

Reverts #95164 This broke a buildbot: https://lab.llvm.org/buildbot/#/builders/37/builds/35987

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733

adrian-prantl · 2024-06-12T22:58:40Z

Thanks!

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733 (relanding 8f6acd9 with the bridgeOS platform check removed)

adrian-prantl · 2024-06-13T16:54:12Z

Relanded in 8f57f68

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733 (relanding 8f6acd9 with the bridgeOS platform check removed) (cherry picked from commit 8f57f68)

…-6.0-Bump-the-DWARF-version-number-to-5-on-Darwin.-95164 [Cherry-pick into swift/release/6.0] Bump the DWARF version number to 5 on Darwin. (llvm#95164)

This test is explicitly checking for dwarf 4 behavior on Apple platforms, so we should explicitly use the dwarf4 flag. Related to #95164

This test is explicitly checking for dwarf 4 behavior on Apple platforms, so we should explicitly use the dwarf4 flag. Related to llvm#95164 (cherry picked from commit 445fc51)

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733 (relanding 8f6acd9 with the bridgeOS platform check removed)

llvmbot added clang Clang issues not falling into any other category clang:driver 'clang' and 'clang++' user-facing binaries. Not 'clang-cl' labels Jun 11, 2024

adrian-prantl requested a review from JDevlieghere June 11, 2024 19:19

adrian-prantl added the debuginfo label Jun 11, 2024

JDevlieghere approved these changes Jun 11, 2024

View reviewed changes

adrian-prantl force-pushed the darwin-dwarf5 branch from bdc0c66 to 112f03d Compare June 11, 2024 19:43

Bump the DWARF version number to 5 on Darwin.

67dd473

The default debug info format for newer versions of Darwin is DWARF 5. https://developer.apple.com/documentation/xcode-release-notes/xcode-16-release-notes rdar://110925733

adrian-prantl force-pushed the darwin-dwarf5 branch from 112f03d to 67dd473 Compare June 12, 2024 15:49

adrian-prantl merged commit 8f6acd9 into llvm:main Jun 12, 2024
5 of 6 checks passed

fmayer added a commit that referenced this pull request Jun 12, 2024

Revert "Bump the DWARF version number to 5 on Darwin. (#95164)"

fc671bb

This reverts commit 8f6acd9.

fmayer mentioned this pull request Jun 12, 2024

Revert "Bump the DWARF version number to 5 on Darwin." #95325

Merged

fmayer added a commit that referenced this pull request Jun 12, 2024

Revert "Bump the DWARF version number to 5 on Darwin." (#95325)

fcc4935

Reverts #95164 This broke a buildbot: https://lab.llvm.org/buildbot/#/builders/37/builds/35987

felipepiovezan mentioned this pull request Jun 13, 2024

[lldb][test] Force dwarf4 usage in test requiring it #95449

Merged

felipepiovezan added a commit that referenced this pull request Jun 14, 2024

[lldb][test] Force dwarf4 usage in test requiring it (#95449)

445fc51

This test is explicitly checking for dwarf 4 behavior on Apple platforms, so we should explicitly use the dwarf4 flag. Related to #95164

felipepiovezan mentioned this pull request Jun 14, 2024

[lldb][test] Force dwarf4 usage in test requiring it (#95449) swiftlang/llvm-project#8902

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Bump the DWARF version number to 5 on Darwin. #95164

Bump the DWARF version number to 5 on Darwin. #95164

Uh oh!

adrian-prantl commented Jun 11, 2024 •

edited

Loading

Uh oh!

llvmbot commented Jun 11, 2024 •

edited

Loading

Uh oh!

JDevlieghere left a comment

Uh oh!

pogo59 commented Jun 11, 2024

Uh oh!

dwblaikie commented Jun 11, 2024

Uh oh!

Uh oh!

fmayer commented Jun 12, 2024

Uh oh!

adrian-prantl commented Jun 12, 2024

Uh oh!

adrian-prantl commented Jun 13, 2024

Uh oh!

Uh oh!

Bump the DWARF version number to 5 on Darwin. #95164

Bump the DWARF version number to 5 on Darwin. #95164

Uh oh!

Conversation

adrian-prantl commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Jun 11, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JDevlieghere left a comment

Choose a reason for hiding this comment

Uh oh!

pogo59 commented Jun 11, 2024

Uh oh!

dwblaikie commented Jun 11, 2024

Uh oh!

Uh oh!

fmayer commented Jun 12, 2024

Uh oh!

adrian-prantl commented Jun 12, 2024

Uh oh!

adrian-prantl commented Jun 13, 2024

Uh oh!

Uh oh!

adrian-prantl commented Jun 11, 2024 •

edited

Loading

llvmbot commented Jun 11, 2024 •

edited

Loading