2 files changed, 25 insertions, 9 deletions
diff --git a/clang/test/Parser/ms-inline-asm.c b/clang/test/Parser/ms-inline-asm.c
new file mode 100644
index 00000000000..b1af23e4728
--- /dev/null
+++ b/clang/test/Parser/ms-inline-asm.c
@@ -0,0 +1,25 @@
+// RUN: %clang_cc1 %s -verify -fms-extensions
+
+#define M __asm int 0x2c
+#define M2 int
+
+void t1(void) { M }
+void t2(void) { __asm int 0x2c }
+void t3(void) { __asm M2 0x2c } 
+void* t4(void) { __asm mov eax, fs:[0x10] }
+void t5() {
+  __asm {
+    int 0x2c ; } asm comments are fun! }{
+  }
+  __asm {}
+}
+int t6() {
+  __asm int 3 ; } comments for single-line asm
+  __asm {}
+
+  __asm int 4
+  return 10;
+}
+int t7() { // expected-note {{to match this}}
+  __asm
+  __asm { // expected-error 3 {{expected}} expected-note {{to match this}}
diff --git a/clang/test/Sema/ms-fuzzy-asm.c b/clang/test/Sema/ms-fuzzy-asm.c
deleted file mode 100644
index 250e3222564..00000000000
--- a/clang/test/Sema/ms-fuzzy-asm.c
+++ /dev/null
@@ -1,9 +0,0 @@
-// RUN: %clang_cc1 %s -verify -fms-extensions
-
-#define M __asm int 0x2c
-#define M2 int
-
-void t1(void) { M }
-void t2(void) { __asm int 0x2c }
-void t3(void) { __asm M2 0x2c } 
-void* t4(void) { __asm mov eax, fs:[0x10] }