summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2016-12-22 00:29:00 +0000
committerAdrian Prantl <aprantl@apple.com>2016-12-22 00:29:00 +0000
commit58c19106429a98c3f3f5c7d36282774432326784 (patch)
tree1b3d3663404392e8a0c68741f36dd08796d6c50b
parentb5ca17f817c066766424a91c2eed97ba4d52eba2 (diff)
downloadbcm5719-llvm-58c19106429a98c3f3f5c7d36282774432326784.tar.gz
bcm5719-llvm-58c19106429a98c3f3f5c7d36282774432326784.zip
[LLParser] Make the line field of DIMacro(File) optional.
Otherwise these records do not survive roundtrips. llvm-svn: 290291
-rw-r--r--llvm/lib/AsmParser/LLParser.cpp4
-rw-r--r--llvm/test/Assembler/DIMacroFile.ll21
2 files changed, 23 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index d1891b7feb0..d2e2c0d46d3 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -4121,7 +4121,7 @@ bool LLParser::ParseDINamespace(MDNode *&Result, bool IsDistinct) {
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 *&Result, bool IsDistinct) {
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();
diff --git a/llvm/test/Assembler/DIMacroFile.ll b/llvm/test/Assembler/DIMacroFile.ll
new file mode 100644
index 00000000000..1ca947dab68
--- /dev/null
+++ b/llvm/test/Assembler/DIMacroFile.ll
@@ -0,0 +1,21 @@
+; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | FileCheck %s
+; RUN: verify-uselistorder %s
+
+@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}
OpenPOWER on IntegriCloud