diff options
| -rw-r--r-- | clang/lib/Sema/SemaStmtAsm.cpp | 11 | ||||
| -rw-r--r-- | clang/test/CodeGen/asm.c | 9 | ||||
| -rw-r--r-- | clang/test/CodeGen/x86-64-inline-asm.c | 5 |
3 files changed, 20 insertions, 5 deletions
diff --git a/clang/lib/Sema/SemaStmtAsm.cpp b/clang/lib/Sema/SemaStmtAsm.cpp index fdab947a477..5d076cac940 100644 --- a/clang/lib/Sema/SemaStmtAsm.cpp +++ b/clang/lib/Sema/SemaStmtAsm.cpp @@ -152,6 +152,12 @@ StmtResult Sema::ActOnGCCAsmStmt(SourceLocation AsmLoc, bool IsSimple, diag::err_asm_invalid_lvalue_in_input) << Info.getConstraintStr() << InputExpr->getSourceRange()); + } else { + ExprResult Result = DefaultFunctionArrayLvalueConversion(Exprs[i]); + if (Result.isInvalid()) + return StmtError(); + + Exprs[i] = Result.get(); } if (Info.allowsRegister()) { @@ -163,11 +169,6 @@ StmtResult Sema::ActOnGCCAsmStmt(SourceLocation AsmLoc, bool IsSimple, } } - ExprResult Result = DefaultFunctionArrayLvalueConversion(Exprs[i]); - if (Result.isInvalid()) - return StmtError(); - - Exprs[i] = Result.get(); InputConstraintInfos.push_back(Info); const Type *Ty = Exprs[i]->getType().getTypePtr(); diff --git a/clang/test/CodeGen/asm.c b/clang/test/CodeGen/asm.c index 670c24405d3..5dbc01b1211 100644 --- a/clang/test/CodeGen/asm.c +++ b/clang/test/CodeGen/asm.c @@ -239,3 +239,12 @@ void t28(void) // CHECK: call void asm sideeffect "/* $0 */", "i|r,~{dirflag},~{fpsr},~{flags}"(i32 1) } +static unsigned t29_var[1]; + +void t29(void) { + asm volatile("movl %%eax, %0" + : + : "m"(t29_var)); + // CHECK: @t29 + // CHECK: call void asm sideeffect "movl %eax, $0", "*m,~{dirflag},~{fpsr},~{flags}"([1 x i32]* @t29_var) +} diff --git a/clang/test/CodeGen/x86-64-inline-asm.c b/clang/test/CodeGen/x86-64-inline-asm.c index fefbf76dd90..bb46eda633b 100644 --- a/clang/test/CodeGen/x86-64-inline-asm.c +++ b/clang/test/CodeGen/x86-64-inline-asm.c @@ -10,3 +10,8 @@ void f() { // expected-error@-5 {{scale factor without index register is ignored}} #endif } + +static unsigned var[1] = {}; +void g(void) { asm volatile("movd %%xmm0, %0" + : + : "m"(var)); } |
