From 10ef8f287e92cad2f6963a9ee25d954c87567629 Mon Sep 17 00:00:00 2001
From: Marek Polacek <polacek@redhat.com>
Date: Fri, 23 Jan 2015 11:57:43 +0000
Subject: re PR preprocessor/60570 (expression in 'elif' directive
 mis-diagnosed as error when group will be skipped)

	DR#412
	PR preprocessor/60570
	* directives.c (do_elif): Don't evaluate #elif conditionals
	when they don't need to be.

	* gcc.dg/cpp/pr36320.c: Turn dg-error into dg-bogus.
	* gcc.dg/cpp/pr60570.c: New test.

From-SVN: r220035
---
 gcc/testsuite/ChangeLog            |  6 +++++
 gcc/testsuite/gcc.dg/cpp/pr36320.c |  4 ++--
 gcc/testsuite/gcc.dg/cpp/pr60570.c | 48 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/cpp/pr60570.c

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 86753d6..cf9b478 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-23  Marek Polacek  <polacek@redhat.com>
+
+	PR preprocessor/60570
+	* gcc.dg/cpp/pr36320.c: Turn dg-error into dg-bogus.
+	* gcc.dg/cpp/pr60570.c: New test.
+
 2015-01-23  Richard Biener  <rguenther@suse.de>
 
 	PR testsuite/63439
diff --git a/gcc/testsuite/gcc.dg/cpp/pr36320.c b/gcc/testsuite/gcc.dg/cpp/pr36320.c
index d136a69..cc2baa7 100644
--- a/gcc/testsuite/gcc.dg/cpp/pr36320.c
+++ b/gcc/testsuite/gcc.dg/cpp/pr36320.c
@@ -1,8 +1,8 @@
 /* PR 36320 - #elif still requires valid expression.  */
-
+/* DR#412: #elif doesn't have to be valid expression (PR60570).  */
 /* { dg-do preprocess } */
 
 int z;
 #if 1
-#elif   /* { dg-error "with no expression" } */
+#elif	/* { dg-bogus "with no expression" } */
 #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/pr60570.c b/gcc/testsuite/gcc.dg/cpp/pr60570.c
new file mode 100644
index 0000000..4755206
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/pr60570.c
@@ -0,0 +1,48 @@
+/* PR preprocessor/60570 */
+/* { dg-do preprocess } */
+
+#if 1
+int i;
+#elif 1/0
+#endif
+
+#if 1
+int j;
+#elif
+#endif
+
+#if 0
+#elif 1/0	/* { dg-error "division by zero" } */
+int k;
+#endif
+
+#if 0
+#elif		/* { dg-error "with no expression" } */
+int n;
+#endif
+
+#if 1
+# if 1
+int l;
+# elif 1/0
+# endif
+#endif
+
+#if 1
+# if 1
+int l;
+# elif
+# endif
+#endif
+
+#if 1
+# if 0
+# elif 1/0	/* { dg-error "division by zero" } */
+# endif
+#endif
+
+#if 1
+# if 0
+# elif		/* { dg-error "with no expression" } */
+# endif
+#endif
-- 
cgit v1.1