summaryrefslogtreecommitdiffstats
path: root/clang/test/Preprocessor
diff options
context:
space:
mode:
Diffstat (limited to 'clang/test/Preprocessor')
-rw-r--r--clang/test/Preprocessor/macro_arg_slocentry_merge.c7
-rw-r--r--clang/test/Preprocessor/macro_arg_slocentry_merge.h7
2 files changed, 14 insertions, 0 deletions
diff --git a/clang/test/Preprocessor/macro_arg_slocentry_merge.c b/clang/test/Preprocessor/macro_arg_slocentry_merge.c
new file mode 100644
index 00000000000..9ab385f8084
--- /dev/null
+++ b/clang/test/Preprocessor/macro_arg_slocentry_merge.c
@@ -0,0 +1,7 @@
+// RUN: not %clang_cc1 -fsyntax-only %s 2>&1 | FileCheck %s
+
+#include "macro_arg_slocentry_merge.h"
+
+// CHECK: macro_arg_slocentry_merge.h:7:19: error: unknown type name 'win'
+// CHECK: macro_arg_slocentry_merge.h:5:16: note: expanded from macro 'WINDOW'
+// CHECK: macro_arg_slocentry_merge.h:6:18: note: expanded from macro 'P_'
diff --git a/clang/test/Preprocessor/macro_arg_slocentry_merge.h b/clang/test/Preprocessor/macro_arg_slocentry_merge.h
new file mode 100644
index 00000000000..62595b762e5
--- /dev/null
+++ b/clang/test/Preprocessor/macro_arg_slocentry_merge.h
@@ -0,0 +1,7 @@
+
+
+
+
+#define WINDOW win
+#define P_(args) args
+extern void f P_((WINDOW win));
OpenPOWER on IntegriCloud