[llvm-commits] [llvm] r103765 - in /llvm/trunk: lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp test/Other/inline-asm-newline-terminator.ll

[Daniel Dunbar]

Author: ddunbar
Date: Thu May 13 23:31:50 2010
New Revision: 103765

URL: http://llvm.org/viewvc/llvm-project?rev=103765&view=rev
Log:
Inline Asm: Ensure buffer is newline terminated to match how the text is printed.
 - This is a hack, but I can't decide the best place to handle this. Chris?

Added:
    llvm/trunk/test/Other/inline-asm-newline-terminator.ll
Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp?rev=103765&r1=103764&r2=103765&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp Thu May 13 23:31:50 2010
@@ -53,6 +53,17 @@
   }
   
   SourceMgr SrcMgr;
+
+  // Ensure the buffer is newline terminated.
+  char *TmpString = 0;
+  if (Str.back() != '\n') {
+    TmpString = new char[Str.size() + 2];
+    memcpy(TmpString, Str.data(), Str.size());
+    TmpString[Str.size()] = '\n';
+    TmpString[Str.size() + 1] = 0;
+    isNullTerminated = true;
+    Str = TmpString;
+  }
   
   // If the current LLVMContext has an inline asm handler, set it in SourceMgr.
   LLVMContext &LLVMCtx = MMI->getModule()->getContext();
@@ -84,6 +95,9 @@
                        /*NoFinalize*/ true);
   if (Res && !HasDiagHandler)
     report_fatal_error("Error parsing inline asm\n");
+
+  if (TmpString)
+    delete[] TmpString;
 }
 
 

Added: llvm/trunk/test/Other/inline-asm-newline-terminator.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Other/inline-asm-newline-terminator.ll?rev=103765&view=auto
==============================================================================
--- llvm/trunk/test/Other/inline-asm-newline-terminator.ll (added)
+++ llvm/trunk/test/Other/inline-asm-newline-terminator.ll Thu May 13 23:31:50 2010
@@ -0,0 +1,6 @@
+; RUN: llc -filetype=obj -o - < %s
+
+; ModuleID = 't.c'
+target triple = "x86_64-apple-darwin10.0.0"
+
+module asm ".desc _f0, 0x10"