From b74b88edac9ab490ba428aef0bdebc957399bbd7 Mon Sep 17 00:00:00 2001
From: Hans Wennborg <hans@hanshq.net>
Date: Thu, 17 Oct 2013 01:13:02 +0000
Subject: Re-commit r192758 - MC: quote tricky symbol names in asm output

The reason this got reverted was that the @feat.00 symbol which was emitted
for every TU became quoted, and on cygwin/mingw we use the gas assembler which
couldn't handle the quotes.

This commit fixes the problem by only emitting @feat.00 for win32, where we use
clang -cc1as to assemble. gas would just drop this symbol anyway, so there is no
loss there.

With @feat.00 gone, there shouldn't be quoted symbols showing up on cygwin since
it uses the Itanium ABI, which doesn't put these funny characters in symbols.

> Because of win32 mangling, we produce symbol and section names with
> funny characters in them, most notably @ characters.
>
> MC would choke on trying to parse its own assembly output. This patch addresses
> that by:
>
> - Making @ trigger quoting of symbol names
> - Also quote section names in the same way
> - Just parse section names like other identifiers (to allow for quotes)
> - Don't assume @ signifies a symbol variant if it is in a string.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192859 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/CodeGen/X86/coff-feat00.ll               | 6 ++++--
 test/CodeGen/X86/fastcall-correct-mangling.ll | 2 +-
 test/CodeGen/X86/stdcall.ll                   | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'test/CodeGen/X86')

diff --git a/test/CodeGen/X86/coff-feat00.ll b/test/CodeGen/X86/coff-feat00.ll
index 1dcd427639..048aa34345 100644
--- a/test/CodeGen/X86/coff-feat00.ll
+++ b/test/CodeGen/X86/coff-feat00.ll
@@ -1,7 +1,9 @@
-; RUN: llc -O0 -mtriple=i386-pc-win32 -filetype=asm -o - %s | FileCheck %s
+; RUN: llc -O0 -mtriple=i386-pc-win32 -filetype=asm -o - %s | FileCheck %s --check-prefix=WIN32
+; RUN: llc -O0 -mtriple=i386-pc-cygwin -filetype=asm -o - %s | FileCheck %s --check-prefix=CYGWIN
 
 define i32 @foo() {
   ret i32 0
 }
 
-; CHECK: @feat.00 = 1
+; WIN32: "@feat.00" = 1
+; CYGWIN-NOT: "@feat.00" = 1
diff --git a/test/CodeGen/X86/fastcall-correct-mangling.ll b/test/CodeGen/X86/fastcall-correct-mangling.ll
index 3569d36541..17addbc3e1 100644
--- a/test/CodeGen/X86/fastcall-correct-mangling.ll
+++ b/test/CodeGen/X86/fastcall-correct-mangling.ll
@@ -3,7 +3,7 @@
 ; Check that a fastcall function gets correct mangling
 
 define x86_fastcallcc void @func(i64 %X, i8 %Y, i8 %G, i16 %Z) {
-; CHECK: @func@20:
+; CHECK: "@func@20":
         ret void
 }
 
diff --git a/test/CodeGen/X86/stdcall.ll b/test/CodeGen/X86/stdcall.ll
index 73826ed0b2..34f90c5ee3 100644
--- a/test/CodeGen/X86/stdcall.ll
+++ b/test/CodeGen/X86/stdcall.ll
@@ -5,7 +5,7 @@
 
 define internal x86_stdcallcc void @MyFunc() nounwind {
 entry:
-; CHECK: MyFunc@0:
+; CHECK: "_MyFunc@0":
 ; CHECK: ret
   ret void
 }
@@ -20,5 +20,5 @@ entry:
 
 @B = global %0 { void (...)* bitcast (void ()* @MyFunc to void (...)*) }, align 4
 ; CHECK: _B:
-; CHECK: .long _MyFunc@0
+; CHECK: .long "_MyFunc@0"
 
-- 
cgit v1.2.3