diff options
| -rw-r--r-- | lib/CodeGen/CGStmt.cpp | 5 | ||||
| -rw-r--r-- | lib/Sema/SemaDecl.cpp | 6 | ||||
| -rw-r--r-- | test/Sema/asm.c | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/lib/CodeGen/CGStmt.cpp b/lib/CodeGen/CGStmt.cpp index a46a412627..8ccd2893b8 100644 --- a/lib/CodeGen/CGStmt.cpp +++ b/lib/CodeGen/CGStmt.cpp @@ -937,10 +937,7 @@ AddVariableConstraints(const std::string &Constraint, const Expr &AsmExpr, if (!Attr) return Constraint; llvm::StringRef Register = Attr->getLabel(); - if (!Target.isValidGCCRegisterName(Register)) { - CGM.ErrorUnsupported(Variable, "__asm__"); - return Constraint; - } + assert(Target.isValidGCCRegisterName(Register)); if (Constraint != "r") { CGM.ErrorUnsupported(&Stmt, "__asm__"); return Constraint; diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index 62262bc60b..abd63198d4 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -2995,8 +2995,12 @@ Sema::ActOnVariableDeclarator(Scope *S, Declarator &D, DeclContext *DC, if (Expr *E = (Expr*)D.getAsmLabel()) { // The parser guarantees this is a string. StringLiteral *SE = cast<StringLiteral>(E); + llvm::StringRef Label = SE->getString(); + if (S->getFnParent() != 0 && + !Context.Target.isValidGCCRegisterName(Label)) + Diag(E->getExprLoc(), diag::err_asm_unknown_register_name) << Label; NewVD->addAttr(::new (Context) AsmLabelAttr(SE->getStrTokenLoc(0), - Context, SE->getString())); + Context, Label)); } // Diagnose shadowed variables before filtering for scope. diff --git a/test/Sema/asm.c b/test/Sema/asm.c index 8148490379..af6754a68b 100644 --- a/test/Sema/asm.c +++ b/test/Sema/asm.c @@ -91,3 +91,7 @@ void test9(int i) { asm("" : [foo] "=r" (i), "=r"(i) : "1[foo]"(i)); // expected-error{{invalid input constraint '1[foo]' in asm}} asm("" : [foo] "=r" (i), "=r"(i) : "[foo]1"(i)); // expected-error{{invalid input constraint '[foo]1' in asm}} } + +void test10(void){ + register unsigned long long bar asm("foo"); // expected-error {{unknown register name 'foo' in asm}} +} |