[PATCH] Fix generation of 'isa' and 'discriminator' keywords.

Diego Novillo dnovillo at google.com
Thu Feb 13 12:03:20 PST 2014


Hi echristo,

There should be a space before each of these two keywords to avoid
generating invalid assembly files.

NOTE: I could not find an obvious maintainers in CODE_OWNERS.TXT, but
      this seems related to debug info.

http://llvm-reviews.chandlerc.com/D2791

Files:
  lib/MC/MCAsmStreamer.cpp
  test/MC/AsmParser/directive_loc.s

Index: lib/MC/MCAsmStreamer.cpp
===================================================================
--- lib/MC/MCAsmStreamer.cpp
+++ lib/MC/MCAsmStreamer.cpp
@@ -902,9 +902,9 @@
   }
 
   if (Isa)
-    OS << "isa " << Isa;
+    OS << " isa " << Isa;
   if (Discriminator)
-    OS << "discriminator " << Discriminator;
+    OS << " discriminator " << Discriminator;
 
   if (IsVerboseAsm) {
     OS.PadToColumn(MAI->getCommentColumn());
Index: test/MC/AsmParser/directive_loc.s
===================================================================
--- test/MC/AsmParser/directive_loc.s
+++ test/MC/AsmParser/directive_loc.s
@@ -1,9 +1,18 @@
-# RUN: llvm-mc -triple i386-unknown-unknown %s
-# FIXME: Actually test the output.
+# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s -check-prefix=FILE
+# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s -check-prefix=BASIC-LOC-1
+# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s -check-prefix=BASIC-LOC-2
+# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s -check-prefix=DISCRIMINATOR
+# RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s -check-prefix=ISA
 
         .file 1 "hello"
+# FILE: .file 1 "hello"
         .loc 1
         .loc 1 2
+# BASIC-LOC-1: .loc 1 2 0
         .loc 1 2 3
+# BASIC-LOC-2: .loc 1 2 3
         .loc 1 2 discriminator 1
+# DISCRIMINATOR: 1 2 0 discriminator 1
+        .loc 1 2 0 isa 3
+# ISA: 1 2 0 isa 3
         .loc 1 0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D2791.1.patch
Type: text/x-patch
Size: 1452 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20140213/d60f8caf/attachment.bin>


More information about the llvm-commits mailing list