[PATCH] D31315: Record command lines in objects built by clang, LLVM part

[Zhizhou Yang via Phabricator via llvm-commits]

zhizhouy updated this revision to Diff 93002.
zhizhouy marked an inline comment as done.
zhizhouy added a comment.

Fixed StringRef related problem.

Added a testcase for it.


https://reviews.llvm.org/D31315

Files:
  lib/CodeGen/AsmPrinter/DwarfDebug.cpp
  test/CodeGen/X86/dwarf-producer-with-flags.ll


Index: test/CodeGen/X86/dwarf-producer-with-flags.ll
===================================================================
--- /dev/null
+++ test/CodeGen/X86/dwarf-producer-with-flags.ll
@@ -0,0 +1,28 @@
+; RUN: llc -o - %s | FileCheck %s
+; CHECK: .Linfo_string0:
+; CHECK-NEXT: .asciz	"clang -g -grecord-gcc-switches -S -llvm-emit -o test.ll"
+; CHECK: .Linfo_string0          # DW_AT_producer
+target triple = "x86_64-unknown-linux-gnu"
+
+define i32 @main() !dbg !6 {
+entry:
+  %retval = alloca i32, align 4
+  store i32 0, i32* %retval, align 4
+  ret i32 0, !dbg !10
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4}
+!llvm.ident = !{!5}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: false, flags: "-g -grecord-gcc-switches -S -llvm-emit -o test.ll", runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!1 = !DIFile(filename: "foo.c", directory: "d")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{!"clang"}
+!6 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 4, type: !7, isLocal: false, isDefinition: true, scopeLine: 4, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2)
+!7 = !DISubroutineType(types: !8)
+!8 = !{!9}
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!10 = !DILocation(line: 5, column: 3, scope: !6)
Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp
===================================================================
--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -423,7 +423,14 @@
     Asm->OutStreamer->getContext().setMCLineTableCompilationDir(
         NewCU.getUniqueID(), CompilationDir);
 
-  NewCU.addString(Die, dwarf::DW_AT_producer, DIUnit->getProducer());
+  StringRef Producer = DIUnit->getProducer();
+  StringRef Flags = DIUnit->getFlags();
+  if (!Flags.empty()) {
+    std::string ProducerWithFlags = Producer.str() + " " + Flags.str();
+    NewCU.addString(Die, dwarf::DW_AT_producer, ProducerWithFlags);
+  } else
+    NewCU.addString(Die, dwarf::DW_AT_producer, Producer);
+
   NewCU.addUInt(Die, dwarf::DW_AT_language, dwarf::DW_FORM_data2,
                 DIUnit->getSourceLanguage());
   NewCU.addString(Die, dwarf::DW_AT_name, FN);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D31315.93002.patch
Type: text/x-patch
Size: 2293 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170324/c0e92766/attachment.bin>