Add a module testcase with a using declaration.

Thanks a lot to Richard Smith for the suggestion.

llvm-svn: 178825

3 files changed, 12 insertions, 2 deletions

diff --git a/clang/test/Modules/Inputs/linkage-merge-bar.h b/clang/test/Modules/Inputs/linkage-merge-bar.h
index e69de29bb2d..cc528f77522 100644
--- a/clang/test/Modules/Inputs/linkage-merge-bar.h
+++ b/clang/test/Modules/Inputs/linkage-merge-bar.h
@@ -0,0 +1,3 @@
+#include <linkage-merge-foo.h>
+
+using ::g;
diff --git a/clang/test/Modules/Inputs/linkage-merge-foo.h b/clang/test/Modules/Inputs/linkage-merge-foo.h
index 7ed77751229..9cb62d2c0cb 100644
--- a/clang/test/Modules/Inputs/linkage-merge-foo.h
+++ b/clang/test/Modules/Inputs/linkage-merge-foo.h
@@ -1 +1,2 @@
 int f();
+static int g(int);
diff --git a/clang/test/Modules/linkage-merge.cpp b/clang/test/Modules/linkage-merge.cpp
index dafb0090e7d..4e2ecef7d97 100644
--- a/clang/test/Modules/linkage-merge.cpp
+++ b/clang/test/Modules/linkage-merge.cpp
@@ -1,7 +1,13 @@
-// RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -I %S/Inputs %s
+// FIXME: we should be able to put these in the .h file :-(
+// expected-note {{target of using declaration}}
+// expected-note {{using declaration}}
 
 #include "linkage-merge-bar.h"
 
 static int f(int);
 int f(int);
+
+static void g(int); // expected-error {{declaration conflicts with target of using declaration already in scope}}
+
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -verify -fmodules -fmodules-cache-path=%t -I %S/Inputs %s