diff options
| -rw-r--r-- | lib/Sema/SemaStmt.cpp | 4 | ||||
| -rw-r--r-- | test/Sema/asm.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lib/Sema/SemaStmt.cpp b/lib/Sema/SemaStmt.cpp index 4b89acb690..9b6da0504a 100644 --- a/lib/Sema/SemaStmt.cpp +++ b/lib/Sema/SemaStmt.cpp @@ -899,8 +899,8 @@ Sema::OwningStmtResult Sema::ActOnAsmStmt(SourceLocation AsmLoc, ParenExpr *InputExpr = cast<ParenExpr>(Exprs[i]); // Only allow void types for memory constraints. - if (info & TargetInfo::CI_AllowsMemory) { - + if ((info & TargetInfo::CI_AllowsMemory) + && !(info & TargetInfo::CI_AllowsRegister)) { if (InputExpr->isLvalue(Context) != Expr::LV_Valid) return StmtError(Diag(InputExpr->getSubExpr()->getLocStart(), diag::err_asm_invalid_lvalue_in_input) diff --git a/test/Sema/asm.c b/test/Sema/asm.c index 312b800ec7..4093b1abeb 100644 --- a/test/Sema/asm.c +++ b/test/Sema/asm.c @@ -46,5 +46,11 @@ void test4(const volatile void *addr) asm ("nop" : : "r"(test4(addr))); // expected-error {{invalid type 'void' in asm input for constraint 'r'}} asm ("nop" : : "m"(test4(addr))); // expected-error {{invalid lvalue in asm input for constraint 'm'}} - asm("nop" : : "m"(f())); // expected-error {{invalid lvalue in asm input for constraint 'm'}} + asm ("nop" : : "m"(f())); // expected-error {{invalid lvalue in asm input for constraint 'm'}} +} + +// <rdar://problem/6512595> +void test5() +{ + asm("nop" : : "X" (8)); } |