diff options
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticASTKinds.def | 7 | ||||
| -rw-r--r-- | clang/lib/AST/Stmt.cpp | 27 | ||||
| -rw-r--r-- | clang/test/Sema/asm.c | 16 |
3 files changed, 36 insertions, 14 deletions
diff --git a/clang/include/clang/Basic/DiagnosticASTKinds.def b/clang/include/clang/Basic/DiagnosticASTKinds.def index e18278ae8bd..0ec49d85086 100644 --- a/clang/include/clang/Basic/DiagnosticASTKinds.def +++ b/clang/include/clang/Basic/DiagnosticASTKinds.def @@ -20,3 +20,10 @@ DIAG(note_expr_divide_by_zero, NOTE, // inline asm related. DIAG(err_asm_invalid_escape, ERROR, "invalid %% escape in inline assembly string") +DIAG(err_asm_unknown_symbolic_operand_name, ERROR, + "unknown symbolic operand name in inline assembly string") + +DIAG(err_asm_unterminated_symbolic_operand_name, ERROR, + "unterminated symbolic operand name in inline assembly string") +DIAG(err_asm_empty_symbolic_operand_name, ERROR, + "empty symbolic operand name in inline assembly string")
\ No newline at end of file diff --git a/clang/lib/AST/Stmt.cpp b/clang/lib/AST/Stmt.cpp index 8062884d7ea..4156af6ef98 100644 --- a/clang/lib/AST/Stmt.cpp +++ b/clang/lib/AST/Stmt.cpp @@ -229,8 +229,11 @@ unsigned AsmStmt::AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece>&Pieces, } // Escaped "%" character in asm string. - // FIXME: This should be caught during Sema. - assert(CurPtr != StrEnd && "Trailing '%' in asm string."); + if (CurPtr == StrEnd) { + // % at end of string is invalid (no escape). + DiagOffs = CurPtr-StrStart-1; + return diag::err_asm_invalid_escape; + } char EscapedChar = *CurPtr++; if (EscapedChar == '%') { // %% -> % @@ -275,16 +278,26 @@ unsigned AsmStmt::AnalyzeAsmString(llvm::SmallVectorImpl<AsmStringPiece>&Pieces, // Handle %[foo], a symbolic operand reference. if (EscapedChar == '[') { + DiagOffs = CurPtr-StrStart-1; + + // Find the ']'. const char *NameEnd = (const char*)memchr(CurPtr, ']', StrEnd-CurPtr); - // FIXME: Should be caught by sema. - // FIXME: Does sema catch multiple operands with the same name? - assert(NameEnd != 0 && "Could not parse symbolic name"); + if (NameEnd == 0) + return diag::err_asm_unterminated_symbolic_operand_name; + if (NameEnd == CurPtr) + return diag::err_asm_empty_symbolic_operand_name; + std::string SymbolicName(CurPtr, NameEnd); - CurPtr = NameEnd+1; int N = getNamedOperand(SymbolicName); - assert(N != -1 && "FIXME: Catch in Sema."); + if (N == -1) { + // Verify that an operand with that name exists. + DiagOffs = CurPtr-StrStart; + return diag::err_asm_unknown_symbolic_operand_name; + } Pieces.push_back(AsmStringPiece(N, Modifier)); + + CurPtr = NameEnd+1; continue; } diff --git a/clang/test/Sema/asm.c b/clang/test/Sema/asm.c index d429b94f401..32f32c66918 100644 --- a/clang/test/Sema/asm.c +++ b/clang/test/Sema/asm.c @@ -1,8 +1,6 @@ // RUN: clang %s -arch=i386 -verify -fsyntax-only -void -f() -{ +void f() { int i; asm ("foo\n" : : "a" (i + 2)); @@ -17,9 +15,7 @@ f() asm ("foo\n" : "=a" (i) : "[symbolic_name]" (i)); // expected-error {{invalid input constraint '[symbolic_name]' in asm}} } -void -clobbers() -{ +void clobbers() { asm ("nop" : : : "ax", "#ax", "%ax"); asm ("nop" : : : "eax", "rax", "ah", "al"); asm ("nop" : : : "0", "%0", "#0"); @@ -59,7 +55,13 @@ void test6(long i) { asm("nop" : : "er"(i)); } -void test7() { +void asm_string_tests() { asm("%!"); // simple asm string, %! is not an error. asm("%!" : ); // expected-error {{invalid % escape in inline assembly string}} + asm("xyz %" : ); // expected-error {{invalid % escape in inline assembly string}} + + asm ("%[somename]" :: [somename] "i"(4)); // ok + asm ("%[somename]" :: "i"(4)); // expected-error {{unknown symbolic operand name in inline assembly string}} + asm ("%[somename" :: "i"(4)); // expected-error {{unterminated symbolic operand name in inline assembly string}} + asm ("%[]" :: "i"(4)); // expected-error {{empty symbolic operand name in inline assembly string}} } |
