diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-03-11 11:15:10 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-11 11:15:10 +0000 |
| commit | 884523df8d676fd03c8d5bacfd98747d7f941a99 (patch) | |
| tree | 34017ef406c60bf1c52ac6f7774bb916f73ccc21 /gcc/java/expr.c | |
| parent | 3fcaac1d8c04d2966e667e1e4b18959bb94656c9 (diff) | |
| download | gcc-884523df8d676fd03c8d5bacfd98747d7f941a99.zip gcc-884523df8d676fd03c8d5bacfd98747d7f941a99.tar.gz gcc-884523df8d676fd03c8d5bacfd98747d7f941a99.tar.bz2 | |
parse.y (patch_assignment): Wrap the right-hand-side with a save_expr to prevent it getting evaluated twice...
* parse.y (patch_assignment): Wrap the right-hand-side with a save_expr
to prevent it getting evaluated twice in the store checking case.
* expr.c (build_java_arraystore_check): Unwrap SAVE_EXPR's when
examining OBJECT.
From-SVN: r50570
Diffstat (limited to 'gcc/java/expr.c')
| -rw-r--r-- | gcc/java/expr.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 8eb816e..fa2935f 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -811,7 +811,7 @@ build_java_arraystore_check (array, object) tree array; tree object; { - tree check, element_type; + tree check, element_type, source; tree array_type_p = TREE_TYPE (array); tree object_type = TYPE_NAME (TREE_TYPE (TREE_TYPE (object))); @@ -837,11 +837,17 @@ build_java_arraystore_check (array, object) || CLASS_FINAL (element_type))) return build1 (NOP_EXPR, array_type_p, array); + /* OBJECT might be wrapped by a SAVE_EXPR. */ + if (TREE_CODE (object) == SAVE_EXPR) + source = TREE_OPERAND (object, 0); + else + source = object; + /* Avoid the check if OBJECT was just loaded from the same array. */ - if (TREE_CODE (object) == ARRAY_REF) + if (TREE_CODE (source) == ARRAY_REF) { tree target; - tree source = TREE_OPERAND (object, 0); /* COMPONENT_REF. */ + source = TREE_OPERAND (source, 0); /* COMPONENT_REF. */ source = TREE_OPERAND (source, 0); /* INDIRECT_REF. */ source = TREE_OPERAND (source, 0); /* Source array's DECL or SAVE_EXPR. */ if (TREE_CODE (source) == SAVE_EXPR) |