[llvm] r290291 - [LLParser] Make the line field of DIMacro(File) optional.

[Adrian Prantl via llvm-commits]

Author: adrian
Date: Wed Dec 21 18:29:00 2016
New Revision: 290291

URL: http://llvm.org/viewvc/llvm-project?rev=290291&view=rev
Log:
[LLParser] Make the line field of DIMacro(File) optional.

Otherwise these records do not survive roundtrips.

Added:
    llvm/trunk/test/Assembler/DIMacroFile.ll
Modified:
    llvm/trunk/lib/AsmParser/LLParser.cpp

Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=290291&r1=290290&r2=290291&view=diff
==============================================================================
--- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
+++ llvm/trunk/lib/AsmParser/LLParser.cpp Wed Dec 21 18:29:00 2016
@@ -4121,7 +4121,7 @@ bool LLParser::ParseDINamespace(MDNode *
 bool LLParser::ParseDIMacro(MDNode *&Result, bool IsDistinct) {
 #define VISIT_MD_FIELDS(OPTIONAL, REQUIRED)                                    \
   REQUIRED(type, DwarfMacinfoTypeField, );                                     \
-  REQUIRED(line, LineField, );                                                 \
+  OPTIONAL(line, LineField, );                                                 \
   REQUIRED(name, MDStringField, );                                             \
   OPTIONAL(value, MDStringField, );
   PARSE_MD_FIELDS();
@@ -4137,7 +4137,7 @@ bool LLParser::ParseDIMacro(MDNode *&Res
 bool LLParser::ParseDIMacroFile(MDNode *&Result, bool IsDistinct) {
 #define VISIT_MD_FIELDS(OPTIONAL, REQUIRED)                                    \
   OPTIONAL(type, DwarfMacinfoTypeField, (dwarf::DW_MACINFO_start_file));       \
-  REQUIRED(line, LineField, );                                                 \
+  OPTIONAL(line, LineField, );                                                 \
   REQUIRED(file, MDField, );                                                   \
   OPTIONAL(nodes, MDField, );
   PARSE_MD_FIELDS();

Added: llvm/trunk/test/Assembler/DIMacroFile.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/DIMacroFile.ll?rev=290291&view=auto
==============================================================================
--- llvm/trunk/test/Assembler/DIMacroFile.ll (added)
+++ llvm/trunk/test/Assembler/DIMacroFile.ll Wed Dec 21 18:29:00 2016
@@ -0,0 +1,21 @@
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
+; RUN: verify-uselistorder %s
+
+ at foo = global i32 0
+
+; CHECK: !named = !{!0, !1, !2, !3, !4, !5}
+!named = !{!0, !1, !2, !3, !4, !5}
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!6, !7}
+ 
+!0 = distinct !DICompileUnit(language: DW_LANG_C89, file: !1, macros: !2)
+!1 = !DIFile(filename: "a.c", directory: "/")
+!2 = !{!3}
+; CHECK: !3 = !DIMacroFile(file: !1, nodes: !4)
+!3 = !DIMacroFile(line: 0, file: !1, nodes: !4)
+!4 = !{!5}
+; CHECK: !5 = !DIMacro(type: DW_MACINFO_define, name: "X", value: "5")
+!5 = !DIMacro(type: DW_MACINFO_define, line: 0, name: "X", value: "5")
+!6 = !{i32 2, !"Dwarf Version", i32 4}
+!7 = !{i32 2, !"Debug Info Version", i32 3}