From 2f93b448a8ca44d90b5c8d0e0c655db72093fb1b Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 25 Jul 2014 02:27:14 +0000 Subject: clang-cl: Merge adjacent single-line __asm blocks Summary: This patch extends the __asm parser to make it keep parsing input tokens as inline assembly if a single-line __asm line is followed by another line starting with __asm too. It also makes sure that we correctly keep matching braces in such situations by separating the notions of how many braces we are matching and whether we are in single-line asm block mode. Reviewers: rnk Subscribers: cfe-commits Differential Revision: http://reviews.llvm.org/D4598 llvm-svn: 213916 --- clang/test/Parser/ms-inline-asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'clang/test/Parser/ms-inline-asm.c') diff --git a/clang/test/Parser/ms-inline-asm.c b/clang/test/Parser/ms-inline-asm.c index 00508f5cf09..646f547e328 100644 --- a/clang/test/Parser/ms-inline-asm.c +++ b/clang/test/Parser/ms-inline-asm.c @@ -50,4 +50,4 @@ void t11() { } int t_fail() { // expected-note {{to match this}} __asm - __asm { // expected-error 3 {{expected}} expected-note {{to match this}} + __asm { // expected-error 2 {{expected}} expected-note {{to match this}} -- cgit v1.2.3