diff options
| author | dodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-02 16:55:19 +0000 |
|---|---|---|
| committer | dodji <dodji@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-05-02 16:55:19 +0000 |
| commit | 6cfa7465658b8383fe8b233b1f37647224aaa505 (patch) | |
| tree | eca8487b03f6e48b0470d9df650fe3ac37959625 /libcpp/ChangeLog | |
| parent | e3a19533c3ba16854e1dc1bb2ac7ce197883e38f (diff) | |
| download | ppe42-gcc-6cfa7465658b8383fe8b233b1f37647224aaa505.tar.gz ppe42-gcc-6cfa7465658b8383fe8b233b1f37647224aaa505.zip | |
Properly initialize cpp_context in destringize_and_run
destringize_and_run forgets to initialize all the fields of the
cpp_context that it pushes. Later _cpp_pop_context then gets confused
when it accesses context->tokens_kind via the call to macro_of_context
on context->prev.
The first hunk of this patch is the real obvious fix. The second hunk
is just an assert that I am adding to err on the safe side.
Tested by on x86_64-unknown-linux-gnu against trunk by running the
test gcc.dg/gomp/macro-4.c under Valgrind, and bootstrapped.
libcpp/
* directives.c (destringize_and_run): Properly initialize the new
context.
* macro.c (_cpp_pop_context): Assert that we shouldn't try to pop
the initial base context, which has the same life time as the
current instance of cpp_file.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@187054 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp/ChangeLog')
| -rw-r--r-- | libcpp/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 2dc1190146c..7365c4e7beb 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,12 @@ +2012-05-02 Dodji Seketeli <dodji@redhat.com> + + Properly initialize cpp_context in destringize_and_run + * directives.c (destringize_and_run): Properly initialize the new + context. + * macro.c (_cpp_pop_context): Assert that we shouldn't try to pop + the initial base context, which has the same life time as the + current instance of cpp_file. + 2012-04-30 Manuel López-Ibáñez <manu@gcc.gnu.org> Dodji Seketeli <dodji@seketeli.org> |
