Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
/* Statement simplification on GIMPLE.
|
2013-01-10 21:38:27 +01:00
|
|
|
Copyright (C) 2010-2013 Free Software Foundation, Inc.
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
Split out from tree-ssa-ccp.c.
|
|
|
|
|
|
|
|
This file is part of GCC.
|
|
|
|
|
|
|
|
GCC is free software; you can redistribute it and/or modify it
|
|
|
|
under the terms of the GNU General Public License as published by the
|
|
|
|
Free Software Foundation; either version 3, or (at your option) any
|
|
|
|
later version.
|
|
|
|
|
|
|
|
GCC is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GCC; see the file COPYING3. If not see
|
|
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "system.h"
|
|
|
|
#include "coretypes.h"
|
|
|
|
#include "tm.h"
|
|
|
|
#include "tree.h"
|
2013-11-19 13:31:09 +01:00
|
|
|
#include "stringpool.h"
|
|
|
|
#include "expr.h"
|
|
|
|
#include "stmt.h"
|
|
|
|
#include "stor-layout.h"
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
#include "flags.h"
|
|
|
|
#include "function.h"
|
system.h (dump_file): Do not define.
gcc/
* system.h (dump_file): Do not define.
* tree-pass.h: Include dumpfile.h, which is a new file containing...
(enum tree_dump_index, TDF_*, get_dump_file_name, dump_enabled_p,
dump_initialized_p, dump_begin, dump_end, dump_node, dump_switch_p,
dump_flag_name, dump_file, dump_flags, dump_file_name,
get_dump_file_info, struct dump_file_info): all of this, moved to...
* dumpfile.h: Here, new file.
* tree-dump.h: Include dumpfile.h, but not tree-pass.h.
(dump_stmt): Remove prototype for C++ specific function.
(dump_enumerated_decls): Move prototype from here...
* tree-flow.h (dump_enumerated_decls): ... to here.
(get_ref_base_and_extent) Move prototype from here ...
* tree.h (get_ref_base_and_extent) ... to here.
* tree-ssa-live.c: Do not inclde tree-pretty-print.h, because
gimple-pretty-print.h is enough. Do not include tree-dump.h,
include timevar.h and dumpfile.h instead.
(struct numbered_tree_d, compare_decls_by_uid,
dump_enumerated_decls_push, dump_enumerated_decls): Move from here ...
* tree-dfa.c:(struct numbered_tree_d, compare_decls_by_uid,
dump_enumerated_decls_push, dump_enumerated_decls):... to here.
Do not include timevar.h.
* tree.c: Do not include timevar.h.
* tree-cfg.c: Do not include langhooks.h, tree-pretty-print.h, and
timevar.h.
(dump_cfg_stats): Use current_function_name.
(gimple_cfg2vcg): Likewise.
(dump_function_to_file): Likewise.
* df-scan.c: Do not include tree-pass.h and timevar.h.
Include dumpfile.h.
(df_entry_block_bitmap_verify, df_exit_block_bitmap_verify): Do not
use print_current_pass.
* df-problems.c: Include dumpfile.h.
Always define REG_DEAD_DEBUGGING, avoid #ifdef code, because it
leads to errors in the code not selected.
(df_note_compute): Do not print_rtl_with_bb here. Fix compilation
bug if REG_DEAD_DEBUGGING is not 0, get_insns is not available here.
* lcm.c: Include dumpfile.h.
Remove obsolete include of insn-attr.h.
* dojump.c (do_compare_rtx_and_jump): Remove failure printing for
missing probability notes.
* stmt.c: Include dumpfile.h.
(emit_case_decision_tree): Re-enable printing expand details only
if TDF_DETAILS.
* alias.c, auto-inc-dec.c, bb-reorder.c, caller-save.c, cfg.c,
cfgcleanup.c, cfgexpand.c, cfgloop.c, cfgloopmanip.c, cgraph.c,
cgraphclones.c, cgraphunit.c, combine.c, combine-stack-adj.c,
coverage.c, cprop.c, cse.c, cselib.c, dbgcnt.c, dce.c, df-core.c,
dse.c, dwarf2out.c, emit-rtl.c, except.c, expr.c, final.c,
function.c, fwprop.c, gcse.c, gimple-fold.c,
gimple-pretty-print.c, gimple-ssa-strength-reduction.c,
gimplify.c, graphite-blocking.c, graphite-clast-to-gimple.c,
graphite-dependences.c, graphite-interchange.c,
graphite-optimize-isl.c, graphite-poly.c,
graphite-sese-to-poly.c, haifa-sched.c, hw-doloop.c, ifcvt.c,
ipa.c, ipa-cp.c, ipa-inline-analysis.c, ipa-inline.c,
ipa-inline-transform.c, ipa-prop.c, ipa-pure-const.c,
ipa-reference.c, ipa-split.c, ipa-utils.c, ira.c, ira-emit.c,
jump.c, loop-doloop.c, loop-init.c, loop-invariant.c, loop-iv.c,
loop-unroll.c, loop-unswitch.c, lower-subreg.c,
lto-section-out.c, lto-streamer-in.c, matrix-reorg.c, mcf.c,
mode-switching.c, modulo-sched.c, omega.c, omp-low.c, passes.c,
plugin.c, postreload.c, postreload-gcse.c, predict.c, print-rtl.c,
print-tree.c, profile.c, recog.c, ree.c, regcprop.c, reginfo.c,
regmove.c, regrename.c, reg-stack.c, reload1.c, reorg.c,
sched-rgn.c, sched-vis.c, sel-sched.c, sel-sched-ir.c,
store-motion.c, tracer.c, trans-mem.c, tree-affine.c,
tree-call-cdce.c, tree-cfgcleanup.c, tree-chrec.c,
tree-data-ref.c, tree-diagnostic.c, tree-dump.c,
tree-eh.c, tree-flow-inline.h, tree-if-conv.c, tree-into-ssa.c,
tree-mudflap.c, tree-nrv.c, tree-object-size.c,
tree-optimize.c, tree-outof-ssa.c, tree-predcom.c,
tree-pretty-print.c, tree-profile.c, tree-scalar-evolution.c,
tree-sra.c, tree-ssa-address.c, tree-ssa-alias.c, tree-ssa.c,
tree-ssa-ccp.c, tree-ssa-coalesce.c, tree-ssa-copy.c,
tree-ssa-copyrename.c,, tree-ssa-dce.c, tree-ssa-dom.c,
tree-ssa-dse.c, tree-ssa-forwprop.c, tree-ssa-ifcombine.c,
tree-ssa-loop.c, tree-ssa-loop-ch.c, tree-ssa-loop-im.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-ivopts.c,
tree-ssa-loop-manip.c, tree-ssa-loop-niter.c,
tree-ssa-loop-prefetch.c, tree-ssa-loop-unswitch.c,
tree-ssa-math-opts.c, tree-ssa-operands.c, tree-ssa-phiopt.c,
tree-ssa-phiprop.c, tree-ssa-pre.c, tree-ssa-propagate.c,
tree-ssa-reassoc.c, tree-ssa-sccvn.c, tree-ssa-sink.c,
tree-ssa-structalias.c, tree-ssa-tail-merge.c, tree-ssa-ter.c,
tree-ssa-threadedge.c, tree-ssa-threadupdate.c,
tree-ssa-uncprop.c, tree-ssa-uninit.c,
tree-switch-conversion.c, tree-tailcall.c,
tree-vect-data-refs.c, tree-vect-loop.c,
tree-vect-loop-manip.c, tree-vectorizer.c,
tree-vect-patterns.c, tree-vect-slp.c, tree-vect-stmts.c,
tree-vrp.c, value-prof.c, var-tracking.c, web.c: Include tree-pass.h
only if needed. If tree-pass.h is included, do not include timevar.h
and dumpfile.h. If tree-pass.h is not included but dump_file, or
dump_flags, or the TDF_* flags are used, include dumpfile.h.
If gimple-pretty-print.h is included, don't include tree-pretty-print.h.
Remove assorted unnecessary includes.
* config/mn10300/mn10300.c, config/c6x/c6x.c, config/ia64/ia64.c,
config/arm/arm.c, config/bfin/bfin.c, config/frv/frv.c,
config/spu/spu.c, config/mep/mep.c, config/i386/i386.c:
Include dumpfile.h.
* config/rl78/rl78.c: Include dumpfile.h instead of tree-pass.h.
* arm/t-arm, avr/t-avr, i386/t-i386, ia64/t-ia64, mep/t-mep,
spu/t-spu-elf: Fix dependencies.
c-family/
* c-gimplify.c: Include dumpfile.h instead of tree-dump.h.
* c-ada-spec.c: Likewise.
* c-dump.c (dump_stmt): Move to cp/dump.c, the only user.
c/
* c-decl.c: Include dumpfile.h instead of tree-dump.h.
* Make-lang.in: Fix dependencies.
cp/
* dump.c (dump_stmt): Moved here from c-dump.c.
* optimize.c: Include dumpfile.h instead of tree-dump.h.
* class.c: Likewise.
* decl2.c: Likewise.
* Make-lang.in: Fix dependencies.
fortran/
* f95-lang.c: Include dumpfile.h instead of tree-dump.h.
* Make-lang.in: Fix dependencies.
java/
* java-gimplify.c Include dumpfile.h instead of tree-dump.h
* Make-lang.in: Fix dependencies.
lto/
* lto.c: Do not include timevar.h.
* Make-lang.in: Fix dependencies.
ada/
* gcc-interface/utils.c: Include timevar.h.
* Make-lang.in: Fix dependencies.
From-SVN: r189519
2012-07-16 13:32:42 +02:00
|
|
|
#include "dumpfile.h"
|
2013-10-23 14:16:58 +02:00
|
|
|
#include "bitmap.h"
|
2013-11-22 16:58:51 +01:00
|
|
|
#include "basic-block.h"
|
|
|
|
#include "tree-ssa-alias.h"
|
|
|
|
#include "internal-fn.h"
|
|
|
|
#include "gimple-fold.h"
|
|
|
|
#include "gimple-expr.h"
|
|
|
|
#include "is-a.h"
|
gimplify-be.h: New file.
* gimplify-be.h: New file. Add prototypes.
* gimplify.h: Don't include gimple.h.
(struct gimplify_hasher, struct gimplify_ctx, is_gimple_sizepos,
gimplify_hasher::hash, gimplify_hasher::equal): Relocate from gimple.h.
* gimple.h (struct gimplify_hasher, gimplify_hasher::hash,
gimplify_hasher::equal, struct gimplify_ctx, is_gimple_sizepos): Move
to gimplify.h.
(enum gsi_iterator_update): Move to gimple-iterator.h.
* gimple-iterator.h (enum gsi_iterator_update): Relocate from gimple.h.
* gimplify-be.c: New File.
(force_gimple_operand_1, force_gimple_operand,
force_gimple_operand_gsi_1, force_gimple_operand_gsi): Relocate from
gimplify.c.
* gimplify.c (force_gimple_operand_1, force_gimple_operand,
force_gimple_operand_gsi_1, force_gimple_operand_gsi): Move to
gimplify-be.c.
* Makefile.in (OBJS): Add gimplify-be.o
* asan.c: Include only gimplify.h, gimplify-be.h, and/or gimple.h as
required.
* cfgloopmanip.c: Likewise.
* cgraphunit.c: Likewise.
* cilk-common.c: Likewise.
* fold-const.c: Likewise.
* function.c: Likewise.
* gimple-expr.c: Likewise.
* gimple-fold.c: Likewise.
* gimple-ssa-strength-reduction.c: Likewise.
* gimple.c: Likewise.
* graphite-clast-to-gimple.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* ipa-prop.c: Likewise.
* ipa-split.c: Likewise.
* ipa.c: Likewise.
* langhooks.c: Likewise.
* omp-low.c: Likewise.
* sese.c: Likewise.
* stor-layout.c: Likewise.
* targhooks.c: Likewise.
* trans-mem.c: Likewise.
* tree-affine.c: Likewise.
* tree-cfg.c: Likewise.
* tree-cfgcleanup.c: Likewise.
* tree-complex.c: Likewise.
* tree-if-conv.c: Likewise.
* tree-inline.c: Likewise.
* tree-loop-distribution.c: Likewise.
* tree-nested.c: Likewise.
* tree-parloops.c: Likewise.
* tree-predcom.c: Likewise.
* tree-profile.c: Likewise.
* tree-scalar-evolution.c: Likewise.
* tree-sra.c: Likewise.
* tree-ssa-address.c: Likewise.
* tree-ssa-ccp.c: Likewise.
* tree-ssa-dce.c: Likewise.
* tree-ssa-forwprop.c: Likewise.
* tree-ssa-ifcombine.c: Likewise.
* tree-ssa-loop-im.c: Likewise.
* tree-ssa-loop-ivopts.c: Likewise.
* tree-ssa-loop-manip.c: Likewise.
* tree-ssa-loop-niter.c: Likewise.
* tree-ssa-loop-prefetch.c: Likewise.
* tree-ssa-loop-unswitch.c: Likewise.
* tree-ssa-math-opts.c: Likewise.
* tree-ssa-phiopt.c: Likewise.
* tree-ssa-phiprop.c: Likewise.
* tree-ssa-pre.c: Likewise.
* tree-ssa-propagate.c: Likewise.
* tree-ssa-reassoc.c: Likewise.
* tree-ssa-sccvn.c: Likewise.
* tree-ssa-strlen.c: Likewise.
* tree-ssa.c: Likewise.
* tree-switch-conversion.c: Likewise.
* tree-tailcall.c: Likewise.
* tree-vect-data-refs.c: Likewise.
* tree-vect-generic.c: Likewise.
* tree-vect-loop-manip.c: Likewise.
* tree-vect-loop.c: Likewise.
* tree-vect-patterns.c: Likewise.
* tree-vect-stmts.c: Likewise.
* tree.c: Likewise.
* tsan.c: Likewise.
* value-prof.c: Likewise.
* config/aarch64/aarch64.c: Likewise.
* config/alpha/alpha.c: Likewise.
* config/darwin.c: Likewise.
* config/i386/i386.c: Likewise.
* config/ia64/ia64.c: Likewise.
* config/mep/mep.c: Likewise.
* config/mips/mips.c: Likewise.
* config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c: Likewise.
* config/sh/sh.c: Likewise.
* config/sparc/sparc.c: Likewise.
* config/spu/spu.c: Likewise.
* config/stormy16/stormy16.c: Likewise.
* config/tilegx/tilegx.c: Likewise.
* config/tilepro/tilepro.c: Likewise.
* config/xtensa/xtensa.c: Likewise.
* c/c-typeck.c: Include only gimplify.h and gimple.h as needed.
* c-family/c-common.c: Likewise.
* c-family/c-gimplify.c: Likewise.
* c-family/cilk.c: Likewise.
* cp/class.c: Include only gimplify.h and gimple.h as needed.
* cp/cp-gimplify.c: Likewise.
* cp/error.c: Likewise.
* cp/init.c: Likewise.
* cp/optimize.c: Likewise.
* cp/pt.c: Likewise.
* cp/semantics.c: Likewise.
* cp/tree.c: Likewise.
* cp/vtable-class-hierarchy.c: Likewise.
* fortran/trans-expr.c: Include only gimplify.h and gimple.h as needed.
* fortran/trans-openmp.c: Likewise.
* go/go-lang.c: Include only gimplify.h and gimple.h as needed.
* java/java-gimplify.c: Include only gimplify.h and gimple.h as needed.
* objc/objc-act.c: Include only gimplify.h and gimple.h as needed.
From-SVN: r204812
2013-11-14 20:39:38 +01:00
|
|
|
#include "gimple.h"
|
gimple-expr.h (create_tmp_var_name, [...]): Relocate prototypes from gimple.h.
2013-11-12 Andrew MacLeod <amacleod@redhat.com>
* gimple-expr.h (create_tmp_var_name, create_tmp_var_raw,
create_tmp_var, create_tmp_reg, mark_addressable, is_gimple_reg_rhs):
Relocate prototypes from gimple.h.
* gimplify.h: New File. Relocate some prototypes from gimple.h here.
(gimple_predicate, enum fallback, enum gimplify_status): Relocate
from gimple.h.
* gimple.h: Move some prototypes to gimplify.h.
(gimple_predicate, enum fallback, enum gimplify_status): Move to
gimplify.h.
(gimple_do_not_emit_location_p, gimple_set_do_not_emit_location):
Relocate from gimpify.c.
* gimple-expr.c (remove_suffix, tmp_var_id_num, create_tmp_var_name,
create_tmp_var_raw, create_tmp_var, create_tmp_reg, mark_addressable,
is_gimple_reg_rhs) Relocate from gimplify.c.
* gimplify.c (mark_addressable): Move to gimple-expr.c.
(gimple_seq_add_stmt_without_update): Move to gimple.c.
(remove_suffix, tmp_var_id_num, create_tmp_var_name, create_tmp_var_raw,
create_tmp_var, create_tmp_reg, is_gimple_reg_rhs): Move to
gimple-expr.c.
(should_carry_location_p): Move to gimple.c.
(gimple_do_not_emit_location_p, gimple_set_do_not_emit_location): Move
to gimple.h.
(annotate_one_with_location, annotate_all_with_location_after,
annotate_all_with_location): Move to gimple.c.
(compare_case_labels, sort_case_labels,
preprocess_case_label_vec_for_gimple): Move to gimple.c.
(rhs_predicate_for): Make static.
(gimplify_assign): Relocate from gimple.c.
* gimple.c (gimplify_assign): Move to gimplify.c.
(gimple_seq_add_stmt_without_update, should_carry_location_p,
annotate_one_with_location, annotate_all_with_location_after,
annotate_all_with_location, compare_case_labels, sort_case_labels,
preprocess_case_label_vec_for_gimple): Relocate from gimplify.c.
* tree.h (unshare_expr, unshare_expr_without_location,
mark_addressable): Move prototypes to gimplify.h.
* Makefile.in (GTFILES): gimple-expr.c now has the GTY tag for
tmp_var_id_num
* asan.c: Include gimplify.h rather than gimple.h.
* cfgloopmanip.c: Likewise.
* cgraphunit.c: Likewise.
* cilk-common.c: Likewise.
* dwarf2out.c: Dont include gimple.h.
* fold-const.c: Include gimplify.h rather than gimple.h.
* function.c: Likewise.
* gimple-fold.c: Likewise.
* gimple-ssa-strength-reduction.c: Likewise.
* graphite-clast-to-gimple.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* ipa-prop.c: Likewise.
* ipa-split.c: Likewise.
* ipa.c: Likewise.
* langhooks.c: Dont include gimple.h.
* loop-init.c: Include gimplify.h rather than gimple.h.
* omp-low.c: Likewise.
* sese.c: Likewise.
* stor-layout.c: Likewise.
* targhooks.c: Likewise.
* trans-mem.c: Likewise.
* tree-affine.c: Likewise.
* tree-cfg.c: Likewise.
* tree-cfgcleanup.c: Likewise.
* tree-complex.c: Likewise.
* tree-if-conv.c: Likewise.
* tree-inline.c: Likewise.
* tree-iterator.c: Likewise.
* tree-loop-distribution.c: Likewise.
* tree-nested.c: Likewise.
* tree-parloops.c: Likewise.
* tree-predcom.c: Likewise.
* tree-profile.c: Likewise.
* tree-scalar-evolution.c: Likewise.
* tree-sra.c: Likewise.
* tree-ssa-address.c: Likewise.
* tree-ssa-ccp.c: Likewise.
* tree-ssa-dce.c: Likewise.
* tree-ssa-forwprop.c: Likewise.
* tree-ssa-ifcombine.c: Likewise.
* tree-ssa-loop-im.c: Likewise.
* tree-ssa-loop-ivopts.c: Likewise.
* tree-ssa-loop-manip.c: Likewise.
* tree-ssa-loop-niter.c: Likewise.
* tree-ssa-loop-prefetch.c: Likewise.
* tree-ssa-loop-unswitch.c: Likewise.
* tree-ssa-math-opts.c: Likewise.
* tree-ssa-phiopt.c: Likewise.
* tree-ssa-phiprop.c: Likewise.
* tree-ssa-pre.c: Likewise.
* tree-ssa-propagate.c: Likewise.
* tree-ssa-reassoc.c: Likewise.
* tree-ssa-sccvn.c: Likewise.
* tree-ssa-strlen.c: Likewise.
* tree-ssa.c: Likewise.
* tree-switch-conversio: Likewise.n.c
* tree-tailcall.c: Likewise.
* tree-vect-data-refs.c: Likewise.
* tree-vect-generic.c: Likewise.
* tree-vect-loop-manip.c: Likewise.
* tree-vect-loop.c: Likewise.
* tree-vect-patterns.c: Likewise.
* tree-vect-stmts.c: Likewise.
* tsan.c: Likewise.
* value-prof.c: Likewise.
* config/aarch64/aarch64.c: Include gimplify.h instead of gimple.h.
* config/alpha/alpha.c: Likewise.
* config/darwin.c: Likewise.
* config/i386/i386.c: Likewise.
* config/ia64/ia64.c: Likewise.
* config/mep/mep.c: Likewise.
* config/mips/mips.c: Likewise.
* config/rs6000/rs6000.c: Likewise.
* config/s390/s390.c: Likewise.
* config/sh/sh.c: Likewise.
* config/sparc/sparc.c: Likewise.
* config/spu/spu.c: Likewise.
* config/stormy16/stormy16.c: Likewise.
* config/tilegx/tilegx.c: Likewise.
* config/tilepro/tilepro.c: Likewise.
* config/xtensa/xtensa.c: Likewise.
* ada/gcc-interface/trans.c: Include gimplify.h.
* c/c-typeck.c: Include gimplify.h.
* c-family/c-common.c: Include gimplify.h.
* c-family/c-gimplify.c: Likewise.
* c-family/cilk.c: Likewise.
* c-family/c-omp.c: Include gimple-expr.h instead of gimple.h.
* c-family/c-ubsan.c: Don't include gimple.h.
* cp/class.c: Include gimplify.h.
* cp/cp-gimplify.c: Likewise.
* cp/error.c: Likewise.
* cp/init.c: Likewise.
* cp/optimize.c: Likewise.
* cp/pt.c: Likewise.
* cp/semantics.c: Likewise.
* cp/tree.c: Likewise.
* cp/vtable-class-hierarchy.c: Likewise.
* cp/decl2.c: Don't include gimple.h.
* cp/except.c: Likewise.
* cp/method.c: Include pointer-set.h instead of gimple.h.
* fortran/f95-lang.c: Don't include gimple.h.
* fortran/trans-array.c: Include gimple-expr.h instead of gimple.h.
* fortran/trans.c: Likewise.
* fortran/trans-decl.c: Likewise.
* fortran/trans-expr.c: Include gimplify.h.
* fortran/trans-openmp.c: Likewise.
* go/go-lang.c: Include gimplify.h.
* java/java-gimplify.c: Include gimplify.h.
* objc/objc-act.c: Include gimplify.h.
From-SVN: r204717
2013-11-12 21:26:43 +01:00
|
|
|
#include "gimplify.h"
|
gimple-walk.h: New File.
* gimple-walk.h: New File. Relocate prototypes from gimple.h.
(struct walk_stmt_info): Relocate here from gimple.h.
* gimple-iterator.h: New File. Relocate prototypes from gimple.h.
(struct gimple_stmt_iterator_d): Relocate here from gimple.h.
(gsi_start_1, gsi_none, gsi_start_bb, gsi_last_1, gsi_last_bb,
gsi_end_p, gsi_one_before_end_p, gsi_next, gsi_prev, gsi_stmt,
gsi_after_labels, gsi_next_nondebug, gsi_prev_nondebug,
gsi_start_nondebug_bb, gsi_start_nondebug_after_labels_bb,
gsi_last_nondebug_bb, gsi_bb, gsi_seq): Relocate here from gimple.h.
* gimple.h (struct gimple_stmt_iterator_d): Move to gimple-iterator.h.
(gsi_start_1, gsi_none, gsi_start_bb, gsi_last_1, gsi_last_bb,
gsi_end_p, gsi_one_before_end_p, gsi_next, gsi_prev, gsi_stmt,
gsi_after_labels, gsi_next_nondebug, gsi_prev_nondebug,
gsi_start_nondebug_bb, gsi_start_nondebug_after_labels_bb,
gsi_last_nondebug_bb, gsi_bb, gsi_seq): Move to gimple-iterator.h.
(struct walk_stmt_info): Move to gimple-walk.h.
(gimple_seq_set_location): Move to gimple.c
* gimple-walk.c: New File.
(walk_gimple_seq_mod, walk_gimple_seq, walk_gimple_asm, walk_gimple_op,
walk_gimple_stmt, get_base_loadstore, walk_stmt_load_store_addr_ops,
walk_stmt_load_store_ops): Relocate here from gimple.c.
* gimple-iterator.c: Include gimple-iterator.h.
* gimple.c (walk_gimple_seq_mod, walk_gimple_seq, walk_gimple_asm,
walk_gimple_op, walk_gimple_stmt, get_base_loadstore,
walk_stmt_load_store_addr_ops, walk_stmt_load_store_ops): Move to
gimple-walk.c.
(gimple_seq_set_location): Relocate from gimple.h.
* tree-phinodes.h (set_phi_nodes): Move to tree-phinodes.c.
* tree-phinodes.c (set_phi_nodes): Relocate from tree-phinodes.h.
* gengtype.c (open_base_files): Add gimple-iterator.h to include list.
* Makefile.in (OBJS): Add gimple-walk.o
* asan.c: Update Include list as required for gimple-iterator.h and
gimple-walk.h.
* cfgexpand.c: Likewise.
* cfgloop.c: Likewise.
* cfgloopmanip.c: Likewise.
* cgraph.c: Likewise.
* cgraphbuild.c: Likewise.
* cgraphunit.c: Likewise.
* gimple-fold.c: Likewise.
* gimple-low.c: Likewise.
* gimple-pretty-print.c: Likewise.
* gimple-ssa-isolate-paths.c: Likewise.
* gimple-ssa-strength-reduction.c: Likewise.
* gimple-streamer-in.c: Likewise.
* gimple-streamer-out.c: Likewise.
* gimplify.c: Likewise.
* graphite-blocking.c: Likewise.
* graphite-clast-to-gimple.c: Likewise.
* graphite-dependences.c: Likewise.
* graphite-interchange.c: Likewise.
* graphite-optimize-isl.c: Likewise.
* graphite-poly.c: Likewise.
* graphite-scop-detection.c: Likewise.
* graphite-sese-to-poly.c: Likewise.
* graphite.c: Likewise.
* ipa-inline-analysis.c: Likewise.
* ipa-profile.c: Likewise.
* ipa-prop.c: Likewise.
* ipa-pure-const.c: Likewise.
* ipa-split.c: Likewise.
* lto-streamer-in.c: Likewise.
* lto-streamer-out.c: Likewise.
* omp-low.c: Likewise.
* predict.c: Likewise.
* profile.c: Likewise.
* sese.c: Likewise.
* tracer.c: Likewise.
* trans-mem.c: Likewise.
* tree-call-cdce.c: Likewise.
* tree-cfg.c: Likewise.
* tree-cfgcleanup.c: Likewise.
* tree-complex.c: Likewise.
* tree-data-ref.c: Likewise.
* tree-dfa.c: Likewise.
* tree-eh.c: Likewise.
* tree-emutls.c: Likewise.
* tree-if-conv.c: Likewise.
* tree-inline.c: Likewise.
* tree-into-ssa.c: Likewise.
* tree-loop-distribution.c: Likewise.
* tree-nested.c: Likewise.
* tree-nrv.c: Likewise.
* tree-object-size.c: Likewise.
* tree-outof-ssa.c: Likewise.
* tree-parloops.c: Likewise.
* tree-predcom.c: Likewise.
* tree-profile.c: Likewise.
* tree-scalar-evolution.c: Likewise.
* tree-sra.c: Likewise.
* tree-ssa-ccp.c: Likewise.
* tree-ssa-coalesce.c: Likewise.
* tree-ssa-copy.c: Likewise.
* tree-ssa-copyrename.c: Likewise.
* tree-ssa-dce.c: Likewise.
* tree-ssa-dom.c: Likewise.
* tree-ssa-dse.c: Likewise.
* tree-ssa-forwprop.c: Likewise.
* tree-ssa-ifcombine.c: Likewise.
* tree-ssa-live.c: Likewise.
* tree-ssa-loop-ch.c: Likewise.
* tree-ssa-loop-im.c: Likewise.
* tree-ssa-loop-ivcanon.c: Likewise.
* tree-ssa-loop-ivopts.c: Likewise.
* tree-ssa-loop-manip.c: Likewise.
* tree-ssa-loop-niter.c: Likewise.
* tree-ssa-loop-prefetch.c: Likewise.
* tree-ssa-loop.c: Likewise.
* tree-ssa-math-opts.c: Likewise.
* tree-ssa-phiopt.c: Likewise.
* tree-ssa-phiprop.c: Likewise.
* tree-ssa-pre.c: Likewise.
* tree-ssa-propagate.c: Likewise.
* tree-ssa-reassoc.c: Likewise.
* tree-ssa-sink.c: Likewise.
* tree-ssa-strlen.c: Likewise.
* tree-ssa-structalias.c: Likewise.
* tree-ssa-tail-merge.c: Likewise.
* tree-ssa-ter.c: Likewise.
* tree-ssa-threadedge.c: Likewise.
* tree-ssa-threadupdate.c: Likewise.
* tree-ssa-uncprop.c: Likewise.
* tree-ssa-uninit.c: Likewise.
* tree-ssa.c: Likewise.
* tree-stdarg.c: Likewise.
* tree-switch-conversion.c: Likewise.
* tree-tailcall.c: Likewise.
* tree-vect-data-refs.c: Likewise.
* tree-vect-generic.c: Likewise.
* tree-vect-loop-manip.c: Likewise.
* tree-vect-loop.c: Likewise.
* tree-vect-patterns.c: Likewise.
* tree-vect-slp.c: Likewise.
* tree-vect-stmts.c: Likewise.
* tree-vectorizer.c: Likewise.
* tree-vrp.c: Likewise.
* tree.c: Likewise.
* tsan.c: Likewise.
* value-prof.c: Likewise.
* vtable-verify.c: Likewise.
* config/aarch64/aarch64-builtins.c: Include gimple-iterator.h.
* config/rs6000/rs6000.c: Include gimple-iterator.h and gimple-walk.h.
* testsuite/g++.dg/plugin/selfassign.c: Include gimple-iterator.h.
* testsuite/gcc.dg/plugin/selfassign.c: Likewise.
From-SVN: r204763
2013-11-14 00:54:17 +01:00
|
|
|
#include "gimple-iterator.h"
|
2013-10-23 14:16:58 +02:00
|
|
|
#include "gimple-ssa.h"
|
|
|
|
#include "tree-ssanames.h"
|
|
|
|
#include "tree-into-ssa.h"
|
|
|
|
#include "tree-dfa.h"
|
tree-ssa.h: New.
* tree-ssa.h: New. Move content from tree-flow.h and
tree-flow-inline.h.
* tree-flow.h (_edge_var_map, edge_var_map_vector): Move to tree-ssa.h.
Move prototypes belonging to tree-ssa.c.
* tree-flow-inline.h (redirect_edge_var_map_def,
redirect_edge_var_map_result, redirect_edge_var_map_location): Move to
tree-ssa.h.
* gimple.h: Adjust prototypes.
* tree-ssa.c (useless_type_conversion_p, types_compatible_p): Move to...
* gimple.c (useless_type_conversion_p, types_compatible_p): Here.
* tree.h: Move prototype to tree-ssa.h.
* gengtype.c (open_base_files): Replace tree-flow.h with tree-ssa.h.
* Makefile.in: (TREE_SSA_H, TREE_FLOW_H): Adjust dependencies.
* alias.c, asan.c, builtins.c, calls.c, cfgexpand.c, cfghooks.c,
cfgloop.c, cfgloopmanip.c, cgraph.c, cgraphbuild.c, cgraphclones.c,
cgraphunit.c, dse.c, except.c, expr.c, final.c, fold-const.c,
ggc-page.c, gimple-fold.c, gimple-iterator.c, gimple-low.c,
gimple-pretty-print.c, gimple-ssa-strength-reduction.c,
gimple-streamer-in.c, gimple-streamer-out.c, gimple.c, gimplify.c,
graphite-blocking.c, graphite-clast-to-gimple.c, graphite-dependences.c,
graphite-interchange.c, graphite-optimize-isl.c, graphite-poly.c,
graphite-scop-detection.c, graphite-sese-to-poly.c, graphite.c,
ipa-cp.c, ipa-inline-analysis.c, ipa-inline-transform.c, ipa-inline.c,
ipa-prop.c, ipa-pure-const.c, ipa-reference.c, ipa-split.c, ipa-utils.c,
loop-init.c, lto-cgraph.c, lto-section-in.c, lto-section-out.c,
lto-streamer-in.c, lto-streamer-out.c, lto-streamer.c, omp-low.c,
passes.c, predict.c, print-tree.c, profile.c, sese.c, targhooks.c,
tracer.c, trans-mem.c, tree-call-cdce.c, tree-cfg.c, tree-cfgcleanup.c,
tree-chrec.c, tree-complex.c, tree-data-ref.c, tree-dfa.c, tree-eh.c,
tree-emutls.c, tree-if-conv.c, tree-inline.c, tree-into-ssa.c,
tree-loop-distribution.c, tree-mudflap.c, tree-nested.c, tree-nrv.c,
tree-object-size.c, tree-optimize.c, tree-outof-ssa.c, tree-parloops.c,
tree-phinodes.c, tree-predcom.c, tree-pretty-print.c, tree-profile.c,
tree-scalar-evolution.c, tree-sra.c, tree-ssa*.c, tree-stdarg.c,
tree-streamer-in.c, tree-switch-conversion.c, tree-tailcall.c,
tree-vect-data-refs.c, tree-vect-generic.c, tree-vect-loop-manip.c,
tree-vect-loop.c, tree-vect-patterns.c, tree-vect-slp.c,
tree-vect-stmts.c, tree-vectorizer.c, tree-vrp.c, tsan.c,
value-prof.c, var-tracking.c,
varpool.c, vtable-verify.c: Replace tree-flow.h with tree-ssa.h
From-SVN: r202523
2013-09-12 15:03:18 +02:00
|
|
|
#include "tree-ssa.h"
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
#include "tree-ssa-propagate.h"
|
|
|
|
#include "target.h"
|
2013-09-23 18:54:34 +02:00
|
|
|
#include "ipa-utils.h"
|
|
|
|
#include "gimple-pretty-print.h"
|
tree-ssa.h: Don't include gimple-low.h...
* tree-ssa.h: Don't include gimple-low.h, tree-ssa-address.h, sbitmap.h,
tree-ssa-threadedge.h, tree-ssa-dom.h, and tree-cfgcleanup.h.
* gimple-low.c (gimple_check_call_arg,
gimple_check_call_matching_types): Move to cgraph.c.
* gimple-low.h: Remove prototype.
* cgraph.c: (gimple_check_call_arg, gimple_check_call_matching_types):
Relocate from gimple-low.c.
* cgraph.h: Add prototype. Don't include basic-block.h.
* gimplify.c: Add gimple-low to include list.
* omp-low.c: Add gimple-low and tree-cfgcleanup.h to include list.
* tree-eh.c: Add gimple-low to include list.
* tree-nested.c: Likewise.
* cfgexpand.c: Add tree-ssa-address.h to include list.
* expr.c: Likewise.
* gimple-fold.c: Likewise.
* gimple-ssa-strength-reduction.c: Likewise.
* trans-mem.c: Likewise.
* tree-mudflap.c: Likewise.
* tree-ssa-loop-ivopts.c: Likewise.
* tree-ssa-dom.c: Include tree-ssa-threadedge.h and tree-ssa-dom.h.
(degenerate_phi_result): Move to tree-phinodes.c.
* tree-ssa-loop-ch.c: Include tree-ssa-threadedge.h.
* tree-ssa-threadedge.c: Likewise.
* tree-vrp.c: Likewise.
* tree-phinodes.c (degenerate_phi_result): Relocate here.
* tree-ssa-dom.h (degenerate_phi_result): Remove Prototype.
* tree-phinodes.h (degenerate_phi_result): Add prototype.
* tree-ssa-copy.c: Include tree-ssa-dom.h.
* tree-ssa-forwprop.c: Likewise.
* tree-cfgcleanup.c (execute_cleanup_cfg_post_optimizing,
pass_data_cleanup_cfg_post_optimizing,
make_pass_cleanup_cfg_post_optimizing): Relocate from tree-optimize.c.
* tree-optimize.c: Delete File.
* graphite.c: Include tree-cfgcleanup.h.
* passes.c: Likewise.
* tree-cfg.c: Likewise.
* tree-profile.c: Likewise.
* tree-ssa-dse.c: Likewise.
* tree-ssa-loop-ivcanon.c: Likewise.
* tree-switch-conversion.c: Don't include tree-ssa-operands.h.
* tree-outof-ssa.c: Include sbitmap.h.
* tree-ssa-live.c: Likewise.
* tree-ssa-propagate.c: Likewise.
* tree-ssa-structalias.c: Likewise.
* tree-stdarg.c: Likewise.
* Makefile.in (OBJS): Delete tree-optimize.o.
* basic-block.h (gcov_type, gcov_type_unsigned): Move to coretypes.h.
* coretypes.h (gcov_type, gcov_type_unsigned): Relocate here.
* varasm.c: Include basic-block.h.
* cfgloop.h: Include function.h instead of basic-block.h
(bb_loop_depth): Move to cfgloop.c.
* cfgloop.c (bb_loop_depth): Relocate from cfgloop.h.
From-SVN: r203833
2013-10-18 21:35:40 +02:00
|
|
|
#include "tree-ssa-address.h"
|
2013-11-08 23:46:16 +01:00
|
|
|
#include "langhooks.h"
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
2010-10-04 22:59:07 +02:00
|
|
|
/* Return true when DECL can be referenced from current unit.
|
2012-05-19 11:49:47 +02:00
|
|
|
FROM_DECL (if non-null) specify constructor of variable DECL was taken from.
|
|
|
|
We can get declarations that are not possible to reference for various
|
|
|
|
reasons:
|
2010-09-18 23:25:29 +02:00
|
|
|
|
|
|
|
1) When analyzing C++ virtual tables.
|
|
|
|
C++ virtual tables do have known constructors even
|
|
|
|
when they are keyed to other compilation unit.
|
|
|
|
Those tables can contain pointers to methods and vars
|
|
|
|
in other units. Those methods have both STATIC and EXTERNAL
|
|
|
|
set.
|
|
|
|
2) In WHOPR mode devirtualization might lead to reference
|
|
|
|
to method that was partitioned elsehwere.
|
|
|
|
In this case we have static VAR_DECL or FUNCTION_DECL
|
|
|
|
that has no corresponding callgraph/varpool node
|
2010-10-04 22:59:07 +02:00
|
|
|
declaring the body.
|
|
|
|
3) COMDAT functions referred by external vtables that
|
2013-11-06 15:37:46 +01:00
|
|
|
we devirtualize only during final compilation stage.
|
2010-10-04 22:59:07 +02:00
|
|
|
At this time we already decided that we will not output
|
|
|
|
the function body and thus we can't reference the symbol
|
|
|
|
directly. */
|
|
|
|
|
2010-09-18 23:25:29 +02:00
|
|
|
static bool
|
2012-05-19 11:49:47 +02:00
|
|
|
can_refer_decl_in_current_unit_p (tree decl, tree from_decl)
|
2010-09-18 23:25:29 +02:00
|
|
|
{
|
2013-12-06 11:40:53 +01:00
|
|
|
varpool_node *vnode;
|
2010-09-18 23:25:29 +02:00
|
|
|
struct cgraph_node *node;
|
2013-10-31 22:26:14 +01:00
|
|
|
symtab_node *snode;
|
2012-05-19 11:49:47 +02:00
|
|
|
|
2013-09-16 13:47:48 +02:00
|
|
|
if (DECL_ABSTRACT (decl))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* We are concerned only about static/external vars and functions. */
|
|
|
|
if ((!TREE_STATIC (decl) && !DECL_EXTERNAL (decl))
|
|
|
|
|| (TREE_CODE (decl) != VAR_DECL && TREE_CODE (decl) != FUNCTION_DECL))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Static objects can be referred only if they was not optimized out yet. */
|
|
|
|
if (!TREE_PUBLIC (decl) && !DECL_EXTERNAL (decl))
|
|
|
|
{
|
|
|
|
snode = symtab_get_node (decl);
|
|
|
|
if (!snode)
|
|
|
|
return false;
|
|
|
|
node = dyn_cast <cgraph_node> (snode);
|
|
|
|
return !node || !node->global.inlined_to;
|
|
|
|
}
|
|
|
|
|
2012-06-15 16:40:38 +02:00
|
|
|
/* We will later output the initializer, so we can refer to it.
|
2012-05-19 11:49:47 +02:00
|
|
|
So we are concerned only when DECL comes from initializer of
|
|
|
|
external var. */
|
|
|
|
if (!from_decl
|
|
|
|
|| TREE_CODE (from_decl) != VAR_DECL
|
|
|
|
|| !DECL_EXTERNAL (from_decl)
|
2012-06-15 16:40:38 +02:00
|
|
|
|| (flag_ltrans
|
2013-10-29 19:30:00 +01:00
|
|
|
&& symtab_get_node (from_decl)->in_other_partition))
|
2012-05-19 11:49:47 +02:00
|
|
|
return true;
|
|
|
|
/* We are folding reference from external vtable. The vtable may reffer
|
|
|
|
to a symbol keyed to other compilation unit. The other compilation
|
|
|
|
unit may be in separate DSO and the symbol may be hidden. */
|
|
|
|
if (DECL_VISIBILITY_SPECIFIED (decl)
|
|
|
|
&& DECL_EXTERNAL (decl)
|
2013-10-29 19:30:00 +01:00
|
|
|
&& (!(snode = symtab_get_node (decl)) || !snode->in_other_partition))
|
2012-05-19 11:49:47 +02:00
|
|
|
return false;
|
2010-10-04 22:59:07 +02:00
|
|
|
/* When function is public, we always can introduce new reference.
|
|
|
|
Exception are the COMDAT functions where introducing a direct
|
|
|
|
reference imply need to include function body in the curren tunit. */
|
|
|
|
if (TREE_PUBLIC (decl) && !DECL_COMDAT (decl))
|
|
|
|
return true;
|
|
|
|
/* We are not at ltrans stage; so don't worry about WHOPR.
|
|
|
|
Also when still gimplifying all referred comdat functions will be
|
2011-04-17 18:37:07 +02:00
|
|
|
produced.
|
2012-05-19 11:49:47 +02:00
|
|
|
|
|
|
|
As observed in PR20991 for already optimized out comdat virtual functions
|
2012-05-29 16:14:06 +02:00
|
|
|
it may be tempting to not necessarily give up because the copy will be
|
2012-05-19 11:49:47 +02:00
|
|
|
output elsewhere when corresponding vtable is output.
|
|
|
|
This is however not possible - ABI specify that COMDATs are output in
|
|
|
|
units where they are used and when the other unit was compiled with LTO
|
|
|
|
it is possible that vtable was kept public while the function itself
|
|
|
|
was privatized. */
|
2010-10-04 22:59:07 +02:00
|
|
|
if (!flag_ltrans && (!DECL_COMDAT (decl) || !cgraph_function_flags_ready))
|
|
|
|
return true;
|
2012-05-19 11:49:47 +02:00
|
|
|
|
|
|
|
/* OK we are seeing either COMDAT or static variable. In this case we must
|
|
|
|
check that the definition is still around so we can refer it. */
|
2010-09-18 23:25:29 +02:00
|
|
|
if (TREE_CODE (decl) == FUNCTION_DECL)
|
|
|
|
{
|
|
|
|
node = cgraph_get_node (decl);
|
2010-10-04 22:59:07 +02:00
|
|
|
/* Check that we still have function body and that we didn't took
|
|
|
|
the decision to eliminate offline copy of the function yet.
|
|
|
|
The second is important when devirtualization happens during final
|
|
|
|
compilation stage when making a new reference no longer makes callee
|
|
|
|
to be compiled. */
|
2013-10-29 19:30:00 +01:00
|
|
|
if (!node || !node->definition || node->global.inlined_to)
|
2012-05-19 11:49:47 +02:00
|
|
|
{
|
|
|
|
gcc_checking_assert (!TREE_ASM_WRITTEN (decl));
|
|
|
|
return false;
|
|
|
|
}
|
2010-09-18 23:25:29 +02:00
|
|
|
}
|
|
|
|
else if (TREE_CODE (decl) == VAR_DECL)
|
|
|
|
{
|
|
|
|
vnode = varpool_get_node (decl);
|
2013-10-29 19:30:00 +01:00
|
|
|
if (!vnode || !vnode->definition)
|
2012-05-19 11:49:47 +02:00
|
|
|
{
|
|
|
|
gcc_checking_assert (!TREE_ASM_WRITTEN (decl));
|
|
|
|
return false;
|
|
|
|
}
|
2010-09-18 23:25:29 +02:00
|
|
|
}
|
2010-10-04 22:59:07 +02:00
|
|
|
return true;
|
2010-09-18 23:25:29 +02:00
|
|
|
}
|
|
|
|
|
2011-04-03 13:13:09 +02:00
|
|
|
/* CVAL is value taken from DECL_INITIAL of variable. Try to transform it into
|
2012-05-19 11:49:47 +02:00
|
|
|
acceptable form for is_gimple_min_invariant.
|
|
|
|
FROM_DECL (if non-NULL) specify variable whose constructor contains CVAL. */
|
2010-09-04 19:36:49 +02:00
|
|
|
|
|
|
|
tree
|
2012-05-19 11:49:47 +02:00
|
|
|
canonicalize_constructor_val (tree cval, tree from_decl)
|
2010-09-04 19:36:49 +02:00
|
|
|
{
|
2012-11-05 22:39:02 +01:00
|
|
|
tree orig_cval = cval;
|
|
|
|
STRIP_NOPS (cval);
|
2011-08-30 16:06:00 +02:00
|
|
|
if (TREE_CODE (cval) == POINTER_PLUS_EXPR
|
|
|
|
&& TREE_CODE (TREE_OPERAND (cval, 1)) == INTEGER_CST)
|
2010-09-04 19:36:49 +02:00
|
|
|
{
|
2011-08-30 16:06:00 +02:00
|
|
|
tree ptr = TREE_OPERAND (cval, 0);
|
|
|
|
if (is_gimple_min_invariant (ptr))
|
|
|
|
cval = build1_loc (EXPR_LOCATION (cval),
|
|
|
|
ADDR_EXPR, TREE_TYPE (ptr),
|
|
|
|
fold_build2 (MEM_REF, TREE_TYPE (TREE_TYPE (ptr)),
|
|
|
|
ptr,
|
|
|
|
fold_convert (ptr_type_node,
|
|
|
|
TREE_OPERAND (cval, 1))));
|
2010-09-04 19:36:49 +02:00
|
|
|
}
|
|
|
|
if (TREE_CODE (cval) == ADDR_EXPR)
|
|
|
|
{
|
2012-09-11 10:32:29 +02:00
|
|
|
tree base = NULL_TREE;
|
|
|
|
if (TREE_CODE (TREE_OPERAND (cval, 0)) == COMPOUND_LITERAL_EXPR)
|
2012-05-29 16:41:53 +02:00
|
|
|
{
|
|
|
|
base = COMPOUND_LITERAL_EXPR_DECL (TREE_OPERAND (cval, 0));
|
|
|
|
if (base)
|
|
|
|
TREE_OPERAND (cval, 0) = base;
|
|
|
|
}
|
2012-09-11 10:32:29 +02:00
|
|
|
else
|
|
|
|
base = get_base_address (TREE_OPERAND (cval, 0));
|
2012-03-14 14:01:46 +01:00
|
|
|
if (!base)
|
|
|
|
return NULL_TREE;
|
2010-10-04 22:59:07 +02:00
|
|
|
|
2012-03-14 14:01:46 +01:00
|
|
|
if ((TREE_CODE (base) == VAR_DECL
|
|
|
|
|| TREE_CODE (base) == FUNCTION_DECL)
|
2012-05-19 11:49:47 +02:00
|
|
|
&& !can_refer_decl_in_current_unit_p (base, from_decl))
|
2010-09-18 23:25:29 +02:00
|
|
|
return NULL_TREE;
|
2012-03-14 14:01:46 +01:00
|
|
|
if (TREE_CODE (base) == VAR_DECL)
|
2012-08-02 10:14:54 +02:00
|
|
|
TREE_ADDRESSABLE (base) = 1;
|
2012-03-14 14:01:46 +01:00
|
|
|
else if (TREE_CODE (base) == FUNCTION_DECL)
|
|
|
|
{
|
|
|
|
/* Make sure we create a cgraph node for functions we'll reference.
|
|
|
|
They can be non-existent if the reference comes from an entry
|
|
|
|
of an external vtable for example. */
|
2013-11-13 16:34:47 +01:00
|
|
|
cgraph_get_create_node (base);
|
2012-03-14 14:01:46 +01:00
|
|
|
}
|
2011-04-03 13:13:09 +02:00
|
|
|
/* Fixup types in global initializers. */
|
2010-12-09 18:00:19 +01:00
|
|
|
if (TREE_TYPE (TREE_TYPE (cval)) != TREE_TYPE (TREE_OPERAND (cval, 0)))
|
|
|
|
cval = build_fold_addr_expr (TREE_OPERAND (cval, 0));
|
2012-11-05 22:39:02 +01:00
|
|
|
|
|
|
|
if (!useless_type_conversion_p (TREE_TYPE (orig_cval), TREE_TYPE (cval)))
|
|
|
|
cval = fold_convert (TREE_TYPE (orig_cval), cval);
|
|
|
|
return cval;
|
2010-09-04 19:36:49 +02:00
|
|
|
}
|
2013-11-07 12:33:03 +01:00
|
|
|
if (TREE_OVERFLOW_P (cval))
|
|
|
|
return drop_tree_overflow (cval);
|
2012-11-05 22:39:02 +01:00
|
|
|
return orig_cval;
|
2010-09-04 19:36:49 +02:00
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
/* If SYM is a constant variable with known value, return the value.
|
|
|
|
NULL_TREE is returned otherwise. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
get_symbol_constant_value (tree sym)
|
|
|
|
{
|
2013-06-19 20:06:12 +02:00
|
|
|
tree val = ctor_for_folding (sym);
|
|
|
|
if (val != error_mark_node)
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
|
|
|
if (val)
|
|
|
|
{
|
2013-01-13 13:33:43 +01:00
|
|
|
val = canonicalize_constructor_val (unshare_expr (val), sym);
|
2010-09-18 23:25:29 +02:00
|
|
|
if (val && is_gimple_min_invariant (val))
|
2010-09-04 19:36:49 +02:00
|
|
|
return val;
|
2010-09-18 23:25:29 +02:00
|
|
|
else
|
|
|
|
return NULL_TREE;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
/* Variables declared 'const' without an initializer
|
|
|
|
have zero as the initializer if they may not be
|
|
|
|
overridden at link or run time. */
|
|
|
|
if (!val
|
|
|
|
&& (INTEGRAL_TYPE_P (TREE_TYPE (sym))
|
|
|
|
|| SCALAR_FLOAT_TYPE_P (TREE_TYPE (sym))))
|
2010-11-03 01:49:00 +01:00
|
|
|
return build_zero_cst (TREE_TYPE (sym));
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Subroutine of fold_stmt. We perform several simplifications of the
|
|
|
|
memory reference tree EXPR and make sure to re-gimplify them properly
|
|
|
|
after propagation of constant addresses. IS_LHS is true if the
|
|
|
|
reference is supposed to be an lvalue. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
maybe_fold_reference (tree expr, bool is_lhs)
|
|
|
|
{
|
|
|
|
tree *t = &expr;
|
2010-09-04 19:36:49 +02:00
|
|
|
tree result;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
2011-03-16 12:36:30 +01:00
|
|
|
if ((TREE_CODE (expr) == VIEW_CONVERT_EXPR
|
|
|
|
|| TREE_CODE (expr) == REALPART_EXPR
|
|
|
|
|| TREE_CODE (expr) == IMAGPART_EXPR)
|
|
|
|
&& CONSTANT_CLASS_P (TREE_OPERAND (expr, 0)))
|
|
|
|
return fold_unary_loc (EXPR_LOCATION (expr),
|
|
|
|
TREE_CODE (expr),
|
|
|
|
TREE_TYPE (expr),
|
|
|
|
TREE_OPERAND (expr, 0));
|
|
|
|
else if (TREE_CODE (expr) == BIT_FIELD_REF
|
|
|
|
&& CONSTANT_CLASS_P (TREE_OPERAND (expr, 0)))
|
|
|
|
return fold_ternary_loc (EXPR_LOCATION (expr),
|
|
|
|
TREE_CODE (expr),
|
|
|
|
TREE_TYPE (expr),
|
|
|
|
TREE_OPERAND (expr, 0),
|
|
|
|
TREE_OPERAND (expr, 1),
|
|
|
|
TREE_OPERAND (expr, 2));
|
|
|
|
|
|
|
|
while (handled_component_p (*t))
|
|
|
|
t = &TREE_OPERAND (*t, 0);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
2011-03-16 12:36:30 +01:00
|
|
|
/* Canonicalize MEM_REFs invariant address operand. Do this first
|
|
|
|
to avoid feeding non-canonical MEM_REFs elsewhere. */
|
|
|
|
if (TREE_CODE (*t) == MEM_REF
|
|
|
|
&& !is_gimple_mem_ref_addr (TREE_OPERAND (*t, 0)))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
2011-03-16 12:36:30 +01:00
|
|
|
bool volatile_p = TREE_THIS_VOLATILE (*t);
|
|
|
|
tree tem = fold_binary (MEM_REF, TREE_TYPE (*t),
|
|
|
|
TREE_OPERAND (*t, 0),
|
|
|
|
TREE_OPERAND (*t, 1));
|
|
|
|
if (tem)
|
|
|
|
{
|
|
|
|
TREE_THIS_VOLATILE (tem) = volatile_p;
|
|
|
|
*t = tem;
|
|
|
|
tem = maybe_fold_reference (expr, is_lhs);
|
|
|
|
if (tem)
|
|
|
|
return tem;
|
|
|
|
return expr;
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
2011-03-16 12:36:30 +01:00
|
|
|
if (!is_lhs
|
|
|
|
&& (result = fold_const_aggregate_ref (expr))
|
|
|
|
&& is_gimple_min_invariant (result))
|
|
|
|
return result;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
re PR middle-end/42834 (memcpy folding overeager)
2010-07-01 Richard Guenther <rguenther@suse.de>
PR middle-end/42834
PR middle-end/44468
* doc/gimple.texi (is_gimple_mem_ref_addr): Document.
* doc/generic.texi (References to storage): Document MEM_REF.
* tree-pretty-print.c (dump_generic_node): Handle MEM_REF.
(print_call_name): Likewise.
* tree.c (recompute_tree_invariant_for_addr_expr): Handle MEM_REF.
(build_simple_mem_ref_loc): New function.
(mem_ref_offset): Likewise.
* tree.h (build_simple_mem_ref_loc): Declare.
(build_simple_mem_ref): Define.
(mem_ref_offset): Declare.
* fold-const.c: Include tree-flow.h.
(operand_equal_p): Handle MEM_REF.
(build_fold_addr_expr_with_type_loc): Likewise.
(fold_comparison): Likewise.
(fold_unary_loc): Fold
VIEW_CONVERT_EXPR <T1, MEM_REF <T2, ...>> to MEM_REF <T1, ...>.
(fold_binary_loc): Fold MEM[&MEM[p, CST1], CST2] to MEM[p, CST1 + CST2],
fold MEM[&a.b, CST2] to MEM[&a, offsetof (a, b) + CST2].
* tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Handle MEM_REF.
(ptr_deref_may_alias_ref_p_1): Likewise.
(ao_ref_base_alias_set): Properly differentiate base object for
offset and TBAA.
(ao_ref_init_from_ptr_and_size): Use MEM_REF.
(indirect_ref_may_alias_decl_p): Handle MEM_REFs properly.
(indirect_refs_may_alias_p): Likewise.
(refs_may_alias_p_1): Likewise. Remove pointer SSA name def
chasing code.
(ref_maybe_used_by_call_p_1): Handle MEM_REF.
(call_may_clobber_ref_p_1): Likewise.
* dwarf2out.c (loc_list_from_tree): Handle MEM_REF.
* expr.c (expand_assignment): Handle MEM_REF.
(store_expr): Handle MEM_REFs from STRING_CSTs.
(store_field): If expanding a MEM_REF of a non-addressable
decl use bitfield operations.
(get_inner_reference): Handle MEM_REF.
(expand_expr_addr_expr_1): Likewise.
(expand_expr_real_1): Likewise.
* tree-eh.c (tree_could_trap_p): Handle MEM_REF.
* alias.c (ao_ref_from_mem): Handle MEM_REF.
(get_alias_set): Likewise. Properly handle VIEW_CONVERT_EXPRs.
* tree-data-ref.c (dr_analyze_innermost): Handle MEM_REF.
(dr_analyze_indices): Likewise.
(dr_analyze_alias): Likewise.
(object_address_invariant_in_loop_p): Likewise.
* gimplify.c (mark_addressable): Handle MEM_REF.
(gimplify_cond_expr): Build MEM_REFs.
(gimplify_modify_expr_to_memcpy): Likewise.
(gimplify_init_ctor_preeval_1): Handle MEM_REF.
(gimple_fold_indirect_ref): Adjust.
(gimplify_expr): Handle MEM_REF. Gimplify INDIRECT_REF to MEM_REF.
* tree.def (MEM_REF): New tree code.
* tree-dfa.c: Include toplev.h.
(get_ref_base_and_extent): Handle MEM_REF.
(get_addr_base_and_unit_offset): New function.
* emit-rtl.c (set_mem_attributes_minus_bitpos): Handle MEM_REF.
* gimple-fold.c (may_propagate_address_into_dereference): Handle
MEM_REF.
(maybe_fold_offset_to_array_ref): Allow possibly out-of bounds
accesses if the array has just one dimension. Remove always true
parameter. Do not require type compatibility here.
(maybe_fold_offset_to_component_ref): Remove.
(maybe_fold_stmt_indirect): Remove.
(maybe_fold_reference): Remove INDIRECT_REF handling.
Fold back to non-MEM_REF.
(maybe_fold_offset_to_address): Simplify. Deal with type
mismatches here.
(maybe_fold_reference): Likewise.
(maybe_fold_stmt_addition): Likewise. Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
(fold_gimple_assign): Handle ADDR_EXPR of MEM_REFs.
(gimple_get_relevant_ref_binfo): Handle MEM_REF.
* cfgexpand.c (expand_debug_expr): Handle MEM_REF.
* tree-ssa.c (useless_type_conversion_p): Make most pointer
conversions useless.
(warn_uninitialized_var): Handle MEM_REF.
(maybe_rewrite_mem_ref_base): New function.
(execute_update_addresses_taken): Implement re-writing of MEM_REFs
to SSA form.
* tree-inline.c (remap_gimple_op_r): Handle MEM_REF, remove
INDIRECT_REF handling.
(copy_tree_body_r): Handle MEM_REF.
* gimple.c (is_gimple_addressable): Adjust.
(is_gimple_address): Likewise.
(is_gimple_invariant_address): ADDR_EXPRs of MEM_REFs with
invariant base are invariant.
(is_gimple_min_lval): Adjust.
(is_gimple_mem_ref_addr): New function.
(get_base_address): Handle MEM_REF.
(count_ptr_derefs): Likewise.
(get_base_loadstore): Likewise.
* gimple.h (is_gimple_mem_ref_addr): Declare.
(gimple_call_fndecl): Handle invariant MEM_REF addresses.
* tree-cfg.c (verify_address): New function, split out from ...
(verify_expr): ... here. Use for verifying ADDR_EXPRs and
the address operand of MEM_REFs. Verify MEM_REFs. Reject
INDIRECT_REFs.
(verify_types_in_gimple_min_lval): Handle MEM_REF. Disallow
INDIRECT_REF. Allow conversions.
(verify_types_in_gimple_reference): Verify VIEW_CONVERT_EXPR of
a register does not change its size.
(verify_types_in_gimple_reference): Verify MEM_REF.
(verify_gimple_assign_single): Disallow INDIRECT_REF.
Handle MEM_REF.
* tree-ssa-operands.c (opf_non_addressable, opf_not_non_addressable):
New.
(mark_address_taken): Handle MEM_REF.
(get_indirect_ref_operands): Pass through opf_not_non_addressable.
(get_asm_expr_operands): Pass opf_not_non_addressable.
(get_expr_operands): Handle opf_[not_]non_addressable.
Handle MEM_REF. Remove INDIRECT_REF handling.
* tree-vrp.c: (check_array_ref): Handle MEM_REF.
(search_for_addr_array): Likewise.
(check_array_bounds): Likewise.
(vrp_stmt_computes_nonzero): Adjust for MEM_REF.
* tree-ssa-loop-im.c (for_each_index): Handle MEM_REF.
(ref_always_accessed_p): Likewise.
(gen_lsm_tmp_name): Likewise. Handle ADDR_EXPR.
* tree-complex.c (extract_component): Do not handle INDIRECT_REF.
Handle MEM_REF.
* cgraphbuild.c (mark_load): Properly check for NULL result
from get_base_address.
(mark_store): Likewise.
* tree-ssa-loop-niter.c (array_at_struct_end_p): Handle MEM_REF.
* tree-loop-distribution.c (generate_builtin): Exchange INDIRECT_REF
handling for MEM_REF.
* tree-scalar-evolution.c (follow_ssa_edge_expr): Handle
&MEM[ptr + CST] similar to POINTER_PLUS_EXPR.
* builtins.c (stabilize_va_list_loc): Use the function ABI
valist type if we couldn't canonicalize the argument type.
Always dereference with the canonical va-list type.
(maybe_emit_free_warning): Handle MEM_REF.
(fold_builtin_memory_op): Simplify and handle MEM_REFs in folding
memmove to memcpy.
* builtins.c (fold_builtin_memory_op): Use ref-all types
for all memcpy foldings.
* omp-low.c (build_receiver_ref): Adjust for MEM_REF.
(build_outer_var_ref): Likewise.
(scan_omp_1_op): Likewise.
(lower_rec_input_clauses): Likewise.
(lower_lastprivate_clauses): Likewise.
(lower_reduction_clauses): Likewise.
(lower_copyprivate_clauses): Likewise.
(expand_omp_atomic_pipeline): Likewise.
(expand_omp_atomic_mutex): Likewise.
(create_task_copyfn): Likewise.
* tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle MEM_REF.
Remove old union trick. Initialize constant offsets.
(ao_ref_init_from_vn_reference): Likewise. Do not handle
INDIRECT_REF. Init base_alias_set properly.
(vn_reference_lookup_3): Replace INDIRECT_REF handling with
MEM_REF.
(vn_reference_fold_indirect): Adjust for MEM_REFs.
(valueize_refs): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs.
(may_insert): Remove.
(visit_reference_op_load): Do not test may_insert.
(run_scc_vn): Remove parameter, do not fiddle with may_insert.
* tree-ssa-sccvn.h (struct vn_reference_op_struct): Add
a field to store the constant offset this op applies.
(run_scc_vn): Adjust prototype.
* cgraphunit.c (thunk_adjust): Adjust for MEM_REF.
* tree-ssa-ccp.c (ccp_fold): Replace INDIRECT_REF folding with
MEM_REF. Propagate &foo + CST as &MEM[&foo, CST]. Do not
bother about volatile qualifiers on pointers.
(fold_const_aggregate_ref): Handle MEM_REF, do not handle INDIRECT_REF.
* tree-ssa-loop-ivopts.c
* tree-ssa-loop-ivopts.c (determine_base_object): Adjust
for MEM_REF.
(strip_offset_1): Likewise.
(find_interesting_uses_address): Replace INDIRECT_REF handling with
MEM_REF handling.
(get_computation_cost_at): Likewise.
* ipa-pure-const.c (check_op): Handle MEM_REF.
* tree-stdarg.c (check_all_va_list_escapes): Adjust for MEM_REF.
* tree-ssa-sink.c (is_hidden_global_store): Handle MEM_REF
and constants.
* ipa-inline.c (likely_eliminated_by_inlining_p): Handle MEM_REF.
* tree-parloops.c (take_address_of): Adjust for MEM_REF.
(eliminate_local_variables_1): Likewise.
(create_call_for_reduction_1): Likewise.
(create_loads_for_reductions): Likewise.
(create_loads_and_stores_for_name): Likewise.
* matrix-reorg.c (may_flatten_matrices_1): Sanitize.
(ssa_accessed_in_tree): Handle MEM_REF.
(ssa_accessed_in_assign_rhs): Likewise.
(update_type_size): Likewise.
(analyze_accesses_for_call_stmt): Likewise.
(analyze_accesses_for_assign_stmt): Likewise.
(transform_access_sites): Likewise.
(transform_allocation_sites): Likewise.
* tree-affine.c (tree_to_aff_combination): Handle MEM_REF.
* tree-vect-data-refs.c (vect_create_addr_base_for_vector_ref): Do
not handle INDIRECT_REF.
* tree-ssa-phiopt.c (add_or_mark_expr): Handle MEM_REF.
(cond_store_replacement): Likewise.
* tree-ssa-pre.c (create_component_ref_by_pieces_1): Handle
MEM_REF, no not handle INDIRECT_REFs.
(insert_into_preds_of_block): Properly initialize avail.
(phi_translate_1): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs. Properly handle reference lookups that
require a bit re-interpretation.
(can_PRE_operation): Do not handle INDIRECT_REF. Handle MEM_REF.
* tree-sra.c
* tree-sra.c (build_access_from_expr_1): Handle MEM_REF.
(build_ref_for_offset_1): Remove.
(build_ref_for_offset): Build MEM_REFs.
(gate_intra_sra): Disable for now.
(sra_ipa_modify_expr): Handle MEM_REF.
(ipa_early_sra_gate): Disable for now.
* tree-sra.c (create_access): Swap INDIRECT_REF handling for
MEM_REF handling.
(disqualify_base_of_expr): Likewise.
(ptr_parm_has_direct_uses): Swap INDIRECT_REF handling for
MEM_REF handling.
(sra_ipa_modify_expr): Remove INDIRECT_REF handling.
Use mem_ref_offset. Remove bogus folding.
(build_access_from_expr_1): Properly handle MEM_REF for
non IPA-SRA.
(make_fancy_name_1): Add support for MEM_REF.
* tree-predcom.c (ref_at_iteration): Handle MEM_REFs.
* tree-mudflap.c (mf_xform_derefs_1): Adjust for MEM_REF.
* ipa-prop.c (compute_complex_assign_jump_func): Handle MEM_REF.
(compute_complex_ancestor_jump_func): Likewise.
(ipa_analyze_virtual_call_uses): Likewise.
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Replace
INDIRECT_REF folding with more generalized MEM_REF folding.
(tree_ssa_forward_propagate_single_use_vars): Adjust accordingly.
(forward_propagate_addr_into_variable_array_index): Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
* tree-ssa-dce.c (ref_may_be_aliased): Handle MEM_REF.
* tree-ssa-ter.c (find_replaceable_in_bb): Avoid TER if that
creates assignments with overlap.
* tree-nested.c (get_static_chain): Adjust for MEM_REF.
(get_frame_field): Likewise.
(get_nonlocal_debug_decl): Likewise.
(convert_nonlocal_reference_op): Likewise.
(struct nesting_info): Add mem_refs pointer-set.
(create_nesting_tree): Allocate it.
(convert_local_reference_op): Insert to be folded mem-refs.
(fold_mem_refs): New function.
(finalize_nesting_tree_1): Perform defered folding of mem-refs
(free_nesting_tree): Free the pointer-set.
* tree-vect-stmts.c (vectorizable_store): Adjust for MEM_REF.
(vectorizable_load): Likewise.
* tree-ssa-phiprop.c (phiprop_insert_phi): Adjust for MEM_REF.
(propagate_with_phi): Likewise.
* tree-object-size.c (addr_object_size): Handle MEM_REFs
instead of INDIRECT_REFs.
(compute_object_offset): Handle MEM_REF.
(plus_stmt_object_size): Handle MEM_REF.
(collect_object_sizes_for): Dispatch to plus_stmt_object_size
for &MEM_REF.
* tree-flow.h (get_addr_base_and_unit_offset): Declare.
(symbol_marked_for_renaming): Likewise.
* Makefile.in (tree-dfa.o): Add $(TOPLEV_H).
(fold-const.o): Add $(TREE_FLOW_H).
* tree-ssa-structalias.c (get_constraint_for_1): Handle MEM_REF.
(find_func_clobbers): Likewise.
* ipa-struct-reorg.c (decompose_indirect_ref_acc): Handle MEM_REF.
(decompose_access): Likewise.
(replace_field_acc): Likewise.
(replace_field_access_stmt): Likewise.
(insert_new_var_in_stmt): Likewise.
(get_stmt_accesses): Likewise.
(reorg_structs_drive): Disable.
* config/i386/i386.c (ix86_va_start): Adjust for MEM_REF.
(ix86_canonical_va_list_type): Likewise.
cp/
* cp-gimplify.c (cp_gimplify_expr): Open-code the rhs
predicate we are looking for, allow non-gimplified
INDIRECT_REFs.
testsuite/
* gcc.c-torture/execute/20100316-1.c: New testcase.
* gcc.c-torture/execute/pr44468.c: Likewise.
* gcc.c-torture/compile/20100609-1.c: Likewise.
* gcc.dg/volatile2.c: Adjust.
* gcc.dg/plugin/selfassign.c: Likewise.
* gcc.dg/pr36902.c: Likewise.
* gcc.dg/tree-ssa/foldaddr-2.c: Remove.
* gcc.dg/tree-ssa/foldaddr-3.c: Likewise.
* gcc.dg/tree-ssa/forwprop-8.c: Adjust.
* gcc.dg/tree-ssa/pr17141-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-13.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-14.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-21.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-1.c: Likewise.
* gcc.dg/tree-ssa/20030807-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-10.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-1.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-23.c: Likewise.
* gcc.dg/tree-ssa/forwprop-1.c: Likewise.
* gcc.dg/tree-ssa/forwprop-2.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-25.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-26.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-26.c: Likewise.
* gcc.dg/tree-ssa/ssa-sccvn-4.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-5.c: Likewise.
* gcc.dg/struct/w_prof_two_strs.c: XFAIL.
* gcc.dg/struct/wo_prof_escape_arg_to_local.c: Likewise.
* gcc.dg/struct/wo_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_malloc_size_var.c: Likewise.
* gcc.dg/struct/w_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_str_init.c: Likewise.
* gcc.dg/struct/wo_prof_array_through_pointer.c: Likewise.
* gcc.dg/struct/w_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_array_field.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_local.c: Likewise.
* gcc.dg/struct/w_prof_local_var.c: Likewise.
* gcc.dg/struct/wo_prof_two_strs.c: Likewise.
* gcc.dg/struct/wo_prof_empty_str.c: Likewise.
* gcc.dg/struct/wo_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_value.c: Likewise.
* gcc.dg/struct/wo_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_escape_return.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_array.c: Likewise.
* gcc.dg/struct/wo_prof_double_malloc.c: Likewise.
* gcc.dg/struct/w_ratio_cold_str.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_pointer.c: Likewise.
* gcc.dg/struct/wo_prof_local_var.c: Likewise.
* gcc.dg/tree-prof/stringop-1.c: Adjust.
* g++.dg/tree-ssa/pr31146.C: Likewise.
* g++.dg/tree-ssa/copyprop-1.C: Likewise.
* g++.dg/tree-ssa/pr33604.C: Likewise.
* g++.dg/plugin/selfassign.c: Likewise.
* gfortran.dg/array_memcpy_3.f90: Likewise.
* gfortran.dg/array_memcpy_4.f90: Likewise.
* c-c++-common/torture/pr42834.c: New testcase.
From-SVN: r161655
2010-07-01 10:49:19 +02:00
|
|
|
/* Fold back MEM_REFs to reference trees. */
|
|
|
|
if (TREE_CODE (*t) == MEM_REF
|
|
|
|
&& TREE_CODE (TREE_OPERAND (*t, 0)) == ADDR_EXPR
|
|
|
|
&& integer_zerop (TREE_OPERAND (*t, 1))
|
|
|
|
&& (TREE_THIS_VOLATILE (*t)
|
|
|
|
== TREE_THIS_VOLATILE (TREE_OPERAND (TREE_OPERAND (*t, 0), 0)))
|
|
|
|
&& !TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (TREE_OPERAND (*t, 1)))
|
|
|
|
&& (TYPE_MAIN_VARIANT (TREE_TYPE (*t))
|
|
|
|
== TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (TREE_OPERAND (*t, 1)))))
|
|
|
|
/* We have to look out here to not drop a required conversion
|
|
|
|
from the rhs to the lhs if is_lhs, but we don't have the
|
|
|
|
rhs here to verify that. Thus require strict type
|
|
|
|
compatibility. */
|
|
|
|
&& types_compatible_p (TREE_TYPE (*t),
|
|
|
|
TREE_TYPE (TREE_OPERAND
|
2011-03-16 12:36:30 +01:00
|
|
|
(TREE_OPERAND (*t, 0), 0))))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
re PR middle-end/42834 (memcpy folding overeager)
2010-07-01 Richard Guenther <rguenther@suse.de>
PR middle-end/42834
PR middle-end/44468
* doc/gimple.texi (is_gimple_mem_ref_addr): Document.
* doc/generic.texi (References to storage): Document MEM_REF.
* tree-pretty-print.c (dump_generic_node): Handle MEM_REF.
(print_call_name): Likewise.
* tree.c (recompute_tree_invariant_for_addr_expr): Handle MEM_REF.
(build_simple_mem_ref_loc): New function.
(mem_ref_offset): Likewise.
* tree.h (build_simple_mem_ref_loc): Declare.
(build_simple_mem_ref): Define.
(mem_ref_offset): Declare.
* fold-const.c: Include tree-flow.h.
(operand_equal_p): Handle MEM_REF.
(build_fold_addr_expr_with_type_loc): Likewise.
(fold_comparison): Likewise.
(fold_unary_loc): Fold
VIEW_CONVERT_EXPR <T1, MEM_REF <T2, ...>> to MEM_REF <T1, ...>.
(fold_binary_loc): Fold MEM[&MEM[p, CST1], CST2] to MEM[p, CST1 + CST2],
fold MEM[&a.b, CST2] to MEM[&a, offsetof (a, b) + CST2].
* tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Handle MEM_REF.
(ptr_deref_may_alias_ref_p_1): Likewise.
(ao_ref_base_alias_set): Properly differentiate base object for
offset and TBAA.
(ao_ref_init_from_ptr_and_size): Use MEM_REF.
(indirect_ref_may_alias_decl_p): Handle MEM_REFs properly.
(indirect_refs_may_alias_p): Likewise.
(refs_may_alias_p_1): Likewise. Remove pointer SSA name def
chasing code.
(ref_maybe_used_by_call_p_1): Handle MEM_REF.
(call_may_clobber_ref_p_1): Likewise.
* dwarf2out.c (loc_list_from_tree): Handle MEM_REF.
* expr.c (expand_assignment): Handle MEM_REF.
(store_expr): Handle MEM_REFs from STRING_CSTs.
(store_field): If expanding a MEM_REF of a non-addressable
decl use bitfield operations.
(get_inner_reference): Handle MEM_REF.
(expand_expr_addr_expr_1): Likewise.
(expand_expr_real_1): Likewise.
* tree-eh.c (tree_could_trap_p): Handle MEM_REF.
* alias.c (ao_ref_from_mem): Handle MEM_REF.
(get_alias_set): Likewise. Properly handle VIEW_CONVERT_EXPRs.
* tree-data-ref.c (dr_analyze_innermost): Handle MEM_REF.
(dr_analyze_indices): Likewise.
(dr_analyze_alias): Likewise.
(object_address_invariant_in_loop_p): Likewise.
* gimplify.c (mark_addressable): Handle MEM_REF.
(gimplify_cond_expr): Build MEM_REFs.
(gimplify_modify_expr_to_memcpy): Likewise.
(gimplify_init_ctor_preeval_1): Handle MEM_REF.
(gimple_fold_indirect_ref): Adjust.
(gimplify_expr): Handle MEM_REF. Gimplify INDIRECT_REF to MEM_REF.
* tree.def (MEM_REF): New tree code.
* tree-dfa.c: Include toplev.h.
(get_ref_base_and_extent): Handle MEM_REF.
(get_addr_base_and_unit_offset): New function.
* emit-rtl.c (set_mem_attributes_minus_bitpos): Handle MEM_REF.
* gimple-fold.c (may_propagate_address_into_dereference): Handle
MEM_REF.
(maybe_fold_offset_to_array_ref): Allow possibly out-of bounds
accesses if the array has just one dimension. Remove always true
parameter. Do not require type compatibility here.
(maybe_fold_offset_to_component_ref): Remove.
(maybe_fold_stmt_indirect): Remove.
(maybe_fold_reference): Remove INDIRECT_REF handling.
Fold back to non-MEM_REF.
(maybe_fold_offset_to_address): Simplify. Deal with type
mismatches here.
(maybe_fold_reference): Likewise.
(maybe_fold_stmt_addition): Likewise. Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
(fold_gimple_assign): Handle ADDR_EXPR of MEM_REFs.
(gimple_get_relevant_ref_binfo): Handle MEM_REF.
* cfgexpand.c (expand_debug_expr): Handle MEM_REF.
* tree-ssa.c (useless_type_conversion_p): Make most pointer
conversions useless.
(warn_uninitialized_var): Handle MEM_REF.
(maybe_rewrite_mem_ref_base): New function.
(execute_update_addresses_taken): Implement re-writing of MEM_REFs
to SSA form.
* tree-inline.c (remap_gimple_op_r): Handle MEM_REF, remove
INDIRECT_REF handling.
(copy_tree_body_r): Handle MEM_REF.
* gimple.c (is_gimple_addressable): Adjust.
(is_gimple_address): Likewise.
(is_gimple_invariant_address): ADDR_EXPRs of MEM_REFs with
invariant base are invariant.
(is_gimple_min_lval): Adjust.
(is_gimple_mem_ref_addr): New function.
(get_base_address): Handle MEM_REF.
(count_ptr_derefs): Likewise.
(get_base_loadstore): Likewise.
* gimple.h (is_gimple_mem_ref_addr): Declare.
(gimple_call_fndecl): Handle invariant MEM_REF addresses.
* tree-cfg.c (verify_address): New function, split out from ...
(verify_expr): ... here. Use for verifying ADDR_EXPRs and
the address operand of MEM_REFs. Verify MEM_REFs. Reject
INDIRECT_REFs.
(verify_types_in_gimple_min_lval): Handle MEM_REF. Disallow
INDIRECT_REF. Allow conversions.
(verify_types_in_gimple_reference): Verify VIEW_CONVERT_EXPR of
a register does not change its size.
(verify_types_in_gimple_reference): Verify MEM_REF.
(verify_gimple_assign_single): Disallow INDIRECT_REF.
Handle MEM_REF.
* tree-ssa-operands.c (opf_non_addressable, opf_not_non_addressable):
New.
(mark_address_taken): Handle MEM_REF.
(get_indirect_ref_operands): Pass through opf_not_non_addressable.
(get_asm_expr_operands): Pass opf_not_non_addressable.
(get_expr_operands): Handle opf_[not_]non_addressable.
Handle MEM_REF. Remove INDIRECT_REF handling.
* tree-vrp.c: (check_array_ref): Handle MEM_REF.
(search_for_addr_array): Likewise.
(check_array_bounds): Likewise.
(vrp_stmt_computes_nonzero): Adjust for MEM_REF.
* tree-ssa-loop-im.c (for_each_index): Handle MEM_REF.
(ref_always_accessed_p): Likewise.
(gen_lsm_tmp_name): Likewise. Handle ADDR_EXPR.
* tree-complex.c (extract_component): Do not handle INDIRECT_REF.
Handle MEM_REF.
* cgraphbuild.c (mark_load): Properly check for NULL result
from get_base_address.
(mark_store): Likewise.
* tree-ssa-loop-niter.c (array_at_struct_end_p): Handle MEM_REF.
* tree-loop-distribution.c (generate_builtin): Exchange INDIRECT_REF
handling for MEM_REF.
* tree-scalar-evolution.c (follow_ssa_edge_expr): Handle
&MEM[ptr + CST] similar to POINTER_PLUS_EXPR.
* builtins.c (stabilize_va_list_loc): Use the function ABI
valist type if we couldn't canonicalize the argument type.
Always dereference with the canonical va-list type.
(maybe_emit_free_warning): Handle MEM_REF.
(fold_builtin_memory_op): Simplify and handle MEM_REFs in folding
memmove to memcpy.
* builtins.c (fold_builtin_memory_op): Use ref-all types
for all memcpy foldings.
* omp-low.c (build_receiver_ref): Adjust for MEM_REF.
(build_outer_var_ref): Likewise.
(scan_omp_1_op): Likewise.
(lower_rec_input_clauses): Likewise.
(lower_lastprivate_clauses): Likewise.
(lower_reduction_clauses): Likewise.
(lower_copyprivate_clauses): Likewise.
(expand_omp_atomic_pipeline): Likewise.
(expand_omp_atomic_mutex): Likewise.
(create_task_copyfn): Likewise.
* tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle MEM_REF.
Remove old union trick. Initialize constant offsets.
(ao_ref_init_from_vn_reference): Likewise. Do not handle
INDIRECT_REF. Init base_alias_set properly.
(vn_reference_lookup_3): Replace INDIRECT_REF handling with
MEM_REF.
(vn_reference_fold_indirect): Adjust for MEM_REFs.
(valueize_refs): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs.
(may_insert): Remove.
(visit_reference_op_load): Do not test may_insert.
(run_scc_vn): Remove parameter, do not fiddle with may_insert.
* tree-ssa-sccvn.h (struct vn_reference_op_struct): Add
a field to store the constant offset this op applies.
(run_scc_vn): Adjust prototype.
* cgraphunit.c (thunk_adjust): Adjust for MEM_REF.
* tree-ssa-ccp.c (ccp_fold): Replace INDIRECT_REF folding with
MEM_REF. Propagate &foo + CST as &MEM[&foo, CST]. Do not
bother about volatile qualifiers on pointers.
(fold_const_aggregate_ref): Handle MEM_REF, do not handle INDIRECT_REF.
* tree-ssa-loop-ivopts.c
* tree-ssa-loop-ivopts.c (determine_base_object): Adjust
for MEM_REF.
(strip_offset_1): Likewise.
(find_interesting_uses_address): Replace INDIRECT_REF handling with
MEM_REF handling.
(get_computation_cost_at): Likewise.
* ipa-pure-const.c (check_op): Handle MEM_REF.
* tree-stdarg.c (check_all_va_list_escapes): Adjust for MEM_REF.
* tree-ssa-sink.c (is_hidden_global_store): Handle MEM_REF
and constants.
* ipa-inline.c (likely_eliminated_by_inlining_p): Handle MEM_REF.
* tree-parloops.c (take_address_of): Adjust for MEM_REF.
(eliminate_local_variables_1): Likewise.
(create_call_for_reduction_1): Likewise.
(create_loads_for_reductions): Likewise.
(create_loads_and_stores_for_name): Likewise.
* matrix-reorg.c (may_flatten_matrices_1): Sanitize.
(ssa_accessed_in_tree): Handle MEM_REF.
(ssa_accessed_in_assign_rhs): Likewise.
(update_type_size): Likewise.
(analyze_accesses_for_call_stmt): Likewise.
(analyze_accesses_for_assign_stmt): Likewise.
(transform_access_sites): Likewise.
(transform_allocation_sites): Likewise.
* tree-affine.c (tree_to_aff_combination): Handle MEM_REF.
* tree-vect-data-refs.c (vect_create_addr_base_for_vector_ref): Do
not handle INDIRECT_REF.
* tree-ssa-phiopt.c (add_or_mark_expr): Handle MEM_REF.
(cond_store_replacement): Likewise.
* tree-ssa-pre.c (create_component_ref_by_pieces_1): Handle
MEM_REF, no not handle INDIRECT_REFs.
(insert_into_preds_of_block): Properly initialize avail.
(phi_translate_1): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs. Properly handle reference lookups that
require a bit re-interpretation.
(can_PRE_operation): Do not handle INDIRECT_REF. Handle MEM_REF.
* tree-sra.c
* tree-sra.c (build_access_from_expr_1): Handle MEM_REF.
(build_ref_for_offset_1): Remove.
(build_ref_for_offset): Build MEM_REFs.
(gate_intra_sra): Disable for now.
(sra_ipa_modify_expr): Handle MEM_REF.
(ipa_early_sra_gate): Disable for now.
* tree-sra.c (create_access): Swap INDIRECT_REF handling for
MEM_REF handling.
(disqualify_base_of_expr): Likewise.
(ptr_parm_has_direct_uses): Swap INDIRECT_REF handling for
MEM_REF handling.
(sra_ipa_modify_expr): Remove INDIRECT_REF handling.
Use mem_ref_offset. Remove bogus folding.
(build_access_from_expr_1): Properly handle MEM_REF for
non IPA-SRA.
(make_fancy_name_1): Add support for MEM_REF.
* tree-predcom.c (ref_at_iteration): Handle MEM_REFs.
* tree-mudflap.c (mf_xform_derefs_1): Adjust for MEM_REF.
* ipa-prop.c (compute_complex_assign_jump_func): Handle MEM_REF.
(compute_complex_ancestor_jump_func): Likewise.
(ipa_analyze_virtual_call_uses): Likewise.
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Replace
INDIRECT_REF folding with more generalized MEM_REF folding.
(tree_ssa_forward_propagate_single_use_vars): Adjust accordingly.
(forward_propagate_addr_into_variable_array_index): Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
* tree-ssa-dce.c (ref_may_be_aliased): Handle MEM_REF.
* tree-ssa-ter.c (find_replaceable_in_bb): Avoid TER if that
creates assignments with overlap.
* tree-nested.c (get_static_chain): Adjust for MEM_REF.
(get_frame_field): Likewise.
(get_nonlocal_debug_decl): Likewise.
(convert_nonlocal_reference_op): Likewise.
(struct nesting_info): Add mem_refs pointer-set.
(create_nesting_tree): Allocate it.
(convert_local_reference_op): Insert to be folded mem-refs.
(fold_mem_refs): New function.
(finalize_nesting_tree_1): Perform defered folding of mem-refs
(free_nesting_tree): Free the pointer-set.
* tree-vect-stmts.c (vectorizable_store): Adjust for MEM_REF.
(vectorizable_load): Likewise.
* tree-ssa-phiprop.c (phiprop_insert_phi): Adjust for MEM_REF.
(propagate_with_phi): Likewise.
* tree-object-size.c (addr_object_size): Handle MEM_REFs
instead of INDIRECT_REFs.
(compute_object_offset): Handle MEM_REF.
(plus_stmt_object_size): Handle MEM_REF.
(collect_object_sizes_for): Dispatch to plus_stmt_object_size
for &MEM_REF.
* tree-flow.h (get_addr_base_and_unit_offset): Declare.
(symbol_marked_for_renaming): Likewise.
* Makefile.in (tree-dfa.o): Add $(TOPLEV_H).
(fold-const.o): Add $(TREE_FLOW_H).
* tree-ssa-structalias.c (get_constraint_for_1): Handle MEM_REF.
(find_func_clobbers): Likewise.
* ipa-struct-reorg.c (decompose_indirect_ref_acc): Handle MEM_REF.
(decompose_access): Likewise.
(replace_field_acc): Likewise.
(replace_field_access_stmt): Likewise.
(insert_new_var_in_stmt): Likewise.
(get_stmt_accesses): Likewise.
(reorg_structs_drive): Disable.
* config/i386/i386.c (ix86_va_start): Adjust for MEM_REF.
(ix86_canonical_va_list_type): Likewise.
cp/
* cp-gimplify.c (cp_gimplify_expr): Open-code the rhs
predicate we are looking for, allow non-gimplified
INDIRECT_REFs.
testsuite/
* gcc.c-torture/execute/20100316-1.c: New testcase.
* gcc.c-torture/execute/pr44468.c: Likewise.
* gcc.c-torture/compile/20100609-1.c: Likewise.
* gcc.dg/volatile2.c: Adjust.
* gcc.dg/plugin/selfassign.c: Likewise.
* gcc.dg/pr36902.c: Likewise.
* gcc.dg/tree-ssa/foldaddr-2.c: Remove.
* gcc.dg/tree-ssa/foldaddr-3.c: Likewise.
* gcc.dg/tree-ssa/forwprop-8.c: Adjust.
* gcc.dg/tree-ssa/pr17141-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-13.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-14.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-21.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-1.c: Likewise.
* gcc.dg/tree-ssa/20030807-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-10.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-1.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-23.c: Likewise.
* gcc.dg/tree-ssa/forwprop-1.c: Likewise.
* gcc.dg/tree-ssa/forwprop-2.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-25.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-26.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-26.c: Likewise.
* gcc.dg/tree-ssa/ssa-sccvn-4.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-5.c: Likewise.
* gcc.dg/struct/w_prof_two_strs.c: XFAIL.
* gcc.dg/struct/wo_prof_escape_arg_to_local.c: Likewise.
* gcc.dg/struct/wo_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_malloc_size_var.c: Likewise.
* gcc.dg/struct/w_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_str_init.c: Likewise.
* gcc.dg/struct/wo_prof_array_through_pointer.c: Likewise.
* gcc.dg/struct/w_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_array_field.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_local.c: Likewise.
* gcc.dg/struct/w_prof_local_var.c: Likewise.
* gcc.dg/struct/wo_prof_two_strs.c: Likewise.
* gcc.dg/struct/wo_prof_empty_str.c: Likewise.
* gcc.dg/struct/wo_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_value.c: Likewise.
* gcc.dg/struct/wo_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_escape_return.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_array.c: Likewise.
* gcc.dg/struct/wo_prof_double_malloc.c: Likewise.
* gcc.dg/struct/w_ratio_cold_str.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_pointer.c: Likewise.
* gcc.dg/struct/wo_prof_local_var.c: Likewise.
* gcc.dg/tree-prof/stringop-1.c: Adjust.
* g++.dg/tree-ssa/pr31146.C: Likewise.
* g++.dg/tree-ssa/copyprop-1.C: Likewise.
* g++.dg/tree-ssa/pr33604.C: Likewise.
* g++.dg/plugin/selfassign.c: Likewise.
* gfortran.dg/array_memcpy_3.f90: Likewise.
* gfortran.dg/array_memcpy_4.f90: Likewise.
* c-c++-common/torture/pr42834.c: New testcase.
From-SVN: r161655
2010-07-01 10:49:19 +02:00
|
|
|
tree tem;
|
|
|
|
*t = TREE_OPERAND (TREE_OPERAND (*t, 0), 0);
|
|
|
|
tem = maybe_fold_reference (expr, is_lhs);
|
|
|
|
if (tem)
|
|
|
|
return tem;
|
|
|
|
return expr;
|
|
|
|
}
|
2010-09-03 11:50:17 +02:00
|
|
|
else if (TREE_CODE (*t) == TARGET_MEM_REF)
|
|
|
|
{
|
|
|
|
tree tem = maybe_fold_tmr (*t);
|
|
|
|
if (tem)
|
|
|
|
{
|
|
|
|
*t = tem;
|
|
|
|
tem = maybe_fold_reference (expr, is_lhs);
|
|
|
|
if (tem)
|
|
|
|
return tem;
|
|
|
|
return expr;
|
|
|
|
}
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Attempt to fold an assignment statement pointed-to by SI. Returns a
|
|
|
|
replacement rhs for the statement or NULL_TREE if no simplification
|
|
|
|
could be made. It is assumed that the operands have been previously
|
|
|
|
folded. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
fold_gimple_assign (gimple_stmt_iterator *si)
|
|
|
|
{
|
|
|
|
gimple stmt = gsi_stmt (*si);
|
|
|
|
enum tree_code subcode = gimple_assign_rhs_code (stmt);
|
|
|
|
location_t loc = gimple_location (stmt);
|
|
|
|
|
|
|
|
tree result = NULL_TREE;
|
|
|
|
|
|
|
|
switch (get_gimple_rhs_class (subcode))
|
|
|
|
{
|
|
|
|
case GIMPLE_SINGLE_RHS:
|
|
|
|
{
|
|
|
|
tree rhs = gimple_assign_rhs1 (stmt);
|
|
|
|
|
2011-09-01 13:46:08 +02:00
|
|
|
if (REFERENCE_CLASS_P (rhs))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
return maybe_fold_reference (rhs, false);
|
|
|
|
|
2013-12-18 00:43:22 +01:00
|
|
|
else if (TREE_CODE (rhs) == OBJ_TYPE_REF)
|
|
|
|
{
|
|
|
|
tree val = OBJ_TYPE_REF_EXPR (rhs);
|
|
|
|
if (is_gimple_min_invariant (val))
|
|
|
|
return val;
|
|
|
|
else if (flag_devirtualize && virtual_method_call_p (val))
|
|
|
|
{
|
|
|
|
bool final;
|
|
|
|
vec <cgraph_node *>targets
|
|
|
|
= possible_polymorphic_call_targets (val, &final);
|
|
|
|
if (final && targets.length () <= 1)
|
|
|
|
{
|
|
|
|
tree fndecl;
|
|
|
|
if (targets.length () == 1)
|
|
|
|
fndecl = targets[0]->decl;
|
|
|
|
else
|
|
|
|
fndecl = builtin_decl_implicit (BUILT_IN_UNREACHABLE);
|
|
|
|
val = fold_convert (TREE_TYPE (val), fndecl);
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (val);
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
else if (TREE_CODE (rhs) == ADDR_EXPR)
|
|
|
|
{
|
re PR middle-end/42834 (memcpy folding overeager)
2010-07-01 Richard Guenther <rguenther@suse.de>
PR middle-end/42834
PR middle-end/44468
* doc/gimple.texi (is_gimple_mem_ref_addr): Document.
* doc/generic.texi (References to storage): Document MEM_REF.
* tree-pretty-print.c (dump_generic_node): Handle MEM_REF.
(print_call_name): Likewise.
* tree.c (recompute_tree_invariant_for_addr_expr): Handle MEM_REF.
(build_simple_mem_ref_loc): New function.
(mem_ref_offset): Likewise.
* tree.h (build_simple_mem_ref_loc): Declare.
(build_simple_mem_ref): Define.
(mem_ref_offset): Declare.
* fold-const.c: Include tree-flow.h.
(operand_equal_p): Handle MEM_REF.
(build_fold_addr_expr_with_type_loc): Likewise.
(fold_comparison): Likewise.
(fold_unary_loc): Fold
VIEW_CONVERT_EXPR <T1, MEM_REF <T2, ...>> to MEM_REF <T1, ...>.
(fold_binary_loc): Fold MEM[&MEM[p, CST1], CST2] to MEM[p, CST1 + CST2],
fold MEM[&a.b, CST2] to MEM[&a, offsetof (a, b) + CST2].
* tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Handle MEM_REF.
(ptr_deref_may_alias_ref_p_1): Likewise.
(ao_ref_base_alias_set): Properly differentiate base object for
offset and TBAA.
(ao_ref_init_from_ptr_and_size): Use MEM_REF.
(indirect_ref_may_alias_decl_p): Handle MEM_REFs properly.
(indirect_refs_may_alias_p): Likewise.
(refs_may_alias_p_1): Likewise. Remove pointer SSA name def
chasing code.
(ref_maybe_used_by_call_p_1): Handle MEM_REF.
(call_may_clobber_ref_p_1): Likewise.
* dwarf2out.c (loc_list_from_tree): Handle MEM_REF.
* expr.c (expand_assignment): Handle MEM_REF.
(store_expr): Handle MEM_REFs from STRING_CSTs.
(store_field): If expanding a MEM_REF of a non-addressable
decl use bitfield operations.
(get_inner_reference): Handle MEM_REF.
(expand_expr_addr_expr_1): Likewise.
(expand_expr_real_1): Likewise.
* tree-eh.c (tree_could_trap_p): Handle MEM_REF.
* alias.c (ao_ref_from_mem): Handle MEM_REF.
(get_alias_set): Likewise. Properly handle VIEW_CONVERT_EXPRs.
* tree-data-ref.c (dr_analyze_innermost): Handle MEM_REF.
(dr_analyze_indices): Likewise.
(dr_analyze_alias): Likewise.
(object_address_invariant_in_loop_p): Likewise.
* gimplify.c (mark_addressable): Handle MEM_REF.
(gimplify_cond_expr): Build MEM_REFs.
(gimplify_modify_expr_to_memcpy): Likewise.
(gimplify_init_ctor_preeval_1): Handle MEM_REF.
(gimple_fold_indirect_ref): Adjust.
(gimplify_expr): Handle MEM_REF. Gimplify INDIRECT_REF to MEM_REF.
* tree.def (MEM_REF): New tree code.
* tree-dfa.c: Include toplev.h.
(get_ref_base_and_extent): Handle MEM_REF.
(get_addr_base_and_unit_offset): New function.
* emit-rtl.c (set_mem_attributes_minus_bitpos): Handle MEM_REF.
* gimple-fold.c (may_propagate_address_into_dereference): Handle
MEM_REF.
(maybe_fold_offset_to_array_ref): Allow possibly out-of bounds
accesses if the array has just one dimension. Remove always true
parameter. Do not require type compatibility here.
(maybe_fold_offset_to_component_ref): Remove.
(maybe_fold_stmt_indirect): Remove.
(maybe_fold_reference): Remove INDIRECT_REF handling.
Fold back to non-MEM_REF.
(maybe_fold_offset_to_address): Simplify. Deal with type
mismatches here.
(maybe_fold_reference): Likewise.
(maybe_fold_stmt_addition): Likewise. Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
(fold_gimple_assign): Handle ADDR_EXPR of MEM_REFs.
(gimple_get_relevant_ref_binfo): Handle MEM_REF.
* cfgexpand.c (expand_debug_expr): Handle MEM_REF.
* tree-ssa.c (useless_type_conversion_p): Make most pointer
conversions useless.
(warn_uninitialized_var): Handle MEM_REF.
(maybe_rewrite_mem_ref_base): New function.
(execute_update_addresses_taken): Implement re-writing of MEM_REFs
to SSA form.
* tree-inline.c (remap_gimple_op_r): Handle MEM_REF, remove
INDIRECT_REF handling.
(copy_tree_body_r): Handle MEM_REF.
* gimple.c (is_gimple_addressable): Adjust.
(is_gimple_address): Likewise.
(is_gimple_invariant_address): ADDR_EXPRs of MEM_REFs with
invariant base are invariant.
(is_gimple_min_lval): Adjust.
(is_gimple_mem_ref_addr): New function.
(get_base_address): Handle MEM_REF.
(count_ptr_derefs): Likewise.
(get_base_loadstore): Likewise.
* gimple.h (is_gimple_mem_ref_addr): Declare.
(gimple_call_fndecl): Handle invariant MEM_REF addresses.
* tree-cfg.c (verify_address): New function, split out from ...
(verify_expr): ... here. Use for verifying ADDR_EXPRs and
the address operand of MEM_REFs. Verify MEM_REFs. Reject
INDIRECT_REFs.
(verify_types_in_gimple_min_lval): Handle MEM_REF. Disallow
INDIRECT_REF. Allow conversions.
(verify_types_in_gimple_reference): Verify VIEW_CONVERT_EXPR of
a register does not change its size.
(verify_types_in_gimple_reference): Verify MEM_REF.
(verify_gimple_assign_single): Disallow INDIRECT_REF.
Handle MEM_REF.
* tree-ssa-operands.c (opf_non_addressable, opf_not_non_addressable):
New.
(mark_address_taken): Handle MEM_REF.
(get_indirect_ref_operands): Pass through opf_not_non_addressable.
(get_asm_expr_operands): Pass opf_not_non_addressable.
(get_expr_operands): Handle opf_[not_]non_addressable.
Handle MEM_REF. Remove INDIRECT_REF handling.
* tree-vrp.c: (check_array_ref): Handle MEM_REF.
(search_for_addr_array): Likewise.
(check_array_bounds): Likewise.
(vrp_stmt_computes_nonzero): Adjust for MEM_REF.
* tree-ssa-loop-im.c (for_each_index): Handle MEM_REF.
(ref_always_accessed_p): Likewise.
(gen_lsm_tmp_name): Likewise. Handle ADDR_EXPR.
* tree-complex.c (extract_component): Do not handle INDIRECT_REF.
Handle MEM_REF.
* cgraphbuild.c (mark_load): Properly check for NULL result
from get_base_address.
(mark_store): Likewise.
* tree-ssa-loop-niter.c (array_at_struct_end_p): Handle MEM_REF.
* tree-loop-distribution.c (generate_builtin): Exchange INDIRECT_REF
handling for MEM_REF.
* tree-scalar-evolution.c (follow_ssa_edge_expr): Handle
&MEM[ptr + CST] similar to POINTER_PLUS_EXPR.
* builtins.c (stabilize_va_list_loc): Use the function ABI
valist type if we couldn't canonicalize the argument type.
Always dereference with the canonical va-list type.
(maybe_emit_free_warning): Handle MEM_REF.
(fold_builtin_memory_op): Simplify and handle MEM_REFs in folding
memmove to memcpy.
* builtins.c (fold_builtin_memory_op): Use ref-all types
for all memcpy foldings.
* omp-low.c (build_receiver_ref): Adjust for MEM_REF.
(build_outer_var_ref): Likewise.
(scan_omp_1_op): Likewise.
(lower_rec_input_clauses): Likewise.
(lower_lastprivate_clauses): Likewise.
(lower_reduction_clauses): Likewise.
(lower_copyprivate_clauses): Likewise.
(expand_omp_atomic_pipeline): Likewise.
(expand_omp_atomic_mutex): Likewise.
(create_task_copyfn): Likewise.
* tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle MEM_REF.
Remove old union trick. Initialize constant offsets.
(ao_ref_init_from_vn_reference): Likewise. Do not handle
INDIRECT_REF. Init base_alias_set properly.
(vn_reference_lookup_3): Replace INDIRECT_REF handling with
MEM_REF.
(vn_reference_fold_indirect): Adjust for MEM_REFs.
(valueize_refs): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs.
(may_insert): Remove.
(visit_reference_op_load): Do not test may_insert.
(run_scc_vn): Remove parameter, do not fiddle with may_insert.
* tree-ssa-sccvn.h (struct vn_reference_op_struct): Add
a field to store the constant offset this op applies.
(run_scc_vn): Adjust prototype.
* cgraphunit.c (thunk_adjust): Adjust for MEM_REF.
* tree-ssa-ccp.c (ccp_fold): Replace INDIRECT_REF folding with
MEM_REF. Propagate &foo + CST as &MEM[&foo, CST]. Do not
bother about volatile qualifiers on pointers.
(fold_const_aggregate_ref): Handle MEM_REF, do not handle INDIRECT_REF.
* tree-ssa-loop-ivopts.c
* tree-ssa-loop-ivopts.c (determine_base_object): Adjust
for MEM_REF.
(strip_offset_1): Likewise.
(find_interesting_uses_address): Replace INDIRECT_REF handling with
MEM_REF handling.
(get_computation_cost_at): Likewise.
* ipa-pure-const.c (check_op): Handle MEM_REF.
* tree-stdarg.c (check_all_va_list_escapes): Adjust for MEM_REF.
* tree-ssa-sink.c (is_hidden_global_store): Handle MEM_REF
and constants.
* ipa-inline.c (likely_eliminated_by_inlining_p): Handle MEM_REF.
* tree-parloops.c (take_address_of): Adjust for MEM_REF.
(eliminate_local_variables_1): Likewise.
(create_call_for_reduction_1): Likewise.
(create_loads_for_reductions): Likewise.
(create_loads_and_stores_for_name): Likewise.
* matrix-reorg.c (may_flatten_matrices_1): Sanitize.
(ssa_accessed_in_tree): Handle MEM_REF.
(ssa_accessed_in_assign_rhs): Likewise.
(update_type_size): Likewise.
(analyze_accesses_for_call_stmt): Likewise.
(analyze_accesses_for_assign_stmt): Likewise.
(transform_access_sites): Likewise.
(transform_allocation_sites): Likewise.
* tree-affine.c (tree_to_aff_combination): Handle MEM_REF.
* tree-vect-data-refs.c (vect_create_addr_base_for_vector_ref): Do
not handle INDIRECT_REF.
* tree-ssa-phiopt.c (add_or_mark_expr): Handle MEM_REF.
(cond_store_replacement): Likewise.
* tree-ssa-pre.c (create_component_ref_by_pieces_1): Handle
MEM_REF, no not handle INDIRECT_REFs.
(insert_into_preds_of_block): Properly initialize avail.
(phi_translate_1): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs. Properly handle reference lookups that
require a bit re-interpretation.
(can_PRE_operation): Do not handle INDIRECT_REF. Handle MEM_REF.
* tree-sra.c
* tree-sra.c (build_access_from_expr_1): Handle MEM_REF.
(build_ref_for_offset_1): Remove.
(build_ref_for_offset): Build MEM_REFs.
(gate_intra_sra): Disable for now.
(sra_ipa_modify_expr): Handle MEM_REF.
(ipa_early_sra_gate): Disable for now.
* tree-sra.c (create_access): Swap INDIRECT_REF handling for
MEM_REF handling.
(disqualify_base_of_expr): Likewise.
(ptr_parm_has_direct_uses): Swap INDIRECT_REF handling for
MEM_REF handling.
(sra_ipa_modify_expr): Remove INDIRECT_REF handling.
Use mem_ref_offset. Remove bogus folding.
(build_access_from_expr_1): Properly handle MEM_REF for
non IPA-SRA.
(make_fancy_name_1): Add support for MEM_REF.
* tree-predcom.c (ref_at_iteration): Handle MEM_REFs.
* tree-mudflap.c (mf_xform_derefs_1): Adjust for MEM_REF.
* ipa-prop.c (compute_complex_assign_jump_func): Handle MEM_REF.
(compute_complex_ancestor_jump_func): Likewise.
(ipa_analyze_virtual_call_uses): Likewise.
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Replace
INDIRECT_REF folding with more generalized MEM_REF folding.
(tree_ssa_forward_propagate_single_use_vars): Adjust accordingly.
(forward_propagate_addr_into_variable_array_index): Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
* tree-ssa-dce.c (ref_may_be_aliased): Handle MEM_REF.
* tree-ssa-ter.c (find_replaceable_in_bb): Avoid TER if that
creates assignments with overlap.
* tree-nested.c (get_static_chain): Adjust for MEM_REF.
(get_frame_field): Likewise.
(get_nonlocal_debug_decl): Likewise.
(convert_nonlocal_reference_op): Likewise.
(struct nesting_info): Add mem_refs pointer-set.
(create_nesting_tree): Allocate it.
(convert_local_reference_op): Insert to be folded mem-refs.
(fold_mem_refs): New function.
(finalize_nesting_tree_1): Perform defered folding of mem-refs
(free_nesting_tree): Free the pointer-set.
* tree-vect-stmts.c (vectorizable_store): Adjust for MEM_REF.
(vectorizable_load): Likewise.
* tree-ssa-phiprop.c (phiprop_insert_phi): Adjust for MEM_REF.
(propagate_with_phi): Likewise.
* tree-object-size.c (addr_object_size): Handle MEM_REFs
instead of INDIRECT_REFs.
(compute_object_offset): Handle MEM_REF.
(plus_stmt_object_size): Handle MEM_REF.
(collect_object_sizes_for): Dispatch to plus_stmt_object_size
for &MEM_REF.
* tree-flow.h (get_addr_base_and_unit_offset): Declare.
(symbol_marked_for_renaming): Likewise.
* Makefile.in (tree-dfa.o): Add $(TOPLEV_H).
(fold-const.o): Add $(TREE_FLOW_H).
* tree-ssa-structalias.c (get_constraint_for_1): Handle MEM_REF.
(find_func_clobbers): Likewise.
* ipa-struct-reorg.c (decompose_indirect_ref_acc): Handle MEM_REF.
(decompose_access): Likewise.
(replace_field_acc): Likewise.
(replace_field_access_stmt): Likewise.
(insert_new_var_in_stmt): Likewise.
(get_stmt_accesses): Likewise.
(reorg_structs_drive): Disable.
* config/i386/i386.c (ix86_va_start): Adjust for MEM_REF.
(ix86_canonical_va_list_type): Likewise.
cp/
* cp-gimplify.c (cp_gimplify_expr): Open-code the rhs
predicate we are looking for, allow non-gimplified
INDIRECT_REFs.
testsuite/
* gcc.c-torture/execute/20100316-1.c: New testcase.
* gcc.c-torture/execute/pr44468.c: Likewise.
* gcc.c-torture/compile/20100609-1.c: Likewise.
* gcc.dg/volatile2.c: Adjust.
* gcc.dg/plugin/selfassign.c: Likewise.
* gcc.dg/pr36902.c: Likewise.
* gcc.dg/tree-ssa/foldaddr-2.c: Remove.
* gcc.dg/tree-ssa/foldaddr-3.c: Likewise.
* gcc.dg/tree-ssa/forwprop-8.c: Adjust.
* gcc.dg/tree-ssa/pr17141-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-13.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-14.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-21.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-1.c: Likewise.
* gcc.dg/tree-ssa/20030807-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-10.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-1.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-23.c: Likewise.
* gcc.dg/tree-ssa/forwprop-1.c: Likewise.
* gcc.dg/tree-ssa/forwprop-2.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-25.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-26.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-26.c: Likewise.
* gcc.dg/tree-ssa/ssa-sccvn-4.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-5.c: Likewise.
* gcc.dg/struct/w_prof_two_strs.c: XFAIL.
* gcc.dg/struct/wo_prof_escape_arg_to_local.c: Likewise.
* gcc.dg/struct/wo_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_malloc_size_var.c: Likewise.
* gcc.dg/struct/w_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_str_init.c: Likewise.
* gcc.dg/struct/wo_prof_array_through_pointer.c: Likewise.
* gcc.dg/struct/w_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_array_field.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_local.c: Likewise.
* gcc.dg/struct/w_prof_local_var.c: Likewise.
* gcc.dg/struct/wo_prof_two_strs.c: Likewise.
* gcc.dg/struct/wo_prof_empty_str.c: Likewise.
* gcc.dg/struct/wo_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_value.c: Likewise.
* gcc.dg/struct/wo_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_escape_return.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_array.c: Likewise.
* gcc.dg/struct/wo_prof_double_malloc.c: Likewise.
* gcc.dg/struct/w_ratio_cold_str.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_pointer.c: Likewise.
* gcc.dg/struct/wo_prof_local_var.c: Likewise.
* gcc.dg/tree-prof/stringop-1.c: Adjust.
* g++.dg/tree-ssa/pr31146.C: Likewise.
* g++.dg/tree-ssa/copyprop-1.C: Likewise.
* g++.dg/tree-ssa/pr33604.C: Likewise.
* g++.dg/plugin/selfassign.c: Likewise.
* gfortran.dg/array_memcpy_3.f90: Likewise.
* gfortran.dg/array_memcpy_4.f90: Likewise.
* c-c++-common/torture/pr42834.c: New testcase.
From-SVN: r161655
2010-07-01 10:49:19 +02:00
|
|
|
tree ref = TREE_OPERAND (rhs, 0);
|
|
|
|
tree tem = maybe_fold_reference (ref, true);
|
|
|
|
if (tem
|
|
|
|
&& TREE_CODE (tem) == MEM_REF
|
|
|
|
&& integer_zerop (TREE_OPERAND (tem, 1)))
|
|
|
|
result = fold_convert (TREE_TYPE (rhs), TREE_OPERAND (tem, 0));
|
|
|
|
else if (tem)
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
result = fold_convert (TREE_TYPE (rhs),
|
|
|
|
build_fold_addr_expr_loc (loc, tem));
|
re PR middle-end/42834 (memcpy folding overeager)
2010-07-01 Richard Guenther <rguenther@suse.de>
PR middle-end/42834
PR middle-end/44468
* doc/gimple.texi (is_gimple_mem_ref_addr): Document.
* doc/generic.texi (References to storage): Document MEM_REF.
* tree-pretty-print.c (dump_generic_node): Handle MEM_REF.
(print_call_name): Likewise.
* tree.c (recompute_tree_invariant_for_addr_expr): Handle MEM_REF.
(build_simple_mem_ref_loc): New function.
(mem_ref_offset): Likewise.
* tree.h (build_simple_mem_ref_loc): Declare.
(build_simple_mem_ref): Define.
(mem_ref_offset): Declare.
* fold-const.c: Include tree-flow.h.
(operand_equal_p): Handle MEM_REF.
(build_fold_addr_expr_with_type_loc): Likewise.
(fold_comparison): Likewise.
(fold_unary_loc): Fold
VIEW_CONVERT_EXPR <T1, MEM_REF <T2, ...>> to MEM_REF <T1, ...>.
(fold_binary_loc): Fold MEM[&MEM[p, CST1], CST2] to MEM[p, CST1 + CST2],
fold MEM[&a.b, CST2] to MEM[&a, offsetof (a, b) + CST2].
* tree-ssa-alias.c (ptr_deref_may_alias_decl_p): Handle MEM_REF.
(ptr_deref_may_alias_ref_p_1): Likewise.
(ao_ref_base_alias_set): Properly differentiate base object for
offset and TBAA.
(ao_ref_init_from_ptr_and_size): Use MEM_REF.
(indirect_ref_may_alias_decl_p): Handle MEM_REFs properly.
(indirect_refs_may_alias_p): Likewise.
(refs_may_alias_p_1): Likewise. Remove pointer SSA name def
chasing code.
(ref_maybe_used_by_call_p_1): Handle MEM_REF.
(call_may_clobber_ref_p_1): Likewise.
* dwarf2out.c (loc_list_from_tree): Handle MEM_REF.
* expr.c (expand_assignment): Handle MEM_REF.
(store_expr): Handle MEM_REFs from STRING_CSTs.
(store_field): If expanding a MEM_REF of a non-addressable
decl use bitfield operations.
(get_inner_reference): Handle MEM_REF.
(expand_expr_addr_expr_1): Likewise.
(expand_expr_real_1): Likewise.
* tree-eh.c (tree_could_trap_p): Handle MEM_REF.
* alias.c (ao_ref_from_mem): Handle MEM_REF.
(get_alias_set): Likewise. Properly handle VIEW_CONVERT_EXPRs.
* tree-data-ref.c (dr_analyze_innermost): Handle MEM_REF.
(dr_analyze_indices): Likewise.
(dr_analyze_alias): Likewise.
(object_address_invariant_in_loop_p): Likewise.
* gimplify.c (mark_addressable): Handle MEM_REF.
(gimplify_cond_expr): Build MEM_REFs.
(gimplify_modify_expr_to_memcpy): Likewise.
(gimplify_init_ctor_preeval_1): Handle MEM_REF.
(gimple_fold_indirect_ref): Adjust.
(gimplify_expr): Handle MEM_REF. Gimplify INDIRECT_REF to MEM_REF.
* tree.def (MEM_REF): New tree code.
* tree-dfa.c: Include toplev.h.
(get_ref_base_and_extent): Handle MEM_REF.
(get_addr_base_and_unit_offset): New function.
* emit-rtl.c (set_mem_attributes_minus_bitpos): Handle MEM_REF.
* gimple-fold.c (may_propagate_address_into_dereference): Handle
MEM_REF.
(maybe_fold_offset_to_array_ref): Allow possibly out-of bounds
accesses if the array has just one dimension. Remove always true
parameter. Do not require type compatibility here.
(maybe_fold_offset_to_component_ref): Remove.
(maybe_fold_stmt_indirect): Remove.
(maybe_fold_reference): Remove INDIRECT_REF handling.
Fold back to non-MEM_REF.
(maybe_fold_offset_to_address): Simplify. Deal with type
mismatches here.
(maybe_fold_reference): Likewise.
(maybe_fold_stmt_addition): Likewise. Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
(fold_gimple_assign): Handle ADDR_EXPR of MEM_REFs.
(gimple_get_relevant_ref_binfo): Handle MEM_REF.
* cfgexpand.c (expand_debug_expr): Handle MEM_REF.
* tree-ssa.c (useless_type_conversion_p): Make most pointer
conversions useless.
(warn_uninitialized_var): Handle MEM_REF.
(maybe_rewrite_mem_ref_base): New function.
(execute_update_addresses_taken): Implement re-writing of MEM_REFs
to SSA form.
* tree-inline.c (remap_gimple_op_r): Handle MEM_REF, remove
INDIRECT_REF handling.
(copy_tree_body_r): Handle MEM_REF.
* gimple.c (is_gimple_addressable): Adjust.
(is_gimple_address): Likewise.
(is_gimple_invariant_address): ADDR_EXPRs of MEM_REFs with
invariant base are invariant.
(is_gimple_min_lval): Adjust.
(is_gimple_mem_ref_addr): New function.
(get_base_address): Handle MEM_REF.
(count_ptr_derefs): Likewise.
(get_base_loadstore): Likewise.
* gimple.h (is_gimple_mem_ref_addr): Declare.
(gimple_call_fndecl): Handle invariant MEM_REF addresses.
* tree-cfg.c (verify_address): New function, split out from ...
(verify_expr): ... here. Use for verifying ADDR_EXPRs and
the address operand of MEM_REFs. Verify MEM_REFs. Reject
INDIRECT_REFs.
(verify_types_in_gimple_min_lval): Handle MEM_REF. Disallow
INDIRECT_REF. Allow conversions.
(verify_types_in_gimple_reference): Verify VIEW_CONVERT_EXPR of
a register does not change its size.
(verify_types_in_gimple_reference): Verify MEM_REF.
(verify_gimple_assign_single): Disallow INDIRECT_REF.
Handle MEM_REF.
* tree-ssa-operands.c (opf_non_addressable, opf_not_non_addressable):
New.
(mark_address_taken): Handle MEM_REF.
(get_indirect_ref_operands): Pass through opf_not_non_addressable.
(get_asm_expr_operands): Pass opf_not_non_addressable.
(get_expr_operands): Handle opf_[not_]non_addressable.
Handle MEM_REF. Remove INDIRECT_REF handling.
* tree-vrp.c: (check_array_ref): Handle MEM_REF.
(search_for_addr_array): Likewise.
(check_array_bounds): Likewise.
(vrp_stmt_computes_nonzero): Adjust for MEM_REF.
* tree-ssa-loop-im.c (for_each_index): Handle MEM_REF.
(ref_always_accessed_p): Likewise.
(gen_lsm_tmp_name): Likewise. Handle ADDR_EXPR.
* tree-complex.c (extract_component): Do not handle INDIRECT_REF.
Handle MEM_REF.
* cgraphbuild.c (mark_load): Properly check for NULL result
from get_base_address.
(mark_store): Likewise.
* tree-ssa-loop-niter.c (array_at_struct_end_p): Handle MEM_REF.
* tree-loop-distribution.c (generate_builtin): Exchange INDIRECT_REF
handling for MEM_REF.
* tree-scalar-evolution.c (follow_ssa_edge_expr): Handle
&MEM[ptr + CST] similar to POINTER_PLUS_EXPR.
* builtins.c (stabilize_va_list_loc): Use the function ABI
valist type if we couldn't canonicalize the argument type.
Always dereference with the canonical va-list type.
(maybe_emit_free_warning): Handle MEM_REF.
(fold_builtin_memory_op): Simplify and handle MEM_REFs in folding
memmove to memcpy.
* builtins.c (fold_builtin_memory_op): Use ref-all types
for all memcpy foldings.
* omp-low.c (build_receiver_ref): Adjust for MEM_REF.
(build_outer_var_ref): Likewise.
(scan_omp_1_op): Likewise.
(lower_rec_input_clauses): Likewise.
(lower_lastprivate_clauses): Likewise.
(lower_reduction_clauses): Likewise.
(lower_copyprivate_clauses): Likewise.
(expand_omp_atomic_pipeline): Likewise.
(expand_omp_atomic_mutex): Likewise.
(create_task_copyfn): Likewise.
* tree-ssa-sccvn.c (copy_reference_ops_from_ref): Handle MEM_REF.
Remove old union trick. Initialize constant offsets.
(ao_ref_init_from_vn_reference): Likewise. Do not handle
INDIRECT_REF. Init base_alias_set properly.
(vn_reference_lookup_3): Replace INDIRECT_REF handling with
MEM_REF.
(vn_reference_fold_indirect): Adjust for MEM_REFs.
(valueize_refs): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs.
(may_insert): Remove.
(visit_reference_op_load): Do not test may_insert.
(run_scc_vn): Remove parameter, do not fiddle with may_insert.
* tree-ssa-sccvn.h (struct vn_reference_op_struct): Add
a field to store the constant offset this op applies.
(run_scc_vn): Adjust prototype.
* cgraphunit.c (thunk_adjust): Adjust for MEM_REF.
* tree-ssa-ccp.c (ccp_fold): Replace INDIRECT_REF folding with
MEM_REF. Propagate &foo + CST as &MEM[&foo, CST]. Do not
bother about volatile qualifiers on pointers.
(fold_const_aggregate_ref): Handle MEM_REF, do not handle INDIRECT_REF.
* tree-ssa-loop-ivopts.c
* tree-ssa-loop-ivopts.c (determine_base_object): Adjust
for MEM_REF.
(strip_offset_1): Likewise.
(find_interesting_uses_address): Replace INDIRECT_REF handling with
MEM_REF handling.
(get_computation_cost_at): Likewise.
* ipa-pure-const.c (check_op): Handle MEM_REF.
* tree-stdarg.c (check_all_va_list_escapes): Adjust for MEM_REF.
* tree-ssa-sink.c (is_hidden_global_store): Handle MEM_REF
and constants.
* ipa-inline.c (likely_eliminated_by_inlining_p): Handle MEM_REF.
* tree-parloops.c (take_address_of): Adjust for MEM_REF.
(eliminate_local_variables_1): Likewise.
(create_call_for_reduction_1): Likewise.
(create_loads_for_reductions): Likewise.
(create_loads_and_stores_for_name): Likewise.
* matrix-reorg.c (may_flatten_matrices_1): Sanitize.
(ssa_accessed_in_tree): Handle MEM_REF.
(ssa_accessed_in_assign_rhs): Likewise.
(update_type_size): Likewise.
(analyze_accesses_for_call_stmt): Likewise.
(analyze_accesses_for_assign_stmt): Likewise.
(transform_access_sites): Likewise.
(transform_allocation_sites): Likewise.
* tree-affine.c (tree_to_aff_combination): Handle MEM_REF.
* tree-vect-data-refs.c (vect_create_addr_base_for_vector_ref): Do
not handle INDIRECT_REF.
* tree-ssa-phiopt.c (add_or_mark_expr): Handle MEM_REF.
(cond_store_replacement): Likewise.
* tree-ssa-pre.c (create_component_ref_by_pieces_1): Handle
MEM_REF, no not handle INDIRECT_REFs.
(insert_into_preds_of_block): Properly initialize avail.
(phi_translate_1): Fold MEM_REFs. Re-evaluate constant offset
for ARRAY_REFs. Properly handle reference lookups that
require a bit re-interpretation.
(can_PRE_operation): Do not handle INDIRECT_REF. Handle MEM_REF.
* tree-sra.c
* tree-sra.c (build_access_from_expr_1): Handle MEM_REF.
(build_ref_for_offset_1): Remove.
(build_ref_for_offset): Build MEM_REFs.
(gate_intra_sra): Disable for now.
(sra_ipa_modify_expr): Handle MEM_REF.
(ipa_early_sra_gate): Disable for now.
* tree-sra.c (create_access): Swap INDIRECT_REF handling for
MEM_REF handling.
(disqualify_base_of_expr): Likewise.
(ptr_parm_has_direct_uses): Swap INDIRECT_REF handling for
MEM_REF handling.
(sra_ipa_modify_expr): Remove INDIRECT_REF handling.
Use mem_ref_offset. Remove bogus folding.
(build_access_from_expr_1): Properly handle MEM_REF for
non IPA-SRA.
(make_fancy_name_1): Add support for MEM_REF.
* tree-predcom.c (ref_at_iteration): Handle MEM_REFs.
* tree-mudflap.c (mf_xform_derefs_1): Adjust for MEM_REF.
* ipa-prop.c (compute_complex_assign_jump_func): Handle MEM_REF.
(compute_complex_ancestor_jump_func): Likewise.
(ipa_analyze_virtual_call_uses): Likewise.
* tree-ssa-forwprop.c (forward_propagate_addr_expr_1): Replace
INDIRECT_REF folding with more generalized MEM_REF folding.
(tree_ssa_forward_propagate_single_use_vars): Adjust accordingly.
(forward_propagate_addr_into_variable_array_index): Also handle
&ARRAY + I in addition to &ARRAY[0] + I.
* tree-ssa-dce.c (ref_may_be_aliased): Handle MEM_REF.
* tree-ssa-ter.c (find_replaceable_in_bb): Avoid TER if that
creates assignments with overlap.
* tree-nested.c (get_static_chain): Adjust for MEM_REF.
(get_frame_field): Likewise.
(get_nonlocal_debug_decl): Likewise.
(convert_nonlocal_reference_op): Likewise.
(struct nesting_info): Add mem_refs pointer-set.
(create_nesting_tree): Allocate it.
(convert_local_reference_op): Insert to be folded mem-refs.
(fold_mem_refs): New function.
(finalize_nesting_tree_1): Perform defered folding of mem-refs
(free_nesting_tree): Free the pointer-set.
* tree-vect-stmts.c (vectorizable_store): Adjust for MEM_REF.
(vectorizable_load): Likewise.
* tree-ssa-phiprop.c (phiprop_insert_phi): Adjust for MEM_REF.
(propagate_with_phi): Likewise.
* tree-object-size.c (addr_object_size): Handle MEM_REFs
instead of INDIRECT_REFs.
(compute_object_offset): Handle MEM_REF.
(plus_stmt_object_size): Handle MEM_REF.
(collect_object_sizes_for): Dispatch to plus_stmt_object_size
for &MEM_REF.
* tree-flow.h (get_addr_base_and_unit_offset): Declare.
(symbol_marked_for_renaming): Likewise.
* Makefile.in (tree-dfa.o): Add $(TOPLEV_H).
(fold-const.o): Add $(TREE_FLOW_H).
* tree-ssa-structalias.c (get_constraint_for_1): Handle MEM_REF.
(find_func_clobbers): Likewise.
* ipa-struct-reorg.c (decompose_indirect_ref_acc): Handle MEM_REF.
(decompose_access): Likewise.
(replace_field_acc): Likewise.
(replace_field_access_stmt): Likewise.
(insert_new_var_in_stmt): Likewise.
(get_stmt_accesses): Likewise.
(reorg_structs_drive): Disable.
* config/i386/i386.c (ix86_va_start): Adjust for MEM_REF.
(ix86_canonical_va_list_type): Likewise.
cp/
* cp-gimplify.c (cp_gimplify_expr): Open-code the rhs
predicate we are looking for, allow non-gimplified
INDIRECT_REFs.
testsuite/
* gcc.c-torture/execute/20100316-1.c: New testcase.
* gcc.c-torture/execute/pr44468.c: Likewise.
* gcc.c-torture/compile/20100609-1.c: Likewise.
* gcc.dg/volatile2.c: Adjust.
* gcc.dg/plugin/selfassign.c: Likewise.
* gcc.dg/pr36902.c: Likewise.
* gcc.dg/tree-ssa/foldaddr-2.c: Remove.
* gcc.dg/tree-ssa/foldaddr-3.c: Likewise.
* gcc.dg/tree-ssa/forwprop-8.c: Adjust.
* gcc.dg/tree-ssa/pr17141-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-13.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-14.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-21.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-1.c: Likewise.
* gcc.dg/tree-ssa/20030807-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-10.c: Likewise.
* gcc.dg/tree-ssa/ssa-fre-1.c: Likewise.
* gcc.dg/tree-ssa/pta-ptrarith-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-23.c: Likewise.
* gcc.dg/tree-ssa/forwprop-1.c: Likewise.
* gcc.dg/tree-ssa/forwprop-2.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-1.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-25.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-26.c: Likewise.
* gcc.dg/tree-ssa/struct-aliasing-2.c: Likewise.
* gcc.dg/tree-ssa/ssa-ccp-26.c: Likewise.
* gcc.dg/tree-ssa/ssa-sccvn-4.c: Likewise.
* gcc.dg/tree-ssa/ssa-pre-7.c: Likewise.
* gcc.dg/tree-ssa/forwprop-5.c: Likewise.
* gcc.dg/struct/w_prof_two_strs.c: XFAIL.
* gcc.dg/struct/wo_prof_escape_arg_to_local.c: Likewise.
* gcc.dg/struct/wo_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_malloc_size_var.c: Likewise.
* gcc.dg/struct/w_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_str_init.c: Likewise.
* gcc.dg/struct/wo_prof_array_through_pointer.c: Likewise.
* gcc.dg/struct/w_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_array_field.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_local.c: Likewise.
* gcc.dg/struct/w_prof_local_var.c: Likewise.
* gcc.dg/struct/wo_prof_two_strs.c: Likewise.
* gcc.dg/struct/wo_prof_empty_str.c: Likewise.
* gcc.dg/struct/wo_prof_local_array.c: Likewise.
* gcc.dg/struct/w_prof_global_var.c: Likewise.
* gcc.dg/struct/wo_prof_single_str_global.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_value.c: Likewise.
* gcc.dg/struct/wo_prof_global_array.c: Likewise.
* gcc.dg/struct/wo_prof_escape_return.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_array.c: Likewise.
* gcc.dg/struct/wo_prof_double_malloc.c: Likewise.
* gcc.dg/struct/w_ratio_cold_str.c: Likewise.
* gcc.dg/struct/wo_prof_escape_substr_pointer.c: Likewise.
* gcc.dg/struct/wo_prof_local_var.c: Likewise.
* gcc.dg/tree-prof/stringop-1.c: Adjust.
* g++.dg/tree-ssa/pr31146.C: Likewise.
* g++.dg/tree-ssa/copyprop-1.C: Likewise.
* g++.dg/tree-ssa/pr33604.C: Likewise.
* g++.dg/plugin/selfassign.c: Likewise.
* gfortran.dg/array_memcpy_3.f90: Likewise.
* gfortran.dg/array_memcpy_4.f90: Likewise.
* c-c++-common/torture/pr42834.c: New testcase.
From-SVN: r161655
2010-07-01 10:49:19 +02:00
|
|
|
else if (TREE_CODE (ref) == MEM_REF
|
|
|
|
&& integer_zerop (TREE_OPERAND (ref, 1)))
|
|
|
|
result = fold_convert (TREE_TYPE (rhs), TREE_OPERAND (ref, 0));
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
else if (TREE_CODE (rhs) == CONSTRUCTOR
|
|
|
|
&& TREE_CODE (TREE_TYPE (rhs)) == VECTOR_TYPE
|
|
|
|
&& (CONSTRUCTOR_NELTS (rhs)
|
|
|
|
== TYPE_VECTOR_SUBPARTS (TREE_TYPE (rhs))))
|
|
|
|
{
|
|
|
|
/* Fold a constant vector CONSTRUCTOR to VECTOR_CST. */
|
|
|
|
unsigned i;
|
|
|
|
tree val;
|
|
|
|
|
|
|
|
FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (rhs), i, val)
|
|
|
|
if (TREE_CODE (val) != INTEGER_CST
|
|
|
|
&& TREE_CODE (val) != REAL_CST
|
|
|
|
&& TREE_CODE (val) != FIXED_CST)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
return build_vector_from_ctor (TREE_TYPE (rhs),
|
|
|
|
CONSTRUCTOR_ELTS (rhs));
|
|
|
|
}
|
|
|
|
|
|
|
|
else if (DECL_P (rhs))
|
2013-01-13 13:33:43 +01:00
|
|
|
return get_symbol_constant_value (rhs);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
/* If we couldn't fold the RHS, hand over to the generic
|
|
|
|
fold routines. */
|
|
|
|
if (result == NULL_TREE)
|
|
|
|
result = fold (rhs);
|
|
|
|
|
|
|
|
/* Strip away useless type conversions. Both the NON_LVALUE_EXPR
|
|
|
|
that may have been added by fold, and "useless" type
|
|
|
|
conversions that might now be apparent due to propagation. */
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (result);
|
|
|
|
|
|
|
|
if (result != rhs && valid_gimple_rhs_p (result))
|
|
|
|
return result;
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GIMPLE_UNARY_RHS:
|
|
|
|
{
|
|
|
|
tree rhs = gimple_assign_rhs1 (stmt);
|
|
|
|
|
|
|
|
result = fold_unary_loc (loc, subcode, gimple_expr_type (stmt), rhs);
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
/* If the operation was a conversion do _not_ mark a
|
|
|
|
resulting constant with TREE_OVERFLOW if the original
|
|
|
|
constant was not. These conversions have implementation
|
|
|
|
defined behavior and retaining the TREE_OVERFLOW flag
|
|
|
|
here would confuse later passes such as VRP. */
|
|
|
|
if (CONVERT_EXPR_CODE_P (subcode)
|
|
|
|
&& TREE_CODE (result) == INTEGER_CST
|
|
|
|
&& TREE_CODE (rhs) == INTEGER_CST)
|
|
|
|
TREE_OVERFLOW (result) = TREE_OVERFLOW (rhs);
|
|
|
|
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (result);
|
|
|
|
if (valid_gimple_rhs_p (result))
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GIMPLE_BINARY_RHS:
|
2011-08-02 16:55:47 +02:00
|
|
|
/* Try to canonicalize for boolean-typed X the comparisons
|
|
|
|
X == 0, X == 1, X != 0, and X != 1. */
|
2011-08-30 16:06:00 +02:00
|
|
|
if (gimple_assign_rhs_code (stmt) == EQ_EXPR
|
|
|
|
|| gimple_assign_rhs_code (stmt) == NE_EXPR)
|
2011-08-02 16:55:47 +02:00
|
|
|
{
|
|
|
|
tree lhs = gimple_assign_lhs (stmt);
|
|
|
|
tree op1 = gimple_assign_rhs1 (stmt);
|
|
|
|
tree op2 = gimple_assign_rhs2 (stmt);
|
|
|
|
tree type = TREE_TYPE (op1);
|
|
|
|
|
|
|
|
/* Check whether the comparison operands are of the same boolean
|
|
|
|
type as the result type is.
|
|
|
|
Check that second operand is an integer-constant with value
|
|
|
|
one or zero. */
|
|
|
|
if (TREE_CODE (op2) == INTEGER_CST
|
|
|
|
&& (integer_zerop (op2) || integer_onep (op2))
|
|
|
|
&& useless_type_conversion_p (TREE_TYPE (lhs), type))
|
|
|
|
{
|
|
|
|
enum tree_code cmp_code = gimple_assign_rhs_code (stmt);
|
|
|
|
bool is_logical_not = false;
|
|
|
|
|
|
|
|
/* X == 0 and X != 1 is a logical-not.of X
|
|
|
|
X == 1 and X != 0 is X */
|
|
|
|
if ((cmp_code == EQ_EXPR && integer_zerop (op2))
|
|
|
|
|| (cmp_code == NE_EXPR && integer_onep (op2)))
|
|
|
|
is_logical_not = true;
|
|
|
|
|
|
|
|
if (is_logical_not == false)
|
|
|
|
result = op1;
|
|
|
|
/* Only for one-bit precision typed X the transformation
|
|
|
|
!X -> ~X is valied. */
|
|
|
|
else if (TYPE_PRECISION (type) == 1)
|
|
|
|
result = build1_loc (gimple_location (stmt), BIT_NOT_EXPR,
|
|
|
|
type, op1);
|
|
|
|
/* Otherwise we use !X -> X ^ 1. */
|
|
|
|
else
|
|
|
|
result = build2_loc (gimple_location (stmt), BIT_XOR_EXPR,
|
|
|
|
type, op1, build_int_cst (type, 1));
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
if (!result)
|
|
|
|
result = fold_binary_loc (loc, subcode,
|
2011-07-14 16:21:07 +02:00
|
|
|
TREE_TYPE (gimple_assign_lhs (stmt)),
|
|
|
|
gimple_assign_rhs1 (stmt),
|
|
|
|
gimple_assign_rhs2 (stmt));
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (result);
|
|
|
|
if (valid_gimple_rhs_p (result))
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2010-06-25 10:56:24 +02:00
|
|
|
case GIMPLE_TERNARY_RHS:
|
2011-09-01 13:46:08 +02:00
|
|
|
/* Try to fold a conditional expression. */
|
|
|
|
if (gimple_assign_rhs_code (stmt) == COND_EXPR)
|
|
|
|
{
|
|
|
|
tree op0 = gimple_assign_rhs1 (stmt);
|
|
|
|
tree tem;
|
|
|
|
bool set = false;
|
|
|
|
location_t cond_loc = gimple_location (stmt);
|
|
|
|
|
|
|
|
if (COMPARISON_CLASS_P (op0))
|
|
|
|
{
|
|
|
|
fold_defer_overflow_warnings ();
|
|
|
|
tem = fold_binary_loc (cond_loc,
|
|
|
|
TREE_CODE (op0), TREE_TYPE (op0),
|
|
|
|
TREE_OPERAND (op0, 0),
|
|
|
|
TREE_OPERAND (op0, 1));
|
|
|
|
/* This is actually a conditional expression, not a GIMPLE
|
|
|
|
conditional statement, however, the valid_gimple_rhs_p
|
|
|
|
test still applies. */
|
|
|
|
set = (tem && is_gimple_condexpr (tem)
|
|
|
|
&& valid_gimple_rhs_p (tem));
|
|
|
|
fold_undefer_overflow_warnings (set, stmt, 0);
|
|
|
|
}
|
|
|
|
else if (is_gimple_min_invariant (op0))
|
|
|
|
{
|
|
|
|
tem = op0;
|
|
|
|
set = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
if (set)
|
|
|
|
result = fold_build3_loc (cond_loc, COND_EXPR,
|
|
|
|
TREE_TYPE (gimple_assign_lhs (stmt)), tem,
|
|
|
|
gimple_assign_rhs2 (stmt),
|
|
|
|
gimple_assign_rhs3 (stmt));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!result)
|
|
|
|
result = fold_ternary_loc (loc, subcode,
|
|
|
|
TREE_TYPE (gimple_assign_lhs (stmt)),
|
|
|
|
gimple_assign_rhs1 (stmt),
|
|
|
|
gimple_assign_rhs2 (stmt),
|
|
|
|
gimple_assign_rhs3 (stmt));
|
2010-06-25 10:56:24 +02:00
|
|
|
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (result);
|
|
|
|
if (valid_gimple_rhs_p (result))
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
case GIMPLE_INVALID_RHS:
|
|
|
|
gcc_unreachable ();
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Attempt to fold a conditional statement. Return true if any changes were
|
|
|
|
made. We only attempt to fold the condition expression, and do not perform
|
|
|
|
any transformation that would require alteration of the cfg. It is
|
|
|
|
assumed that the operands have been previously folded. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
fold_gimple_cond (gimple stmt)
|
|
|
|
{
|
|
|
|
tree result = fold_binary_loc (gimple_location (stmt),
|
|
|
|
gimple_cond_code (stmt),
|
|
|
|
boolean_type_node,
|
|
|
|
gimple_cond_lhs (stmt),
|
|
|
|
gimple_cond_rhs (stmt));
|
|
|
|
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
STRIP_USELESS_TYPE_CONVERSION (result);
|
|
|
|
if (is_gimple_condexpr (result) && valid_gimple_rhs_p (result))
|
|
|
|
{
|
|
|
|
gimple_cond_set_condition_from_tree (stmt, result);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert EXPR into a GIMPLE value suitable for substitution on the
|
|
|
|
RHS of an assignment. Insert the necessary statements before
|
|
|
|
iterator *SI_P. The statement at *SI_P, which must be a GIMPLE_CALL
|
|
|
|
is replaced. If the call is expected to produces a result, then it
|
|
|
|
is replaced by an assignment of the new RHS to the result variable.
|
|
|
|
If the result is to be ignored, then the call is replaced by a
|
2010-06-28 17:14:31 +02:00
|
|
|
GIMPLE_NOP. A proper VDEF chain is retained by making the first
|
|
|
|
VUSE and the last VDEF of the whole sequence be the same as the replaced
|
|
|
|
statement and using new SSA names for stores in between. */
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
void
|
|
|
|
gimplify_and_update_call_from_tree (gimple_stmt_iterator *si_p, tree expr)
|
|
|
|
{
|
|
|
|
tree lhs;
|
|
|
|
gimple stmt, new_stmt;
|
|
|
|
gimple_stmt_iterator i;
|
coretypes.h (gimple_seq, [...]): Typedef as gimple.
* coretypes.h (gimple_seq, const_gimple_seq): Typedef as gimple.
* gimple.h (struct gimple_seq_node_d, struct gimple_seq_d): Remove.
(const_gimple_seq_node): Remove.
(gimple_seq_node): Typedef as gimple.
(struct gimple_statement_base): Add next and prev members,
adjust all WORD markers in using structs.
(union gimple_statement_d): Link via gsbase.next field for GC and PCH.
(gimple_seq_first, gimple_seq_first_stmt, gimple_seq_last,
gimple_seq_last_stmt): Adjust as gimple_seq, gimple_seq_node and
gimple are the same.
(gimple_seq_set_last, gimple_seq_set_first): Don't allocate
gimple_seq, adjust.
(gimple_init_singleton): New function.
(gsi_start_1, gsi_last_1, gsi_end_p, gsi_one_before_end_p): Adjust.
(gsi_next, gsi_prev): Adjust, handle prev cyclic list correctly.
(gsi_stmt): Adjust.
(gsi_stmt_ptr): Remove.
(enum gimple_alloc_kind): Remove gimple_alloc_kind_seq member.
* gimple-iterator.c (update_bb_for_stmts): Take last parameter
again, adjust for above changes.
(update_call_edge_frequencies): Adjust for above changes.
(gsi_insert_seq_nodes_before): Rewrite for new data structure.
(gsi_insert_seq_nodes_after): Ditto.
(gsi_split_seq_after): Ditto.
(gsi_set_stmt): Ditto.
(gsi_split_seq_before): Ditto.
(gsi_remove): Ditto.
(gsi_insert_seq_before_without_update): Don't free sequence.
(gsi_insert_seq_after_without_update): Ditto.
(gsi_replace): Assert some more invariants.
(gsi_insert_before_without_update, gsi_insert_after_without_update):
Tidy.
(gsi_for_stmt): Don't search for stmt.
(gsi_insert_on_edge_immediate): Tidy.
* gimple.c (gimple_alloc_k): Remove "sequences".
(gimple_seq_cache): Remove.
(gimple_alloc_stat): Make stmt a singleton sequence.
(gimple_seq_alloc, gimple_seq_free): Remove.
(gimple_assign_set_rhs_with_ops_1): Ensure new stmt is a singleton.
(gimple_copy): Ditto.
* gimplify.c (gimplify_cleanup_point_expr): Use gsi_set_stmt,
create iterator from correct sequence.
* tree-phinodes.c (make_phi_node): Make stmt a singleton.
* gimple.h (gimple_stmt_iterator <seq>): Make it be pointer to
gimple_seq.
(gimple_seq_set_last, gimple_seq_set_first): Take pointer to
sequence, lazily allocate it.
(bb_seq_addr): New function.
(gsi_start_1): Rename from gsi_start, but take pointer to sequence.
(gsi_start): Macro to wrap gsi_start_1 taking pointer of argument.
(gsi_none): New function.
(gsi_start_bb): Adjust.
(gsi_last_1): Rename from gsi_last, but take pointer to sequence.
(gsi_last): Macro to wrap gsi_last_1 taking pointer of argument.
(gsi_last_bb): Adjust.
(gsi_seq): Adjust.
* tree-flow-inline.h (phi_nodes_ptr): New function.
* gimple-iterator.c (gsi_insert_seq_nodes_before): Adjust to
datastructure and interface change.
(gsi_insert_seq_before_without_update): Ditto.
(gsi_insert_seq_nodes_after): Ditto.
(gsi_insert_seq_after_without_update): Ditto.
(gsi_split_seq_after): Ditto, don't use gimple_seq_alloc.
(gsi_split_seq_before): Ditto.
(gsi_start_phis): Adjust.
* tree-vect-loop.c (vect_determine_vectorization_factor): Use
gsi_none.
(vect_transform_loop): Ditto.
* gimple.c (gimple_seq_add_stmt, gimple_seq_add_seq,
gimple_seq_copy): Don't use gimple_seq_alloc.
* gimplify.c (gimple_seq_add_stmt_without_update): Ditto.
(gimplify_seq_add_seq): Ditto.
* lto-streamer-in.c (make_new_block): Ditto.
* tree-cfg.c (create_bb): Ditto.
* tree-sra.c (initialize_parameter_reductions): Ditto.
* gimple.h (gimple_seq_first, gimple_seq_first_stmt, gimple_seq_last,
gimple_seq_last_stmt, gimple_seq_set_last, gimple_seq_set_first,
gimple_seq_empty_p, gimple_seq_alloc_with_stmt, bb_seq,
set_bb_seq): Move down to after gimple_statement_d definition.
* gimple-fold.c (gimplify_and_update_call_from_tree): Use
gsi_replace_with_seq, instead of inserting itself.
* gimple-iterator.c (gsi_replace_with_seq): New function.
* tree-ssa-forwprop.c (forward_propagate_comparison): Take
iterator instead of statement, advance it.
(ssa_forward_propagate_and_combine): Adjust call to above.
* tree-phinodes.c (add_phi_node_to_bb): Tidy, don't use
gimple_seq_alloc.
* omp-low.c (finalize_task_copyfn): Don't use gimple_seq_alloc.
* tree-nested.c (walk_gimple_omp_for): Ditto.
* trans-mem.c (lower_transaction): Ditto.
* tree-eh.c (do_return_redirection): Ditto.
(do_goto_redirection): Ditto.
(lower_try_finally_switch): Ditto.
* gimplify.c (gimplify_stmt): Ditto.
(gimplify_scan_omp_clauses): Ditto.
(gimplify_omp_for): Ditto.
(gimplify_function_tree): Ditto.
* gimple-fold.c (gimplify_and_update_call_from_tree): Ditto.
* tree-mudflap.c (mf_decl_cache_locals): Ditto.
(mf_build_check_statement_for): Ditto.
(mx_register_decls): Ditto.
* graphite-sese-to-poly.c (remove_invariant_phi): Ditto,
and don't use itertors to append.
(insert_stmts): Ditto.
(insert_out_of_ssa_copy): Ditto.
(insert_out_of_ssa_copy_on_edge): Ditto.
* gimple.h (gimple_bind_body_ptr): New function.
(gimple_bind_body): Use it.
(gimple_catch_handler): Use gimple_catch_handler_ptr.
(gimple_eh_filter_failure_ptr): New function.
(gimple_eh_filter_failure): Use it.
(gimple_eh_else_n_body_ptr): New function.
(gimple_eh_else_n_body): Use it.
(gimple_eh_else_e_body_ptr): New function.
(gimple_eh_else_e_body): Use it.
(gimple_try_eval_ptr): New function.
(gimple_try_eval): Use it.
(gimple_try_cleanup_ptr): New function.
(gimple_try_cleanup): Use it.
(gimple_wce_cleanup_ptr): New function.
(gimple_wce_cleanup): Use it.
(gimple_omp_body_ptr): New function.
(gimple_omp_body): Use it.
(gimple_omp_for_pre_body_ptr): New function.
(gimple_omp_for_pre_body): Use it.
(gimple_transaction_body_ptr): New function.
(gimple_transaction_body): Use it.
(gsi_split_seq_before): Adjust to return nothing and take pointer
to sequence.
(gsi_set_stmt): Declare.
(gsi_replace_with_seq): Declare.
(walk_gimple_seq_mod): Declare.
* function.h (struct function <gimple_body>): Use typedef gimple_seq.
* gimple-iterator.c (gsi_set_stmt): New function.
(gsi_split_seq_before): Return new sequence via pointer argument.
(gsi_replace): Use gsi_set_stmt.
* tree-ssa-loop-im.c (move_computations_stmt): First remove
then insert stmt.
* tree-complex.c (update_complex_components_on_edge): Don't
copy gsi.
* tree-phinodes.c (resize_phi_node): Don't resize stmt in-place,
return new stmt.
(reserve_phi_args_for_new_edge): Change call to above,
use gsi_set_stmt.
* omp-low.c (lower_omp): Change prototype to take pointer to
sequence.
(lower_rec_input_clauses): Use gimple_seq_add_seq instead of
iterators. Adjust call to lower_omp.
(lower_lastprivate_clauses): Adjust call to lower_omp.
(lower_reduction_clauses): Ditto.
(expand_omp_taskreg): Nullify non-cfg body of child_fn.
(lower_omp_sections): Don't explicitely count sequence length,
nullify lowered bodies earlier, ensure stmts are part of only
one sequence, adjust call to lower_omp.
(lower_omp_single): Ensure stmts are part of only one sequence,
adjust call to lower_omp.
(lower_omp_master): Ditto.
(lower_omp_ordered): Ditto.
(lower_omp_critical): Ditto.
(lower_omp_for): Ditto.
(lower_omp_taskreg): Ditto, tidy.
(lower_omp_1): Adjust calls to lower_omp.
(execute_lower_omp): Ditto.
(lower_omp): Adjust to take pointer to sequence.
(diagnose_sb_2): Use walk_gimple_seq_mod.
(diagnose_omp_structured_block_errors): Ditto and set possibly
changed function body.
* gimple-low.c (lower_function_body): Set function body after
it stabilizes.
(lower_sequence): Adjust to take pointer to sequence.
(lower_omp_directive): Ensure stmt isn't put twice into the
sequence, adjust call to lower_sequence.
(lower_stmt): Adjust calls to lower_sequence.
(lower_gimple_bind): Ditto.
(gimple_try_catch_may_fallthru): Call gsi_start with lvalue.
* tree-nested.c (walk_body): Take pointer to sequence, use
walk_gimple_seq_mod.
(walk_function): Adjust call to walk_body, set possibly changed
body.
(walk_gimple_omp_for): Adjust calls to walk_body.
(convert_nonlocal_omp_clauses): Ditto.
(convert_nonlocal_reference_stmt): Ditto.
(convert_local_omp_clauses): Ditto.
(convert_local_reference_stmt): Ditto.
(convert_tramp_reference_stmt): Ditto.
(convert_gimple_call): Ditto.
(convert_nl_goto_reference): Use local iterator copy.
* gimple.c (walk_gimple_seq_mod): Renamed from walk_gimple_seq,
but taking pointer to sequence, ensure gsi_start is called with
callers lvalue.
(walk_gimple_seq): New wrapper around walk_gimple_seq_mod,
asserting that the sequence head didn't change.
(walk_gimple_stmt): Replace all calls to walk_gimple_seq with
walk_gimple_seq_mod.
* trans-mem.c (lower_transaction): Use walk_gimple_seq_mod.
(execute_lower_tm): Ditto, and set possibly changed body.
* tree-eh.c (lower_eh_constructs_1): Take pointer to sequence,
call gsi_start with that lvalue.
(replace_goto_queue_stmt_list): Ditto.
(replace_goto_queue_1): Adjust calls to replace_goto_queue_stmt_list.
(replace_goto_queue): Ditto.
(lower_try_finally_nofallthru): Adjust calls to lower_eh_constructs_1.
(lower_try_finally_onedest): Ditto.
(lower_try_finally_copy): Ditto.
(lower_try_finally_switch): Ditto.
(lower_try_finally): Ditto.
(lower_eh_filter): Ditto.
(lower_eh_must_not_throw): Ditto.
(lower_cleanup): Ditto.
(lower_eh_constructs_2): Ditto.
(lower_catch): Ditto, and ensure gsi_start is called with lvalue.
(lower_eh_constructs): Adjust calls to lower_eh_constructs_1, and
set possibly changed body.
(optimize_double_finally): Call gsi_start with lvalue.
* tree-cfg.c (make_blocks): Adjust call to gsi_split_seq_before.
(gimple_split_block): Ditto.
(gimple_merge_blocks): Use gsi_start_phis.
(move_stmt_r): Use walk_gimple_seq_mod.
* tree-ssa-dse.c (dse_enter_block): Use gsi_last_bb.
* cgraphbuild.c (build_cgraph_edges): Use gsi_start_phis.
(rebuild_cgraph_edges): Ditto.
(cgraph_rebuild_references): Ditto.
* ipa-prop.c (ipa_analyze_params_uses): Ditto.
* tree-inline.c (copy_phis_for_bb): Ditto.
* tree-ssa-dce.c: Ditto.
* cgraphunit.c (cgraph_analyze_function): Use gimple_has_body_p.
From-SVN: r187053
2012-05-02 18:41:48 +02:00
|
|
|
gimple_seq stmts = NULL;
|
2011-10-19 14:59:21 +02:00
|
|
|
gimple laststore;
|
2010-06-28 17:14:31 +02:00
|
|
|
tree reaching_vuse;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
stmt = gsi_stmt (*si_p);
|
|
|
|
|
|
|
|
gcc_assert (is_gimple_call (stmt));
|
|
|
|
|
gimplify.h (gimplify_hasher : typed_free_remove, [...]): Move to gimplify.c.
* gimplify.h (gimplify_hasher : typed_free_remove, struct gimplify_ctx):
Move to gimplify.c.
(free_gimplify_stack): Add prototype.
* gimplify.c (gimplify_hasher:typed_free_remove): Relocate here.
(struct gimplify_ctx): Relocate here.
(gimplify_ctxp): Make static.
(ctx_pool, ctx_alloc, ctx_free, free_gimplify_stack): New. Manage a
list of struct gimplify_ctx.
(push_gimplify_context): Add default parameters and allocate a struct
from the pool.
(pop_gimplify_context): Free a struct back to the pool.
(gimplify_scan_omp_clauses, gimplify_omp_parallel, gimplify_omp_task,
gimplify_omp_workshare, gimplify_transaction, gimplify_body): Don't
use a local 'struct gimplify_ctx'.
* cgraphunit.c (expand_all_functions): call free_gimplify_stack.
* gimplify-me.c (force_gimple_operand_1, gimple_regimplify_operands):
Likewise.
* omp-low.c (lower_omp_sections, lower_omp_single, lower_omp_master,
lower_omp_ordered, lower_omp_critical, lower_omp_for,
create_task_copyfn, lower_omp_taskreg, lower_omp_target,
lower_omp_teams, execute_lower_omp): Likewise.
* gimple-fold.c (gimplify_and_update_call_from_tree): Likewise.
* tree-inline.c (optimize_inline_calls): Likewise.
From-SVN: r205168
2013-11-21 01:06:23 +01:00
|
|
|
push_gimplify_context (gimple_in_ssa_p (cfun));
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
2011-10-19 14:59:21 +02:00
|
|
|
lhs = gimple_call_lhs (stmt);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
if (lhs == NULL_TREE)
|
2010-10-05 12:37:12 +02:00
|
|
|
{
|
|
|
|
gimplify_and_add (expr, &stmts);
|
|
|
|
/* We can end up with folding a memcpy of an empty class assignment
|
|
|
|
which gets optimized away by C++ gimplification. */
|
|
|
|
if (gimple_seq_empty_p (stmts))
|
|
|
|
{
|
2010-12-29 22:49:37 +01:00
|
|
|
pop_gimplify_context (NULL);
|
2010-10-05 12:37:12 +02:00
|
|
|
if (gimple_in_ssa_p (cfun))
|
|
|
|
{
|
|
|
|
unlink_stmt_vdef (stmt);
|
|
|
|
release_defs (stmt);
|
|
|
|
}
|
2012-11-27 10:20:02 +01:00
|
|
|
gsi_replace (si_p, gimple_build_nop (), true);
|
2010-10-05 12:37:12 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
else
|
2011-10-19 14:59:21 +02:00
|
|
|
{
|
|
|
|
tree tmp = get_initialized_tmp_var (expr, &stmts, NULL);
|
|
|
|
new_stmt = gimple_build_assign (lhs, tmp);
|
|
|
|
i = gsi_last (stmts);
|
|
|
|
gsi_insert_after_without_update (&i, new_stmt,
|
|
|
|
GSI_CONTINUE_LINKING);
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
|
|
|
pop_gimplify_context (NULL);
|
|
|
|
|
|
|
|
if (gimple_has_location (stmt))
|
|
|
|
annotate_all_with_location (stmts, gimple_location (stmt));
|
|
|
|
|
2011-10-19 14:59:21 +02:00
|
|
|
/* First iterate over the replacement statements backward, assigning
|
|
|
|
virtual operands to their defining statements. */
|
|
|
|
laststore = NULL;
|
|
|
|
for (i = gsi_last (stmts); !gsi_end_p (i); gsi_prev (&i))
|
|
|
|
{
|
|
|
|
new_stmt = gsi_stmt (i);
|
2012-02-21 10:24:42 +01:00
|
|
|
if ((gimple_assign_single_p (new_stmt)
|
|
|
|
&& !is_gimple_reg (gimple_assign_lhs (new_stmt)))
|
|
|
|
|| (is_gimple_call (new_stmt)
|
|
|
|
&& (gimple_call_flags (new_stmt)
|
|
|
|
& (ECF_NOVOPS | ECF_PURE | ECF_CONST | ECF_NORETURN)) == 0))
|
2011-10-19 14:59:21 +02:00
|
|
|
{
|
|
|
|
tree vdef;
|
|
|
|
if (!laststore)
|
|
|
|
vdef = gimple_vdef (stmt);
|
|
|
|
else
|
|
|
|
vdef = make_ssa_name (gimple_vop (cfun), new_stmt);
|
|
|
|
gimple_set_vdef (new_stmt, vdef);
|
2011-12-06 13:17:31 +01:00
|
|
|
if (vdef && TREE_CODE (vdef) == SSA_NAME)
|
2011-10-19 14:59:21 +02:00
|
|
|
SSA_NAME_DEF_STMT (vdef) = new_stmt;
|
|
|
|
laststore = new_stmt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Second iterate over the statements forward, assigning virtual
|
|
|
|
operands to their uses. */
|
|
|
|
reaching_vuse = gimple_vuse (stmt);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
for (i = gsi_start (stmts); !gsi_end_p (i); gsi_next (&i))
|
|
|
|
{
|
|
|
|
new_stmt = gsi_stmt (i);
|
2011-10-10 17:45:53 +02:00
|
|
|
/* If the new statement possibly has a VUSE, update it with exact SSA
|
|
|
|
name we know will reach this one. */
|
|
|
|
if (gimple_has_mem_ops (new_stmt))
|
2011-10-19 14:59:21 +02:00
|
|
|
gimple_set_vuse (new_stmt, reaching_vuse);
|
|
|
|
gimple_set_modified (new_stmt, true);
|
|
|
|
if (gimple_vdef (new_stmt))
|
|
|
|
reaching_vuse = gimple_vdef (new_stmt);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
2011-10-19 14:59:21 +02:00
|
|
|
/* If the new sequence does not do a store release the virtual
|
|
|
|
definition of the original statement. */
|
|
|
|
if (reaching_vuse
|
|
|
|
&& reaching_vuse == gimple_vuse (stmt))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
2011-10-19 14:59:21 +02:00
|
|
|
tree vdef = gimple_vdef (stmt);
|
|
|
|
if (vdef
|
|
|
|
&& TREE_CODE (vdef) == SSA_NAME)
|
2010-06-28 17:14:31 +02:00
|
|
|
{
|
|
|
|
unlink_stmt_vdef (stmt);
|
2011-10-19 14:59:21 +02:00
|
|
|
release_ssa_name (vdef);
|
2010-06-30 18:34:22 +02:00
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
coretypes.h (gimple_seq, [...]): Typedef as gimple.
* coretypes.h (gimple_seq, const_gimple_seq): Typedef as gimple.
* gimple.h (struct gimple_seq_node_d, struct gimple_seq_d): Remove.
(const_gimple_seq_node): Remove.
(gimple_seq_node): Typedef as gimple.
(struct gimple_statement_base): Add next and prev members,
adjust all WORD markers in using structs.
(union gimple_statement_d): Link via gsbase.next field for GC and PCH.
(gimple_seq_first, gimple_seq_first_stmt, gimple_seq_last,
gimple_seq_last_stmt): Adjust as gimple_seq, gimple_seq_node and
gimple are the same.
(gimple_seq_set_last, gimple_seq_set_first): Don't allocate
gimple_seq, adjust.
(gimple_init_singleton): New function.
(gsi_start_1, gsi_last_1, gsi_end_p, gsi_one_before_end_p): Adjust.
(gsi_next, gsi_prev): Adjust, handle prev cyclic list correctly.
(gsi_stmt): Adjust.
(gsi_stmt_ptr): Remove.
(enum gimple_alloc_kind): Remove gimple_alloc_kind_seq member.
* gimple-iterator.c (update_bb_for_stmts): Take last parameter
again, adjust for above changes.
(update_call_edge_frequencies): Adjust for above changes.
(gsi_insert_seq_nodes_before): Rewrite for new data structure.
(gsi_insert_seq_nodes_after): Ditto.
(gsi_split_seq_after): Ditto.
(gsi_set_stmt): Ditto.
(gsi_split_seq_before): Ditto.
(gsi_remove): Ditto.
(gsi_insert_seq_before_without_update): Don't free sequence.
(gsi_insert_seq_after_without_update): Ditto.
(gsi_replace): Assert some more invariants.
(gsi_insert_before_without_update, gsi_insert_after_without_update):
Tidy.
(gsi_for_stmt): Don't search for stmt.
(gsi_insert_on_edge_immediate): Tidy.
* gimple.c (gimple_alloc_k): Remove "sequences".
(gimple_seq_cache): Remove.
(gimple_alloc_stat): Make stmt a singleton sequence.
(gimple_seq_alloc, gimple_seq_free): Remove.
(gimple_assign_set_rhs_with_ops_1): Ensure new stmt is a singleton.
(gimple_copy): Ditto.
* gimplify.c (gimplify_cleanup_point_expr): Use gsi_set_stmt,
create iterator from correct sequence.
* tree-phinodes.c (make_phi_node): Make stmt a singleton.
* gimple.h (gimple_stmt_iterator <seq>): Make it be pointer to
gimple_seq.
(gimple_seq_set_last, gimple_seq_set_first): Take pointer to
sequence, lazily allocate it.
(bb_seq_addr): New function.
(gsi_start_1): Rename from gsi_start, but take pointer to sequence.
(gsi_start): Macro to wrap gsi_start_1 taking pointer of argument.
(gsi_none): New function.
(gsi_start_bb): Adjust.
(gsi_last_1): Rename from gsi_last, but take pointer to sequence.
(gsi_last): Macro to wrap gsi_last_1 taking pointer of argument.
(gsi_last_bb): Adjust.
(gsi_seq): Adjust.
* tree-flow-inline.h (phi_nodes_ptr): New function.
* gimple-iterator.c (gsi_insert_seq_nodes_before): Adjust to
datastructure and interface change.
(gsi_insert_seq_before_without_update): Ditto.
(gsi_insert_seq_nodes_after): Ditto.
(gsi_insert_seq_after_without_update): Ditto.
(gsi_split_seq_after): Ditto, don't use gimple_seq_alloc.
(gsi_split_seq_before): Ditto.
(gsi_start_phis): Adjust.
* tree-vect-loop.c (vect_determine_vectorization_factor): Use
gsi_none.
(vect_transform_loop): Ditto.
* gimple.c (gimple_seq_add_stmt, gimple_seq_add_seq,
gimple_seq_copy): Don't use gimple_seq_alloc.
* gimplify.c (gimple_seq_add_stmt_without_update): Ditto.
(gimplify_seq_add_seq): Ditto.
* lto-streamer-in.c (make_new_block): Ditto.
* tree-cfg.c (create_bb): Ditto.
* tree-sra.c (initialize_parameter_reductions): Ditto.
* gimple.h (gimple_seq_first, gimple_seq_first_stmt, gimple_seq_last,
gimple_seq_last_stmt, gimple_seq_set_last, gimple_seq_set_first,
gimple_seq_empty_p, gimple_seq_alloc_with_stmt, bb_seq,
set_bb_seq): Move down to after gimple_statement_d definition.
* gimple-fold.c (gimplify_and_update_call_from_tree): Use
gsi_replace_with_seq, instead of inserting itself.
* gimple-iterator.c (gsi_replace_with_seq): New function.
* tree-ssa-forwprop.c (forward_propagate_comparison): Take
iterator instead of statement, advance it.
(ssa_forward_propagate_and_combine): Adjust call to above.
* tree-phinodes.c (add_phi_node_to_bb): Tidy, don't use
gimple_seq_alloc.
* omp-low.c (finalize_task_copyfn): Don't use gimple_seq_alloc.
* tree-nested.c (walk_gimple_omp_for): Ditto.
* trans-mem.c (lower_transaction): Ditto.
* tree-eh.c (do_return_redirection): Ditto.
(do_goto_redirection): Ditto.
(lower_try_finally_switch): Ditto.
* gimplify.c (gimplify_stmt): Ditto.
(gimplify_scan_omp_clauses): Ditto.
(gimplify_omp_for): Ditto.
(gimplify_function_tree): Ditto.
* gimple-fold.c (gimplify_and_update_call_from_tree): Ditto.
* tree-mudflap.c (mf_decl_cache_locals): Ditto.
(mf_build_check_statement_for): Ditto.
(mx_register_decls): Ditto.
* graphite-sese-to-poly.c (remove_invariant_phi): Ditto,
and don't use itertors to append.
(insert_stmts): Ditto.
(insert_out_of_ssa_copy): Ditto.
(insert_out_of_ssa_copy_on_edge): Ditto.
* gimple.h (gimple_bind_body_ptr): New function.
(gimple_bind_body): Use it.
(gimple_catch_handler): Use gimple_catch_handler_ptr.
(gimple_eh_filter_failure_ptr): New function.
(gimple_eh_filter_failure): Use it.
(gimple_eh_else_n_body_ptr): New function.
(gimple_eh_else_n_body): Use it.
(gimple_eh_else_e_body_ptr): New function.
(gimple_eh_else_e_body): Use it.
(gimple_try_eval_ptr): New function.
(gimple_try_eval): Use it.
(gimple_try_cleanup_ptr): New function.
(gimple_try_cleanup): Use it.
(gimple_wce_cleanup_ptr): New function.
(gimple_wce_cleanup): Use it.
(gimple_omp_body_ptr): New function.
(gimple_omp_body): Use it.
(gimple_omp_for_pre_body_ptr): New function.
(gimple_omp_for_pre_body): Use it.
(gimple_transaction_body_ptr): New function.
(gimple_transaction_body): Use it.
(gsi_split_seq_before): Adjust to return nothing and take pointer
to sequence.
(gsi_set_stmt): Declare.
(gsi_replace_with_seq): Declare.
(walk_gimple_seq_mod): Declare.
* function.h (struct function <gimple_body>): Use typedef gimple_seq.
* gimple-iterator.c (gsi_set_stmt): New function.
(gsi_split_seq_before): Return new sequence via pointer argument.
(gsi_replace): Use gsi_set_stmt.
* tree-ssa-loop-im.c (move_computations_stmt): First remove
then insert stmt.
* tree-complex.c (update_complex_components_on_edge): Don't
copy gsi.
* tree-phinodes.c (resize_phi_node): Don't resize stmt in-place,
return new stmt.
(reserve_phi_args_for_new_edge): Change call to above,
use gsi_set_stmt.
* omp-low.c (lower_omp): Change prototype to take pointer to
sequence.
(lower_rec_input_clauses): Use gimple_seq_add_seq instead of
iterators. Adjust call to lower_omp.
(lower_lastprivate_clauses): Adjust call to lower_omp.
(lower_reduction_clauses): Ditto.
(expand_omp_taskreg): Nullify non-cfg body of child_fn.
(lower_omp_sections): Don't explicitely count sequence length,
nullify lowered bodies earlier, ensure stmts are part of only
one sequence, adjust call to lower_omp.
(lower_omp_single): Ensure stmts are part of only one sequence,
adjust call to lower_omp.
(lower_omp_master): Ditto.
(lower_omp_ordered): Ditto.
(lower_omp_critical): Ditto.
(lower_omp_for): Ditto.
(lower_omp_taskreg): Ditto, tidy.
(lower_omp_1): Adjust calls to lower_omp.
(execute_lower_omp): Ditto.
(lower_omp): Adjust to take pointer to sequence.
(diagnose_sb_2): Use walk_gimple_seq_mod.
(diagnose_omp_structured_block_errors): Ditto and set possibly
changed function body.
* gimple-low.c (lower_function_body): Set function body after
it stabilizes.
(lower_sequence): Adjust to take pointer to sequence.
(lower_omp_directive): Ensure stmt isn't put twice into the
sequence, adjust call to lower_sequence.
(lower_stmt): Adjust calls to lower_sequence.
(lower_gimple_bind): Ditto.
(gimple_try_catch_may_fallthru): Call gsi_start with lvalue.
* tree-nested.c (walk_body): Take pointer to sequence, use
walk_gimple_seq_mod.
(walk_function): Adjust call to walk_body, set possibly changed
body.
(walk_gimple_omp_for): Adjust calls to walk_body.
(convert_nonlocal_omp_clauses): Ditto.
(convert_nonlocal_reference_stmt): Ditto.
(convert_local_omp_clauses): Ditto.
(convert_local_reference_stmt): Ditto.
(convert_tramp_reference_stmt): Ditto.
(convert_gimple_call): Ditto.
(convert_nl_goto_reference): Use local iterator copy.
* gimple.c (walk_gimple_seq_mod): Renamed from walk_gimple_seq,
but taking pointer to sequence, ensure gsi_start is called with
callers lvalue.
(walk_gimple_seq): New wrapper around walk_gimple_seq_mod,
asserting that the sequence head didn't change.
(walk_gimple_stmt): Replace all calls to walk_gimple_seq with
walk_gimple_seq_mod.
* trans-mem.c (lower_transaction): Use walk_gimple_seq_mod.
(execute_lower_tm): Ditto, and set possibly changed body.
* tree-eh.c (lower_eh_constructs_1): Take pointer to sequence,
call gsi_start with that lvalue.
(replace_goto_queue_stmt_list): Ditto.
(replace_goto_queue_1): Adjust calls to replace_goto_queue_stmt_list.
(replace_goto_queue): Ditto.
(lower_try_finally_nofallthru): Adjust calls to lower_eh_constructs_1.
(lower_try_finally_onedest): Ditto.
(lower_try_finally_copy): Ditto.
(lower_try_finally_switch): Ditto.
(lower_try_finally): Ditto.
(lower_eh_filter): Ditto.
(lower_eh_must_not_throw): Ditto.
(lower_cleanup): Ditto.
(lower_eh_constructs_2): Ditto.
(lower_catch): Ditto, and ensure gsi_start is called with lvalue.
(lower_eh_constructs): Adjust calls to lower_eh_constructs_1, and
set possibly changed body.
(optimize_double_finally): Call gsi_start with lvalue.
* tree-cfg.c (make_blocks): Adjust call to gsi_split_seq_before.
(gimple_split_block): Ditto.
(gimple_merge_blocks): Use gsi_start_phis.
(move_stmt_r): Use walk_gimple_seq_mod.
* tree-ssa-dse.c (dse_enter_block): Use gsi_last_bb.
* cgraphbuild.c (build_cgraph_edges): Use gsi_start_phis.
(rebuild_cgraph_edges): Ditto.
(cgraph_rebuild_references): Ditto.
* ipa-prop.c (ipa_analyze_params_uses): Ditto.
* tree-inline.c (copy_phis_for_bb): Ditto.
* tree-ssa-dce.c: Ditto.
* cgraphunit.c (cgraph_analyze_function): Use gimple_has_body_p.
From-SVN: r187053
2012-05-02 18:41:48 +02:00
|
|
|
/* Finally replace the original statement with the sequence. */
|
|
|
|
gsi_replace_with_seq (si_p, stmts, false);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the string length, maximum string length or maximum value of
|
|
|
|
ARG in LENGTH.
|
|
|
|
If ARG is an SSA name variable, follow its use-def chains. If LENGTH
|
|
|
|
is not NULL and, for TYPE == 0, its value is not equal to the length
|
|
|
|
we determine or if we are unable to determine the length or value,
|
|
|
|
return false. VISITED is a bitmap of visited variables.
|
|
|
|
TYPE is 0 if string length should be returned, 1 for maximum string
|
|
|
|
length and 2 for maximum value ARG can have. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
get_maxval_strlen (tree arg, tree *length, bitmap visited, int type)
|
|
|
|
{
|
|
|
|
tree var, val;
|
|
|
|
gimple def_stmt;
|
|
|
|
|
|
|
|
if (TREE_CODE (arg) != SSA_NAME)
|
|
|
|
{
|
|
|
|
/* We can end up with &(*iftmp_1)[0] here as well, so handle it. */
|
2012-05-16 22:22:03 +02:00
|
|
|
if (TREE_CODE (arg) == ADDR_EXPR
|
|
|
|
&& TREE_CODE (TREE_OPERAND (arg, 0)) == ARRAY_REF
|
|
|
|
&& integer_zerop (TREE_OPERAND (TREE_OPERAND (arg, 0), 1)))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
|
|
|
tree aop0 = TREE_OPERAND (TREE_OPERAND (arg, 0), 0);
|
|
|
|
if (TREE_CODE (aop0) == INDIRECT_REF
|
|
|
|
&& TREE_CODE (TREE_OPERAND (aop0, 0)) == SSA_NAME)
|
|
|
|
return get_maxval_strlen (TREE_OPERAND (aop0, 0),
|
|
|
|
length, visited, type);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (type == 2)
|
|
|
|
{
|
|
|
|
val = arg;
|
|
|
|
if (TREE_CODE (val) != INTEGER_CST
|
|
|
|
|| tree_int_cst_sgn (val) < 0)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
val = c_strlen (arg, 1);
|
|
|
|
if (!val)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (*length)
|
|
|
|
{
|
|
|
|
if (type > 0)
|
|
|
|
{
|
|
|
|
if (TREE_CODE (*length) != INTEGER_CST
|
|
|
|
|| TREE_CODE (val) != INTEGER_CST)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (tree_int_cst_lt (*length, val))
|
|
|
|
*length = val;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
else if (simple_cst_equal (val, *length) != 1)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*length = val;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-08-20 12:26:45 +02:00
|
|
|
/* If ARG is registered for SSA update we cannot look at its defining
|
|
|
|
statement. */
|
|
|
|
if (name_registered_for_update_p (arg))
|
|
|
|
return false;
|
|
|
|
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
/* If we were already here, break the infinite cycle. */
|
2010-08-19 18:51:39 +02:00
|
|
|
if (!bitmap_set_bit (visited, SSA_NAME_VERSION (arg)))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
var = arg;
|
|
|
|
def_stmt = SSA_NAME_DEF_STMT (var);
|
|
|
|
|
|
|
|
switch (gimple_code (def_stmt))
|
|
|
|
{
|
|
|
|
case GIMPLE_ASSIGN:
|
|
|
|
/* The RHS of the statement defining VAR must either have a
|
|
|
|
constant length or come from another SSA_NAME with a constant
|
|
|
|
length. */
|
|
|
|
if (gimple_assign_single_p (def_stmt)
|
|
|
|
|| gimple_assign_unary_nop_p (def_stmt))
|
|
|
|
{
|
|
|
|
tree rhs = gimple_assign_rhs1 (def_stmt);
|
|
|
|
return get_maxval_strlen (rhs, length, visited, type);
|
|
|
|
}
|
2012-05-16 22:22:03 +02:00
|
|
|
else if (gimple_assign_rhs_code (def_stmt) == COND_EXPR)
|
|
|
|
{
|
|
|
|
tree op2 = gimple_assign_rhs2 (def_stmt);
|
|
|
|
tree op3 = gimple_assign_rhs3 (def_stmt);
|
|
|
|
return get_maxval_strlen (op2, length, visited, type)
|
|
|
|
&& get_maxval_strlen (op3, length, visited, type);
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
case GIMPLE_PHI:
|
|
|
|
{
|
|
|
|
/* All the arguments of the PHI node must have the same constant
|
|
|
|
length. */
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
for (i = 0; i < gimple_phi_num_args (def_stmt); i++)
|
|
|
|
{
|
|
|
|
tree arg = gimple_phi_arg (def_stmt, i)->def;
|
|
|
|
|
|
|
|
/* If this PHI has itself as an argument, we cannot
|
|
|
|
determine the string length of this argument. However,
|
|
|
|
if we can find a constant string length for the other
|
|
|
|
PHI args then we can still be sure that this is a
|
|
|
|
constant string length. So be optimistic and just
|
|
|
|
continue with the next argument. */
|
|
|
|
if (arg == gimple_phi_result (def_stmt))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!get_maxval_strlen (arg, length, visited, type))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Fold builtin call in statement STMT. Returns a simplified tree.
|
|
|
|
We may return a non-constant expression, including another call
|
|
|
|
to a different function and with different arguments, e.g.,
|
|
|
|
substituting memcpy for strcpy when the string length is known.
|
|
|
|
Note that some builtins expand into inline code that may not
|
|
|
|
be valid in GIMPLE. Callers must take care. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
gimple_fold_builtin (gimple stmt)
|
|
|
|
{
|
|
|
|
tree result, val[3];
|
|
|
|
tree callee, a;
|
|
|
|
int arg_idx, type;
|
|
|
|
bitmap visited;
|
|
|
|
bool ignore;
|
|
|
|
int nargs;
|
|
|
|
location_t loc = gimple_location (stmt);
|
|
|
|
|
|
|
|
gcc_assert (is_gimple_call (stmt));
|
|
|
|
|
|
|
|
ignore = (gimple_call_lhs (stmt) == NULL);
|
|
|
|
|
|
|
|
/* First try the generic builtin folder. If that succeeds, return the
|
|
|
|
result directly. */
|
|
|
|
result = fold_call_stmt (stmt, ignore);
|
|
|
|
if (result)
|
|
|
|
{
|
|
|
|
if (ignore)
|
|
|
|
STRIP_NOPS (result);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ignore MD builtins. */
|
|
|
|
callee = gimple_call_fndecl (stmt);
|
|
|
|
if (DECL_BUILT_IN_CLASS (callee) == BUILT_IN_MD)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
2011-10-06 16:34:48 +02:00
|
|
|
/* Give up for always_inline inline builtins until they are
|
|
|
|
inlined. */
|
|
|
|
if (avoid_folding_inline_builtin (callee))
|
|
|
|
return NULL_TREE;
|
|
|
|
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
/* If the builtin could not be folded, and it has no argument list,
|
|
|
|
we're done. */
|
|
|
|
nargs = gimple_call_num_args (stmt);
|
|
|
|
if (nargs == 0)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* Limit the work only for builtins we know how to simplify. */
|
|
|
|
switch (DECL_FUNCTION_CODE (callee))
|
|
|
|
{
|
|
|
|
case BUILT_IN_STRLEN:
|
|
|
|
case BUILT_IN_FPUTS:
|
|
|
|
case BUILT_IN_FPUTS_UNLOCKED:
|
|
|
|
arg_idx = 0;
|
|
|
|
type = 0;
|
|
|
|
break;
|
|
|
|
case BUILT_IN_STRCPY:
|
|
|
|
case BUILT_IN_STRNCPY:
|
|
|
|
arg_idx = 1;
|
|
|
|
type = 0;
|
|
|
|
break;
|
|
|
|
case BUILT_IN_MEMCPY_CHK:
|
|
|
|
case BUILT_IN_MEMPCPY_CHK:
|
|
|
|
case BUILT_IN_MEMMOVE_CHK:
|
|
|
|
case BUILT_IN_MEMSET_CHK:
|
|
|
|
case BUILT_IN_STRNCPY_CHK:
|
2011-12-15 18:26:10 +01:00
|
|
|
case BUILT_IN_STPNCPY_CHK:
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
arg_idx = 2;
|
|
|
|
type = 2;
|
|
|
|
break;
|
|
|
|
case BUILT_IN_STRCPY_CHK:
|
|
|
|
case BUILT_IN_STPCPY_CHK:
|
|
|
|
arg_idx = 1;
|
|
|
|
type = 1;
|
|
|
|
break;
|
|
|
|
case BUILT_IN_SNPRINTF_CHK:
|
|
|
|
case BUILT_IN_VSNPRINTF_CHK:
|
|
|
|
arg_idx = 1;
|
|
|
|
type = 2;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_idx >= nargs)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* Try to use the dataflow information gathered by the CCP process. */
|
|
|
|
visited = BITMAP_ALLOC (NULL);
|
|
|
|
bitmap_clear (visited);
|
|
|
|
|
|
|
|
memset (val, 0, sizeof (val));
|
|
|
|
a = gimple_call_arg (stmt, arg_idx);
|
|
|
|
if (!get_maxval_strlen (a, &val[arg_idx], visited, type))
|
|
|
|
val[arg_idx] = NULL_TREE;
|
|
|
|
|
|
|
|
BITMAP_FREE (visited);
|
|
|
|
|
|
|
|
result = NULL_TREE;
|
|
|
|
switch (DECL_FUNCTION_CODE (callee))
|
|
|
|
{
|
|
|
|
case BUILT_IN_STRLEN:
|
|
|
|
if (val[0] && nargs == 1)
|
|
|
|
{
|
|
|
|
tree new_val =
|
|
|
|
fold_convert (TREE_TYPE (gimple_call_lhs (stmt)), val[0]);
|
|
|
|
|
|
|
|
/* If the result is not a valid gimple value, or not a cast
|
2010-07-06 13:44:34 +02:00
|
|
|
of a valid gimple value, then we cannot use the result. */
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
if (is_gimple_val (new_val)
|
2010-11-27 15:32:47 +01:00
|
|
|
|| (CONVERT_EXPR_P (new_val)
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
&& is_gimple_val (TREE_OPERAND (new_val, 0))))
|
|
|
|
return new_val;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_STRCPY:
|
|
|
|
if (val[1] && is_gimple_val (val[1]) && nargs == 2)
|
|
|
|
result = fold_builtin_strcpy (loc, callee,
|
|
|
|
gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
val[1]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_STRNCPY:
|
|
|
|
if (val[1] && is_gimple_val (val[1]) && nargs == 3)
|
|
|
|
result = fold_builtin_strncpy (loc, callee,
|
|
|
|
gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
gimple_call_arg (stmt, 2),
|
|
|
|
val[1]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_FPUTS:
|
|
|
|
if (nargs == 2)
|
|
|
|
result = fold_builtin_fputs (loc, gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
ignore, false, val[0]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_FPUTS_UNLOCKED:
|
|
|
|
if (nargs == 2)
|
|
|
|
result = fold_builtin_fputs (loc, gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
ignore, true, val[0]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_MEMCPY_CHK:
|
|
|
|
case BUILT_IN_MEMPCPY_CHK:
|
|
|
|
case BUILT_IN_MEMMOVE_CHK:
|
|
|
|
case BUILT_IN_MEMSET_CHK:
|
|
|
|
if (val[2] && is_gimple_val (val[2]) && nargs == 4)
|
|
|
|
result = fold_builtin_memory_chk (loc, callee,
|
|
|
|
gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
gimple_call_arg (stmt, 2),
|
|
|
|
gimple_call_arg (stmt, 3),
|
|
|
|
val[2], ignore,
|
|
|
|
DECL_FUNCTION_CODE (callee));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_STRCPY_CHK:
|
|
|
|
case BUILT_IN_STPCPY_CHK:
|
|
|
|
if (val[1] && is_gimple_val (val[1]) && nargs == 3)
|
|
|
|
result = fold_builtin_stxcpy_chk (loc, callee,
|
|
|
|
gimple_call_arg (stmt, 0),
|
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
gimple_call_arg (stmt, 2),
|
|
|
|
val[1], ignore,
|
|
|
|
DECL_FUNCTION_CODE (callee));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_STRNCPY_CHK:
|
2011-12-15 18:26:10 +01:00
|
|
|
case BUILT_IN_STPNCPY_CHK:
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
if (val[2] && is_gimple_val (val[2]) && nargs == 4)
|
2011-12-15 18:26:10 +01:00
|
|
|
result = fold_builtin_stxncpy_chk (loc, gimple_call_arg (stmt, 0),
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
gimple_call_arg (stmt, 1),
|
|
|
|
gimple_call_arg (stmt, 2),
|
|
|
|
gimple_call_arg (stmt, 3),
|
2011-12-15 18:26:10 +01:00
|
|
|
val[2], ignore,
|
|
|
|
DECL_FUNCTION_CODE (callee));
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case BUILT_IN_SNPRINTF_CHK:
|
|
|
|
case BUILT_IN_VSNPRINTF_CHK:
|
|
|
|
if (val[1] && is_gimple_val (val[1]))
|
|
|
|
result = gimple_fold_builtin_snprintf_chk (stmt, val[1],
|
|
|
|
DECL_FUNCTION_CODE (callee));
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
gcc_unreachable ();
|
|
|
|
}
|
|
|
|
|
|
|
|
if (result && ignore)
|
|
|
|
result = fold_ignored_result (result);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2010-05-13 14:19:02 +02:00
|
|
|
|
2011-04-19 18:35:33 +02:00
|
|
|
/* Return a binfo to be used for devirtualization of calls based on an object
|
|
|
|
represented by a declaration (i.e. a global or automatically allocated one)
|
|
|
|
or NULL if it cannot be found or is not safe. CST is expected to be an
|
|
|
|
ADDR_EXPR of such object or the function will return NULL. Currently it is
|
2013-08-16 14:38:04 +02:00
|
|
|
safe to use such binfo only if it has no base binfo (i.e. no ancestors)
|
|
|
|
EXPECTED_TYPE is type of the class virtual belongs to. */
|
2011-04-19 18:35:33 +02:00
|
|
|
|
|
|
|
tree
|
2013-08-16 14:38:04 +02:00
|
|
|
gimple_extract_devirt_binfo_from_cst (tree cst, tree expected_type)
|
2011-04-19 18:35:33 +02:00
|
|
|
{
|
|
|
|
HOST_WIDE_INT offset, size, max_size;
|
2013-08-16 14:38:04 +02:00
|
|
|
tree base, type, binfo;
|
2011-04-19 18:35:33 +02:00
|
|
|
bool last_artificial = false;
|
|
|
|
|
|
|
|
if (!flag_devirtualize
|
|
|
|
|| TREE_CODE (cst) != ADDR_EXPR
|
|
|
|
|| TREE_CODE (TREE_TYPE (TREE_TYPE (cst))) != RECORD_TYPE)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
cst = TREE_OPERAND (cst, 0);
|
|
|
|
base = get_ref_base_and_extent (cst, &offset, &size, &max_size);
|
|
|
|
type = TREE_TYPE (base);
|
|
|
|
if (!DECL_P (base)
|
|
|
|
|| max_size == -1
|
|
|
|
|| max_size != size
|
|
|
|
|| TREE_CODE (type) != RECORD_TYPE)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* Find the sub-object the constant actually refers to and mark whether it is
|
|
|
|
an artificial one (as opposed to a user-defined one). */
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
HOST_WIDE_INT pos, size;
|
|
|
|
tree fld;
|
|
|
|
|
2013-06-21 08:43:39 +02:00
|
|
|
if (types_same_for_odr (type, expected_type))
|
2011-04-19 18:35:33 +02:00
|
|
|
break;
|
|
|
|
if (offset < 0)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
for (fld = TYPE_FIELDS (type); fld; fld = DECL_CHAIN (fld))
|
|
|
|
{
|
|
|
|
if (TREE_CODE (fld) != FIELD_DECL)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
pos = int_bit_position (fld);
|
decl.c, [...]: Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/utils.c, gcc-interface/utils2.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/c-family/
* c-common.c, c-cppbuiltin.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/c/
* c-decl.c, c-typeck.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/cp/
* call.c, class.c, decl.c, error.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/objc/
* objc-encoding.c: Replace tree_low_cst (..., 1) with tree_to_uhwi
throughout.
gcc/
* alias.c, asan.c, builtins.c, cfgexpand.c, cgraph.c,
config/aarch64/aarch64.c, config/alpha/predicates.md,
config/arm/arm.c, config/darwin.c, config/epiphany/epiphany.c,
config/i386/i386.c, config/iq2000/iq2000.c, config/m32c/m32c-pragma.c,
config/mep/mep-pragma.c, config/mips/mips.c,
config/picochip/picochip.c, config/rs6000/rs6000.c, cppbuiltin.c,
dbxout.c, dwarf2out.c, emit-rtl.c, except.c, expr.c, fold-const.c,
function.c, gimple-fold.c, godump.c, ipa-cp.c, ipa-prop.c, omp-low.c,
predict.c, sdbout.c, stor-layout.c, trans-mem.c, tree-object-size.c,
tree-sra.c, tree-ssa-ccp.c, tree-ssa-forwprop.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-ivopts.c, tree-ssa-loop-niter.c,
tree-ssa-loop-prefetch.c, tree-ssa-strlen.c, tree-stdarg.c,
tree-switch-conversion.c, tree-vect-generic.c, tree-vect-loop.c,
tree-vect-patterns.c, tree-vrp.c, tree.c, tsan.c, ubsan.c, varasm.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
From-SVN: r204961
2013-11-18 15:52:19 +01:00
|
|
|
size = tree_to_uhwi (DECL_SIZE (fld));
|
2011-04-19 18:35:33 +02:00
|
|
|
if (pos <= offset && (pos + size) > offset)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!fld || TREE_CODE (TREE_TYPE (fld)) != RECORD_TYPE)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
last_artificial = DECL_ARTIFICIAL (fld);
|
|
|
|
type = TREE_TYPE (fld);
|
|
|
|
offset -= pos;
|
|
|
|
}
|
2012-05-29 16:14:06 +02:00
|
|
|
/* Artificial sub-objects are ancestors, we do not want to use them for
|
2011-04-19 18:35:33 +02:00
|
|
|
devirtualization, at least not here. */
|
|
|
|
if (last_artificial)
|
|
|
|
return NULL_TREE;
|
|
|
|
binfo = TYPE_BINFO (type);
|
|
|
|
if (!binfo || BINFO_N_BASE_BINFOS (binfo) > 0)
|
|
|
|
return NULL_TREE;
|
|
|
|
else
|
|
|
|
return binfo;
|
|
|
|
}
|
|
|
|
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
/* Attempt to fold a call statement referenced by the statement iterator GSI.
|
|
|
|
The statement may be replaced by another statement, e.g., if the call
|
|
|
|
simplifies to a constant value. Return true if any changes were made.
|
|
|
|
It is assumed that the operands have been previously folded. */
|
|
|
|
|
2011-11-02 09:46:08 +01:00
|
|
|
static bool
|
2010-12-15 14:19:46 +01:00
|
|
|
gimple_fold_call (gimple_stmt_iterator *gsi, bool inplace)
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
|
|
|
gimple stmt = gsi_stmt (*gsi);
|
2011-04-18 13:59:34 +02:00
|
|
|
tree callee;
|
2011-11-02 09:46:08 +01:00
|
|
|
bool changed = false;
|
|
|
|
unsigned i;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
|
2011-11-02 09:46:08 +01:00
|
|
|
/* Fold *& in call arguments. */
|
|
|
|
for (i = 0; i < gimple_call_num_args (stmt); ++i)
|
|
|
|
if (REFERENCE_CLASS_P (gimple_call_arg (stmt, i)))
|
|
|
|
{
|
|
|
|
tree tmp = maybe_fold_reference (gimple_call_arg (stmt, i), false);
|
|
|
|
if (tmp)
|
|
|
|
{
|
|
|
|
gimple_call_set_arg (stmt, i, tmp);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
2011-04-18 13:59:34 +02:00
|
|
|
|
|
|
|
/* Check for virtual calls that became direct calls. */
|
|
|
|
callee = gimple_call_fn (stmt);
|
2011-04-20 10:21:25 +02:00
|
|
|
if (callee && TREE_CODE (callee) == OBJ_TYPE_REF)
|
2011-04-18 13:59:34 +02:00
|
|
|
{
|
2011-04-19 18:35:33 +02:00
|
|
|
if (gimple_call_addr_fndecl (OBJ_TYPE_REF_EXPR (callee)) != NULL_TREE)
|
|
|
|
{
|
2013-09-23 18:54:34 +02:00
|
|
|
if (dump_file && virtual_method_call_p (callee)
|
|
|
|
&& !possible_polymorphic_call_target_p
|
|
|
|
(callee, cgraph_get_node (gimple_call_addr_fndecl
|
|
|
|
(OBJ_TYPE_REF_EXPR (callee)))))
|
|
|
|
{
|
|
|
|
fprintf (dump_file,
|
|
|
|
"Type inheritnace inconsistent devirtualization of ");
|
|
|
|
print_gimple_stmt (dump_file, stmt, 0, TDF_SLIM);
|
|
|
|
fprintf (dump_file, " to ");
|
|
|
|
print_generic_expr (dump_file, callee, TDF_SLIM);
|
|
|
|
fprintf (dump_file, "\n");
|
|
|
|
}
|
|
|
|
|
2011-04-19 18:35:33 +02:00
|
|
|
gimple_call_set_fn (stmt, OBJ_TYPE_REF_EXPR (callee));
|
2011-11-02 09:46:08 +01:00
|
|
|
changed = true;
|
|
|
|
}
|
2013-12-17 11:26:59 +01:00
|
|
|
else if (flag_devirtualize && virtual_method_call_p (callee))
|
2011-11-02 09:46:08 +01:00
|
|
|
{
|
2013-12-17 11:26:59 +01:00
|
|
|
bool final;
|
|
|
|
vec <cgraph_node *>targets
|
|
|
|
= possible_polymorphic_call_targets (callee, &final);
|
|
|
|
if (final && targets.length () <= 1)
|
2011-11-02 09:46:08 +01:00
|
|
|
{
|
2013-12-17 11:26:59 +01:00
|
|
|
if (targets.length () == 1)
|
2013-12-31 12:57:39 +01:00
|
|
|
{
|
|
|
|
gimple_call_set_fndecl (stmt, targets[0]->decl);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
else if (!inplace)
|
|
|
|
{
|
|
|
|
tree fndecl = builtin_decl_implicit (BUILT_IN_UNREACHABLE);
|
|
|
|
gimple new_stmt = gimple_build_call (fndecl, 0);
|
|
|
|
gimple_set_location (new_stmt, gimple_location (stmt));
|
|
|
|
gsi_insert_before (gsi, new_stmt, GSI_SAME_STMT);
|
|
|
|
return true;
|
|
|
|
}
|
2011-11-02 09:46:08 +01:00
|
|
|
}
|
2011-04-19 18:35:33 +02:00
|
|
|
}
|
2011-11-02 09:46:08 +01:00
|
|
|
}
|
2011-04-19 18:35:33 +02:00
|
|
|
|
2011-11-02 09:46:08 +01:00
|
|
|
if (inplace)
|
|
|
|
return changed;
|
|
|
|
|
|
|
|
/* Check for builtins that CCP can handle using information not
|
|
|
|
available in the generic fold routines. */
|
2011-12-05 09:51:53 +01:00
|
|
|
callee = gimple_call_fndecl (stmt);
|
2011-11-02 09:46:08 +01:00
|
|
|
if (callee && DECL_BUILT_IN (callee))
|
|
|
|
{
|
|
|
|
tree result = gimple_fold_builtin (stmt);
|
2011-12-13 15:00:58 +01:00
|
|
|
if (result)
|
2011-11-02 09:46:08 +01:00
|
|
|
{
|
|
|
|
if (!update_call_from_tree (gsi, result))
|
|
|
|
gimplify_and_update_call_from_tree (gsi, result);
|
|
|
|
changed = true;
|
|
|
|
}
|
2013-04-22 16:50:32 +02:00
|
|
|
else if (DECL_BUILT_IN_CLASS (callee) == BUILT_IN_MD)
|
|
|
|
changed |= targetm.gimple_fold_builtin (gsi);
|
2011-04-18 13:59:34 +02:00
|
|
|
}
|
|
|
|
|
2011-11-02 09:46:08 +01:00
|
|
|
return changed;
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Worker for both fold_stmt and fold_stmt_inplace. The INPLACE argument
|
|
|
|
distinguishes both cases. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
fold_stmt_1 (gimple_stmt_iterator *gsi, bool inplace)
|
|
|
|
{
|
|
|
|
bool changed = false;
|
|
|
|
gimple stmt = gsi_stmt (*gsi);
|
|
|
|
unsigned i;
|
|
|
|
|
|
|
|
/* Fold the main computation performed by the statement. */
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
{
|
|
|
|
case GIMPLE_ASSIGN:
|
|
|
|
{
|
|
|
|
unsigned old_num_ops = gimple_num_ops (stmt);
|
2011-07-14 16:21:07 +02:00
|
|
|
enum tree_code subcode = gimple_assign_rhs_code (stmt);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
tree lhs = gimple_assign_lhs (stmt);
|
2011-07-14 16:21:07 +02:00
|
|
|
tree new_rhs;
|
|
|
|
/* First canonicalize operand order. This avoids building new
|
|
|
|
trees if this is the only thing fold would later do. */
|
|
|
|
if ((commutative_tree_code (subcode)
|
|
|
|
|| commutative_ternary_tree_code (subcode))
|
|
|
|
&& tree_swap_operands_p (gimple_assign_rhs1 (stmt),
|
|
|
|
gimple_assign_rhs2 (stmt), false))
|
|
|
|
{
|
|
|
|
tree tem = gimple_assign_rhs1 (stmt);
|
|
|
|
gimple_assign_set_rhs1 (stmt, gimple_assign_rhs2 (stmt));
|
|
|
|
gimple_assign_set_rhs2 (stmt, tem);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
new_rhs = fold_gimple_assign (gsi);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
if (new_rhs
|
|
|
|
&& !useless_type_conversion_p (TREE_TYPE (lhs),
|
|
|
|
TREE_TYPE (new_rhs)))
|
|
|
|
new_rhs = fold_convert (TREE_TYPE (lhs), new_rhs);
|
|
|
|
if (new_rhs
|
|
|
|
&& (!inplace
|
|
|
|
|| get_gimple_rhs_num_ops (TREE_CODE (new_rhs)) < old_num_ops))
|
|
|
|
{
|
|
|
|
gimple_assign_set_rhs_from_tree (gsi, new_rhs);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case GIMPLE_COND:
|
|
|
|
changed |= fold_gimple_cond (stmt);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GIMPLE_CALL:
|
2010-12-15 14:19:46 +01:00
|
|
|
changed |= gimple_fold_call (gsi, inplace);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case GIMPLE_ASM:
|
|
|
|
/* Fold *& in asm operands. */
|
2011-09-30 17:01:27 +02:00
|
|
|
{
|
|
|
|
size_t noutputs;
|
|
|
|
const char **oconstraints;
|
|
|
|
const char *constraint;
|
|
|
|
bool allows_mem, allows_reg;
|
|
|
|
|
|
|
|
noutputs = gimple_asm_noutputs (stmt);
|
|
|
|
oconstraints = XALLOCAVEC (const char *, noutputs);
|
|
|
|
|
|
|
|
for (i = 0; i < gimple_asm_noutputs (stmt); ++i)
|
|
|
|
{
|
|
|
|
tree link = gimple_asm_output_op (stmt, i);
|
|
|
|
tree op = TREE_VALUE (link);
|
|
|
|
oconstraints[i]
|
|
|
|
= TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
|
|
|
|
if (REFERENCE_CLASS_P (op)
|
|
|
|
&& (op = maybe_fold_reference (op, true)) != NULL_TREE)
|
|
|
|
{
|
|
|
|
TREE_VALUE (link) = op;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (i = 0; i < gimple_asm_ninputs (stmt); ++i)
|
|
|
|
{
|
|
|
|
tree link = gimple_asm_input_op (stmt, i);
|
|
|
|
tree op = TREE_VALUE (link);
|
|
|
|
constraint
|
|
|
|
= TREE_STRING_POINTER (TREE_VALUE (TREE_PURPOSE (link)));
|
|
|
|
parse_input_constraint (&constraint, 0, 0, noutputs, 0,
|
|
|
|
oconstraints, &allows_mem, &allows_reg);
|
|
|
|
if (REFERENCE_CLASS_P (op)
|
|
|
|
&& (op = maybe_fold_reference (op, !allows_reg && allows_mem))
|
|
|
|
!= NULL_TREE)
|
|
|
|
{
|
|
|
|
TREE_VALUE (link) = op;
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
break;
|
|
|
|
|
2010-07-26 15:29:14 +02:00
|
|
|
case GIMPLE_DEBUG:
|
|
|
|
if (gimple_debug_bind_p (stmt))
|
|
|
|
{
|
|
|
|
tree val = gimple_debug_bind_get_value (stmt);
|
|
|
|
if (val
|
|
|
|
&& REFERENCE_CLASS_P (val))
|
|
|
|
{
|
|
|
|
tree tem = maybe_fold_reference (val, false);
|
|
|
|
if (tem)
|
|
|
|
{
|
|
|
|
gimple_debug_bind_set_value (stmt, tem);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
2012-02-22 12:21:48 +01:00
|
|
|
else if (val
|
|
|
|
&& TREE_CODE (val) == ADDR_EXPR)
|
|
|
|
{
|
|
|
|
tree ref = TREE_OPERAND (val, 0);
|
|
|
|
tree tem = maybe_fold_reference (ref, false);
|
|
|
|
if (tem)
|
|
|
|
{
|
|
|
|
tem = build_fold_addr_expr_with_type (tem, TREE_TYPE (val));
|
|
|
|
gimple_debug_bind_set_value (stmt, tem);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
2010-07-26 15:29:14 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
default:;
|
|
|
|
}
|
|
|
|
|
|
|
|
stmt = gsi_stmt (*gsi);
|
|
|
|
|
2012-12-06 12:00:23 +01:00
|
|
|
/* Fold *& on the lhs. */
|
|
|
|
if (gimple_has_lhs (stmt))
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
|
|
|
tree lhs = gimple_get_lhs (stmt);
|
|
|
|
if (lhs && REFERENCE_CLASS_P (lhs))
|
|
|
|
{
|
|
|
|
tree new_lhs = maybe_fold_reference (lhs, true);
|
|
|
|
if (new_lhs)
|
|
|
|
{
|
|
|
|
gimple_set_lhs (stmt, new_lhs);
|
|
|
|
changed = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fold the statement pointed to by GSI. In some cases, this function may
|
|
|
|
replace the whole statement with a new one. Returns true iff folding
|
|
|
|
makes any changes.
|
|
|
|
The statement pointed to by GSI should be in valid gimple form but may
|
|
|
|
be in unfolded state as resulting from for example constant propagation
|
|
|
|
which can produce *&x = 0. */
|
|
|
|
|
|
|
|
bool
|
|
|
|
fold_stmt (gimple_stmt_iterator *gsi)
|
|
|
|
{
|
|
|
|
return fold_stmt_1 (gsi, false);
|
|
|
|
}
|
|
|
|
|
2011-09-09 13:52:51 +02:00
|
|
|
/* Perform the minimal folding on statement *GSI. Only operations like
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
*&x created by constant propagation are handled. The statement cannot
|
|
|
|
be replaced with a new one. Return true if the statement was
|
|
|
|
changed, false otherwise.
|
2011-09-09 13:52:51 +02:00
|
|
|
The statement *GSI should be in valid gimple form but may
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
be in unfolded state as resulting from for example constant propagation
|
|
|
|
which can produce *&x = 0. */
|
|
|
|
|
|
|
|
bool
|
2011-09-09 13:52:51 +02:00
|
|
|
fold_stmt_inplace (gimple_stmt_iterator *gsi)
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
{
|
2011-09-09 13:52:51 +02:00
|
|
|
gimple stmt = gsi_stmt (*gsi);
|
|
|
|
bool changed = fold_stmt_1 (gsi, true);
|
|
|
|
gcc_assert (gsi_stmt (*gsi) == stmt);
|
Makefile.in (OBJS-common): Add gimple-fold.o.
2010-04-15 Richard Guenther <rguenther@suse.de>
* Makefile.in (OBJS-common): Add gimple-fold.o.
(gimple-fold.o): New rule.
* tree.h (maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_addition): Move
prototypes ...
* gimple.h: ... here.
* tree-flow.h (fold_stmt, fold_stmt_inplace, get_symbol_constant_value,
may_propagate_address_into_dereference): Move prototypes ...
* gimple.h: ... here.
* tree-ssa-ccp.c (get_symbol_constant_value,
may_propagate_address_into_dereference, maybe_fold_offset_to_array_ref,
maybe_fold_offset_to_component_ref, maybe_fold_offset_to_reference,
maybe_fold_offset_to_address, maybe_fold_stmt_indirect,
maybe_fold_stmt_addition, maybe_fold_reference, get_maxval_strlen,
ccp_fold_builtin, fold_gimple_assign, fold_gimple_cond,
fold_gimple_call, fold_stmt_1, fold_stmt, fold_stmt_inplace,
gimplify_and_update_call_from_tree): Move ...
* gimple-fold.c: ... here. New file.
(ccp_fold_builtin): Rename to ...
(gimple_fold_builtin): ... this.
* tree-ssa-ccp.c (execute_fold_all_builtins): Adjust.
From-SVN: r158373
2010-04-15 14:58:05 +02:00
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
/* Canonicalize and possibly invert the boolean EXPR; return NULL_TREE
|
|
|
|
if EXPR is null or we don't know how.
|
|
|
|
If non-null, the result always has boolean type. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
canonicalize_bool (tree expr, bool invert)
|
|
|
|
{
|
|
|
|
if (!expr)
|
|
|
|
return NULL_TREE;
|
|
|
|
else if (invert)
|
|
|
|
{
|
|
|
|
if (integer_nonzerop (expr))
|
|
|
|
return boolean_false_node;
|
|
|
|
else if (integer_zerop (expr))
|
|
|
|
return boolean_true_node;
|
|
|
|
else if (TREE_CODE (expr) == SSA_NAME)
|
|
|
|
return fold_build2 (EQ_EXPR, boolean_type_node, expr,
|
|
|
|
build_int_cst (TREE_TYPE (expr), 0));
|
|
|
|
else if (TREE_CODE_CLASS (TREE_CODE (expr)) == tcc_comparison)
|
|
|
|
return fold_build2 (invert_tree_comparison (TREE_CODE (expr), false),
|
|
|
|
boolean_type_node,
|
|
|
|
TREE_OPERAND (expr, 0),
|
|
|
|
TREE_OPERAND (expr, 1));
|
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (TREE_CODE (TREE_TYPE (expr)) == BOOLEAN_TYPE)
|
|
|
|
return expr;
|
|
|
|
if (integer_nonzerop (expr))
|
|
|
|
return boolean_true_node;
|
|
|
|
else if (integer_zerop (expr))
|
|
|
|
return boolean_false_node;
|
|
|
|
else if (TREE_CODE (expr) == SSA_NAME)
|
|
|
|
return fold_build2 (NE_EXPR, boolean_type_node, expr,
|
|
|
|
build_int_cst (TREE_TYPE (expr), 0));
|
|
|
|
else if (TREE_CODE_CLASS (TREE_CODE (expr)) == tcc_comparison)
|
|
|
|
return fold_build2 (TREE_CODE (expr),
|
|
|
|
boolean_type_node,
|
|
|
|
TREE_OPERAND (expr, 0),
|
|
|
|
TREE_OPERAND (expr, 1));
|
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check to see if a boolean expression EXPR is logically equivalent to the
|
|
|
|
comparison (OP1 CODE OP2). Check for various identities involving
|
|
|
|
SSA_NAMEs. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
same_bool_comparison_p (const_tree expr, enum tree_code code,
|
|
|
|
const_tree op1, const_tree op2)
|
|
|
|
{
|
|
|
|
gimple s;
|
|
|
|
|
|
|
|
/* The obvious case. */
|
|
|
|
if (TREE_CODE (expr) == code
|
|
|
|
&& operand_equal_p (TREE_OPERAND (expr, 0), op1, 0)
|
|
|
|
&& operand_equal_p (TREE_OPERAND (expr, 1), op2, 0))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Check for comparing (name, name != 0) and the case where expr
|
|
|
|
is an SSA_NAME with a definition matching the comparison. */
|
|
|
|
if (TREE_CODE (expr) == SSA_NAME
|
|
|
|
&& TREE_CODE (TREE_TYPE (expr)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
if (operand_equal_p (expr, op1, 0))
|
|
|
|
return ((code == NE_EXPR && integer_zerop (op2))
|
|
|
|
|| (code == EQ_EXPR && integer_nonzerop (op2)));
|
|
|
|
s = SSA_NAME_DEF_STMT (expr);
|
|
|
|
if (is_gimple_assign (s)
|
|
|
|
&& gimple_assign_rhs_code (s) == code
|
|
|
|
&& operand_equal_p (gimple_assign_rhs1 (s), op1, 0)
|
|
|
|
&& operand_equal_p (gimple_assign_rhs2 (s), op2, 0))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If op1 is of the form (name != 0) or (name == 0), and the definition
|
|
|
|
of name is a comparison, recurse. */
|
|
|
|
if (TREE_CODE (op1) == SSA_NAME
|
|
|
|
&& TREE_CODE (TREE_TYPE (op1)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
s = SSA_NAME_DEF_STMT (op1);
|
|
|
|
if (is_gimple_assign (s)
|
|
|
|
&& TREE_CODE_CLASS (gimple_assign_rhs_code (s)) == tcc_comparison)
|
|
|
|
{
|
|
|
|
enum tree_code c = gimple_assign_rhs_code (s);
|
|
|
|
if ((c == NE_EXPR && integer_zerop (op2))
|
|
|
|
|| (c == EQ_EXPR && integer_nonzerop (op2)))
|
|
|
|
return same_bool_comparison_p (expr, c,
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s));
|
|
|
|
if ((c == EQ_EXPR && integer_zerop (op2))
|
|
|
|
|| (c == NE_EXPR && integer_nonzerop (op2)))
|
|
|
|
return same_bool_comparison_p (expr,
|
|
|
|
invert_tree_comparison (c, false),
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check to see if two boolean expressions OP1 and OP2 are logically
|
|
|
|
equivalent. */
|
|
|
|
|
|
|
|
static bool
|
|
|
|
same_bool_result_p (const_tree op1, const_tree op2)
|
|
|
|
{
|
|
|
|
/* Simple cases first. */
|
|
|
|
if (operand_equal_p (op1, op2, 0))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Check the cases where at least one of the operands is a comparison.
|
|
|
|
These are a bit smarter than operand_equal_p in that they apply some
|
|
|
|
identifies on SSA_NAMEs. */
|
|
|
|
if (TREE_CODE_CLASS (TREE_CODE (op2)) == tcc_comparison
|
|
|
|
&& same_bool_comparison_p (op1, TREE_CODE (op2),
|
|
|
|
TREE_OPERAND (op2, 0),
|
|
|
|
TREE_OPERAND (op2, 1)))
|
|
|
|
return true;
|
|
|
|
if (TREE_CODE_CLASS (TREE_CODE (op1)) == tcc_comparison
|
|
|
|
&& same_bool_comparison_p (op2, TREE_CODE (op1),
|
|
|
|
TREE_OPERAND (op1, 0),
|
|
|
|
TREE_OPERAND (op1, 1)))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Default case. */
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Forward declarations for some mutually recursive functions. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
and_comparisons_1 (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
static tree
|
|
|
|
and_var_with_comparison (tree var, bool invert,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
static tree
|
|
|
|
and_var_with_comparison_1 (gimple stmt,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
static tree
|
|
|
|
or_comparisons_1 (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
static tree
|
|
|
|
or_var_with_comparison (tree var, bool invert,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
static tree
|
|
|
|
or_var_with_comparison_1 (gimple stmt,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b);
|
|
|
|
|
|
|
|
/* Helper function for and_comparisons_1: try to simplify the AND of the
|
|
|
|
ssa variable VAR with the comparison specified by (OP2A CODE2 OP2B).
|
|
|
|
If INVERT is true, invert the value of the VAR before doing the AND.
|
|
|
|
Return NULL_EXPR if we can't simplify this to a single expression. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
and_var_with_comparison (tree var, bool invert,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree t;
|
|
|
|
gimple stmt = SSA_NAME_DEF_STMT (var);
|
|
|
|
|
|
|
|
/* We can only deal with variables whose definitions are assignments. */
|
|
|
|
if (!is_gimple_assign (stmt))
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* If we have an inverted comparison, apply DeMorgan's law and rewrite
|
|
|
|
!var AND (op2a code2 op2b) => !(var OR !(op2a code2 op2b))
|
|
|
|
Then we only have to consider the simpler non-inverted cases. */
|
|
|
|
if (invert)
|
|
|
|
t = or_var_with_comparison_1 (stmt,
|
|
|
|
invert_tree_comparison (code2, false),
|
|
|
|
op2a, op2b);
|
|
|
|
else
|
|
|
|
t = and_var_with_comparison_1 (stmt, code2, op2a, op2b);
|
|
|
|
return canonicalize_bool (t, invert);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the AND of the ssa variable defined by the assignment
|
|
|
|
STMT with the comparison specified by (OP2A CODE2 OP2B).
|
|
|
|
Return NULL_EXPR if we can't simplify this to a single expression. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
and_var_with_comparison_1 (gimple stmt,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree var = gimple_assign_lhs (stmt);
|
|
|
|
tree true_test_var = NULL_TREE;
|
|
|
|
tree false_test_var = NULL_TREE;
|
|
|
|
enum tree_code innercode = gimple_assign_rhs_code (stmt);
|
|
|
|
|
|
|
|
/* Check for identities like (var AND (var == 0)) => false. */
|
|
|
|
if (TREE_CODE (op2a) == SSA_NAME
|
|
|
|
&& TREE_CODE (TREE_TYPE (var)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
if ((code2 == NE_EXPR && integer_zerop (op2b))
|
|
|
|
|| (code2 == EQ_EXPR && integer_nonzerop (op2b)))
|
|
|
|
{
|
|
|
|
true_test_var = op2a;
|
|
|
|
if (var == true_test_var)
|
|
|
|
return var;
|
|
|
|
}
|
|
|
|
else if ((code2 == EQ_EXPR && integer_zerop (op2b))
|
|
|
|
|| (code2 == NE_EXPR && integer_nonzerop (op2b)))
|
|
|
|
{
|
|
|
|
false_test_var = op2a;
|
|
|
|
if (var == false_test_var)
|
|
|
|
return boolean_false_node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the definition is a comparison, recurse on it. */
|
|
|
|
if (TREE_CODE_CLASS (innercode) == tcc_comparison)
|
|
|
|
{
|
|
|
|
tree t = and_comparisons_1 (innercode,
|
|
|
|
gimple_assign_rhs1 (stmt),
|
|
|
|
gimple_assign_rhs2 (stmt),
|
|
|
|
code2,
|
|
|
|
op2a,
|
|
|
|
op2b);
|
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the definition is an AND or OR expression, we may be able to
|
|
|
|
simplify by reassociating. */
|
2011-07-27 16:59:40 +02:00
|
|
|
if (TREE_CODE (TREE_TYPE (var)) == BOOLEAN_TYPE
|
|
|
|
&& (innercode == BIT_AND_EXPR || innercode == BIT_IOR_EXPR))
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
|
|
|
tree inner1 = gimple_assign_rhs1 (stmt);
|
|
|
|
tree inner2 = gimple_assign_rhs2 (stmt);
|
|
|
|
gimple s;
|
|
|
|
tree t;
|
|
|
|
tree partial = NULL_TREE;
|
2011-07-27 16:59:40 +02:00
|
|
|
bool is_and = (innercode == BIT_AND_EXPR);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
|
|
|
|
/* Check for boolean identities that don't require recursive examination
|
|
|
|
of inner1/inner2:
|
|
|
|
inner1 AND (inner1 AND inner2) => inner1 AND inner2 => var
|
|
|
|
inner1 AND (inner1 OR inner2) => inner1
|
|
|
|
!inner1 AND (inner1 AND inner2) => false
|
|
|
|
!inner1 AND (inner1 OR inner2) => !inner1 AND inner2
|
|
|
|
Likewise for similar cases involving inner2. */
|
|
|
|
if (inner1 == true_test_var)
|
|
|
|
return (is_and ? var : inner1);
|
|
|
|
else if (inner2 == true_test_var)
|
|
|
|
return (is_and ? var : inner2);
|
|
|
|
else if (inner1 == false_test_var)
|
|
|
|
return (is_and
|
|
|
|
? boolean_false_node
|
|
|
|
: and_var_with_comparison (inner2, false, code2, op2a, op2b));
|
|
|
|
else if (inner2 == false_test_var)
|
|
|
|
return (is_and
|
|
|
|
? boolean_false_node
|
|
|
|
: and_var_with_comparison (inner1, false, code2, op2a, op2b));
|
|
|
|
|
|
|
|
/* Next, redistribute/reassociate the AND across the inner tests.
|
|
|
|
Compute the first partial result, (inner1 AND (op2a code op2b)) */
|
|
|
|
if (TREE_CODE (inner1) == SSA_NAME
|
|
|
|
&& is_gimple_assign (s = SSA_NAME_DEF_STMT (inner1))
|
|
|
|
&& TREE_CODE_CLASS (gimple_assign_rhs_code (s)) == tcc_comparison
|
|
|
|
&& (t = maybe_fold_and_comparisons (gimple_assign_rhs_code (s),
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s),
|
|
|
|
code2, op2a, op2b)))
|
|
|
|
{
|
|
|
|
/* Handle the AND case, where we are reassociating:
|
|
|
|
(inner1 AND inner2) AND (op2a code2 op2b)
|
|
|
|
=> (t AND inner2)
|
|
|
|
If the partial result t is a constant, we win. Otherwise
|
|
|
|
continue on to try reassociating with the other inner test. */
|
|
|
|
if (is_and)
|
|
|
|
{
|
|
|
|
if (integer_onep (t))
|
|
|
|
return inner2;
|
|
|
|
else if (integer_zerop (t))
|
|
|
|
return boolean_false_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the OR case, where we are redistributing:
|
|
|
|
(inner1 OR inner2) AND (op2a code2 op2b)
|
|
|
|
=> (t OR (inner2 AND (op2a code2 op2b))) */
|
2010-12-14 15:09:59 +01:00
|
|
|
else if (integer_onep (t))
|
|
|
|
return boolean_true_node;
|
|
|
|
|
|
|
|
/* Save partial result for later. */
|
|
|
|
partial = t;
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute the second partial result, (inner2 AND (op2a code op2b)) */
|
|
|
|
if (TREE_CODE (inner2) == SSA_NAME
|
|
|
|
&& is_gimple_assign (s = SSA_NAME_DEF_STMT (inner2))
|
|
|
|
&& TREE_CODE_CLASS (gimple_assign_rhs_code (s)) == tcc_comparison
|
|
|
|
&& (t = maybe_fold_and_comparisons (gimple_assign_rhs_code (s),
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s),
|
|
|
|
code2, op2a, op2b)))
|
|
|
|
{
|
|
|
|
/* Handle the AND case, where we are reassociating:
|
|
|
|
(inner1 AND inner2) AND (op2a code2 op2b)
|
|
|
|
=> (inner1 AND t) */
|
|
|
|
if (is_and)
|
|
|
|
{
|
|
|
|
if (integer_onep (t))
|
|
|
|
return inner1;
|
|
|
|
else if (integer_zerop (t))
|
|
|
|
return boolean_false_node;
|
2010-12-14 15:09:59 +01:00
|
|
|
/* If both are the same, we can apply the identity
|
|
|
|
(x AND x) == x. */
|
|
|
|
else if (partial && same_bool_result_p (t, partial))
|
|
|
|
return t;
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the OR case. where we are redistributing:
|
|
|
|
(inner1 OR inner2) AND (op2a code2 op2b)
|
|
|
|
=> (t OR (inner1 AND (op2a code2 op2b)))
|
|
|
|
=> (t OR partial) */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (integer_onep (t))
|
|
|
|
return boolean_true_node;
|
|
|
|
else if (partial)
|
|
|
|
{
|
|
|
|
/* We already got a simplification for the other
|
|
|
|
operand to the redistributed OR expression. The
|
|
|
|
interesting case is when at least one is false.
|
|
|
|
Or, if both are the same, we can apply the identity
|
|
|
|
(x OR x) == x. */
|
|
|
|
if (integer_zerop (partial))
|
|
|
|
return t;
|
|
|
|
else if (integer_zerop (t))
|
|
|
|
return partial;
|
|
|
|
else if (same_bool_result_p (t, partial))
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the AND of two comparisons defined by
|
|
|
|
(OP1A CODE1 OP1B) and (OP2A CODE2 OP2B), respectively.
|
|
|
|
If this can be done without constructing an intermediate value,
|
|
|
|
return the resulting tree; otherwise NULL_TREE is returned.
|
|
|
|
This function is deliberately asymmetric as it recurses on SSA_DEFs
|
|
|
|
in the first comparison but not the second. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
and_comparisons_1 (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
2012-09-29 10:23:23 +02:00
|
|
|
tree truth_type = truth_type_for (TREE_TYPE (op1a));
|
2012-09-14 19:17:01 +02:00
|
|
|
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
/* First check for ((x CODE1 y) AND (x CODE2 y)). */
|
|
|
|
if (operand_equal_p (op1a, op2a, 0)
|
|
|
|
&& operand_equal_p (op1b, op2b, 0))
|
|
|
|
{
|
2011-07-27 16:59:40 +02:00
|
|
|
/* Result will be either NULL_TREE, or a combined comparison. */
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
tree t = combine_comparisons (UNKNOWN_LOCATION,
|
|
|
|
TRUTH_ANDIF_EXPR, code1, code2,
|
2012-09-14 19:17:01 +02:00
|
|
|
truth_type, op1a, op1b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Likewise the swapped case of the above. */
|
|
|
|
if (operand_equal_p (op1a, op2b, 0)
|
|
|
|
&& operand_equal_p (op1b, op2a, 0))
|
|
|
|
{
|
2011-07-27 16:59:40 +02:00
|
|
|
/* Result will be either NULL_TREE, or a combined comparison. */
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
tree t = combine_comparisons (UNKNOWN_LOCATION,
|
|
|
|
TRUTH_ANDIF_EXPR, code1,
|
|
|
|
swap_tree_comparison (code2),
|
2012-09-14 19:17:01 +02:00
|
|
|
truth_type, op1a, op1b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If both comparisons are of the same value against constants, we might
|
|
|
|
be able to merge them. */
|
|
|
|
if (operand_equal_p (op1a, op2a, 0)
|
|
|
|
&& TREE_CODE (op1b) == INTEGER_CST
|
|
|
|
&& TREE_CODE (op2b) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
int cmp = tree_int_cst_compare (op1b, op2b);
|
|
|
|
|
|
|
|
/* If we have (op1a == op1b), we should either be able to
|
|
|
|
return that or FALSE, depending on whether the constant op1b
|
|
|
|
also satisfies the other comparison against op2b. */
|
|
|
|
if (code1 == EQ_EXPR)
|
|
|
|
{
|
|
|
|
bool done = true;
|
|
|
|
bool val;
|
|
|
|
switch (code2)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp < 0); break;
|
|
|
|
case GT_EXPR: val = (cmp > 0); break;
|
|
|
|
case LE_EXPR: val = (cmp <= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp >= 0); break;
|
|
|
|
default: done = false;
|
|
|
|
}
|
|
|
|
if (done)
|
|
|
|
{
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
else
|
|
|
|
return boolean_false_node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Likewise if the second comparison is an == comparison. */
|
|
|
|
else if (code2 == EQ_EXPR)
|
|
|
|
{
|
|
|
|
bool done = true;
|
|
|
|
bool val;
|
|
|
|
switch (code1)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp > 0); break;
|
|
|
|
case GT_EXPR: val = (cmp < 0); break;
|
|
|
|
case LE_EXPR: val = (cmp >= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp <= 0); break;
|
|
|
|
default: done = false;
|
|
|
|
}
|
|
|
|
if (done)
|
|
|
|
{
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
else
|
|
|
|
return boolean_false_node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Same business with inequality tests. */
|
|
|
|
else if (code1 == NE_EXPR)
|
|
|
|
{
|
|
|
|
bool val;
|
|
|
|
switch (code2)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp != 0); break;
|
|
|
|
case NE_EXPR: val = (cmp == 0); break;
|
|
|
|
case LT_EXPR: val = (cmp >= 0); break;
|
|
|
|
case GT_EXPR: val = (cmp <= 0); break;
|
|
|
|
case LE_EXPR: val = (cmp > 0); break;
|
|
|
|
case GE_EXPR: val = (cmp < 0); break;
|
|
|
|
default:
|
|
|
|
val = false;
|
|
|
|
}
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
}
|
|
|
|
else if (code2 == NE_EXPR)
|
|
|
|
{
|
|
|
|
bool val;
|
|
|
|
switch (code1)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp <= 0); break;
|
|
|
|
case GT_EXPR: val = (cmp >= 0); break;
|
|
|
|
case LE_EXPR: val = (cmp < 0); break;
|
|
|
|
case GE_EXPR: val = (cmp > 0); break;
|
|
|
|
default:
|
|
|
|
val = false;
|
|
|
|
}
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Chose the more restrictive of two < or <= comparisons. */
|
|
|
|
else if ((code1 == LT_EXPR || code1 == LE_EXPR)
|
|
|
|
&& (code2 == LT_EXPR || code2 == LE_EXPR))
|
|
|
|
{
|
|
|
|
if ((cmp < 0) || (cmp == 0 && code1 == LT_EXPR))
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
else
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Likewise chose the more restrictive of two > or >= comparisons. */
|
|
|
|
else if ((code1 == GT_EXPR || code1 == GE_EXPR)
|
|
|
|
&& (code2 == GT_EXPR || code2 == GE_EXPR))
|
|
|
|
{
|
|
|
|
if ((cmp > 0) || (cmp == 0 && code1 == GT_EXPR))
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
else
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for singleton ranges. */
|
|
|
|
else if (cmp == 0
|
|
|
|
&& ((code1 == LE_EXPR && code2 == GE_EXPR)
|
|
|
|
|| (code1 == GE_EXPR && code2 == LE_EXPR)))
|
|
|
|
return fold_build2 (EQ_EXPR, boolean_type_node, op1a, op2b);
|
|
|
|
|
|
|
|
/* Check for disjoint ranges. */
|
|
|
|
else if (cmp <= 0
|
|
|
|
&& (code1 == LT_EXPR || code1 == LE_EXPR)
|
|
|
|
&& (code2 == GT_EXPR || code2 == GE_EXPR))
|
|
|
|
return boolean_false_node;
|
|
|
|
else if (cmp >= 0
|
|
|
|
&& (code1 == GT_EXPR || code1 == GE_EXPR)
|
|
|
|
&& (code2 == LT_EXPR || code2 == LE_EXPR))
|
|
|
|
return boolean_false_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Perhaps the first comparison is (NAME != 0) or (NAME == 1) where
|
|
|
|
NAME's definition is a truth value. See if there are any simplifications
|
|
|
|
that can be done against the NAME's definition. */
|
|
|
|
if (TREE_CODE (op1a) == SSA_NAME
|
|
|
|
&& (code1 == NE_EXPR || code1 == EQ_EXPR)
|
|
|
|
&& (integer_zerop (op1b) || integer_onep (op1b)))
|
|
|
|
{
|
|
|
|
bool invert = ((code1 == EQ_EXPR && integer_zerop (op1b))
|
|
|
|
|| (code1 == NE_EXPR && integer_onep (op1b)));
|
|
|
|
gimple stmt = SSA_NAME_DEF_STMT (op1a);
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
{
|
|
|
|
case GIMPLE_ASSIGN:
|
|
|
|
/* Try to simplify by copy-propagating the definition. */
|
|
|
|
return and_var_with_comparison (op1a, invert, code2, op2a, op2b);
|
|
|
|
|
|
|
|
case GIMPLE_PHI:
|
|
|
|
/* If every argument to the PHI produces the same result when
|
|
|
|
ANDed with the second comparison, we win.
|
|
|
|
Do not do this unless the type is bool since we need a bool
|
|
|
|
result here anyway. */
|
|
|
|
if (TREE_CODE (TREE_TYPE (op1a)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
tree result = NULL_TREE;
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < gimple_phi_num_args (stmt); i++)
|
|
|
|
{
|
|
|
|
tree arg = gimple_phi_arg_def (stmt, i);
|
|
|
|
|
|
|
|
/* If this PHI has itself as an argument, ignore it.
|
|
|
|
If all the other args produce the same result,
|
|
|
|
we're still OK. */
|
|
|
|
if (arg == gimple_phi_result (stmt))
|
|
|
|
continue;
|
|
|
|
else if (TREE_CODE (arg) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
if (invert ? integer_nonzerop (arg) : integer_zerop (arg))
|
|
|
|
{
|
|
|
|
if (!result)
|
|
|
|
result = boolean_false_node;
|
|
|
|
else if (!integer_zerop (result))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
else if (!result)
|
|
|
|
result = fold_build2 (code2, boolean_type_node,
|
|
|
|
op2a, op2b);
|
|
|
|
else if (!same_bool_comparison_p (result,
|
|
|
|
code2, op2a, op2b))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
2011-05-20 20:22:49 +02:00
|
|
|
else if (TREE_CODE (arg) == SSA_NAME
|
|
|
|
&& !SSA_NAME_IS_DEFAULT_DEF (arg))
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
2011-05-20 16:19:05 +02:00
|
|
|
tree temp;
|
|
|
|
gimple def_stmt = SSA_NAME_DEF_STMT (arg);
|
|
|
|
/* In simple cases we can look through PHI nodes,
|
|
|
|
but we have to be careful with loops.
|
|
|
|
See PR49073. */
|
|
|
|
if (! dom_info_available_p (CDI_DOMINATORS)
|
|
|
|
|| gimple_bb (def_stmt) == gimple_bb (stmt)
|
|
|
|
|| dominated_by_p (CDI_DOMINATORS,
|
|
|
|
gimple_bb (def_stmt),
|
|
|
|
gimple_bb (stmt)))
|
|
|
|
return NULL_TREE;
|
|
|
|
temp = and_var_with_comparison (arg, invert, code2,
|
|
|
|
op2a, op2b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (!temp)
|
|
|
|
return NULL_TREE;
|
|
|
|
else if (!result)
|
|
|
|
result = temp;
|
|
|
|
else if (!same_bool_result_p (result, temp))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the AND of two comparisons, specified by
|
|
|
|
(OP1A CODE1 OP1B) and (OP2B CODE2 OP2B), respectively.
|
|
|
|
If this can be simplified to a single expression (without requiring
|
|
|
|
introducing more SSA variables to hold intermediate values),
|
|
|
|
return the resulting tree. Otherwise return NULL_TREE.
|
|
|
|
If the result expression is non-null, it has boolean type. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
maybe_fold_and_comparisons (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree t = and_comparisons_1 (code1, op1a, op1b, code2, op2a, op2b);
|
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
else
|
|
|
|
return and_comparisons_1 (code2, op2a, op2b, code1, op1a, op1b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Helper function for or_comparisons_1: try to simplify the OR of the
|
|
|
|
ssa variable VAR with the comparison specified by (OP2A CODE2 OP2B).
|
|
|
|
If INVERT is true, invert the value of VAR before doing the OR.
|
|
|
|
Return NULL_EXPR if we can't simplify this to a single expression. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
or_var_with_comparison (tree var, bool invert,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree t;
|
|
|
|
gimple stmt = SSA_NAME_DEF_STMT (var);
|
|
|
|
|
|
|
|
/* We can only deal with variables whose definitions are assignments. */
|
|
|
|
if (!is_gimple_assign (stmt))
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* If we have an inverted comparison, apply DeMorgan's law and rewrite
|
|
|
|
!var OR (op2a code2 op2b) => !(var AND !(op2a code2 op2b))
|
|
|
|
Then we only have to consider the simpler non-inverted cases. */
|
|
|
|
if (invert)
|
|
|
|
t = and_var_with_comparison_1 (stmt,
|
|
|
|
invert_tree_comparison (code2, false),
|
|
|
|
op2a, op2b);
|
|
|
|
else
|
|
|
|
t = or_var_with_comparison_1 (stmt, code2, op2a, op2b);
|
|
|
|
return canonicalize_bool (t, invert);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the OR of the ssa variable defined by the assignment
|
|
|
|
STMT with the comparison specified by (OP2A CODE2 OP2B).
|
|
|
|
Return NULL_EXPR if we can't simplify this to a single expression. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
or_var_with_comparison_1 (gimple stmt,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree var = gimple_assign_lhs (stmt);
|
|
|
|
tree true_test_var = NULL_TREE;
|
|
|
|
tree false_test_var = NULL_TREE;
|
|
|
|
enum tree_code innercode = gimple_assign_rhs_code (stmt);
|
|
|
|
|
|
|
|
/* Check for identities like (var OR (var != 0)) => true . */
|
|
|
|
if (TREE_CODE (op2a) == SSA_NAME
|
|
|
|
&& TREE_CODE (TREE_TYPE (var)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
if ((code2 == NE_EXPR && integer_zerop (op2b))
|
|
|
|
|| (code2 == EQ_EXPR && integer_nonzerop (op2b)))
|
|
|
|
{
|
|
|
|
true_test_var = op2a;
|
|
|
|
if (var == true_test_var)
|
|
|
|
return var;
|
|
|
|
}
|
|
|
|
else if ((code2 == EQ_EXPR && integer_zerop (op2b))
|
|
|
|
|| (code2 == NE_EXPR && integer_nonzerop (op2b)))
|
|
|
|
{
|
|
|
|
false_test_var = op2a;
|
|
|
|
if (var == false_test_var)
|
|
|
|
return boolean_true_node;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the definition is a comparison, recurse on it. */
|
|
|
|
if (TREE_CODE_CLASS (innercode) == tcc_comparison)
|
|
|
|
{
|
|
|
|
tree t = or_comparisons_1 (innercode,
|
|
|
|
gimple_assign_rhs1 (stmt),
|
|
|
|
gimple_assign_rhs2 (stmt),
|
|
|
|
code2,
|
|
|
|
op2a,
|
|
|
|
op2b);
|
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If the definition is an AND or OR expression, we may be able to
|
|
|
|
simplify by reassociating. */
|
2011-07-27 16:59:40 +02:00
|
|
|
if (TREE_CODE (TREE_TYPE (var)) == BOOLEAN_TYPE
|
|
|
|
&& (innercode == BIT_AND_EXPR || innercode == BIT_IOR_EXPR))
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
|
|
|
tree inner1 = gimple_assign_rhs1 (stmt);
|
|
|
|
tree inner2 = gimple_assign_rhs2 (stmt);
|
|
|
|
gimple s;
|
|
|
|
tree t;
|
|
|
|
tree partial = NULL_TREE;
|
2011-07-27 16:59:40 +02:00
|
|
|
bool is_or = (innercode == BIT_IOR_EXPR);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
|
|
|
|
/* Check for boolean identities that don't require recursive examination
|
|
|
|
of inner1/inner2:
|
|
|
|
inner1 OR (inner1 OR inner2) => inner1 OR inner2 => var
|
|
|
|
inner1 OR (inner1 AND inner2) => inner1
|
|
|
|
!inner1 OR (inner1 OR inner2) => true
|
|
|
|
!inner1 OR (inner1 AND inner2) => !inner1 OR inner2
|
|
|
|
*/
|
|
|
|
if (inner1 == true_test_var)
|
|
|
|
return (is_or ? var : inner1);
|
|
|
|
else if (inner2 == true_test_var)
|
|
|
|
return (is_or ? var : inner2);
|
|
|
|
else if (inner1 == false_test_var)
|
|
|
|
return (is_or
|
|
|
|
? boolean_true_node
|
|
|
|
: or_var_with_comparison (inner2, false, code2, op2a, op2b));
|
|
|
|
else if (inner2 == false_test_var)
|
|
|
|
return (is_or
|
|
|
|
? boolean_true_node
|
|
|
|
: or_var_with_comparison (inner1, false, code2, op2a, op2b));
|
|
|
|
|
|
|
|
/* Next, redistribute/reassociate the OR across the inner tests.
|
|
|
|
Compute the first partial result, (inner1 OR (op2a code op2b)) */
|
|
|
|
if (TREE_CODE (inner1) == SSA_NAME
|
|
|
|
&& is_gimple_assign (s = SSA_NAME_DEF_STMT (inner1))
|
|
|
|
&& TREE_CODE_CLASS (gimple_assign_rhs_code (s)) == tcc_comparison
|
|
|
|
&& (t = maybe_fold_or_comparisons (gimple_assign_rhs_code (s),
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s),
|
|
|
|
code2, op2a, op2b)))
|
|
|
|
{
|
|
|
|
/* Handle the OR case, where we are reassociating:
|
|
|
|
(inner1 OR inner2) OR (op2a code2 op2b)
|
|
|
|
=> (t OR inner2)
|
|
|
|
If the partial result t is a constant, we win. Otherwise
|
|
|
|
continue on to try reassociating with the other inner test. */
|
2010-12-14 15:09:59 +01:00
|
|
|
if (is_or)
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
|
|
|
if (integer_onep (t))
|
|
|
|
return boolean_true_node;
|
|
|
|
else if (integer_zerop (t))
|
|
|
|
return inner2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the AND case, where we are redistributing:
|
|
|
|
(inner1 AND inner2) OR (op2a code2 op2b)
|
|
|
|
=> (t AND (inner2 OR (op2a code op2b))) */
|
2010-12-14 15:09:59 +01:00
|
|
|
else if (integer_zerop (t))
|
|
|
|
return boolean_false_node;
|
|
|
|
|
|
|
|
/* Save partial result for later. */
|
|
|
|
partial = t;
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Compute the second partial result, (inner2 OR (op2a code op2b)) */
|
|
|
|
if (TREE_CODE (inner2) == SSA_NAME
|
|
|
|
&& is_gimple_assign (s = SSA_NAME_DEF_STMT (inner2))
|
|
|
|
&& TREE_CODE_CLASS (gimple_assign_rhs_code (s)) == tcc_comparison
|
|
|
|
&& (t = maybe_fold_or_comparisons (gimple_assign_rhs_code (s),
|
|
|
|
gimple_assign_rhs1 (s),
|
|
|
|
gimple_assign_rhs2 (s),
|
|
|
|
code2, op2a, op2b)))
|
|
|
|
{
|
|
|
|
/* Handle the OR case, where we are reassociating:
|
|
|
|
(inner1 OR inner2) OR (op2a code2 op2b)
|
2010-12-14 15:09:59 +01:00
|
|
|
=> (inner1 OR t)
|
|
|
|
=> (t OR partial) */
|
|
|
|
if (is_or)
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
|
|
|
if (integer_zerop (t))
|
|
|
|
return inner1;
|
|
|
|
else if (integer_onep (t))
|
|
|
|
return boolean_true_node;
|
2010-12-14 15:09:59 +01:00
|
|
|
/* If both are the same, we can apply the identity
|
|
|
|
(x OR x) == x. */
|
|
|
|
else if (partial && same_bool_result_p (t, partial))
|
|
|
|
return t;
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle the AND case, where we are redistributing:
|
|
|
|
(inner1 AND inner2) OR (op2a code2 op2b)
|
|
|
|
=> (t AND (inner1 OR (op2a code2 op2b)))
|
|
|
|
=> (t AND partial) */
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (integer_zerop (t))
|
|
|
|
return boolean_false_node;
|
|
|
|
else if (partial)
|
|
|
|
{
|
|
|
|
/* We already got a simplification for the other
|
|
|
|
operand to the redistributed AND expression. The
|
|
|
|
interesting case is when at least one is true.
|
|
|
|
Or, if both are the same, we can apply the identity
|
2010-12-14 15:09:59 +01:00
|
|
|
(x AND x) == x. */
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (integer_onep (partial))
|
|
|
|
return t;
|
|
|
|
else if (integer_onep (t))
|
|
|
|
return partial;
|
|
|
|
else if (same_bool_result_p (t, partial))
|
2010-12-14 15:09:59 +01:00
|
|
|
return t;
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the OR of two comparisons defined by
|
|
|
|
(OP1A CODE1 OP1B) and (OP2A CODE2 OP2B), respectively.
|
|
|
|
If this can be done without constructing an intermediate value,
|
|
|
|
return the resulting tree; otherwise NULL_TREE is returned.
|
|
|
|
This function is deliberately asymmetric as it recurses on SSA_DEFs
|
|
|
|
in the first comparison but not the second. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
or_comparisons_1 (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
2012-09-29 10:23:23 +02:00
|
|
|
tree truth_type = truth_type_for (TREE_TYPE (op1a));
|
2012-09-14 19:17:01 +02:00
|
|
|
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
/* First check for ((x CODE1 y) OR (x CODE2 y)). */
|
|
|
|
if (operand_equal_p (op1a, op2a, 0)
|
|
|
|
&& operand_equal_p (op1b, op2b, 0))
|
|
|
|
{
|
2011-07-27 16:59:40 +02:00
|
|
|
/* Result will be either NULL_TREE, or a combined comparison. */
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
tree t = combine_comparisons (UNKNOWN_LOCATION,
|
|
|
|
TRUTH_ORIF_EXPR, code1, code2,
|
2012-09-14 19:17:01 +02:00
|
|
|
truth_type, op1a, op1b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Likewise the swapped case of the above. */
|
|
|
|
if (operand_equal_p (op1a, op2b, 0)
|
|
|
|
&& operand_equal_p (op1b, op2a, 0))
|
|
|
|
{
|
2011-07-27 16:59:40 +02:00
|
|
|
/* Result will be either NULL_TREE, or a combined comparison. */
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
tree t = combine_comparisons (UNKNOWN_LOCATION,
|
|
|
|
TRUTH_ORIF_EXPR, code1,
|
|
|
|
swap_tree_comparison (code2),
|
2012-09-14 19:17:01 +02:00
|
|
|
truth_type, op1a, op1b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If both comparisons are of the same value against constants, we might
|
|
|
|
be able to merge them. */
|
|
|
|
if (operand_equal_p (op1a, op2a, 0)
|
|
|
|
&& TREE_CODE (op1b) == INTEGER_CST
|
|
|
|
&& TREE_CODE (op2b) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
int cmp = tree_int_cst_compare (op1b, op2b);
|
|
|
|
|
|
|
|
/* If we have (op1a != op1b), we should either be able to
|
|
|
|
return that or TRUE, depending on whether the constant op1b
|
|
|
|
also satisfies the other comparison against op2b. */
|
|
|
|
if (code1 == NE_EXPR)
|
|
|
|
{
|
|
|
|
bool done = true;
|
|
|
|
bool val;
|
|
|
|
switch (code2)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp < 0); break;
|
|
|
|
case GT_EXPR: val = (cmp > 0); break;
|
|
|
|
case LE_EXPR: val = (cmp <= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp >= 0); break;
|
|
|
|
default: done = false;
|
|
|
|
}
|
|
|
|
if (done)
|
|
|
|
{
|
|
|
|
if (val)
|
|
|
|
return boolean_true_node;
|
|
|
|
else
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Likewise if the second comparison is a != comparison. */
|
|
|
|
else if (code2 == NE_EXPR)
|
|
|
|
{
|
|
|
|
bool done = true;
|
|
|
|
bool val;
|
|
|
|
switch (code1)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp > 0); break;
|
|
|
|
case GT_EXPR: val = (cmp < 0); break;
|
|
|
|
case LE_EXPR: val = (cmp >= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp <= 0); break;
|
|
|
|
default: done = false;
|
|
|
|
}
|
|
|
|
if (done)
|
|
|
|
{
|
|
|
|
if (val)
|
|
|
|
return boolean_true_node;
|
|
|
|
else
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* See if an equality test is redundant with the other comparison. */
|
|
|
|
else if (code1 == EQ_EXPR)
|
|
|
|
{
|
|
|
|
bool val;
|
|
|
|
switch (code2)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp < 0); break;
|
|
|
|
case GT_EXPR: val = (cmp > 0); break;
|
|
|
|
case LE_EXPR: val = (cmp <= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp >= 0); break;
|
|
|
|
default:
|
|
|
|
val = false;
|
|
|
|
}
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
}
|
|
|
|
else if (code2 == EQ_EXPR)
|
|
|
|
{
|
|
|
|
bool val;
|
|
|
|
switch (code1)
|
|
|
|
{
|
|
|
|
case EQ_EXPR: val = (cmp == 0); break;
|
|
|
|
case NE_EXPR: val = (cmp != 0); break;
|
|
|
|
case LT_EXPR: val = (cmp > 0); break;
|
|
|
|
case GT_EXPR: val = (cmp < 0); break;
|
|
|
|
case LE_EXPR: val = (cmp >= 0); break;
|
|
|
|
case GE_EXPR: val = (cmp <= 0); break;
|
|
|
|
default:
|
|
|
|
val = false;
|
|
|
|
}
|
|
|
|
if (val)
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Chose the less restrictive of two < or <= comparisons. */
|
|
|
|
else if ((code1 == LT_EXPR || code1 == LE_EXPR)
|
|
|
|
&& (code2 == LT_EXPR || code2 == LE_EXPR))
|
|
|
|
{
|
|
|
|
if ((cmp < 0) || (cmp == 0 && code1 == LT_EXPR))
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
else
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Likewise chose the less restrictive of two > or >= comparisons. */
|
|
|
|
else if ((code1 == GT_EXPR || code1 == GE_EXPR)
|
|
|
|
&& (code2 == GT_EXPR || code2 == GE_EXPR))
|
|
|
|
{
|
|
|
|
if ((cmp > 0) || (cmp == 0 && code1 == GT_EXPR))
|
|
|
|
return fold_build2 (code2, boolean_type_node, op2a, op2b);
|
|
|
|
else
|
|
|
|
return fold_build2 (code1, boolean_type_node, op1a, op1b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Check for singleton ranges. */
|
|
|
|
else if (cmp == 0
|
|
|
|
&& ((code1 == LT_EXPR && code2 == GT_EXPR)
|
|
|
|
|| (code1 == GT_EXPR && code2 == LT_EXPR)))
|
|
|
|
return fold_build2 (NE_EXPR, boolean_type_node, op1a, op2b);
|
|
|
|
|
|
|
|
/* Check for less/greater pairs that don't restrict the range at all. */
|
|
|
|
else if (cmp >= 0
|
|
|
|
&& (code1 == LT_EXPR || code1 == LE_EXPR)
|
|
|
|
&& (code2 == GT_EXPR || code2 == GE_EXPR))
|
|
|
|
return boolean_true_node;
|
|
|
|
else if (cmp <= 0
|
|
|
|
&& (code1 == GT_EXPR || code1 == GE_EXPR)
|
|
|
|
&& (code2 == LT_EXPR || code2 == LE_EXPR))
|
|
|
|
return boolean_true_node;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Perhaps the first comparison is (NAME != 0) or (NAME == 1) where
|
|
|
|
NAME's definition is a truth value. See if there are any simplifications
|
|
|
|
that can be done against the NAME's definition. */
|
|
|
|
if (TREE_CODE (op1a) == SSA_NAME
|
|
|
|
&& (code1 == NE_EXPR || code1 == EQ_EXPR)
|
|
|
|
&& (integer_zerop (op1b) || integer_onep (op1b)))
|
|
|
|
{
|
|
|
|
bool invert = ((code1 == EQ_EXPR && integer_zerop (op1b))
|
|
|
|
|| (code1 == NE_EXPR && integer_onep (op1b)));
|
|
|
|
gimple stmt = SSA_NAME_DEF_STMT (op1a);
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
{
|
|
|
|
case GIMPLE_ASSIGN:
|
|
|
|
/* Try to simplify by copy-propagating the definition. */
|
|
|
|
return or_var_with_comparison (op1a, invert, code2, op2a, op2b);
|
|
|
|
|
|
|
|
case GIMPLE_PHI:
|
|
|
|
/* If every argument to the PHI produces the same result when
|
|
|
|
ORed with the second comparison, we win.
|
|
|
|
Do not do this unless the type is bool since we need a bool
|
|
|
|
result here anyway. */
|
|
|
|
if (TREE_CODE (TREE_TYPE (op1a)) == BOOLEAN_TYPE)
|
|
|
|
{
|
|
|
|
tree result = NULL_TREE;
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < gimple_phi_num_args (stmt); i++)
|
|
|
|
{
|
|
|
|
tree arg = gimple_phi_arg_def (stmt, i);
|
|
|
|
|
|
|
|
/* If this PHI has itself as an argument, ignore it.
|
|
|
|
If all the other args produce the same result,
|
|
|
|
we're still OK. */
|
|
|
|
if (arg == gimple_phi_result (stmt))
|
|
|
|
continue;
|
|
|
|
else if (TREE_CODE (arg) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
if (invert ? integer_zerop (arg) : integer_nonzerop (arg))
|
|
|
|
{
|
|
|
|
if (!result)
|
|
|
|
result = boolean_true_node;
|
|
|
|
else if (!integer_onep (result))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
else if (!result)
|
|
|
|
result = fold_build2 (code2, boolean_type_node,
|
|
|
|
op2a, op2b);
|
|
|
|
else if (!same_bool_comparison_p (result,
|
|
|
|
code2, op2a, op2b))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
2011-05-20 20:22:49 +02:00
|
|
|
else if (TREE_CODE (arg) == SSA_NAME
|
|
|
|
&& !SSA_NAME_IS_DEFAULT_DEF (arg))
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
{
|
2011-05-20 16:19:05 +02:00
|
|
|
tree temp;
|
|
|
|
gimple def_stmt = SSA_NAME_DEF_STMT (arg);
|
|
|
|
/* In simple cases we can look through PHI nodes,
|
|
|
|
but we have to be careful with loops.
|
|
|
|
See PR49073. */
|
|
|
|
if (! dom_info_available_p (CDI_DOMINATORS)
|
|
|
|
|| gimple_bb (def_stmt) == gimple_bb (stmt)
|
|
|
|
|| dominated_by_p (CDI_DOMINATORS,
|
|
|
|
gimple_bb (def_stmt),
|
|
|
|
gimple_bb (stmt)))
|
|
|
|
return NULL_TREE;
|
|
|
|
temp = or_var_with_comparison (arg, invert, code2,
|
|
|
|
op2a, op2b);
|
re PR tree-optimization/39874 (missing VRP (submission))
2010-06-08 Sandra Loosemore <sandra@codesourcery.com>
PR tree-optimization/39874
PR middle-end/28685
gcc/
* gimple.h (maybe_fold_and_comparisons, maybe_fold_or_comparisons):
Declare.
* gimple-fold.c (canonicalize_bool, same_bool_comparison_p,
same_bool_result_p): New.
(and_var_with_comparison, and_var_with_comparison_1,
and_comparisons_1, and_comparisons, maybe_fold_and_comparisons): New.
(or_var_with_comparison, or_var_with_comparison_1,
or_comparisons_1, or_comparisons, maybe_fold_or_comparisons): New.
* tree-ssa-reassoc.c (eliminate_redundant_comparison): Use
maybe_fold_and_comparisons or maybe_fold_or_comparisons instead
of combine_comparisons.
* tree-ssa-ifcombine.c (ifcombine_ifandif, ifcombine_iforif): Likewise.
gcc/testsuite/
* gcc.dg/pr39874.c: New file.
From-SVN: r160445
2010-06-08 20:15:53 +02:00
|
|
|
if (!temp)
|
|
|
|
return NULL_TREE;
|
|
|
|
else if (!result)
|
|
|
|
result = temp;
|
|
|
|
else if (!same_bool_result_p (result, temp))
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try to simplify the OR of two comparisons, specified by
|
|
|
|
(OP1A CODE1 OP1B) and (OP2B CODE2 OP2B), respectively.
|
|
|
|
If this can be simplified to a single expression (without requiring
|
|
|
|
introducing more SSA variables to hold intermediate values),
|
|
|
|
return the resulting tree. Otherwise return NULL_TREE.
|
|
|
|
If the result expression is non-null, it has boolean type. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
maybe_fold_or_comparisons (enum tree_code code1, tree op1a, tree op1b,
|
|
|
|
enum tree_code code2, tree op2a, tree op2b)
|
|
|
|
{
|
|
|
|
tree t = or_comparisons_1 (code1, op1a, op1b, code2, op2a, op2b);
|
|
|
|
if (t)
|
|
|
|
return t;
|
|
|
|
else
|
|
|
|
return or_comparisons_1 (code2, op2a, op2b, code1, op1a, op1b);
|
|
|
|
}
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* Fold STMT to a constant using VALUEIZE to valueize SSA names.
|
|
|
|
|
|
|
|
Either NULL_TREE, a simplified but non-constant or a constant
|
|
|
|
is returned.
|
|
|
|
|
|
|
|
??? This should go into a gimple-fold-inline.h file to be eventually
|
|
|
|
privatized with the single valueize function used in the various TUs
|
|
|
|
to avoid the indirect function call overhead. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
gimple_fold_stmt_to_constant_1 (gimple stmt, tree (*valueize) (tree))
|
|
|
|
{
|
|
|
|
location_t loc = gimple_location (stmt);
|
|
|
|
switch (gimple_code (stmt))
|
|
|
|
{
|
|
|
|
case GIMPLE_ASSIGN:
|
|
|
|
{
|
|
|
|
enum tree_code subcode = gimple_assign_rhs_code (stmt);
|
|
|
|
|
|
|
|
switch (get_gimple_rhs_class (subcode))
|
|
|
|
{
|
|
|
|
case GIMPLE_SINGLE_RHS:
|
|
|
|
{
|
|
|
|
tree rhs = gimple_assign_rhs1 (stmt);
|
|
|
|
enum tree_code_class kind = TREE_CODE_CLASS (subcode);
|
|
|
|
|
|
|
|
if (TREE_CODE (rhs) == SSA_NAME)
|
|
|
|
{
|
|
|
|
/* If the RHS is an SSA_NAME, return its known constant value,
|
|
|
|
if any. */
|
|
|
|
return (*valueize) (rhs);
|
|
|
|
}
|
|
|
|
/* Handle propagating invariant addresses into address
|
|
|
|
operations. */
|
|
|
|
else if (TREE_CODE (rhs) == ADDR_EXPR
|
|
|
|
&& !is_gimple_min_invariant (rhs))
|
|
|
|
{
|
2012-04-07 01:00:11 +02:00
|
|
|
HOST_WIDE_INT offset = 0;
|
2011-03-24 12:23:29 +01:00
|
|
|
tree base;
|
|
|
|
base = get_addr_base_and_unit_offset_1 (TREE_OPERAND (rhs, 0),
|
|
|
|
&offset,
|
|
|
|
valueize);
|
|
|
|
if (base
|
|
|
|
&& (CONSTANT_CLASS_P (base)
|
|
|
|
|| decl_address_invariant_p (base)))
|
|
|
|
return build_invariant_address (TREE_TYPE (rhs),
|
|
|
|
base, offset);
|
|
|
|
}
|
|
|
|
else if (TREE_CODE (rhs) == CONSTRUCTOR
|
|
|
|
&& TREE_CODE (TREE_TYPE (rhs)) == VECTOR_TYPE
|
|
|
|
&& (CONSTRUCTOR_NELTS (rhs)
|
|
|
|
== TYPE_VECTOR_SUBPARTS (TREE_TYPE (rhs))))
|
|
|
|
{
|
|
|
|
unsigned i;
|
tree.h (TREE_VECTOR_CST_ELTS): Remove.
2012-03-16 Richard Guenther <rguenther@suse.de>
* tree.h (TREE_VECTOR_CST_ELTS): Remove.
(VECTOR_CST_NELTS, VECTOR_CST_ELTS, VECTOR_CST_ELT): New defines.
(struct tree_vector): Remove elements member, add variable size
elts array member.
(build_vector_stat): Declare.
(build_vector): Define in terms of build_vector_stat.
* tree.c (build_vector): Rename to ...
(build_vector_stat): ... this. Take array of trees as parameter.
(build_vector_from_ctor): Adjust.
(integer_zerop, integer_onep, integer_all_onesp, iterative_hash_expr,
initializer_zerop): Adjust.
* cfgexpand.c (expand_debug_expr): Likewise.
* expr.c (categorize_ctor_elements_1, expand_expr_real_1,
const_vector_from_tree): Likewise.
* fold-const.c (const_binop, operand_equal_p, native_encode_vector,
native_interpret_vector, fold_unary_loc, vec_cst_ctor_to_array,
fold_vec_perm, fold_binary_loc, fold_ternary_loc): Likewise.
* tree-streamer-in.c (streamer_alloc_tree): Handle TS_VECTOR.
(lto_input_ts_vector_tree_pointers): Adjust.
* tree-streamer-out.c (streamer_write_tree_header): Handle TS_VECTOR.
(write_ts_vector_tree_pointers): Adjust.
* varasm.c (const_hash_1, compare_constant, copy_constant,
output_constant): Adjust.
* gimple-fold.c (gimple_fold_stmt_to_constant_1): Adjust.
* print-tree.c (print_node): Adjust.
* tree-pretty-print.c (dump_generic_node): Adjust.
* tree-vect-generic.c (uniform_vector_p, vector_element,
lower_vec_perm): Adjust.
* tree-vect-loop.c (get_initial_def_for_reduction): Adjust.
* tree-vect-slp.c (vect_get_constant_vectors,
vect_transform_slp_perm_load): Adjust.
* tree-vect-stmts.c (vect_gen_perm_mask): Adjust.
* expmed.c (make_tree): Adjust.
* config/i386/i386.c (ix86_expand_builtin): Adjust.
* config/sparc/sparc.c (sparc_handle_vis_mul8x16): Adjust interface
and implementation.
(sparc_fold_builtin): Adjust.
c-family/
* c-pretty-print.c (pp_c_initializer_list): Adjust.
From-SVN: r185458
2012-03-16 10:47:09 +01:00
|
|
|
tree val, *vec;
|
2011-03-24 12:23:29 +01:00
|
|
|
|
tree.h (TREE_VECTOR_CST_ELTS): Remove.
2012-03-16 Richard Guenther <rguenther@suse.de>
* tree.h (TREE_VECTOR_CST_ELTS): Remove.
(VECTOR_CST_NELTS, VECTOR_CST_ELTS, VECTOR_CST_ELT): New defines.
(struct tree_vector): Remove elements member, add variable size
elts array member.
(build_vector_stat): Declare.
(build_vector): Define in terms of build_vector_stat.
* tree.c (build_vector): Rename to ...
(build_vector_stat): ... this. Take array of trees as parameter.
(build_vector_from_ctor): Adjust.
(integer_zerop, integer_onep, integer_all_onesp, iterative_hash_expr,
initializer_zerop): Adjust.
* cfgexpand.c (expand_debug_expr): Likewise.
* expr.c (categorize_ctor_elements_1, expand_expr_real_1,
const_vector_from_tree): Likewise.
* fold-const.c (const_binop, operand_equal_p, native_encode_vector,
native_interpret_vector, fold_unary_loc, vec_cst_ctor_to_array,
fold_vec_perm, fold_binary_loc, fold_ternary_loc): Likewise.
* tree-streamer-in.c (streamer_alloc_tree): Handle TS_VECTOR.
(lto_input_ts_vector_tree_pointers): Adjust.
* tree-streamer-out.c (streamer_write_tree_header): Handle TS_VECTOR.
(write_ts_vector_tree_pointers): Adjust.
* varasm.c (const_hash_1, compare_constant, copy_constant,
output_constant): Adjust.
* gimple-fold.c (gimple_fold_stmt_to_constant_1): Adjust.
* print-tree.c (print_node): Adjust.
* tree-pretty-print.c (dump_generic_node): Adjust.
* tree-vect-generic.c (uniform_vector_p, vector_element,
lower_vec_perm): Adjust.
* tree-vect-loop.c (get_initial_def_for_reduction): Adjust.
* tree-vect-slp.c (vect_get_constant_vectors,
vect_transform_slp_perm_load): Adjust.
* tree-vect-stmts.c (vect_gen_perm_mask): Adjust.
* expmed.c (make_tree): Adjust.
* config/i386/i386.c (ix86_expand_builtin): Adjust.
* config/sparc/sparc.c (sparc_handle_vis_mul8x16): Adjust interface
and implementation.
(sparc_fold_builtin): Adjust.
c-family/
* c-pretty-print.c (pp_c_initializer_list): Adjust.
From-SVN: r185458
2012-03-16 10:47:09 +01:00
|
|
|
vec = XALLOCAVEC (tree,
|
|
|
|
TYPE_VECTOR_SUBPARTS (TREE_TYPE (rhs)));
|
2011-03-24 12:23:29 +01:00
|
|
|
FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (rhs), i, val)
|
|
|
|
{
|
|
|
|
val = (*valueize) (val);
|
|
|
|
if (TREE_CODE (val) == INTEGER_CST
|
|
|
|
|| TREE_CODE (val) == REAL_CST
|
|
|
|
|| TREE_CODE (val) == FIXED_CST)
|
tree.h (TREE_VECTOR_CST_ELTS): Remove.
2012-03-16 Richard Guenther <rguenther@suse.de>
* tree.h (TREE_VECTOR_CST_ELTS): Remove.
(VECTOR_CST_NELTS, VECTOR_CST_ELTS, VECTOR_CST_ELT): New defines.
(struct tree_vector): Remove elements member, add variable size
elts array member.
(build_vector_stat): Declare.
(build_vector): Define in terms of build_vector_stat.
* tree.c (build_vector): Rename to ...
(build_vector_stat): ... this. Take array of trees as parameter.
(build_vector_from_ctor): Adjust.
(integer_zerop, integer_onep, integer_all_onesp, iterative_hash_expr,
initializer_zerop): Adjust.
* cfgexpand.c (expand_debug_expr): Likewise.
* expr.c (categorize_ctor_elements_1, expand_expr_real_1,
const_vector_from_tree): Likewise.
* fold-const.c (const_binop, operand_equal_p, native_encode_vector,
native_interpret_vector, fold_unary_loc, vec_cst_ctor_to_array,
fold_vec_perm, fold_binary_loc, fold_ternary_loc): Likewise.
* tree-streamer-in.c (streamer_alloc_tree): Handle TS_VECTOR.
(lto_input_ts_vector_tree_pointers): Adjust.
* tree-streamer-out.c (streamer_write_tree_header): Handle TS_VECTOR.
(write_ts_vector_tree_pointers): Adjust.
* varasm.c (const_hash_1, compare_constant, copy_constant,
output_constant): Adjust.
* gimple-fold.c (gimple_fold_stmt_to_constant_1): Adjust.
* print-tree.c (print_node): Adjust.
* tree-pretty-print.c (dump_generic_node): Adjust.
* tree-vect-generic.c (uniform_vector_p, vector_element,
lower_vec_perm): Adjust.
* tree-vect-loop.c (get_initial_def_for_reduction): Adjust.
* tree-vect-slp.c (vect_get_constant_vectors,
vect_transform_slp_perm_load): Adjust.
* tree-vect-stmts.c (vect_gen_perm_mask): Adjust.
* expmed.c (make_tree): Adjust.
* config/i386/i386.c (ix86_expand_builtin): Adjust.
* config/sparc/sparc.c (sparc_handle_vis_mul8x16): Adjust interface
and implementation.
(sparc_fold_builtin): Adjust.
c-family/
* c-pretty-print.c (pp_c_initializer_list): Adjust.
From-SVN: r185458
2012-03-16 10:47:09 +01:00
|
|
|
vec[i] = val;
|
2011-03-24 12:23:29 +01:00
|
|
|
else
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
tree.h (TREE_VECTOR_CST_ELTS): Remove.
2012-03-16 Richard Guenther <rguenther@suse.de>
* tree.h (TREE_VECTOR_CST_ELTS): Remove.
(VECTOR_CST_NELTS, VECTOR_CST_ELTS, VECTOR_CST_ELT): New defines.
(struct tree_vector): Remove elements member, add variable size
elts array member.
(build_vector_stat): Declare.
(build_vector): Define in terms of build_vector_stat.
* tree.c (build_vector): Rename to ...
(build_vector_stat): ... this. Take array of trees as parameter.
(build_vector_from_ctor): Adjust.
(integer_zerop, integer_onep, integer_all_onesp, iterative_hash_expr,
initializer_zerop): Adjust.
* cfgexpand.c (expand_debug_expr): Likewise.
* expr.c (categorize_ctor_elements_1, expand_expr_real_1,
const_vector_from_tree): Likewise.
* fold-const.c (const_binop, operand_equal_p, native_encode_vector,
native_interpret_vector, fold_unary_loc, vec_cst_ctor_to_array,
fold_vec_perm, fold_binary_loc, fold_ternary_loc): Likewise.
* tree-streamer-in.c (streamer_alloc_tree): Handle TS_VECTOR.
(lto_input_ts_vector_tree_pointers): Adjust.
* tree-streamer-out.c (streamer_write_tree_header): Handle TS_VECTOR.
(write_ts_vector_tree_pointers): Adjust.
* varasm.c (const_hash_1, compare_constant, copy_constant,
output_constant): Adjust.
* gimple-fold.c (gimple_fold_stmt_to_constant_1): Adjust.
* print-tree.c (print_node): Adjust.
* tree-pretty-print.c (dump_generic_node): Adjust.
* tree-vect-generic.c (uniform_vector_p, vector_element,
lower_vec_perm): Adjust.
* tree-vect-loop.c (get_initial_def_for_reduction): Adjust.
* tree-vect-slp.c (vect_get_constant_vectors,
vect_transform_slp_perm_load): Adjust.
* tree-vect-stmts.c (vect_gen_perm_mask): Adjust.
* expmed.c (make_tree): Adjust.
* config/i386/i386.c (ix86_expand_builtin): Adjust.
* config/sparc/sparc.c (sparc_handle_vis_mul8x16): Adjust interface
and implementation.
(sparc_fold_builtin): Adjust.
c-family/
* c-pretty-print.c (pp_c_initializer_list): Adjust.
From-SVN: r185458
2012-03-16 10:47:09 +01:00
|
|
|
return build_vector (TREE_TYPE (rhs), vec);
|
2011-03-24 12:23:29 +01:00
|
|
|
}
|
2013-12-18 00:43:22 +01:00
|
|
|
if (subcode == OBJ_TYPE_REF)
|
|
|
|
{
|
|
|
|
tree val = (*valueize) (OBJ_TYPE_REF_EXPR (rhs));
|
|
|
|
/* If callee is constant, we can fold away the wrapper. */
|
|
|
|
if (is_gimple_min_invariant (val))
|
|
|
|
return val;
|
|
|
|
}
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
if (kind == tcc_reference)
|
|
|
|
{
|
|
|
|
if ((TREE_CODE (rhs) == VIEW_CONVERT_EXPR
|
|
|
|
|| TREE_CODE (rhs) == REALPART_EXPR
|
|
|
|
|| TREE_CODE (rhs) == IMAGPART_EXPR)
|
|
|
|
&& TREE_CODE (TREE_OPERAND (rhs, 0)) == SSA_NAME)
|
|
|
|
{
|
|
|
|
tree val = (*valueize) (TREE_OPERAND (rhs, 0));
|
|
|
|
return fold_unary_loc (EXPR_LOCATION (rhs),
|
|
|
|
TREE_CODE (rhs),
|
|
|
|
TREE_TYPE (rhs), val);
|
|
|
|
}
|
|
|
|
else if (TREE_CODE (rhs) == BIT_FIELD_REF
|
|
|
|
&& TREE_CODE (TREE_OPERAND (rhs, 0)) == SSA_NAME)
|
|
|
|
{
|
|
|
|
tree val = (*valueize) (TREE_OPERAND (rhs, 0));
|
|
|
|
return fold_ternary_loc (EXPR_LOCATION (rhs),
|
|
|
|
TREE_CODE (rhs),
|
|
|
|
TREE_TYPE (rhs), val,
|
|
|
|
TREE_OPERAND (rhs, 1),
|
|
|
|
TREE_OPERAND (rhs, 2));
|
|
|
|
}
|
|
|
|
else if (TREE_CODE (rhs) == MEM_REF
|
|
|
|
&& TREE_CODE (TREE_OPERAND (rhs, 0)) == SSA_NAME)
|
|
|
|
{
|
|
|
|
tree val = (*valueize) (TREE_OPERAND (rhs, 0));
|
|
|
|
if (TREE_CODE (val) == ADDR_EXPR
|
|
|
|
&& is_gimple_min_invariant (val))
|
|
|
|
{
|
|
|
|
tree tem = fold_build2 (MEM_REF, TREE_TYPE (rhs),
|
|
|
|
unshare_expr (val),
|
|
|
|
TREE_OPERAND (rhs, 1));
|
|
|
|
if (tem)
|
|
|
|
rhs = tem;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return fold_const_aggregate_ref_1 (rhs, valueize);
|
|
|
|
}
|
|
|
|
else if (kind == tcc_declaration)
|
|
|
|
return get_symbol_constant_value (rhs);
|
|
|
|
return rhs;
|
|
|
|
}
|
|
|
|
|
|
|
|
case GIMPLE_UNARY_RHS:
|
|
|
|
{
|
|
|
|
/* Handle unary operators that can appear in GIMPLE form.
|
|
|
|
Note that we know the single operand must be a constant,
|
|
|
|
so this should almost always return a simplified RHS. */
|
2011-08-30 16:06:00 +02:00
|
|
|
tree lhs = gimple_assign_lhs (stmt);
|
2011-03-24 12:23:29 +01:00
|
|
|
tree op0 = (*valueize) (gimple_assign_rhs1 (stmt));
|
|
|
|
|
|
|
|
/* Conversions are useless for CCP purposes if they are
|
|
|
|
value-preserving. Thus the restrictions that
|
2011-08-30 16:06:00 +02:00
|
|
|
useless_type_conversion_p places for restrict qualification
|
|
|
|
of pointer types should not apply here.
|
|
|
|
Substitution later will only substitute to allowed places. */
|
2011-03-24 12:23:29 +01:00
|
|
|
if (CONVERT_EXPR_CODE_P (subcode)
|
|
|
|
&& POINTER_TYPE_P (TREE_TYPE (lhs))
|
2011-08-30 16:06:00 +02:00
|
|
|
&& POINTER_TYPE_P (TREE_TYPE (op0))
|
2011-12-09 22:11:21 +01:00
|
|
|
&& TYPE_ADDR_SPACE (TREE_TYPE (lhs))
|
|
|
|
== TYPE_ADDR_SPACE (TREE_TYPE (op0))
|
|
|
|
&& TYPE_MODE (TREE_TYPE (lhs))
|
|
|
|
== TYPE_MODE (TREE_TYPE (op0)))
|
2011-08-30 16:06:00 +02:00
|
|
|
return op0;
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
return
|
|
|
|
fold_unary_ignore_overflow_loc (loc, subcode,
|
|
|
|
gimple_expr_type (stmt), op0);
|
|
|
|
}
|
|
|
|
|
|
|
|
case GIMPLE_BINARY_RHS:
|
|
|
|
{
|
|
|
|
/* Handle binary operators that can appear in GIMPLE form. */
|
|
|
|
tree op0 = (*valueize) (gimple_assign_rhs1 (stmt));
|
|
|
|
tree op1 = (*valueize) (gimple_assign_rhs2 (stmt));
|
|
|
|
|
|
|
|
/* Translate &x + CST into an invariant form suitable for
|
|
|
|
further propagation. */
|
|
|
|
if (gimple_assign_rhs_code (stmt) == POINTER_PLUS_EXPR
|
|
|
|
&& TREE_CODE (op0) == ADDR_EXPR
|
|
|
|
&& TREE_CODE (op1) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
tree off = fold_convert (ptr_type_node, op1);
|
2011-08-29 11:03:41 +02:00
|
|
|
return build_fold_addr_expr_loc
|
|
|
|
(loc,
|
|
|
|
fold_build2 (MEM_REF,
|
2011-03-24 12:23:29 +01:00
|
|
|
TREE_TYPE (TREE_TYPE (op0)),
|
|
|
|
unshare_expr (op0), off));
|
|
|
|
}
|
|
|
|
|
|
|
|
return fold_binary_loc (loc, subcode,
|
|
|
|
gimple_expr_type (stmt), op0, op1);
|
|
|
|
}
|
|
|
|
|
|
|
|
case GIMPLE_TERNARY_RHS:
|
|
|
|
{
|
|
|
|
/* Handle ternary operators that can appear in GIMPLE form. */
|
|
|
|
tree op0 = (*valueize) (gimple_assign_rhs1 (stmt));
|
|
|
|
tree op1 = (*valueize) (gimple_assign_rhs2 (stmt));
|
|
|
|
tree op2 = (*valueize) (gimple_assign_rhs3 (stmt));
|
|
|
|
|
2011-10-05 12:54:14 +02:00
|
|
|
/* Fold embedded expressions in ternary codes. */
|
|
|
|
if ((subcode == COND_EXPR
|
|
|
|
|| subcode == VEC_COND_EXPR)
|
|
|
|
&& COMPARISON_CLASS_P (op0))
|
|
|
|
{
|
|
|
|
tree op00 = (*valueize) (TREE_OPERAND (op0, 0));
|
|
|
|
tree op01 = (*valueize) (TREE_OPERAND (op0, 1));
|
|
|
|
tree tem = fold_binary_loc (loc, TREE_CODE (op0),
|
|
|
|
TREE_TYPE (op0), op00, op01);
|
|
|
|
if (tem)
|
|
|
|
op0 = tem;
|
|
|
|
}
|
|
|
|
|
2011-03-24 12:23:29 +01:00
|
|
|
return fold_ternary_loc (loc, subcode,
|
|
|
|
gimple_expr_type (stmt), op0, op1, op2);
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
gcc_unreachable ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
case GIMPLE_CALL:
|
|
|
|
{
|
2011-04-20 10:21:25 +02:00
|
|
|
tree fn;
|
|
|
|
|
|
|
|
if (gimple_call_internal_p (stmt))
|
2013-12-04 23:47:11 +01:00
|
|
|
{
|
|
|
|
enum tree_code subcode = ERROR_MARK;
|
|
|
|
switch (gimple_call_internal_fn (stmt))
|
|
|
|
{
|
|
|
|
case IFN_UBSAN_CHECK_ADD:
|
|
|
|
subcode = PLUS_EXPR;
|
|
|
|
break;
|
|
|
|
case IFN_UBSAN_CHECK_SUB:
|
|
|
|
subcode = MINUS_EXPR;
|
|
|
|
break;
|
|
|
|
case IFN_UBSAN_CHECK_MUL:
|
|
|
|
subcode = MULT_EXPR;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
tree op0 = (*valueize) (gimple_call_arg (stmt, 0));
|
|
|
|
tree op1 = (*valueize) (gimple_call_arg (stmt, 1));
|
|
|
|
|
|
|
|
if (TREE_CODE (op0) != INTEGER_CST
|
|
|
|
|| TREE_CODE (op1) != INTEGER_CST)
|
|
|
|
return NULL_TREE;
|
|
|
|
tree res = fold_binary_loc (loc, subcode,
|
|
|
|
TREE_TYPE (gimple_call_arg (stmt, 0)),
|
|
|
|
op0, op1);
|
|
|
|
if (res
|
|
|
|
&& TREE_CODE (res) == INTEGER_CST
|
|
|
|
&& !TREE_OVERFLOW (res))
|
|
|
|
return res;
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
2011-04-20 10:21:25 +02:00
|
|
|
|
|
|
|
fn = (*valueize) (gimple_call_fn (stmt));
|
2011-03-24 12:23:29 +01:00
|
|
|
if (TREE_CODE (fn) == ADDR_EXPR
|
|
|
|
&& TREE_CODE (TREE_OPERAND (fn, 0)) == FUNCTION_DECL
|
|
|
|
&& DECL_BUILT_IN (TREE_OPERAND (fn, 0)))
|
|
|
|
{
|
|
|
|
tree *args = XALLOCAVEC (tree, gimple_call_num_args (stmt));
|
|
|
|
tree call, retval;
|
|
|
|
unsigned i;
|
|
|
|
for (i = 0; i < gimple_call_num_args (stmt); ++i)
|
|
|
|
args[i] = (*valueize) (gimple_call_arg (stmt, i));
|
|
|
|
call = build_call_array_loc (loc,
|
|
|
|
gimple_call_return_type (stmt),
|
|
|
|
fn, gimple_call_num_args (stmt), args);
|
|
|
|
retval = fold_call_expr (EXPR_LOCATION (call), call, false);
|
|
|
|
if (retval)
|
|
|
|
/* fold_call_expr wraps the result inside a NOP_EXPR. */
|
|
|
|
STRIP_NOPS (retval);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fold STMT to a constant using VALUEIZE to valueize SSA names.
|
|
|
|
Returns NULL_TREE if folding to a constant is not possible, otherwise
|
|
|
|
returns a constant according to is_gimple_min_invariant. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
gimple_fold_stmt_to_constant (gimple stmt, tree (*valueize) (tree))
|
|
|
|
{
|
|
|
|
tree res = gimple_fold_stmt_to_constant_1 (stmt, valueize);
|
|
|
|
if (res && is_gimple_min_invariant (res))
|
|
|
|
return res;
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* The following set of functions are supposed to fold references using
|
|
|
|
their constant initializers. */
|
|
|
|
|
|
|
|
static tree fold_ctor_reference (tree type, tree ctor,
|
|
|
|
unsigned HOST_WIDE_INT offset,
|
2012-05-19 11:49:47 +02:00
|
|
|
unsigned HOST_WIDE_INT size, tree);
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* See if we can find constructor defining value of BASE.
|
|
|
|
When we know the consructor with constant offset (such as
|
|
|
|
base is array[40] and we do know constructor of array), then
|
|
|
|
BIT_OFFSET is adjusted accordingly.
|
|
|
|
|
|
|
|
As a special case, return error_mark_node when constructor
|
|
|
|
is not explicitly available, but it is known to be zero
|
|
|
|
such as 'static const int a;'. */
|
|
|
|
static tree
|
|
|
|
get_base_constructor (tree base, HOST_WIDE_INT *bit_offset,
|
|
|
|
tree (*valueize)(tree))
|
|
|
|
{
|
|
|
|
HOST_WIDE_INT bit_offset2, size, max_size;
|
|
|
|
if (TREE_CODE (base) == MEM_REF)
|
|
|
|
{
|
|
|
|
if (!integer_zerop (TREE_OPERAND (base, 1)))
|
|
|
|
{
|
cuintp.c: Replace host_integerp (..., 0) with tree_fits_shwi_p throughout.
gcc/ada/
* gcc-interface/cuintp.c: Replace host_integerp (..., 0) with
tree_fits_shwi_p throughout.
gcc/c-family/
* c-ada-spec.c, c-common.c, c-format.c, c-pretty-print.c: Replace
host_integerp (..., 0) with tree_fits_shwi_p throughout.
gcc/c/
* c-parser.c: Replace host_integerp (..., 0) with tree_fits_shwi_p
throughout.
gcc/cp/
* error.c, init.c, parser.c, semantics.c: Replace
host_integerp (..., 0) with tree_fits_shwi_p throughout.
gcc/go/
* gofrontend/expressions.cc: Replace host_integerp (..., 0) with
tree_fits_shwi_p throughout.
gcc/java/
* class.c, expr.c: Replace host_integerp (..., 0) with
tree_fits_shwi_p throughout.
gcc/
* builtins.c, config/alpha/alpha.c, config/c6x/predicates.md,
config/ia64/predicates.md, config/iq2000/iq2000.c, config/mips/mips.c,
config/s390/s390.c, dbxout.c, dwarf2out.c, except.c, explow.c, expr.c,
expr.h, fold-const.c, gimple-fold.c, gimple-ssa-strength-reduction.c,
gimple.c, godump.c, graphite-scop-detection.c, graphite-sese-to-poly.c,
omp-low.c, predict.c, rtlanal.c, sdbout.c, simplify-rtx.c,
stor-layout.c, tree-data-ref.c, tree-dfa.c, tree-pretty-print.c,
tree-sra.c, tree-ssa-alias.c, tree-ssa-forwprop.c,
tree-ssa-loop-ivopts.c, tree-ssa-loop-prefetch.c, tree-ssa-math-opts.c,
tree-ssa-phiopt.c, tree-ssa-reassoc.c, tree-ssa-sccvn.c,
tree-ssa-strlen.c, tree-ssa-structalias.c, tree-vect-data-refs.c,
tree-vect-patterns.c, tree-vectorizer.h, tree.c, var-tracking.c,
varasm.c: Replace host_integerp (..., 0) with tree_fits_shwi_p
throughout.
From-SVN: r204955
2013-11-18 15:51:10 +01:00
|
|
|
if (!tree_fits_shwi_p (TREE_OPERAND (base, 1)))
|
2011-03-24 12:23:29 +01:00
|
|
|
return NULL_TREE;
|
|
|
|
*bit_offset += (mem_ref_offset (base).low
|
|
|
|
* BITS_PER_UNIT);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (valueize
|
|
|
|
&& TREE_CODE (TREE_OPERAND (base, 0)) == SSA_NAME)
|
|
|
|
base = valueize (TREE_OPERAND (base, 0));
|
|
|
|
if (!base || TREE_CODE (base) != ADDR_EXPR)
|
|
|
|
return NULL_TREE;
|
|
|
|
base = TREE_OPERAND (base, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Get a CONSTRUCTOR. If BASE is a VAR_DECL, get its
|
|
|
|
DECL_INITIAL. If BASE is a nested reference into another
|
|
|
|
ARRAY_REF or COMPONENT_REF, make a recursive call to resolve
|
|
|
|
the inner reference. */
|
|
|
|
switch (TREE_CODE (base))
|
|
|
|
{
|
|
|
|
case VAR_DECL:
|
|
|
|
case CONST_DECL:
|
2013-06-19 20:06:12 +02:00
|
|
|
{
|
|
|
|
tree init = ctor_for_folding (base);
|
|
|
|
|
2013-07-21 20:31:07 +02:00
|
|
|
/* Our semantic is exact opposite of ctor_for_folding;
|
2013-06-19 20:06:12 +02:00
|
|
|
NULL means unknown, while error_mark_node is 0. */
|
|
|
|
if (init == error_mark_node)
|
|
|
|
return NULL_TREE;
|
|
|
|
if (!init)
|
|
|
|
return error_mark_node;
|
|
|
|
return init;
|
|
|
|
}
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
case ARRAY_REF:
|
|
|
|
case COMPONENT_REF:
|
|
|
|
base = get_ref_base_and_extent (base, &bit_offset2, &size, &max_size);
|
|
|
|
if (max_size == -1 || size != max_size)
|
|
|
|
return NULL_TREE;
|
|
|
|
*bit_offset += bit_offset2;
|
|
|
|
return get_base_constructor (base, bit_offset, valueize);
|
|
|
|
|
|
|
|
case STRING_CST:
|
|
|
|
case CONSTRUCTOR:
|
|
|
|
return base;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CTOR is STRING_CST. Fold reference of type TYPE and size SIZE
|
|
|
|
to the memory at bit OFFSET.
|
|
|
|
|
|
|
|
We do only simple job of folding byte accesses. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
fold_string_cst_ctor_reference (tree type, tree ctor,
|
|
|
|
unsigned HOST_WIDE_INT offset,
|
|
|
|
unsigned HOST_WIDE_INT size)
|
|
|
|
{
|
|
|
|
if (INTEGRAL_TYPE_P (type)
|
|
|
|
&& (TYPE_MODE (type)
|
|
|
|
== TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor))))
|
|
|
|
&& (GET_MODE_CLASS (TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor))))
|
|
|
|
== MODE_INT)
|
|
|
|
&& GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (TREE_TYPE (ctor)))) == 1
|
|
|
|
&& size == BITS_PER_UNIT
|
|
|
|
&& !(offset % BITS_PER_UNIT))
|
|
|
|
{
|
|
|
|
offset /= BITS_PER_UNIT;
|
|
|
|
if (offset < (unsigned HOST_WIDE_INT) TREE_STRING_LENGTH (ctor))
|
|
|
|
return build_int_cst_type (type, (TREE_STRING_POINTER (ctor)
|
|
|
|
[offset]));
|
|
|
|
/* Folding
|
|
|
|
const char a[20]="hello";
|
|
|
|
return a[10];
|
|
|
|
|
|
|
|
might lead to offset greater than string length. In this case we
|
|
|
|
know value is either initialized to 0 or out of bounds. Return 0
|
|
|
|
in both cases. */
|
|
|
|
return build_zero_cst (type);
|
|
|
|
}
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CTOR is CONSTRUCTOR of an array type. Fold reference of type TYPE and size
|
|
|
|
SIZE to the memory at bit OFFSET. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
fold_array_ctor_reference (tree type, tree ctor,
|
|
|
|
unsigned HOST_WIDE_INT offset,
|
2012-05-19 11:49:47 +02:00
|
|
|
unsigned HOST_WIDE_INT size,
|
|
|
|
tree from_decl)
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
|
|
|
unsigned HOST_WIDE_INT cnt;
|
|
|
|
tree cfield, cval;
|
|
|
|
double_int low_bound, elt_size;
|
|
|
|
double_int index, max_index;
|
|
|
|
double_int access_index;
|
2012-05-07 20:57:23 +02:00
|
|
|
tree domain_type = NULL_TREE, index_type = NULL_TREE;
|
2011-03-24 12:23:29 +01:00
|
|
|
HOST_WIDE_INT inner_offset;
|
|
|
|
|
|
|
|
/* Compute low bound and elt size. */
|
2011-10-05 11:31:40 +02:00
|
|
|
if (TREE_CODE (TREE_TYPE (ctor)) == ARRAY_TYPE)
|
|
|
|
domain_type = TYPE_DOMAIN (TREE_TYPE (ctor));
|
2011-03-24 12:23:29 +01:00
|
|
|
if (domain_type && TYPE_MIN_VALUE (domain_type))
|
|
|
|
{
|
|
|
|
/* Static constructors for variably sized objects makes no sense. */
|
|
|
|
gcc_assert (TREE_CODE (TYPE_MIN_VALUE (domain_type)) == INTEGER_CST);
|
2012-05-07 20:57:23 +02:00
|
|
|
index_type = TREE_TYPE (TYPE_MIN_VALUE (domain_type));
|
2011-03-24 12:23:29 +01:00
|
|
|
low_bound = tree_to_double_int (TYPE_MIN_VALUE (domain_type));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
low_bound = double_int_zero;
|
|
|
|
/* Static constructors for variably sized objects makes no sense. */
|
alloc-pool.c, [...]: Add missing whitespace before "(".
gcc/
* alloc-pool.c, asan.c, auto-inc-dec.c, basic-block.h, bb-reorder.c,
bitmap.c, bitmap.h, bt-load.c, builtins.c, calls.c, cfgcleanup.c,
cfgexpand.c, cfghooks.c, cfgloop.c, cfgloopmanip.c, cfgrtl.c, cgraph.c,
cgraph.h, cgraphbuild.c, cgraphclones.c, cgraphunit.c, collect2.c,
combine-stack-adj.c, combine.c, compare-elim.c, context.c, context.h,
cprop.c, cse.c, cselib.c, dbxout.c, dce.c, defaults.h, df-core.c,
df-problems.c, df-scan.c, df.h, diagnostic.c, double-int.c, dse.c,
dumpfile.c, dwarf2asm.c, dwarf2cfi.c, dwarf2out.c, emit-rtl.c,
errors.c, except.c, expmed.c, expr.c, file-find.c, final.c,
fixed-value.c, fold-const.c, function.c, fwprop.c, gcc-ar.c, gcc.c,
gcov-io.c, gcov-io.h, gcov.c, gcse.c, genattr-common.c, genattr.c,
genattrtab.c, genautomata.c, genconfig.c, genemit.c, genextract.c,
genflags.c, gengenrtl.c, gengtype-state.c, gengtype.c, genmodes.c,
genopinit.c, genoutput.c, genpeep.c, genpreds.c, genrecog.c,
gensupport.c, ggc-common.c, ggc-page.c, gimple-fold.c, gimple-low.c,
gimple-pretty-print.c, gimple-ssa-strength-reduction.c, gimple.c,
gimple.h, godump.c, graphite-clast-to-gimple.c,
graphite-optimize-isl.c, graphite-poly.h, graphite-sese-to-poly.c,
graphite.c, haifa-sched.c, hash-table.c, hash-table.h, hwint.c,
hwint.h, ifcvt.c, incpath.c, init-regs.c, input.h, intl.c, intl.h,
ipa-cp.c, ipa-devirt.c, ipa-inline-analysis.c, ipa-inline.c,
ipa-profile.c, ipa-pure-const.c, ipa-reference.c, ipa-split.c,
ipa-utils.c, ipa.c, ira-build.c, ira.c, jump.c, loop-doloop.c,
loop-init.c, loop-invariant.c, loop-iv.c, lower-subreg.c, lto-cgraph.c,
lto-streamer-in.c, lto-streamer-out.c, lto-wrapper.c, mcf.c,
mode-switching.c, modulo-sched.c, omp-low.c, optabs.c, opts.c,
pass_manager.h, passes.c, plugin.c, postreload-gcse.c, postreload.c,
predict.c, prefix.c, pretty-print.c, print-rtl.c, print-tree.c,
profile.c, read-md.c, real.c, real.h, recog.c, ree.c, reg-stack.c,
regcprop.c, reginfo.c, regmove.c, regrename.c, regs.h, regstat.c,
reload1.c, reorg.c, rtl.c, rtl.h, rtlanal.c, sbitmap.c, sched-rgn.c,
sdbout.c, sel-sched-ir.c, sel-sched.c, sparseset.c, stack-ptr-mod.c,
statistics.c, stmt.c, stor-layout.c, store-motion.c, streamer-hooks.h,
system.h, target-hooks-macros.h, targhooks.c, targhooks.h, toplev.c,
tracer.c, trans-mem.c, tree-browser.c, tree-call-cdce.c, tree-cfg.c,
tree-cfgcleanup.c, tree-complex.c, tree-data-ref.c, tree-data-ref.h,
tree-eh.c, tree-emutls.c, tree-flow.h, tree-if-conv.c, tree-into-ssa.c,
tree-iterator.c, tree-loop-distribution.c, tree-mudflap.c,
tree-nested.c, tree-nomudflap.c, tree-nrv.c, tree-object-size.c,
tree-optimize.c, tree-pass.h, tree-pretty-print.c, tree-profile.c,
tree-scalar-evolution.c, tree-sra.c, tree-ssa-ccp.c,
tree-ssa-coalesce.c, tree-ssa-copy.c, tree-ssa-copyrename.c,
tree-ssa-dce.c, tree-ssa-dom.c, tree-ssa-dse.c, tree-ssa-forwprop.c,
tree-ssa-ifcombine.c, tree-ssa-live.c, tree-ssa-loop-ch.c,
tree-ssa-loop-im.c, tree-ssa-loop-ivopts.c, tree-ssa-loop-prefetch.c,
tree-ssa-loop.c, tree-ssa-math-opts.c, tree-ssa-operands.c,
tree-ssa-phiopt.c, tree-ssa-phiprop.c, tree-ssa-pre.c,
tree-ssa-reassoc.c, tree-ssa-sink.c, tree-ssa-strlen.c,
tree-ssa-structalias.c, tree-ssa-threadedge.c, tree-ssa-threadupdate.c,
tree-ssa-uncprop.c, tree-ssa-uninit.c, tree-ssa.c, tree-ssanames.c,
tree-stdarg.c, tree-switch-conversion.c, tree-tailcall.c,
tree-vect-data-refs.c, tree-vect-generic.c, tree-vect-loop-manip.c,
tree-vect-stmts.c, tree-vectorizer.c, tree-vectorizer.h, tree-vrp.c,
tree.c, tree.h, tsan.c, tsystem.h, value-prof.c, var-tracking.c,
varasm.c, vec.h, vmsdbgout.c, vtable-verify.c, web.c: Add missing
whitespace before "(".
From-SVN: r203004
2013-09-28 10:42:34 +02:00
|
|
|
gcc_assert (TREE_CODE (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (ctor))))
|
2011-03-24 12:23:29 +01:00
|
|
|
== INTEGER_CST);
|
|
|
|
elt_size =
|
|
|
|
tree_to_double_int (TYPE_SIZE_UNIT (TREE_TYPE (TREE_TYPE (ctor))));
|
|
|
|
|
|
|
|
|
|
|
|
/* We can handle only constantly sized accesses that are known to not
|
|
|
|
be larger than size of array element. */
|
|
|
|
if (!TYPE_SIZE_UNIT (type)
|
|
|
|
|| TREE_CODE (TYPE_SIZE_UNIT (type)) != INTEGER_CST
|
2012-09-07 02:06:35 +02:00
|
|
|
|| elt_size.slt (tree_to_double_int (TYPE_SIZE_UNIT (type))))
|
2011-03-24 12:23:29 +01:00
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* Compute the array index we look for. */
|
2012-09-07 02:06:35 +02:00
|
|
|
access_index = double_int::from_uhwi (offset / BITS_PER_UNIT)
|
|
|
|
.udiv (elt_size, TRUNC_DIV_EXPR);
|
|
|
|
access_index += low_bound;
|
2012-05-07 20:57:23 +02:00
|
|
|
if (index_type)
|
2012-09-07 02:06:35 +02:00
|
|
|
access_index = access_index.ext (TYPE_PRECISION (index_type),
|
|
|
|
TYPE_UNSIGNED (index_type));
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* And offset within the access. */
|
2012-09-07 02:06:35 +02:00
|
|
|
inner_offset = offset % (elt_size.to_uhwi () * BITS_PER_UNIT);
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* See if the array field is large enough to span whole access. We do not
|
|
|
|
care to fold accesses spanning multiple array indexes. */
|
2012-09-07 02:06:35 +02:00
|
|
|
if (inner_offset + size > elt_size.to_uhwi () * BITS_PER_UNIT)
|
2011-03-24 12:23:29 +01:00
|
|
|
return NULL_TREE;
|
|
|
|
|
2012-09-07 02:06:35 +02:00
|
|
|
index = low_bound - double_int_one;
|
2012-05-07 20:57:23 +02:00
|
|
|
if (index_type)
|
2012-09-07 02:06:35 +02:00
|
|
|
index = index.ext (TYPE_PRECISION (index_type), TYPE_UNSIGNED (index_type));
|
2012-05-07 20:57:23 +02:00
|
|
|
|
2011-03-24 12:23:29 +01:00
|
|
|
FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (ctor), cnt, cfield, cval)
|
|
|
|
{
|
|
|
|
/* Array constructor might explicitely set index, or specify range
|
|
|
|
or leave index NULL meaning that it is next index after previous
|
|
|
|
one. */
|
|
|
|
if (cfield)
|
|
|
|
{
|
|
|
|
if (TREE_CODE (cfield) == INTEGER_CST)
|
|
|
|
max_index = index = tree_to_double_int (cfield);
|
|
|
|
else
|
|
|
|
{
|
|
|
|
gcc_assert (TREE_CODE (cfield) == RANGE_EXPR);
|
|
|
|
index = tree_to_double_int (TREE_OPERAND (cfield, 0));
|
|
|
|
max_index = tree_to_double_int (TREE_OPERAND (cfield, 1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
2012-05-07 20:57:23 +02:00
|
|
|
{
|
2012-09-07 02:06:35 +02:00
|
|
|
index += double_int_one;
|
2012-05-07 20:57:23 +02:00
|
|
|
if (index_type)
|
2012-09-07 02:06:35 +02:00
|
|
|
index = index.ext (TYPE_PRECISION (index_type),
|
|
|
|
TYPE_UNSIGNED (index_type));
|
2012-05-07 20:57:23 +02:00
|
|
|
max_index = index;
|
|
|
|
}
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* Do we have match? */
|
2012-09-07 02:06:35 +02:00
|
|
|
if (access_index.cmp (index, 1) >= 0
|
|
|
|
&& access_index.cmp (max_index, 1) <= 0)
|
2012-05-19 11:49:47 +02:00
|
|
|
return fold_ctor_reference (type, cval, inner_offset, size,
|
|
|
|
from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
}
|
|
|
|
/* When memory is not explicitely mentioned in constructor,
|
|
|
|
it is 0 (or out of range). */
|
|
|
|
return build_zero_cst (type);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CTOR is CONSTRUCTOR of an aggregate or vector.
|
|
|
|
Fold reference of type TYPE and size SIZE to the memory at bit OFFSET. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
fold_nonarray_ctor_reference (tree type, tree ctor,
|
|
|
|
unsigned HOST_WIDE_INT offset,
|
2012-05-19 11:49:47 +02:00
|
|
|
unsigned HOST_WIDE_INT size,
|
|
|
|
tree from_decl)
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
|
|
|
unsigned HOST_WIDE_INT cnt;
|
|
|
|
tree cfield, cval;
|
|
|
|
|
|
|
|
FOR_EACH_CONSTRUCTOR_ELT (CONSTRUCTOR_ELTS (ctor), cnt, cfield,
|
|
|
|
cval)
|
|
|
|
{
|
|
|
|
tree byte_offset = DECL_FIELD_OFFSET (cfield);
|
|
|
|
tree field_offset = DECL_FIELD_BIT_OFFSET (cfield);
|
|
|
|
tree field_size = DECL_SIZE (cfield);
|
|
|
|
double_int bitoffset;
|
|
|
|
double_int byte_offset_cst = tree_to_double_int (byte_offset);
|
2012-09-07 02:06:35 +02:00
|
|
|
double_int bits_per_unit_cst = double_int::from_uhwi (BITS_PER_UNIT);
|
2011-07-19 11:24:28 +02:00
|
|
|
double_int bitoffset_end, access_end;
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* Variable sized objects in static constructors makes no sense,
|
|
|
|
but field_size can be NULL for flexible array members. */
|
|
|
|
gcc_assert (TREE_CODE (field_offset) == INTEGER_CST
|
|
|
|
&& TREE_CODE (byte_offset) == INTEGER_CST
|
|
|
|
&& (field_size != NULL_TREE
|
|
|
|
? TREE_CODE (field_size) == INTEGER_CST
|
|
|
|
: TREE_CODE (TREE_TYPE (cfield)) == ARRAY_TYPE));
|
|
|
|
|
|
|
|
/* Compute bit offset of the field. */
|
2012-09-07 02:06:35 +02:00
|
|
|
bitoffset = tree_to_double_int (field_offset)
|
|
|
|
+ byte_offset_cst * bits_per_unit_cst;
|
2011-03-24 12:23:29 +01:00
|
|
|
/* Compute bit offset where the field ends. */
|
|
|
|
if (field_size != NULL_TREE)
|
2012-09-07 02:06:35 +02:00
|
|
|
bitoffset_end = bitoffset + tree_to_double_int (field_size);
|
2011-03-24 12:23:29 +01:00
|
|
|
else
|
|
|
|
bitoffset_end = double_int_zero;
|
|
|
|
|
2012-09-07 02:06:35 +02:00
|
|
|
access_end = double_int::from_uhwi (offset)
|
|
|
|
+ double_int::from_uhwi (size);
|
2011-07-19 11:24:28 +02:00
|
|
|
|
|
|
|
/* Is there any overlap between [OFFSET, OFFSET+SIZE) and
|
|
|
|
[BITOFFSET, BITOFFSET_END)? */
|
2012-09-07 02:06:35 +02:00
|
|
|
if (access_end.cmp (bitoffset, 0) > 0
|
2011-03-24 12:23:29 +01:00
|
|
|
&& (field_size == NULL_TREE
|
2012-09-07 02:06:35 +02:00
|
|
|
|| double_int::from_uhwi (offset).slt (bitoffset_end)))
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
2012-09-07 02:06:35 +02:00
|
|
|
double_int inner_offset = double_int::from_uhwi (offset) - bitoffset;
|
2011-03-24 12:23:29 +01:00
|
|
|
/* We do have overlap. Now see if field is large enough to
|
|
|
|
cover the access. Give up for accesses spanning multiple
|
|
|
|
fields. */
|
2012-09-07 02:06:35 +02:00
|
|
|
if (access_end.cmp (bitoffset_end, 0) > 0)
|
2011-03-24 12:23:29 +01:00
|
|
|
return NULL_TREE;
|
2012-09-07 02:06:35 +02:00
|
|
|
if (double_int::from_uhwi (offset).slt (bitoffset))
|
2011-07-19 11:24:28 +02:00
|
|
|
return NULL_TREE;
|
2011-03-24 12:23:29 +01:00
|
|
|
return fold_ctor_reference (type, cval,
|
2012-09-07 02:06:35 +02:00
|
|
|
inner_offset.to_uhwi (), size,
|
2012-05-19 11:49:47 +02:00
|
|
|
from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* When memory is not explicitely mentioned in constructor, it is 0. */
|
|
|
|
return build_zero_cst (type);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* CTOR is value initializing memory, fold reference of type TYPE and size SIZE
|
|
|
|
to the memory at bit OFFSET. */
|
|
|
|
|
|
|
|
static tree
|
|
|
|
fold_ctor_reference (tree type, tree ctor, unsigned HOST_WIDE_INT offset,
|
2012-05-19 11:49:47 +02:00
|
|
|
unsigned HOST_WIDE_INT size, tree from_decl)
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
|
|
|
tree ret;
|
|
|
|
|
|
|
|
/* We found the field with exact match. */
|
|
|
|
if (useless_type_conversion_p (type, TREE_TYPE (ctor))
|
|
|
|
&& !offset)
|
2013-01-13 13:33:43 +01:00
|
|
|
return canonicalize_constructor_val (unshare_expr (ctor), from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* We are at the end of walk, see if we can view convert the
|
|
|
|
result. */
|
|
|
|
if (!AGGREGATE_TYPE_P (TREE_TYPE (ctor)) && !offset
|
|
|
|
/* VIEW_CONVERT_EXPR is defined only for matching sizes. */
|
|
|
|
&& operand_equal_p (TYPE_SIZE (type),
|
|
|
|
TYPE_SIZE (TREE_TYPE (ctor)), 0))
|
|
|
|
{
|
2013-01-13 13:33:43 +01:00
|
|
|
ret = canonicalize_constructor_val (unshare_expr (ctor), from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
ret = fold_unary (VIEW_CONVERT_EXPR, type, ret);
|
|
|
|
if (ret)
|
|
|
|
STRIP_NOPS (ret);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
if (TREE_CODE (ctor) == STRING_CST)
|
|
|
|
return fold_string_cst_ctor_reference (type, ctor, offset, size);
|
|
|
|
if (TREE_CODE (ctor) == CONSTRUCTOR)
|
|
|
|
{
|
|
|
|
|
2011-10-05 11:31:40 +02:00
|
|
|
if (TREE_CODE (TREE_TYPE (ctor)) == ARRAY_TYPE
|
|
|
|
|| TREE_CODE (TREE_TYPE (ctor)) == VECTOR_TYPE)
|
2012-05-19 11:49:47 +02:00
|
|
|
return fold_array_ctor_reference (type, ctor, offset, size,
|
|
|
|
from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
else
|
2012-05-19 11:49:47 +02:00
|
|
|
return fold_nonarray_ctor_reference (type, ctor, offset, size,
|
|
|
|
from_decl);
|
2011-03-24 12:23:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return the tree representing the element referenced by T if T is an
|
|
|
|
ARRAY_REF or COMPONENT_REF into constant aggregates valuezing SSA
|
|
|
|
names using VALUEIZE. Return NULL_TREE otherwise. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
fold_const_aggregate_ref_1 (tree t, tree (*valueize) (tree))
|
|
|
|
{
|
|
|
|
tree ctor, idx, base;
|
|
|
|
HOST_WIDE_INT offset, size, max_size;
|
|
|
|
tree tem;
|
|
|
|
|
2011-09-26 14:58:35 +02:00
|
|
|
if (TREE_THIS_VOLATILE (t))
|
|
|
|
return NULL_TREE;
|
|
|
|
|
2011-03-24 12:23:29 +01:00
|
|
|
if (TREE_CODE_CLASS (TREE_CODE (t)) == tcc_declaration)
|
|
|
|
return get_symbol_constant_value (t);
|
|
|
|
|
|
|
|
tem = fold_read_from_constant_string (t);
|
|
|
|
if (tem)
|
|
|
|
return tem;
|
|
|
|
|
|
|
|
switch (TREE_CODE (t))
|
|
|
|
{
|
|
|
|
case ARRAY_REF:
|
|
|
|
case ARRAY_RANGE_REF:
|
|
|
|
/* Constant indexes are handled well by get_base_constructor.
|
|
|
|
Only special case variable offsets.
|
|
|
|
FIXME: This code can't handle nested references with variable indexes
|
|
|
|
(they will be handled only by iteration of ccp). Perhaps we can bring
|
|
|
|
get_ref_base_and_extent here and make it use a valueize callback. */
|
|
|
|
if (TREE_CODE (TREE_OPERAND (t, 1)) == SSA_NAME
|
|
|
|
&& valueize
|
|
|
|
&& (idx = (*valueize) (TREE_OPERAND (t, 1)))
|
2012-05-07 20:57:23 +02:00
|
|
|
&& TREE_CODE (idx) == INTEGER_CST)
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
|
|
|
tree low_bound, unit_size;
|
2012-05-07 20:57:23 +02:00
|
|
|
double_int doffset;
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
/* If the resulting bit-offset is constant, track it. */
|
|
|
|
if ((low_bound = array_ref_low_bound (t),
|
2012-05-07 20:57:23 +02:00
|
|
|
TREE_CODE (low_bound) == INTEGER_CST)
|
2011-03-24 12:23:29 +01:00
|
|
|
&& (unit_size = array_ref_element_size (t),
|
decl.c, [...]: Replace host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/misc.c, gcc-interface/utils.c:
Replace host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/c-family/
* c-ada-spec.c, c-common.c, c-pretty-print.c: Replace
host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/cp/
* decl.c: Replace host_integerp (..., 1) with tree_fits_uhwi_p
throughout.
gcc/
* builtins.c, config/alpha/alpha.c, config/iq2000/iq2000.c,
config/mips/mips.c, dbxout.c, dwarf2out.c, expr.c, fold-const.c,
gimple-fold.c, godump.c, omp-low.c, predict.c, sdbout.c, stor-layout.c,
tree-dfa.c, tree-sra.c, tree-ssa-forwprop.c, tree-ssa-loop-prefetch.c,
tree-ssa-phiopt.c, tree-ssa-sccvn.c, tree-ssa-strlen.c,
tree-ssa-structalias.c, tree-vect-data-refs.c, tree-vect-patterns.c,
tree.c, varasm.c, alias.c, cfgexpand.c, config/aarch64/aarch64.c,
config/arm/arm.c, config/epiphany/epiphany.c, config/i386/i386.c,
config/m32c/m32c-pragma.c, config/mep/mep-pragma.c,
config/rs6000/rs6000.c, config/sparc/sparc.c, emit-rtl.c, function.c,
gimplify.c, ipa-prop.c, stmt.c, trans-mem.c, tree-cfg.c,
tree-object-size.c, tree-ssa-ccp.c, tree-ssa-loop-ivcanon.c,
tree-stdarg.c, tree-switch-conversion.c, tree-vect-generic.c,
tree-vrp.c, tsan.c, ubsan.c: Replace host_integerp (..., 1) with
tree_fits_uhwi_p throughout.
From-SVN: r204956
2013-11-18 15:51:26 +01:00
|
|
|
tree_fits_uhwi_p (unit_size))
|
2012-09-07 02:06:35 +02:00
|
|
|
&& (doffset = (TREE_INT_CST (idx) - TREE_INT_CST (low_bound))
|
|
|
|
.sext (TYPE_PRECISION (TREE_TYPE (idx))),
|
|
|
|
doffset.fits_shwi ()))
|
2011-03-24 12:23:29 +01:00
|
|
|
{
|
2012-09-07 02:06:35 +02:00
|
|
|
offset = doffset.to_shwi ();
|
2013-11-20 12:57:27 +01:00
|
|
|
offset *= tree_to_uhwi (unit_size);
|
2011-03-24 12:23:29 +01:00
|
|
|
offset *= BITS_PER_UNIT;
|
|
|
|
|
|
|
|
base = TREE_OPERAND (t, 0);
|
|
|
|
ctor = get_base_constructor (base, &offset, valueize);
|
|
|
|
/* Empty constructor. Always fold to 0. */
|
|
|
|
if (ctor == error_mark_node)
|
|
|
|
return build_zero_cst (TREE_TYPE (t));
|
|
|
|
/* Out of bound array access. Value is undefined,
|
|
|
|
but don't fold. */
|
|
|
|
if (offset < 0)
|
|
|
|
return NULL_TREE;
|
|
|
|
/* We can not determine ctor. */
|
|
|
|
if (!ctor)
|
|
|
|
return NULL_TREE;
|
|
|
|
return fold_ctor_reference (TREE_TYPE (t), ctor, offset,
|
2013-11-20 12:57:27 +01:00
|
|
|
tree_to_uhwi (unit_size)
|
2012-05-19 11:49:47 +02:00
|
|
|
* BITS_PER_UNIT,
|
|
|
|
base);
|
2011-03-24 12:23:29 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Fallthru. */
|
|
|
|
|
|
|
|
case COMPONENT_REF:
|
|
|
|
case BIT_FIELD_REF:
|
|
|
|
case TARGET_MEM_REF:
|
|
|
|
case MEM_REF:
|
|
|
|
base = get_ref_base_and_extent (t, &offset, &size, &max_size);
|
|
|
|
ctor = get_base_constructor (base, &offset, valueize);
|
|
|
|
|
|
|
|
/* Empty constructor. Always fold to 0. */
|
|
|
|
if (ctor == error_mark_node)
|
|
|
|
return build_zero_cst (TREE_TYPE (t));
|
|
|
|
/* We do not know precise address. */
|
|
|
|
if (max_size == -1 || max_size != size)
|
|
|
|
return NULL_TREE;
|
|
|
|
/* We can not determine ctor. */
|
|
|
|
if (!ctor)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
/* Out of bound array access. Value is undefined, but don't fold. */
|
|
|
|
if (offset < 0)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
2012-05-19 11:49:47 +02:00
|
|
|
return fold_ctor_reference (TREE_TYPE (t), ctor, offset, size,
|
|
|
|
base);
|
2011-03-24 12:23:29 +01:00
|
|
|
|
|
|
|
case REALPART_EXPR:
|
|
|
|
case IMAGPART_EXPR:
|
|
|
|
{
|
|
|
|
tree c = fold_const_aggregate_ref_1 (TREE_OPERAND (t, 0), valueize);
|
|
|
|
if (c && TREE_CODE (c) == COMPLEX_CST)
|
|
|
|
return fold_build1_loc (EXPR_LOCATION (t),
|
|
|
|
TREE_CODE (t), TREE_TYPE (t), c);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
|
|
|
|
|
|
|
tree
|
|
|
|
fold_const_aggregate_ref (tree t)
|
|
|
|
{
|
|
|
|
return fold_const_aggregate_ref_1 (t, NULL);
|
|
|
|
}
|
2011-06-07 17:12:04 +02:00
|
|
|
|
2011-09-02 15:26:30 +02:00
|
|
|
/* Return a declaration of a function which an OBJ_TYPE_REF references. TOKEN
|
|
|
|
is integer form of OBJ_TYPE_REF_TOKEN of the reference expression.
|
|
|
|
KNOWN_BINFO carries the binfo describing the true type of
|
|
|
|
OBJ_TYPE_REF_OBJECT(REF). */
|
|
|
|
|
|
|
|
tree
|
|
|
|
gimple_get_virt_method_for_binfo (HOST_WIDE_INT token, tree known_binfo)
|
|
|
|
{
|
|
|
|
unsigned HOST_WIDE_INT offset, size;
|
2013-08-26 17:40:40 +02:00
|
|
|
tree v, fn, vtable, init;
|
2011-09-02 15:26:30 +02:00
|
|
|
|
2012-05-19 11:49:47 +02:00
|
|
|
vtable = v = BINFO_VTABLE (known_binfo);
|
2011-09-02 15:26:30 +02:00
|
|
|
/* If there is no virtual methods table, leave the OBJ_TYPE_REF alone. */
|
|
|
|
if (!v)
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
if (TREE_CODE (v) == POINTER_PLUS_EXPR)
|
|
|
|
{
|
decl.c, [...]: Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/utils.c, gcc-interface/utils2.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/c-family/
* c-common.c, c-cppbuiltin.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/c/
* c-decl.c, c-typeck.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/cp/
* call.c, class.c, decl.c, error.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/objc/
* objc-encoding.c: Replace tree_low_cst (..., 1) with tree_to_uhwi
throughout.
gcc/
* alias.c, asan.c, builtins.c, cfgexpand.c, cgraph.c,
config/aarch64/aarch64.c, config/alpha/predicates.md,
config/arm/arm.c, config/darwin.c, config/epiphany/epiphany.c,
config/i386/i386.c, config/iq2000/iq2000.c, config/m32c/m32c-pragma.c,
config/mep/mep-pragma.c, config/mips/mips.c,
config/picochip/picochip.c, config/rs6000/rs6000.c, cppbuiltin.c,
dbxout.c, dwarf2out.c, emit-rtl.c, except.c, expr.c, fold-const.c,
function.c, gimple-fold.c, godump.c, ipa-cp.c, ipa-prop.c, omp-low.c,
predict.c, sdbout.c, stor-layout.c, trans-mem.c, tree-object-size.c,
tree-sra.c, tree-ssa-ccp.c, tree-ssa-forwprop.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-ivopts.c, tree-ssa-loop-niter.c,
tree-ssa-loop-prefetch.c, tree-ssa-strlen.c, tree-stdarg.c,
tree-switch-conversion.c, tree-vect-generic.c, tree-vect-loop.c,
tree-vect-patterns.c, tree-vrp.c, tree.c, tsan.c, ubsan.c, varasm.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
From-SVN: r204961
2013-11-18 15:52:19 +01:00
|
|
|
offset = tree_to_uhwi (TREE_OPERAND (v, 1)) * BITS_PER_UNIT;
|
2011-09-02 15:26:30 +02:00
|
|
|
v = TREE_OPERAND (v, 0);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
offset = 0;
|
|
|
|
|
|
|
|
if (TREE_CODE (v) != ADDR_EXPR)
|
|
|
|
return NULL_TREE;
|
|
|
|
v = TREE_OPERAND (v, 0);
|
|
|
|
|
|
|
|
if (TREE_CODE (v) != VAR_DECL
|
2013-08-26 17:40:40 +02:00
|
|
|
|| !DECL_VIRTUAL_P (v))
|
2011-09-02 15:26:30 +02:00
|
|
|
return NULL_TREE;
|
2013-08-26 17:40:40 +02:00
|
|
|
init = ctor_for_folding (v);
|
|
|
|
|
|
|
|
/* The virtual tables should always be born with constructors.
|
|
|
|
and we always should assume that they are avaialble for
|
|
|
|
folding. At the moment we do not stream them in all cases,
|
|
|
|
but it should never happen that ctor seem unreachable. */
|
|
|
|
gcc_assert (init);
|
|
|
|
if (init == error_mark_node)
|
|
|
|
{
|
|
|
|
gcc_assert (in_lto_p);
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|
2011-09-02 15:26:30 +02:00
|
|
|
gcc_checking_assert (TREE_CODE (TREE_TYPE (v)) == ARRAY_TYPE);
|
decl.c, [...]: Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/utils.c, gcc-interface/utils2.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/c-family/
* c-common.c, c-cppbuiltin.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/c/
* c-decl.c, c-typeck.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/cp/
* call.c, class.c, decl.c, error.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/objc/
* objc-encoding.c: Replace tree_low_cst (..., 1) with tree_to_uhwi
throughout.
gcc/
* alias.c, asan.c, builtins.c, cfgexpand.c, cgraph.c,
config/aarch64/aarch64.c, config/alpha/predicates.md,
config/arm/arm.c, config/darwin.c, config/epiphany/epiphany.c,
config/i386/i386.c, config/iq2000/iq2000.c, config/m32c/m32c-pragma.c,
config/mep/mep-pragma.c, config/mips/mips.c,
config/picochip/picochip.c, config/rs6000/rs6000.c, cppbuiltin.c,
dbxout.c, dwarf2out.c, emit-rtl.c, except.c, expr.c, fold-const.c,
function.c, gimple-fold.c, godump.c, ipa-cp.c, ipa-prop.c, omp-low.c,
predict.c, sdbout.c, stor-layout.c, trans-mem.c, tree-object-size.c,
tree-sra.c, tree-ssa-ccp.c, tree-ssa-forwprop.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-ivopts.c, tree-ssa-loop-niter.c,
tree-ssa-loop-prefetch.c, tree-ssa-strlen.c, tree-stdarg.c,
tree-switch-conversion.c, tree-vect-generic.c, tree-vect-loop.c,
tree-vect-patterns.c, tree-vrp.c, tree.c, tsan.c, ubsan.c, varasm.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
From-SVN: r204961
2013-11-18 15:52:19 +01:00
|
|
|
size = tree_to_uhwi (TYPE_SIZE (TREE_TYPE (TREE_TYPE (v))));
|
2011-09-02 15:26:30 +02:00
|
|
|
offset += token * size;
|
2013-08-26 17:40:40 +02:00
|
|
|
fn = fold_ctor_reference (TREE_TYPE (TREE_TYPE (v)), init,
|
2013-09-10 15:46:31 +02:00
|
|
|
offset, size, v);
|
2012-04-13 19:57:21 +02:00
|
|
|
if (!fn || integer_zerop (fn))
|
2011-09-02 15:26:30 +02:00
|
|
|
return NULL_TREE;
|
|
|
|
gcc_assert (TREE_CODE (fn) == ADDR_EXPR
|
|
|
|
|| TREE_CODE (fn) == FDESC_EXPR);
|
|
|
|
fn = TREE_OPERAND (fn, 0);
|
|
|
|
gcc_assert (TREE_CODE (fn) == FUNCTION_DECL);
|
|
|
|
|
|
|
|
/* When cgraph node is missing and function is not public, we cannot
|
|
|
|
devirtualize. This can happen in WHOPR when the actual method
|
|
|
|
ends up in other partition, because we found devirtualization
|
|
|
|
possibility too late. */
|
2012-05-19 11:49:47 +02:00
|
|
|
if (!can_refer_decl_in_current_unit_p (fn, vtable))
|
2011-09-02 15:26:30 +02:00
|
|
|
return NULL_TREE;
|
|
|
|
|
2012-03-14 14:01:46 +01:00
|
|
|
/* Make sure we create a cgraph node for functions we'll reference.
|
|
|
|
They can be non-existent if the reference comes from an entry
|
|
|
|
of an external vtable for example. */
|
|
|
|
cgraph_get_create_node (fn);
|
|
|
|
|
2011-09-02 15:26:30 +02:00
|
|
|
return fn;
|
|
|
|
}
|
|
|
|
|
2011-06-07 17:12:04 +02:00
|
|
|
/* Return true iff VAL is a gimple expression that is known to be
|
|
|
|
non-negative. Restricted to floating-point inputs. */
|
|
|
|
|
|
|
|
bool
|
|
|
|
gimple_val_nonnegative_real_p (tree val)
|
|
|
|
{
|
|
|
|
gimple def_stmt;
|
|
|
|
|
|
|
|
gcc_assert (val && SCALAR_FLOAT_TYPE_P (TREE_TYPE (val)));
|
|
|
|
|
|
|
|
/* Use existing logic for non-gimple trees. */
|
|
|
|
if (tree_expr_nonnegative_p (val))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (TREE_CODE (val) != SSA_NAME)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
/* Currently we look only at the immediately defining statement
|
|
|
|
to make this determination, since recursion on defining
|
|
|
|
statements of operands can lead to quadratic behavior in the
|
|
|
|
worst case. This is expected to catch almost all occurrences
|
|
|
|
in practice. It would be possible to implement limited-depth
|
|
|
|
recursion if important cases are lost. Alternatively, passes
|
|
|
|
that need this information (such as the pow/powi lowering code
|
|
|
|
in the cse_sincos pass) could be revised to provide it through
|
|
|
|
dataflow propagation. */
|
|
|
|
|
|
|
|
def_stmt = SSA_NAME_DEF_STMT (val);
|
|
|
|
|
|
|
|
if (is_gimple_assign (def_stmt))
|
|
|
|
{
|
|
|
|
tree op0, op1;
|
|
|
|
|
|
|
|
/* See fold-const.c:tree_expr_nonnegative_p for additional
|
|
|
|
cases that could be handled with recursion. */
|
|
|
|
|
|
|
|
switch (gimple_assign_rhs_code (def_stmt))
|
|
|
|
{
|
|
|
|
case ABS_EXPR:
|
|
|
|
/* Always true for floating-point operands. */
|
|
|
|
return true;
|
|
|
|
|
|
|
|
case MULT_EXPR:
|
|
|
|
/* True if the two operands are identical (since we are
|
|
|
|
restricted to floating-point inputs). */
|
|
|
|
op0 = gimple_assign_rhs1 (def_stmt);
|
|
|
|
op1 = gimple_assign_rhs2 (def_stmt);
|
|
|
|
|
|
|
|
if (op0 == op1
|
|
|
|
|| operand_equal_p (op0, op1, 0))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (is_gimple_call (def_stmt))
|
|
|
|
{
|
|
|
|
tree fndecl = gimple_call_fndecl (def_stmt);
|
|
|
|
if (fndecl
|
|
|
|
&& DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_NORMAL)
|
|
|
|
{
|
|
|
|
tree arg1;
|
|
|
|
|
|
|
|
switch (DECL_FUNCTION_CODE (fndecl))
|
|
|
|
{
|
|
|
|
CASE_FLT_FN (BUILT_IN_ACOS):
|
|
|
|
CASE_FLT_FN (BUILT_IN_ACOSH):
|
|
|
|
CASE_FLT_FN (BUILT_IN_CABS):
|
|
|
|
CASE_FLT_FN (BUILT_IN_COSH):
|
|
|
|
CASE_FLT_FN (BUILT_IN_ERFC):
|
|
|
|
CASE_FLT_FN (BUILT_IN_EXP):
|
|
|
|
CASE_FLT_FN (BUILT_IN_EXP10):
|
|
|
|
CASE_FLT_FN (BUILT_IN_EXP2):
|
|
|
|
CASE_FLT_FN (BUILT_IN_FABS):
|
|
|
|
CASE_FLT_FN (BUILT_IN_FDIM):
|
|
|
|
CASE_FLT_FN (BUILT_IN_HYPOT):
|
|
|
|
CASE_FLT_FN (BUILT_IN_POW10):
|
|
|
|
return true;
|
|
|
|
|
|
|
|
CASE_FLT_FN (BUILT_IN_SQRT):
|
|
|
|
/* sqrt(-0.0) is -0.0, and sqrt is not defined over other
|
|
|
|
nonnegative inputs. */
|
|
|
|
if (!HONOR_SIGNED_ZEROS (TYPE_MODE (TREE_TYPE (val))))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
CASE_FLT_FN (BUILT_IN_POWI):
|
|
|
|
/* True if the second argument is an even integer. */
|
|
|
|
arg1 = gimple_call_arg (def_stmt, 1);
|
|
|
|
|
|
|
|
if (TREE_CODE (arg1) == INTEGER_CST
|
|
|
|
&& (TREE_INT_CST_LOW (arg1) & 1) == 0)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
CASE_FLT_FN (BUILT_IN_POW):
|
|
|
|
/* True if the second argument is an even integer-valued
|
|
|
|
real. */
|
|
|
|
arg1 = gimple_call_arg (def_stmt, 1);
|
|
|
|
|
|
|
|
if (TREE_CODE (arg1) == REAL_CST)
|
|
|
|
{
|
|
|
|
REAL_VALUE_TYPE c;
|
|
|
|
HOST_WIDE_INT n;
|
|
|
|
|
|
|
|
c = TREE_REAL_CST (arg1);
|
|
|
|
n = real_to_integer (&c);
|
|
|
|
|
|
|
|
if ((n & 1) == 0)
|
|
|
|
{
|
|
|
|
REAL_VALUE_TYPE cint;
|
|
|
|
real_from_integer (&cint, VOIDmode, n, n < 0 ? -1 : 0, 0);
|
|
|
|
if (real_identical (&c, &cint))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
2013-10-10 14:16:24 +02:00
|
|
|
|
|
|
|
/* Given a pointer value OP0, return a simplified version of an
|
|
|
|
indirection through OP0, or NULL_TREE if no simplification is
|
|
|
|
possible. Note that the resulting type may be different from
|
|
|
|
the type pointed to in the sense that it is still compatible
|
|
|
|
from the langhooks point of view. */
|
|
|
|
|
|
|
|
tree
|
|
|
|
gimple_fold_indirect_ref (tree t)
|
|
|
|
{
|
|
|
|
tree ptype = TREE_TYPE (t), type = TREE_TYPE (ptype);
|
|
|
|
tree sub = t;
|
|
|
|
tree subtype;
|
|
|
|
|
|
|
|
STRIP_NOPS (sub);
|
|
|
|
subtype = TREE_TYPE (sub);
|
|
|
|
if (!POINTER_TYPE_P (subtype))
|
|
|
|
return NULL_TREE;
|
|
|
|
|
|
|
|
if (TREE_CODE (sub) == ADDR_EXPR)
|
|
|
|
{
|
|
|
|
tree op = TREE_OPERAND (sub, 0);
|
|
|
|
tree optype = TREE_TYPE (op);
|
|
|
|
/* *&p => p */
|
|
|
|
if (useless_type_conversion_p (type, optype))
|
|
|
|
return op;
|
|
|
|
|
|
|
|
/* *(foo *)&fooarray => fooarray[0] */
|
|
|
|
if (TREE_CODE (optype) == ARRAY_TYPE
|
|
|
|
&& TREE_CODE (TYPE_SIZE (TREE_TYPE (optype))) == INTEGER_CST
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (optype)))
|
|
|
|
{
|
|
|
|
tree type_domain = TYPE_DOMAIN (optype);
|
|
|
|
tree min_val = size_zero_node;
|
|
|
|
if (type_domain && TYPE_MIN_VALUE (type_domain))
|
|
|
|
min_val = TYPE_MIN_VALUE (type_domain);
|
|
|
|
if (TREE_CODE (min_val) == INTEGER_CST)
|
|
|
|
return build4 (ARRAY_REF, type, op, min_val, NULL_TREE, NULL_TREE);
|
|
|
|
}
|
|
|
|
/* *(foo *)&complexfoo => __real__ complexfoo */
|
|
|
|
else if (TREE_CODE (optype) == COMPLEX_TYPE
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (optype)))
|
|
|
|
return fold_build1 (REALPART_EXPR, type, op);
|
|
|
|
/* *(foo *)&vectorfoo => BIT_FIELD_REF<vectorfoo,...> */
|
|
|
|
else if (TREE_CODE (optype) == VECTOR_TYPE
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (optype)))
|
|
|
|
{
|
|
|
|
tree part_width = TYPE_SIZE (type);
|
|
|
|
tree index = bitsize_int (0);
|
|
|
|
return fold_build3 (BIT_FIELD_REF, type, op, part_width, index);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *(p + CST) -> ... */
|
|
|
|
if (TREE_CODE (sub) == POINTER_PLUS_EXPR
|
|
|
|
&& TREE_CODE (TREE_OPERAND (sub, 1)) == INTEGER_CST)
|
|
|
|
{
|
|
|
|
tree addr = TREE_OPERAND (sub, 0);
|
|
|
|
tree off = TREE_OPERAND (sub, 1);
|
|
|
|
tree addrtype;
|
|
|
|
|
|
|
|
STRIP_NOPS (addr);
|
|
|
|
addrtype = TREE_TYPE (addr);
|
|
|
|
|
|
|
|
/* ((foo*)&vectorfoo)[1] -> BIT_FIELD_REF<vectorfoo,...> */
|
|
|
|
if (TREE_CODE (addr) == ADDR_EXPR
|
|
|
|
&& TREE_CODE (TREE_TYPE (addrtype)) == VECTOR_TYPE
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (TREE_TYPE (addrtype)))
|
decl.c, [...]: Replace host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/misc.c, gcc-interface/utils.c:
Replace host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/c-family/
* c-ada-spec.c, c-common.c, c-pretty-print.c: Replace
host_integerp (..., 1) with tree_fits_uhwi_p throughout.
gcc/cp/
* decl.c: Replace host_integerp (..., 1) with tree_fits_uhwi_p
throughout.
gcc/
* builtins.c, config/alpha/alpha.c, config/iq2000/iq2000.c,
config/mips/mips.c, dbxout.c, dwarf2out.c, expr.c, fold-const.c,
gimple-fold.c, godump.c, omp-low.c, predict.c, sdbout.c, stor-layout.c,
tree-dfa.c, tree-sra.c, tree-ssa-forwprop.c, tree-ssa-loop-prefetch.c,
tree-ssa-phiopt.c, tree-ssa-sccvn.c, tree-ssa-strlen.c,
tree-ssa-structalias.c, tree-vect-data-refs.c, tree-vect-patterns.c,
tree.c, varasm.c, alias.c, cfgexpand.c, config/aarch64/aarch64.c,
config/arm/arm.c, config/epiphany/epiphany.c, config/i386/i386.c,
config/m32c/m32c-pragma.c, config/mep/mep-pragma.c,
config/rs6000/rs6000.c, config/sparc/sparc.c, emit-rtl.c, function.c,
gimplify.c, ipa-prop.c, stmt.c, trans-mem.c, tree-cfg.c,
tree-object-size.c, tree-ssa-ccp.c, tree-ssa-loop-ivcanon.c,
tree-stdarg.c, tree-switch-conversion.c, tree-vect-generic.c,
tree-vrp.c, tsan.c, ubsan.c: Replace host_integerp (..., 1) with
tree_fits_uhwi_p throughout.
From-SVN: r204956
2013-11-18 15:51:26 +01:00
|
|
|
&& tree_fits_uhwi_p (off))
|
2013-10-10 14:16:24 +02:00
|
|
|
{
|
decl.c, [...]: Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/ada/
* gcc-interface/decl.c, gcc-interface/utils.c, gcc-interface/utils2.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
gcc/c-family/
* c-common.c, c-cppbuiltin.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/c/
* c-decl.c, c-typeck.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/cp/
* call.c, class.c, decl.c, error.c: Replace tree_low_cst (..., 1) with
tree_to_uhwi throughout.
gcc/objc/
* objc-encoding.c: Replace tree_low_cst (..., 1) with tree_to_uhwi
throughout.
gcc/
* alias.c, asan.c, builtins.c, cfgexpand.c, cgraph.c,
config/aarch64/aarch64.c, config/alpha/predicates.md,
config/arm/arm.c, config/darwin.c, config/epiphany/epiphany.c,
config/i386/i386.c, config/iq2000/iq2000.c, config/m32c/m32c-pragma.c,
config/mep/mep-pragma.c, config/mips/mips.c,
config/picochip/picochip.c, config/rs6000/rs6000.c, cppbuiltin.c,
dbxout.c, dwarf2out.c, emit-rtl.c, except.c, expr.c, fold-const.c,
function.c, gimple-fold.c, godump.c, ipa-cp.c, ipa-prop.c, omp-low.c,
predict.c, sdbout.c, stor-layout.c, trans-mem.c, tree-object-size.c,
tree-sra.c, tree-ssa-ccp.c, tree-ssa-forwprop.c,
tree-ssa-loop-ivcanon.c, tree-ssa-loop-ivopts.c, tree-ssa-loop-niter.c,
tree-ssa-loop-prefetch.c, tree-ssa-strlen.c, tree-stdarg.c,
tree-switch-conversion.c, tree-vect-generic.c, tree-vect-loop.c,
tree-vect-patterns.c, tree-vrp.c, tree.c, tsan.c, ubsan.c, varasm.c:
Replace tree_low_cst (..., 1) with tree_to_uhwi throughout.
From-SVN: r204961
2013-11-18 15:52:19 +01:00
|
|
|
unsigned HOST_WIDE_INT offset = tree_to_uhwi (off);
|
2013-10-10 14:16:24 +02:00
|
|
|
tree part_width = TYPE_SIZE (type);
|
|
|
|
unsigned HOST_WIDE_INT part_widthi
|
c-common.c, [...]: Replace tree_low_cst (..., 0) with tree_to_shwi throughout.
gcc/c-family/
* c-common.c, c-format.c, c-omp.c, c-pretty-print.c: Replace
tree_low_cst (..., 0) with tree_to_shwi throughout.
gcc/c/
* c-parser.c: Replace tree_low_cst (..., 0) with tree_to_shwi
throughout.
gcc/cp/
* class.c, dump.c, error.c, init.c, method.c, parser.c, semantics.c:
Replace tree_low_cst (..., 0) with tree_to_shwi throughout.
gcc/go/
* gofrontend/expressions.cc: Replace tree_low_cst (..., 0) with
tree_to_shwi throughout.
gcc/java/
* class.c, expr.c: Replace tree_low_cst (..., 0) with tree_to_shwi
throughout.
gcc/objc/
* objc-next-runtime-abi-02.c: Replace tree_low_cst (..., 0) with
tree_to_shwi throughout.
gcc/
* builtins.c, cilk-common.c, config/aarch64/aarch64.c,
config/alpha/alpha.c, config/arm/arm.c, config/c6x/predicates.md,
config/i386/i386.c, config/ia64/predicates.md, config/s390/s390.c,
coverage.c, dbxout.c, dwarf2out.c, except.c, explow.c, expr.c, expr.h,
fold-const.c, gimple-fold.c, godump.c, ipa-prop.c, omp-low.c,
predict.c, rtlanal.c, sdbout.c, stmt.c, stor-layout.c, targhooks.c,
tree-cfg.c, tree-data-ref.c, tree-inline.c, tree-ssa-forwprop.c,
tree-ssa-loop-prefetch.c, tree-ssa-phiopt.c, tree-ssa-sccvn.c,
tree-ssa-strlen.c, tree-stdarg.c, tree-vect-data-refs.c,
tree-vect-patterns.c, tree.c, tree.h, var-tracking.c, varasm.c:
Replace tree_low_cst (..., 0) with tree_to_shwi throughout.
From-SVN: r204959
2013-11-18 15:52:03 +01:00
|
|
|
= tree_to_shwi (part_width) / BITS_PER_UNIT;
|
2013-10-10 14:16:24 +02:00
|
|
|
unsigned HOST_WIDE_INT indexi = offset * BITS_PER_UNIT;
|
|
|
|
tree index = bitsize_int (indexi);
|
|
|
|
if (offset / part_widthi
|
2013-11-27 11:00:30 +01:00
|
|
|
< TYPE_VECTOR_SUBPARTS (TREE_TYPE (addrtype)))
|
2013-10-10 14:16:24 +02:00
|
|
|
return fold_build3 (BIT_FIELD_REF, type, TREE_OPERAND (addr, 0),
|
|
|
|
part_width, index);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ((foo*)&complexfoo)[1] -> __imag__ complexfoo */
|
|
|
|
if (TREE_CODE (addr) == ADDR_EXPR
|
|
|
|
&& TREE_CODE (TREE_TYPE (addrtype)) == COMPLEX_TYPE
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (TREE_TYPE (addrtype))))
|
|
|
|
{
|
|
|
|
tree size = TYPE_SIZE_UNIT (type);
|
|
|
|
if (tree_int_cst_equal (size, off))
|
|
|
|
return fold_build1 (IMAGPART_EXPR, type, TREE_OPERAND (addr, 0));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *(p + CST) -> MEM_REF <p, CST>. */
|
|
|
|
if (TREE_CODE (addr) != ADDR_EXPR
|
|
|
|
|| DECL_P (TREE_OPERAND (addr, 0)))
|
|
|
|
return fold_build2 (MEM_REF, type,
|
|
|
|
addr,
|
|
|
|
build_int_cst_wide (ptype,
|
|
|
|
TREE_INT_CST_LOW (off),
|
|
|
|
TREE_INT_CST_HIGH (off)));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* *(foo *)fooarrptr => (*fooarrptr)[0] */
|
|
|
|
if (TREE_CODE (TREE_TYPE (subtype)) == ARRAY_TYPE
|
|
|
|
&& TREE_CODE (TYPE_SIZE (TREE_TYPE (TREE_TYPE (subtype)))) == INTEGER_CST
|
|
|
|
&& useless_type_conversion_p (type, TREE_TYPE (TREE_TYPE (subtype))))
|
|
|
|
{
|
|
|
|
tree type_domain;
|
|
|
|
tree min_val = size_zero_node;
|
|
|
|
tree osub = sub;
|
|
|
|
sub = gimple_fold_indirect_ref (sub);
|
|
|
|
if (! sub)
|
|
|
|
sub = build1 (INDIRECT_REF, TREE_TYPE (subtype), osub);
|
|
|
|
type_domain = TYPE_DOMAIN (TREE_TYPE (sub));
|
|
|
|
if (type_domain && TYPE_MIN_VALUE (type_domain))
|
|
|
|
min_val = TYPE_MIN_VALUE (type_domain);
|
|
|
|
if (TREE_CODE (min_val) == INTEGER_CST)
|
|
|
|
return build4 (ARRAY_REF, type, sub, min_val, NULL_TREE, NULL_TREE);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL_TREE;
|
|
|
|
}
|