diff options
| author | Andrew Haley <aph@redhat.com> | 2002-12-19 06:43:12 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2002-12-19 06:43:12 +0000 |
| commit | 71d082af2f352ab8c65c6668ecef830fdc2547f2 (patch) | |
| tree | e735cfccad765c219865a9ea699dc216159fb1e7 /gcc/java | |
| parent | 453eac4a7d74f65a362d616656ef5d95dfe41f42 (diff) | |
| download | gcc-71d082af2f352ab8c65c6668ecef830fdc2547f2.zip gcc-71d082af2f352ab8c65c6668ecef830fdc2547f2.tar.gz gcc-71d082af2f352ab8c65c6668ecef830fdc2547f2.tar.bz2 | |
re PR libgcj/8945 (StringTokenizer)
2002-12-18 Andrew Haley <aph@redhat.com>
* parse.y (patch_invoke): Force evaluation order when `check' is
set. For PR libgcj/8945.
From-SVN: r60290
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index bed6fdc..3b6cf6c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2002-12-18 Andrew Haley <aph@redhat.com> + + * parse.y (patch_invoke): Force evaluation order when `check' is + set. For PR libgcj/8945. + 2002-12-16 Mark Mitchell <mark@codesourcery.com> * gcj.texi: Change version number to 3.4. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index d117368..b68eb15 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -10793,7 +10793,11 @@ patch_invoke (patch, method, args) is NULL. */ if (check != NULL_TREE) { - patch = build (COMPOUND_EXPR, TREE_TYPE (patch), check, patch); + /* We have to call force_evaluation_order now because creating a + COMPOUND_EXPR wraps the arg list in a way that makes it + unrecognizable by force_evaluation_order later. Yuk. */ + patch = build (COMPOUND_EXPR, TREE_TYPE (patch), check, + force_evaluation_order (patch)); TREE_SIDE_EFFECTS (patch) = 1; } |