Merge pull request #4697 from adrian-prantl/28231982

Bump the DWARF format to version 4 on Darwin.
swiftlang · Sep 13, 2016 · d0f16bf · d0f16bf
2 parents d88e003 + 9f060dc
commit d0f16bf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 9 deletions.
diff --git a/include/swift/Basic/Dwarf.h b/include/swift/Basic/Dwarf.h
@@ -21,8 +21,7 @@
 
 namespace swift {
   /// The DWARF version emitted by the Swift compiler.
-  const unsigned GenericDWARFVersion = 3;
-  const unsigned CygwinDWARFVersion = 4;
+  const unsigned DWARFVersion = 4;
 
   static const char MachOASTSegmentName[] = "__SWIFT";
   static const char MachOASTSectionName[] = "__ast";

diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -1182,9 +1182,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
 
   // Setting DWARF Version depend on platform
   IRGenOptions &IRGenOpts = Invocation.getIRGenOptions();
-  IRGenOpts.DWARFVersion = swift::GenericDWARFVersion;
-  if (Invocation.getLangOptions().Target.isWindowsCygwinEnvironment())
-    IRGenOpts.DWARFVersion = swift::CygwinDWARFVersion;
+  IRGenOpts.DWARFVersion = swift::DWARFVersion;
 
   // The compiler invocation is now fully configured; notify our observer.
   if (observer) {

diff --git a/test/DebugInfo/apple-types-accel.swift b/test/DebugInfo/apple-types-accel.swift
@@ -1,8 +1,8 @@
 // RUN: %target-swift-frontend %s -emit-ir -g -o - | %FileCheck %s
 // RUN: %target-swift-frontend %s -c -g -o %t.o
-// RUN: dwarfdump --verify --apple-types %t.o | %FileCheck --check-prefix=CHECK-ACCEL %s
+// RUN: dwarfdump --apple-types %t.o | %FileCheck --check-prefix=CHECK-ACCEL %s
 // RUN: dwarfdump --debug-info %t.o | %FileCheck --check-prefix=CHECK-DWARF %s
-
+// DISABLED <rdar://problem/28232630>: dwarfdump --verify %t.o
 // REQUIRES: OS=macosx
 
 // Verify that the unmangles basenames end up in the accelerator table.

diff --git a/test/DebugInfo/basic.swift b/test/DebugInfo/basic.swift
@@ -81,7 +81,7 @@ func foo(_ a: Int64, _ b: Int64) -> Int64 {
 // CHECK-DAG: ![[MAINMODULE]] = !DIModule({{.*}}, name: "basic"
 
 // DWARF Version
-// CHECK-DAG:  i32 2, !"Dwarf Version", i32 3}
+// CHECK-DAG:  i32 2, !"Dwarf Version", i32 4}
 
 // Debug Info Version
 // CHECK-DAG:  i32 2, !"Debug Info Version", i32
diff --git a/test/DebugInfo/test-foundation.swift b/test/DebugInfo/test-foundation.swift
@@ -3,7 +3,7 @@
 // RUN: %FileCheck %s --check-prefix LOC-CHECK < %t.ll
 // RUN: llc %t.ll -filetype=obj -o %t.o
 // RUN: llvm-dwarfdump %t.o | %FileCheck %s --check-prefix DWARF-CHECK
-// RUN: dwarfdump --verify %t.o
+// DISABLED <rdar://problem/28232630>: dwarfdump --verify %t.o
 
 // REQUIRES: OS=macosx