Revert "[dsymutil] Emit valid debug locations when no symbol flags are set"

This reverts commit r315082, which fails on non-darwin buildbots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315088 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/tools/dsymutil/Inputs/swift-dwarf-loc.ll b/test/tools/dsymutil/Inputs/swift-dwarf-loc.ll
deleted file mode 100644 (file)
index c2e7050..0000000
--- a/test/tools/dsymutil/Inputs/swift-dwarf-loc.ll
+++ /dev/null
@@ -1,25 +0,0 @@
-; ModuleID = '-'
-source_filename = "-"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.12"
-
-%TSi = type <{ i64 }>
-
-@_var = hidden global %TSi zeroinitializer, align 8, !dbg !0
-
-!llvm.dbg.cu = !{!8}
-!llvm.module.flags = !{!11, !12}
-
-!0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
-!1 = distinct !DIGlobalVariable(name: "x", linkageName: "_var", scope: !2, file: !3, line: 1, type: !4, isLocal: false, isDefinition: true)
-!2 = !DIModule(scope: null, name: "main")
-!3 = !DIFile(filename: "<stdin>", directory: "")
-!4 = !DICompositeType(tag: DW_TAG_structure_type, name: "Int", scope: !6, file: !5, size: 64, elements: !7, runtimeLang: DW_LANG_Swift, identifier: "_T0SiD")
-!5 = !DIFile(filename: "foo", directory: "/tmp")
-!6 = !DIModule(scope: null, name: "foo", includePath: "")
-!7 = !{}
-!8 = distinct !DICompileUnit(language: DW_LANG_Swift, file: !9, producer: "swiftc", isOptimized: false, flags: "", runtimeVersion: 4, emissionKind: FullDebug, enums: !7, globals: !10, imports: null)
-!9 = !DIFile(filename: "/tmp", directory: "")
-!10 = !{!0}
-!11 = !{i32 2, !"Dwarf Version", i32 4}
-!12 = !{i32 2, !"Debug Info Version", i32 3}

diff --git a/test/tools/dsymutil/X86/swift-dwarf-loc.test b/test/tools/dsymutil/X86/swift-dwarf-loc.test
deleted file mode 100644 (file)
index c8e8afc..0000000
--- a/test/tools/dsymutil/X86/swift-dwarf-loc.test
+++ /dev/null
@@ -1,9 +0,0 @@
-RUN: llc -filetype=obj %p/../Inputs/swift-dwarf-loc.ll -mtriple x86_64-apple-darwin -o %T/swift-dwarf-loc.o
-RUN: ld -dylib %T/swift-dwarf-loc.o -arch x86_64 -lSystem -macosx_version_min 10.9.0 -o %T/swift-dwarf-loc
-RUN: llvm-dsymutil %T/swift-dwarf-loc -no-output -verbose | FileCheck %s
-
-This test checks that dsymutil generates a valid dwarf location for a symbol with no flags set.
-
-CHECK: __var,
-CHECK-NOT: __var,{{.*}}binAddr: 0x0000000000000000
-CHECK-NOT: __var{{.*}} => 0000000000000000

diff --git a/tools/dsymutil/MachODebugMapParser.cpp b/tools/dsymutil/MachODebugMapParser.cpp
index 0cd6a89..79b1913 100644 (file)
--- a/tools/dsymutil/MachODebugMapParser.cpp
+++ b/tools/dsymutil/MachODebugMapParser.cpp
@@ -482,9 +482,7 @@ void MachODebugMapParser::loadMainBinarySymbols(
     // are the only ones that need to be queried because the address
     // of common data won't be described in the debug map. All other
     // addresses should be fetched for the debug map.
-    uint8_t SymType =
-        MainBinary.getSymbolTableEntry(Sym.getRawDataRefImpl()).n_type;
-    if (!(SymType & (MachO::N_EXT | MachO::N_PEXT)))
+    if (!(Sym.getFlags() & SymbolRef::SF_Global))
       continue;
     Expected<section_iterator> SectionOrErr = Sym.getSection();
     if (!SectionOrErr) {