diff options
author | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-02-18 21:16:33 +0000 |
---|---|---|
committer | Duncan P. N. Exon Smith <dexonsmith@apple.com> | 2015-02-18 21:16:33 +0000 |
commit | cd8fb60fce21b985b87c0e9b7aaefc43e94f316b (patch) | |
tree | d4a8c0314a18d62015d799566bf50e657c5e39e6 /llvm | |
parent | 2e3b8c29c9b6d1b2d02d94983d258995318410af (diff) | |
download | bcm5719-llvm-cd8fb60fce21b985b87c0e9b7aaefc43e94f316b.tar.gz bcm5719-llvm-cd8fb60fce21b985b87c0e9b7aaefc43e94f316b.zip |
IR: Swap order of name and value in MDEnum
Put the name before the value in assembly for `MDEnum`. While working
on the testcase upgrade script for the new hierarchy, I noticed that it
"looks nicer" to have the name first, since it lines the names up in the
(somewhat typical) case that they have a common prefix.
llvm-svn: 229747
Diffstat (limited to 'llvm')
-rw-r--r-- | llvm/lib/AsmParser/LLParser.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/IR/AsmWriter.cpp | 2 | ||||
-rw-r--r-- | llvm/test/Assembler/debug-info.ll | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp index 47125ca954c..76365ea2233 100644 --- a/llvm/lib/AsmParser/LLParser.cpp +++ b/llvm/lib/AsmParser/LLParser.cpp @@ -3289,8 +3289,8 @@ bool LLParser::ParseMDSubrange(MDNode *&Result, bool IsDistinct) { /// ::= !MDEnumerator(value: 30, name: "SomeKind") bool LLParser::ParseMDEnumerator(MDNode *&Result, bool IsDistinct) { #define VISIT_MD_FIELDS(OPTIONAL, REQUIRED) \ - REQUIRED(value, MDSignedField, ); \ - REQUIRED(name, MDStringField, ); + REQUIRED(name, MDStringField, ); \ + REQUIRED(value, MDSignedField, ); PARSE_MD_FIELDS(); #undef VISIT_MD_FIELDS diff --git a/llvm/lib/IR/AsmWriter.cpp b/llvm/lib/IR/AsmWriter.cpp index 27f619b5eed..662771b3278 100644 --- a/llvm/lib/IR/AsmWriter.cpp +++ b/llvm/lib/IR/AsmWriter.cpp @@ -1361,8 +1361,8 @@ static void writeMDEnumerator(raw_ostream &Out, const MDEnumerator *N, TypePrinting *, SlotTracker *, const Module *) { Out << "!MDEnumerator("; FieldSeparator FS; - Out << FS << "value: " << N->getValue(); Out << FS << "name: \"" << N->getName() << "\""; + Out << FS << "value: " << N->getValue(); Out << ")"; } diff --git a/llvm/test/Assembler/debug-info.ll b/llvm/test/Assembler/debug-info.ll index 4d508e1bf00..7d71a26c6ad 100644 --- a/llvm/test/Assembler/debug-info.ll +++ b/llvm/test/Assembler/debug-info.ll @@ -13,12 +13,12 @@ !2 = !MDSubrange(count: 3, lowerBound: 4) !3 = !MDSubrange(count: 3, lowerBound: -5) -; CHECK-NEXT: !3 = !MDEnumerator(value: 7, name: "seven") -; CHECK-NEXT: !4 = !MDEnumerator(value: -8, name: "negeight") -; CHECK-NEXT: !5 = !MDEnumerator(value: 0, name: "") -!4 = !MDEnumerator(value: 7, name: "seven") -!5 = !MDEnumerator(value: -8, name: "negeight") -!6 = !MDEnumerator(value: 0, name: "") +; CHECK-NEXT: !3 = !MDEnumerator(name: "seven", value: 7) +; CHECK-NEXT: !4 = !MDEnumerator(name: "negeight", value: -8) +; CHECK-NEXT: !5 = !MDEnumerator(name: "", value: 0) +!4 = !MDEnumerator(name: "seven", value: 7) +!5 = !MDEnumerator(name: "negeight", value: -8) +!6 = !MDEnumerator(name: "", value: 0) ; CHECK-NEXT: !6 = !MDBasicType(tag: DW_TAG_base_type, name: "name", size: 1, align: 2, encoding: DW_ATE_unsigned_char) ; CHECK-NEXT: !7 = !MDBasicType(tag: DW_TAG_unspecified_type, name: "decltype(nullptr)") |