diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-02 16:38:05 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-06-02 16:38:05 +0000 |
| commit | 24d2e7f8c5c5de77acdf237bdbacf8d076d0a54b (patch) | |
| tree | 7ee063f8af7cf0286b6498f0a769ce77d0b4a6c9 /gcc/java | |
| parent | bb644f257f764f423569256ab096a6f5b51e884d (diff) | |
| download | gcc-24d2e7f8c5c5de77acdf237bdbacf8d076d0a54b.tar.gz | |
Fix for PR java/5913:
* parse.y (patch_binop): Call patch_string on op1.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 1ddef436b33..1de79dfbe7c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,10 @@ 2002-06-02 Tom Tromey <tromey@redhat.com> + Fix for PR java/5913: + * parse.y (patch_binop): Call patch_string on op1. + +2002-06-02 Tom Tromey <tromey@redhat.com> + Fix for PR java/1343, PR java/6336: * parse.y (make_nested_class_name): Remove extraneous `else'; fix formatting. Changed return type. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 742cc6f3b00..197816feb12 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -13538,6 +13538,15 @@ patch_binop (node, wfl_op1, wfl_op2) TREE_TYPE (node) = boolean_type_node; + /* OP1_TYPE might be NULL when OP1 is a string constant. */ + if ((cn = patch_string (op1))) + { + op1 = cn; + op1_type = TREE_TYPE (op1); + } + if (op1_type == NULL_TREE) + abort (); + if (!(op2_type = resolve_type_during_patch (op2))) return error_mark_node; |