Allow empty statements in naked functions in addition to ASM statements
Summary: This fixes PR20883.
Test Plan: The patch includes an automated test.
Reviewers: hansw
Differential Revision: http://reviews.llvm.org/D5256
llvm-svn: 217413
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index 27f69ad..1f2cf7b 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -10426,7 +10426,7 @@
if (FD && FD->hasAttr<NakedAttr>()) {
for (const Stmt *S : Body->children()) {
- if (!isa<AsmStmt>(S)) {
+ if (!isa<AsmStmt>(S) && !isa<NullStmt>(S)) {
Diag(S->getLocStart(), diag::err_non_asm_stmt_in_naked_function);
Diag(FD->getAttr<NakedAttr>()->getLocation(), diag::note_attribute);
FD->setInvalidDecl();
diff --git a/clang/test/Sema/attr-naked.c b/clang/test/Sema/attr-naked.c
index f6c26b2..fcae842 100644
--- a/clang/test/Sema/attr-naked.c
+++ b/clang/test/Sema/attr-naked.c
@@ -23,3 +23,12 @@
asm("movl x, %eax");
asm("retl");
}
+
+__attribute__((naked)) void t6() {
+ ;
+}
+
+__attribute__((naked)) void t7() {
+ asm("movl $42, %eax");
+ ;
+}