diff options
| -rw-r--r-- | Sema/SemaDecl.cpp | 5 | ||||
| -rw-r--r-- | test/Sema/merge-decls.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Sema/SemaDecl.cpp b/Sema/SemaDecl.cpp index 40414b46cd..7eec3b0093 100644 --- a/Sema/SemaDecl.cpp +++ b/Sema/SemaDecl.cpp @@ -245,6 +245,11 @@ FunctionDecl *Sema::MergeFunctionDecl(FunctionDecl *New, ScopedDecl *OldD) { Old->getCanonicalType() == New->getCanonicalType()) { return New; } + + if (New->getBody() == 0 && + Old->getCanonicalType() == New->getCanonicalType()) { + return 0; + } // TODO: CHECK FOR CONFLICTS, multiple decls with same name in one scope. // TODO: This is totally simplistic. It should handle merging functions diff --git a/test/Sema/merge-decls.c b/test/Sema/merge-decls.c new file mode 100644 index 0000000000..f9a89988f2 --- /dev/null +++ b/test/Sema/merge-decls.c @@ -0,0 +1,8 @@ +// RUN: clang %s -verify -fsyntax-only + +void foo(void); +void foo(void) {} // expected-error{{previous definition is here}} +void foo(void); +void foo(void); + +void foo(int); // expected-error {{redefinition of 'foo'}} |