Merging r226046:

------------------------------------------------------------------------
r226046 | dexonsmith | 2015-01-14 14:14:26 -0800 (Wed, 14 Jan 2015) | 3 lines

IR: Always print MDLocation line

Print `MDLocation`'s `line` field even when it's 0.
------------------------------------------------------------------------

git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_36@226092 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/IR/AsmWriter.cpp b/lib/IR/AsmWriter.cpp
index 215332b82562f271935e936f1547554e3734613b..c494d6ce3f0f725c1008f9ee8ad3c42f842a39e2 100644 (file)
--- a/lib/IR/AsmWriter.cpp
+++ b/lib/IR/AsmWriter.cpp
@@ -1291,8 +1291,8 @@ static void writeMDLocation(raw_ostream &Out, const MDLocation *DL,
                             const Module *Context) {
   Out << "!MDLocation(";
   FieldSeparator FS;
-  if (DL->getLine())
-    Out << FS << "line: " << DL->getLine();
+  // Always output the line, since 0 is a relevant and important value for it.
+  Out << FS << "line: " << DL->getLine();
   if (DL->getColumn())
     Out << FS << "column: " << DL->getColumn();
   Out << FS << "scope: ";

diff --git a/test/Assembler/mdlocation.ll b/test/Assembler/mdlocation.ll
index e1216fa27508f9e290f2b0e96b1560bbc5a72f8b..c1815ff50e09082e9c351a39c6e3bd901982838b 100644 (file)
--- a/test/Assembler/mdlocation.ll
+++ b/test/Assembler/mdlocation.ll
@@ -15,6 +15,6 @@
 !3 = !MDLocation(scope: !0, inlinedAt: !1, column: 7, line: 3)
 !4 = !MDLocation(column: 7, line: 3, scope: !0, inlinedAt: !1)
 
-; CHECK-NEXT: !3 = !MDLocation(scope: !0)
+; CHECK-NEXT: !3 = !MDLocation(line: 0, scope: !0)
 !5 = !MDLocation(scope: !0)
 !6 = !MDLocation(scope: !0, column: 0, line: 0)