Revert r187597, "Bugfix for making the DWARF debug strings and labels to code emitted...

It broke x86_64-win32 builder in llvm/test/DebugInfo.

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

diff --git a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
index 650acab757ef9c339f0bffaef409823d5f3081ac..748259e298a88fbcb3e87f6a334204e7d15b29df 100644 (file)
--- a/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
+++ b/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
@@ -1416,10 +1416,6 @@ void AsmPrinter::EmitLabelOffsetDifference(const MCSymbol *Hi, uint64_t Offset,
 void AsmPrinter::EmitLabelPlusOffset(const MCSymbol *Label, uint64_t Offset,
                                       unsigned Size)
   const {
-  if (MAI->needsDwarfSectionOffsetDirective()) {
-    OutStreamer.EmitCOFFSecRel32(Label);
-    return;
-  }
 
   // Emit Label+Offset (or just Label if Offset is zero)
   const MCExpr *Expr = MCSymbolRefExpr::Create(Label, OutContext);

diff --git a/test/DebugInfo/X86/coff_relative_names.ll b/test/DebugInfo/X86/coff_relative_names.ll
deleted file mode 100644 (file)
index 8e46e0b..0000000
--- a/test/DebugInfo/X86/coff_relative_names.ll
+++ /dev/null
@@ -1,40 +0,0 @@
-; RUN: llc -mtriple=i686-w64-mingw32 -filetype=asm -O0 < %s | FileCheck %s\r
-\r
-; CHECK:       .secrel32 Linfo_string0\r
-; CHECK:       .secrel32 Linfo_string1\r
-;\r
-; generated from:\r
-; clang -g -S -emit-llvm test.c -o test.ll\r
-; int main()\r
-; {\r
-;      return 0;\r
-; }\r
-\r
-; ModuleID = 'test.c'\r
-target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:128:128-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S32"\r
-target triple = "i686-pc-win32"\r
-\r
-; Function Attrs: nounwind\r
-define i32 @main() #0 {\r
-entry:\r
-  %retval = alloca i32, align 4\r
-  store i32 0, i32* %retval\r
-  ret i32 0, !dbg !10\r
-}\r
-\r
-attributes #0 = { nounwind "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf"="true" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }\r
-\r
-!llvm.dbg.cu = !{!0}\r
-!llvm.module.flags = !{!9}\r
-\r
-!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.4 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [C:\Projects/test.c] [DW_LANG_C99]\r
-!1 = metadata !{metadata !"test.c", metadata !"C:\5CProjects"}\r
-!2 = metadata !{i32 0}\r
-!3 = metadata !{metadata !4}\r
-!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"main", metadata !"main", metadata !"", i32 1, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 0, i1 false, i32 ()* @main, null, null, metadata !2, i32 2} ; [ DW_TAG_subprogram ] [line 1] [def] [scope 2] [main]\r
-!5 = metadata !{i32 786473, metadata !1}          ; [ DW_TAG_file_type ] [C:\Projects/test.c]\r
-!6 = metadata !{i32 786453, i32 0, i32 0, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]\r
-!7 = metadata !{metadata !8}\r
-!8 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]\r
-!9 = metadata !{i32 2, metadata !"Dwarf Version", i32 3}\r
-!10 = metadata !{i32 3, i32 0, metadata !4, null}\r