diff options
| author | Diego Novillo <dnovillo@gcc.gnu.org> | 2010-06-01 10:20:24 -0400 |
|---|---|---|
| committer | Diego Novillo <dnovillo@gcc.gnu.org> | 2010-06-01 10:20:24 -0400 |
| commit | 558c51c59dea8a6d596889350970fb1d6c947d79 (patch) | |
| tree | a9b94038e6ad1ab42135385b6219b239fb2504cf /gcc | |
| parent | 2e3b48853d2d57009cf7e82919cba9eb2cbd5772 (diff) | |
| download | gcc-558c51c59dea8a6d596889350970fb1d6c947d79.zip gcc-558c51c59dea8a6d596889350970fb1d6c947d79.tar.gz gcc-558c51c59dea8a6d596889350970fb1d6c947d79.tar.bz2 | |
Undo inadvertent commit in rev 160105.
From-SVN: r160107
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/cvt.c | 28 | ||||
| -rw-r--r-- | gcc/simplify-rtx.c | 6 |
2 files changed, 15 insertions, 19 deletions
diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 2654ccd..646610a 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -822,26 +822,22 @@ ocp_convert (tree type, tree expr, int convtype, int flags) tree convert_to_void (tree expr, const char *implicit, tsubst_flags_t complain) { + tree exprv; + if (expr == error_mark_node || TREE_TYPE (expr) == error_mark_node) return error_mark_node; - if (implicit == NULL) - mark_rvalue_use (expr); - else - { - tree exprv = expr; - - while (TREE_CODE (exprv) == COMPOUND_EXPR) - exprv = TREE_OPERAND (exprv, 1); - if (DECL_P (exprv) || handled_component_p (exprv)) - /* Expr is not being 'used' here, otherwise we whould have - called mark_{rl}value_use use here, which would have in turn - called mark_exp_read. Rather, we call mark_exp_read directly - to avoid some warnings when - -Wunused-but-set-{variable,parameter} is in effect. */ - mark_exp_read (exprv); - } + exprv = expr; + while (TREE_CODE (exprv) == COMPOUND_EXPR) + exprv = TREE_OPERAND (exprv, 1); + if (DECL_P (exprv) || handled_component_p (exprv)) + /* Expr is not being 'used' here, otherwise we whould have + called mark_{rl}value_use use here, which would have in turn + called mark_exp_read. Rather, we call mark_exp_read directly + to avoid some warnings when + -Wunused-but-set-{variable,parameter} is in effect. */ + mark_exp_read (exprv); if (!TREE_TYPE (expr)) return expr; diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c index c085952..b38ab2e 100644 --- a/gcc/simplify-rtx.c +++ b/gcc/simplify-rtx.c @@ -4875,7 +4875,7 @@ simplify_immed_subreg (enum machine_mode outermode, rtx op, a mistake.) */ { unsigned byte = (elem * elem_bitsize) / BITS_PER_UNIT; - unsigned ibyte ATTRIBUTE_UNUSED = (((num_elem - 1 - elem) * elem_bitsize) + unsigned ibyte = (((num_elem - 1 - elem) * elem_bitsize) / BITS_PER_UNIT); unsigned word_byte = WORDS_BIG_ENDIAN ? ibyte : byte; unsigned subword_byte = BYTES_BIG_ENDIAN ? ibyte : byte; @@ -4979,7 +4979,7 @@ simplify_immed_subreg (enum machine_mode outermode, rtx op, will already have offset 0. */ if (GET_MODE_SIZE (innermode) >= GET_MODE_SIZE (outermode)) { - unsigned ibyte ATTRIBUTE_UNUSED = (GET_MODE_SIZE (innermode) - GET_MODE_SIZE (outermode) + unsigned ibyte = (GET_MODE_SIZE (innermode) - GET_MODE_SIZE (outermode) - byte); unsigned word_byte = WORDS_BIG_ENDIAN ? ibyte : byte; unsigned subword_byte = BYTES_BIG_ENDIAN ? ibyte : byte; @@ -5024,7 +5024,7 @@ simplify_immed_subreg (enum machine_mode outermode, rtx op, a mistake.) */ { unsigned byte = (elem * elem_bitsize) / BITS_PER_UNIT; - unsigned ibyte ATTRIBUTE_UNUSED = (((num_elem - 1 - elem) * elem_bitsize) + unsigned ibyte = (((num_elem - 1 - elem) * elem_bitsize) / BITS_PER_UNIT); unsigned word_byte = WORDS_BIG_ENDIAN ? ibyte : byte; unsigned subword_byte = BYTES_BIG_ENDIAN ? ibyte : byte; |