From: Neil Booth <neil@daikokuya.co.uk>
Date: Wed, 14 Aug 2002 20:17:55 +0000 (+0000)
Subject: re PR preprocessor/7526 (cpp0 core dump when _Pragma implies #pragma dependency)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8bfb14674d5dccd6a1cdd71051dfac643901c4d4;p=gcc.git

re PR preprocessor/7526 (cpp0 core dump when _Pragma implies #pragma dependency)

	PR preprocessor/7526
	* cpplib.c (run_directive): Kludge so _Pragma dependency works.
testsuite:
	* gcc.dg/cpp/_Pragma3.c: New test.

From-SVN: r56332
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index afd4ac23897..a411d93976d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-08-14  Neil Booth  <neil@daikokuya.co.uk>
+
+	PR preprocessor/7526
+	* cpplib.c (run_directive): Kludge so _Pragma dependency works.
+
 2002-08-14  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* doc/invoke.texi (-a): Remove documentation.
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 935a0e0b882..0e9c4a1263f 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -459,6 +459,9 @@ run_directive (pfile, dir_no, buf, count)
 {
   cpp_push_buffer (pfile, (const uchar *) buf, count,
 		   /* from_stage3 */ true, 1);
+  /* Disgusting hack.  */
+  if (dir_no == T_PRAGMA)
+    pfile->buffer->inc = pfile->buffer->prev->inc;
   start_directive (pfile);
   /* We don't want a leading # to be interpreted as a directive.  */
   pfile->buffer->saved_flags = 0;
@@ -467,6 +470,8 @@ run_directive (pfile, dir_no, buf, count)
     prepare_directive_trad (pfile);
   (void) (*pfile->directive->handler) (pfile);
   end_directive (pfile, 1);
+  if (dir_no == T_PRAGMA)
+    pfile->buffer->inc = NULL;
   _cpp_pop_buffer (pfile);
 }
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a6d3d69b59f..e9fd9277f84 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-14  Neil Booth  <neil@daikokuya.co.uk>
+
+	* gcc.dg/cpp/_Pragma3.c: New test.
+
 2002-08-13  Mark Mitchell  <mark@codesourcery.com>
 
 	* g++.dg/template/inherit3: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/_Pragma3.c b/gcc/testsuite/gcc.dg/cpp/_Pragma3.c
new file mode 100644
index 00000000000..7d1b42aab63
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/_Pragma3.c
@@ -0,0 +1,11 @@
+/* Copyright (C) 2002 Free Software Foundation, Inc.  */
+
+/* { dg-do preprocess } */
+
+/* Pragma buffers have a NULL "inc" member, which we would dereference
+   when getting a file's date and time.
+
+   Based on PR 7526.  14 Aug 2002.  */
+
+#define GCC_PRAGMA(x) _Pragma (#x)
+GCC_PRAGMA(GCC dependency "mi1c.h")