Fix crasher when redefining functions. Not 100% pleased with this solution, but it is clearly an improvement. Will discuss with Chris later.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@45975 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Sema/merge-decls.c b/test/Sema/merge-decls.c
index f9a8998..22026e7 100644
--- a/test/Sema/merge-decls.c
+++ b/test/Sema/merge-decls.c
@@ -1,8 +1,19 @@
 // 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(void);
+void foo(void); // expected-error{{previous definition is here}}
 
 void foo(int); // expected-error {{redefinition of 'foo'}}
+
+int funcdef()
+{
+ return 0;
+}
+
+int funcdef();
+
+int funcdef2() { return 0; } // expected-error{{previous definition is here}}
+int funcdef2() { return 0; } // expected-error {{redefinition of 'funcdef2'}}
+