diff options
| -rw-r--r-- | lib/AST/Stmt.cpp | 14 | ||||
| -rw-r--r-- | test/CodeGen/asm.c | 12 |
2 files changed, 21 insertions, 5 deletions
diff --git a/lib/AST/Stmt.cpp b/lib/AST/Stmt.cpp index 8347249a46..97023820e2 100644 --- a/lib/AST/Stmt.cpp +++ b/lib/AST/Stmt.cpp @@ -249,14 +249,18 @@ unsigned AsmStmt::AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece>&Pieces, } char CurChar = *CurPtr++; - if (CurChar == '$') { - CurStringPiece += "$$"; - continue; - } else if (CurChar != '%') { + switch (CurChar) { + case '$': CurStringPiece += "$$"; continue; + case '{': CurStringPiece += "$("; continue; + case '|': CurStringPiece += "$|"; continue; + case '}': CurStringPiece += "$)"; continue; + case '%': + break; + default: CurStringPiece += CurChar; continue; } - + // Escaped "%" character in asm string. if (CurPtr == StrEnd) { // % at end of string is invalid (no escape). diff --git a/test/CodeGen/asm.c b/test/CodeGen/asm.c index bf1c806a2c..ace0db9af6 100644 --- a/test/CodeGen/asm.c +++ b/test/CodeGen/asm.c @@ -135,3 +135,15 @@ int t18(unsigned data) { // CHECK-NEXT: extractvalue // CHECK-NEXT: extractvalue } + + +// PR6780 +int t19(unsigned data) { + int a, b; + + asm("x{abc|def|ghi}z" :"=r"(a): "r"(data)); + return a + b; + // CHECK: t19(i32 + // CHECK: = call {{.*}}asm "x$(abc$|def$|ghi$)z" +} + |