<div dir="ltr">Rather than testing the generated assembly, DWARF tests usually use llvm-dwarfdump to test the DWARF. Check other tests in LLVM's test/DebugInfo/...</div><br><div class="gmail_quote"><div dir="ltr">On Fri, Mar 24, 2017 at 1:55 PM Zhizhou Yang via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">zhizhouy updated this revision to Diff 93002.<br class="gmail_msg">
zhizhouy marked an inline comment as done.<br class="gmail_msg">
zhizhouy added a comment.<br class="gmail_msg">
<br class="gmail_msg">
Fixed StringRef related problem.<br class="gmail_msg">
<br class="gmail_msg">
Added a testcase for it.<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
<a href="https://reviews.llvm.org/D31315" rel="noreferrer" class="gmail_msg" target="_blank">https://reviews.llvm.org/D31315</a><br class="gmail_msg">
<br class="gmail_msg">
Files:<br class="gmail_msg">
  lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br class="gmail_msg">
  test/CodeGen/X86/dwarf-producer-with-flags.ll<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
Index: test/CodeGen/X86/dwarf-producer-with-flags.ll<br class="gmail_msg">
===================================================================<br class="gmail_msg">
--- /dev/null<br class="gmail_msg">
+++ test/CodeGen/X86/dwarf-producer-with-flags.ll<br class="gmail_msg">
@@ -0,0 +1,28 @@<br class="gmail_msg">
+; RUN: llc -o - %s | FileCheck %s<br class="gmail_msg">
+; CHECK: .Linfo_string0:<br class="gmail_msg">
+; CHECK-NEXT: .asciz   "clang -g -grecord-gcc-switches -S -llvm-emit -o test.ll"<br class="gmail_msg">
+; CHECK: .Linfo_string0          # DW_AT_producer<br class="gmail_msg">
+target triple = "x86_64-unknown-linux-gnu"<br class="gmail_msg">
+<br class="gmail_msg">
+define i32 @main() !dbg !6 {<br class="gmail_msg">
+entry:<br class="gmail_msg">
+  %retval = alloca i32, align 4<br class="gmail_msg">
+  store i32 0, i32* %retval, align 4<br class="gmail_msg">
+  ret i32 0, !dbg !10<br class="gmail_msg">
+}<br class="gmail_msg">
+<br class="gmail_msg">
+!<a href="http://llvm.dbg.cu" rel="noreferrer" class="gmail_msg" target="_blank">llvm.dbg.cu</a> = !{!0}<br class="gmail_msg">
+!llvm.module.flags = !{!3, !4}<br class="gmail_msg">
+!llvm.ident = !{!5}<br class="gmail_msg">
+<br class="gmail_msg">
+!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)<br class="gmail_msg">
+!1 = !DIFile(filename: "foo.c", directory: "d")<br class="gmail_msg">
+!2 = !{}<br class="gmail_msg">
+!3 = !{i32 2, !"Dwarf Version", i32 4}<br class="gmail_msg">
+!4 = !{i32 2, !"Debug Info Version", i32 3}<br class="gmail_msg">
+!5 = !{!"clang"}<br class="gmail_msg">
+!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)<br class="gmail_msg">
+!7 = !DISubroutineType(types: !8)<br class="gmail_msg">
+!8 = !{!9}<br class="gmail_msg">
+!9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)<br class="gmail_msg">
+!10 = !DILocation(line: 5, column: 3, scope: !6)<br class="gmail_msg">
Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br class="gmail_msg">
===================================================================<br class="gmail_msg">
--- lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br class="gmail_msg">
+++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br class="gmail_msg">
@@ -423,7 +423,14 @@<br class="gmail_msg">
     Asm->OutStreamer->getContext().setMCLineTableCompilationDir(<br class="gmail_msg">
         NewCU.getUniqueID(), CompilationDir);<br class="gmail_msg">
<br class="gmail_msg">
-  NewCU.addString(Die, dwarf::DW_AT_producer, DIUnit->getProducer());<br class="gmail_msg">
+  StringRef Producer = DIUnit->getProducer();<br class="gmail_msg">
+  StringRef Flags = DIUnit->getFlags();<br class="gmail_msg">
+  if (!Flags.empty()) {<br class="gmail_msg">
+    std::string ProducerWithFlags = Producer.str() + " " + Flags.str();<br class="gmail_msg">
+    NewCU.addString(Die, dwarf::DW_AT_producer, ProducerWithFlags);<br class="gmail_msg">
+  } else<br class="gmail_msg">
+    NewCU.addString(Die, dwarf::DW_AT_producer, Producer);<br class="gmail_msg">
+<br class="gmail_msg">
   NewCU.addUInt(Die, dwarf::DW_AT_language, dwarf::DW_FORM_data2,<br class="gmail_msg">
                 DIUnit->getSourceLanguage());<br class="gmail_msg">
   NewCU.addString(Die, dwarf::DW_AT_name, FN);<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
</blockquote></div>