From d00dc3c26f4bdae3e67d8e2dab18e7699b7e9f43 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Tue, 4 Jan 2011 23:18:52 +0000 Subject: [PATCH] re PR preprocessor/39213 (Preprocessor ICE with -m64 and --traditional-cpp) PR preprocessor/39213 * directives.c (end_directive): Call _cpp_remove_overlay for deferred pragmas as well in traditional mode. Co-Authored-By: Jakub Jelinek From-SVN: r168492 --- libcpp/ChangeLog | 7 +++++++ libcpp/directives.c | 9 +++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index e5f50399bffa..cb493c6c5574 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2011-11-04 Eric Botcazou + Jakub Jelinek + + PR preprocessor/39213 + * directives.c (end_directive): Call _cpp_remove_overlay for deferred + pragmas as well in traditional mode. + 2010-10-01 Release Manager * GCC 4.4.5 released. diff --git a/libcpp/directives.c b/libcpp/directives.c index 49f70b54da19..412a214a2d71 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -276,16 +276,17 @@ start_directive (cpp_reader *pfile) static void end_directive (cpp_reader *pfile, int skip_line) { - if (pfile->state.in_deferred_pragma) - ; - else if (CPP_OPTION (pfile, traditional)) + if (CPP_OPTION (pfile, traditional)) { /* Revert change of prepare_directive_trad. */ - pfile->state.prevent_expansion--; + if (!pfile->state.in_deferred_pragma) + pfile->state.prevent_expansion--; if (pfile->directive != &dtable[T_DEFINE]) _cpp_remove_overlay (pfile); } + else if (pfile->state.in_deferred_pragma) + ; /* We don't skip for an assembler #. */ else if (skip_line) { -- 2.47.2