4 files changed, 24 insertions, 4 deletions
diff --git a/test/CodeGen/X86/coff-feat00.ll b/test/CodeGen/X86/coff-feat00.ll
index 1dcd427..c535f793 100644
--- a/test/CodeGen/X86/coff-feat00.ll
+++ b/test/CodeGen/X86/coff-feat00.ll
@@ -4,4 +4,4 @@ define i32 @foo() {
   ret i32 0
 }
 
-; CHECK: @feat.00 = 1
+; CHECK: "@feat.00" = 1
diff --git a/test/CodeGen/X86/fastcall-correct-mangling.ll b/test/CodeGen/X86/fastcall-correct-mangling.ll
index 3569d36..17addbc 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 73826ed..34f90c5 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"
 
diff --git a/test/MC/COFF/quoted-names.ll b/test/MC/COFF/quoted-names.ll
new file mode 100644
index 0000000..1360312
--- /dev/null
+++ b/test/MC/COFF/quoted-names.ll
@@ -0,0 +1,20 @@
+; Check that certain symbol and section names are quoted in the asm output.
+; RUN: llc -mtriple=i686-pc-win32 %s -o - | FileCheck %s
+
+; Check that the symbol and section names can round-trip through the assembler.
+; RUN: llc -mtriple=i686-pc-win32 %s -o - | llvm-mc -triple i686-pc-win32 -filetype=obj | llvm-readobj -s -section-symbols | FileCheck %s --check-prefix=READOBJ
+
+@"\01??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ" = global i32 0
+
+define weak i32 @"\01??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"() section ".text" {
+  %res = load i32* @"\01??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ"
+  ret i32 %res
+}
+
+; CHECK: .section ".text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51","xr"
+; CHECK: .globl "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
+; CHECK: "??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51"
+
+; READOBJ: Symbol
+; READOBJ: Name: ??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51
+; READOBJ: Section: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51