This is the mail archive of the mailing list for the GCC project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[committed] PR preprocessor/14438

This patch reverts an unnecessary part of a change I made that
introduced a regression in 3.3.2 (?), 3.4 and mainline.  Bootstrapped
and regression tested in 3.3 and 3.4 branches, as well as mainline, on
i686-pc-linux-gnu.  Approved by Mark Mitchell for 3.4 and by Gabriel
dos Reis for 3.3.

Hmm...  I thought it had been approved for mainline as well and just
checked it in, but now I realize Zack requested for additional
investigation for mainline.  I'll proceed to investigate now, but I
won't revert the patch, since it would gratuitously re-introduce a
regression.  Sorry about inappropriately checking the patch into

Patches for 3.3/3.4 are identical, posted below.  Patch for mainline
is the same except for whitespace conflicts, so I'm not including it.
It's available from the PR.

Index: gcc/ChangeLog
from  Alexandre Oliva  <>

	PR preprocessor/14438
	* cpplib.c (do_pragma): Remove line_change call after pragma

Index: gcc/cpplib.c
RCS file: /cvs/gcc/gcc/gcc/cpplib.c,v
retrieving revision 1.361
diff -u -p -r1.361 cpplib.c
--- gcc/cpplib.c 12 Feb 2004 02:25:02 -0000 1.361
+++ gcc/cpplib.c 24 Mar 2004 03:17:41 -0000
@@ -1164,9 +1164,6 @@ do_pragma (cpp_reader *pfile)
       if (pfile->cb.line_change)
 	(*pfile->cb.line_change) (pfile, pragma_token, false);
       (*p->u.handler) (pfile);
-      if (pfile->cb.line_change)
-	(*pfile->cb.line_change) (pfile, pfile->cur_token, false);
   else if (pfile->cb.def_pragma)
Alexandre Oliva   
Red Hat Compiler Engineer   aoliva@{,}
Free Software Evangelist  oliva@{,}

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]